Fix RFS link on the contact page, fix link routing issues, disable sponsoring team boiler plates

debexpo/config/routing.py

@@ -66,7 +66,6 @@ def make_map(config):
     map.connect('sponsors', '/sponsors', controller='sponsor', action='index')
     map.connect('packaging-team', '/sponsors/spackaging-team', controller='sponsor', action='packaging_team')
     map.connect('guidelines', '/sponsors/guidelines', controller='sponsor', action='guidelines')
-    map.connect('rfs-howto', '/sponsors/rfs-howto', controller='sponsor', action='rfs_howto')
     map.connect('sponsor-developer', '/sponsors/profile/{id}', controller='sponsor', action='developer')
     map.connect('sponsor_tag_save', '/sponsors/save', controller='sponsor', action='save')
     map.connect('sponsor_tag_clear', '/sponsors/clear', controller='sponsor', action='clear')
@@ -81,6 +80,7 @@ def make_map(config):
     map.connect('sponsor', '/package/{packagename}/needs_sponsor/{key}', controller='package', action='sponsor')
     map.connect('subscribe', '/package/{packagename}/subscribe', controller='package', action='subscribe')
     map.connect('delete', '/package/{packagename}/delete/{key}', controller='package', action='delete')
+    map.connect('rfs', '/sponsors/rfs-howto', controller='sponsor', action='rfs_howto')
     map.connect('rfs', '/sponsors/rfs-howto/{packagename}', controller='sponsor', action='rfs_howto')
     map.connect('packages', '/packages/{action}', controller='packages', action='index')
     map.connect('all-packages', '/packages', controller='packages', action='index')

debexpo/controllers/sponsor.py

@@ -74,7 +74,7 @@ class SponsorController(BaseController):
         c.submenu = SubMenu()
         c.submenu.set_label("About Sponsoring")
         c.submenu.add_entry(_("Overview"), url("sponsors"))
-        c.submenu.add_entry(_("Join a packaging team"), url("packaging-team"))
+        #c.submenu.add_entry(_("Join a packaging team"), url("packaging-team"))
         c.submenu.add_entry(_("Sponsoring Guidelines"), url("guidelines"))
         c.submenu.add_entry(_("Request for Sponsorship"), url("rfs-howto"))
         BaseController.__init__(self)

debexpo/templates/index/contact.mako

@@ -3,7 +3,7 @@
 
 <h1>${ _('Site contact') }</h1>
 
-<p>You can get in direct contact with the debexpo team. In case of technical problems please check the ${ h.tags.link_to( _('Q & A'), h.url('qa')) } section and the <a href="http://wiki.debian.org/Debexpo">Debian wiki</a> first. <strong>Please do not use this contact address for sponsor requests or packaging questions</strong>, write to the <a href="http://lists.debian.org/debian-mentors/">debian-mentors mailing list</a> instead or ${ h.tags.link_to( _('file a RFS bug'), h.url('rfs_howto')) } respectively.</p>
+<p>You can get in direct contact with the debexpo team. In case of technical problems please check the ${ h.tags.link_to( _('Q & A'), h.url('qa')) } section and the <a href="http://wiki.debian.org/Debexpo">Debian wiki</a> first. <strong>Please do not use this contact address for sponsor requests or packaging questions</strong>, write to the <a href="http://lists.debian.org/debian-mentors/">debian-mentors mailing list</a> instead or ${ h.tags.link_to( _('file a RFS bug'), h.url(controller="sponsor", action="rfs-howto") ) } respectively.</p>
 
 <p><strong>${ _('Site email') }</strong>: <a href="mailto: ${ c.config['debexpo.email'] }">${ c.config['debexpo.email'] }</a>.</p>