Mercurial > public > sg101

diff gpp/templates/base.html @ 310:daa2916f5b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing 145; New url tag behavior (forwards compatibility) in Django 1.3.
author Brian Neal <bgneal@gmail.com>
date Thu, 20 Jan 2011 04:03:48 +0000
parents 4557974db0e0
children 88b2b9cb8c1f
line wrap: on
line diff
--- a/gpp/templates/base.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/base.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,3 +1,4 @@
+{% load url from future %}
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -37,37 +38,37 @@
 <div id="header-nav" class="span-24">
    <ul>
       {% if user.is_authenticated %}
-      <li>Welcome, <a href="{% url bio-me %}">{{ user.username }}</a></li>
-      <li><a href="{% url forums-index %}">Forums</a></li>
+      <li>Welcome, <a href="{% url 'bio-me' %}">{{ user.username }}</a></li>
+      <li><a href="{% url 'forums-index' %}">Forums</a></li>
       <li>{% unread_messages user %}</li>
-      <li><a href="{% url haystack_search %}">Search</a></li>
-      <li><a href="{% url accounts-logout %}">Logout</a></li>
+      <li><a href="{% url 'haystack_search' %}">Search</a></li>
+      <li><a href="{% url 'accounts-logout' %}">Logout</a></li>
       {% else %}
-      <li><a href="{% url accounts-login %}">Login</a></li>
-      <li><a href="{% url accounts-register %}">Register</a></li>
+      <li><a href="{% url 'accounts-login' %}">Login</a></li>
+      <li><a href="{% url 'accounts-register' %}">Register</a></li>
       {% endif %}
    </ul> 
 </div>
 
 <div id="content-secondary" class="span-4 append-1">
    <ul class="nav-left">
-      <li><a href="{% url home %}">Home</a></li>
-      <li><a href="{% url news-index_page %}">News</a></li>
-      <li><a href="{% url news-submit %}">Submit News</a></li>
-      <li><a href="{% url gcalendar-index %}">Calendar</a></li>
-      <li><a href="{% url contact-form %}">Contact</a></li>
-      {# <li><a href="{% url donations-index %}">Donations</a></li> #}
-      <li><a href="{% url downloads-index %}">Downloads</a></li>
-      <li><a href="{% url forums-index %}">Forums</a></li>
-      <li><a href="{% url irc-main %}">IRC</a></li>
-      <li><a href="{% url bio-member_list type='user' %}">Member List</a></li>
-      <li><a href="{% url membermap-index %}">Member Map</a></li>
-      <li><a href="{% url messages-inbox %}">Private Messages</a></li>
-      <li><a href="{% url podcast-main %}">Podcast</a></li>
-      <li><a href="{% url polls-main %}">Polls</a></li>
-      <li><a href="{% url potd-view %}">Photo of the Day</a></li>
-      <li><a href="{% url weblinks-main %}">Links</a></li>
-      <li><a href="{% url haystack_search %}">Search</a></li>
+      <li><a href="{% url 'home' %}">Home</a></li>
+      <li><a href="{% url 'news-index_page' %}">News</a></li>
+      <li><a href="{% url 'news-submit' %}">Submit News</a></li>
+      <li><a href="{% url 'gcalendar-index' %}">Calendar</a></li>
+      <li><a href="{% url 'contact-form' %}">Contact</a></li>
+      {# <li><a href="{% url 'donations-index' %}">Donations</a></li> #}
+      <li><a href="{% url 'downloads-index' %}">Downloads</a></li>
+      <li><a href="{% url 'forums-index' %}">Forums</a></li>
+      <li><a href="{% url 'irc-main' %}">IRC</a></li>
+      <li><a href="{% url 'bio-member_list' type='user' %}">Member List</a></li>
+      <li><a href="{% url 'membermap-index' %}">Member Map</a></li>
+      <li><a href="{% url 'messages-inbox' %}">Private Messages</a></li>
+      <li><a href="{% url 'podcast-main' %}">Podcast</a></li>
+      <li><a href="{% url 'polls-main' %}">Polls</a></li>
+      <li><a href="{% url 'potd-view' %}">Photo of the Day</a></li>
+      <li><a href="{% url 'weblinks-main' %}">Links</a></li>
+      <li><a href="{% url 'haystack_search' %}">Search</a></li>
    </ul>
    {% cache 300 potd_block %}
       {% photo_of_the_day %}
@@ -83,7 +84,7 @@
 
 <div id="footer" class="prepend-5 span-19">
    <p>
-   <a href="{% url contact-form %}">Contact Us</a> &bull;
+   <a href="{% url 'contact-form' %}">Contact Us</a> &bull;
    <a href="/about/">About Us</a> &bull;
    <a href="/policy/tos/">Terms of Service</a> &bull; 
    <a href="/policy/privacy/">Privacy Policy</a> &bull;