Changeset 247:0208c25f683f

Timestamp:

01/29/10 12:00:10 (6 months ago)

Author:

rgrp <http://rufuspollock.org>

Branch:

default

Message:

[routing][s]: change/sort out named routes for home, about, news etc.

Location:

shakespeare

Files:

• config/routing.py (modified) (1 diff)
• templates/layout_base.html (modified) (1 diff)

shakespeare/config/routing.py

@@ -25 +25 @@
     # now main shakespeare routes
     map.connect('/pdf', 'pdf/*url')
-    map.connect('/home', '/', controller='site', action='index')
-    map.connect('/about', '/about', controller='site', action='about')
-    map.connect('/guide', '/guide', controller='site', action='guide')
+    map.connect('home', '/', controller='site', action='index')
+    map.connect('about', '/about/', controller='site', action='about')
+    map.connect('guide', '/guide/', controller='site', action='guide')
+    map.connect('news', '/news/', controller='site', action='news')
     map.connect('/resource/{action}/{id}{url:.*}', controller='our_resource')
     map.connect('/material/{action}/{id}', controller='text')

shakespeare/templates/layout_base.html

@@ -58 +58 @@
     <h3 class="hidden">Sections:</h3>
     <ul id="navigation">
-      <li><a href="${h.url_for('/')}">Home</a></li>
+      <li><a href="${h.url_for('home')}">Home</a></li>
       <li><a href="${h.url_for(controller='work', action='index', id=None)}">Works</a></li>
       <li><a href="${h.url_for(controller='search', action='index', id=None)}">Search</a></li>
       <li><a href="${h.url_for(controller='stats', action='index', id=None)}">Stats</a></li>
-      <li><a href="${h.url_for('/guide/')}">Guide</a></li>
-      <li><a href="${h.url_for('/about/')}">About</a></li>
+      <li><a href="${h.url_for('guide')}">Guide</a></li>
+      <li><a href="${h.url_for('about')}">About</a></li>
       <li><a href="http://blog.openshakespeare.org">Blog</a></li>
     </ul>