Changeset 188:8487b9c747f0

Timestamp:

07/19/09 17:31:56 (8 months ago)

Author:

rgrp

Branch:

default

convert_revision:

svn:0ead1229-0713-0410-96cd-f668dbfad531/trunk@274

Message:

[templates][xs]: set id=None in url generation for main nav links so we get no bleed-over (i.e. ids from one area appearing in urls for another when you click on nav).

Files:

• shakespeare/templates/layout.html (modified) (2 diffs)

shakespeare/templates/layout.html

@@ -59 +59 @@
     <ul id="navigation">
       <li><a href="${h.url_for('/')}">Home</a></li>
-      <li><a href="${h.url_for(controller='work', action='index')}">Works</a></li>
-      <li><a href="${h.url_for(controller='material', action='index')}">Material</a></li>
-      <li><a href="${h.url_for(controller='search', action='index')}">Search</a></li>
-      <li><a href="${h.url_for(controller='stats', action='index')}">Stats</a></li>
+      <li><a href="${h.url_for(controller='work', action='index', id=None)}">Works</a></li>
+      <li><a href="${h.url_for(controller='material', action='index', id=None)}">Material</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>
@@ -71 +71 @@
       <!--<minornavigation>-->
       <li><a href="${h.url_for(controller='site', action='index')}">Home</a></li>
-      <py:choose>
-      <py:when test="c.user">
-      <li><a href="/account/logout/">Logout</a></li>
-      </py:when>
-      <py:otherwise>
-      <li><a href="/account/">Register</a></li>
-      <li><a href="/account/login/">Login</a></li>
-      </py:otherwise>
-      </py:choose>
-      <li><a href="/package/new/">New Package</a></li>
       <!--</minornavigation>-->
     </ul>