Mercurial > public > sg101

--- a/gpp/templates/500.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/500.html	Thu Jan 20 04:03:48 2011 +0000
@@ -6,10 +6,10 @@
 </head>
 <body>

-   <h1>Internal Server Error</h1>
+   <h1>Whoops! Internal Server Error</h1>

    <p>We're sorry, that page is currently unavailable due to a server misconfiguration.</p>
-   <p>The server administrator has been notified, and we apologise for any inconvenience.</p>
+   <p>The server administrator has been notified, and we apologize for any inconvenience.</p>

 </body>
 </html>
--- a/gpp/templates/accounts/login.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/accounts/login.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Login{% endblock %}
 {% block content %}
 <h2>Login</h2>
@@ -12,9 +13,9 @@
 </form>

 <ul>
-<li>Forgot your password? You can reset it <a href="{% url accounts-password_reset %}">here</a>.</li>
-<li>Don't have an account? Why don't you <a href="{% url accounts-register %}">register</a>?</li>
-<li>Having problems? Please <a href="{% url contact-form %}">contact us</a>.</li>
+<li>Forgot your password? You can reset it <a href="{% url 'accounts-password_reset' %}">here</a>.</li>
+<li>Don't have an account? Why don't you <a href="{% url 'accounts-register' %}">register</a>?</li>
+<li>Having problems? Please <a href="{% url 'contact-form' %}">contact us</a>.</li>
 </ul>

 {% endblock %}
--- a/gpp/templates/accounts/password_change.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/accounts/password_change.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Change Password{% endblock %}
 {% block content %}
 <h2>Change Password</h2>
@@ -6,7 +7,7 @@
 <table>
 {{ form.as_table }}
 <tr><td>&nbsp;</td><td><input type="submit" value="Change Password" />
-      &nbsp;<a href="{% url bio-me %}">Cancel</a>
+      &nbsp;<a href="{% url 'bio-me' %}">Cancel</a>
       </td></tr>
 </table>
 </form>
--- a/gpp/templates/accounts/password_reset_complete.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/accounts/password_reset_complete.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,8 +1,9 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Password Reset Complete{% endblock %}
 {% block content %}
 <h2>Password Reset Complete</h2>
 <p>
-Your password has been successfully changed. You may now <a href="{% url accounts-login %}">login</a>.
+Your password has been successfully changed. You may now <a href="{% url 'accounts-login' %}">login</a>.
 </p>
 {% endblock %}
--- a/gpp/templates/accounts/password_reset_confirm.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/accounts/password_reset_confirm.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Reset Password{% endblock %}
 {% block content %}
 <h2>Reset Password</h2>
@@ -16,8 +17,8 @@
 {% else %}
 <p>
 We're sorry, the link you provided is invalid or has expired. If you are trying to
-reset your password, please <a href="{% url accounts-password_reset %}">try again</a>.
-If you have questions or problems, please <a href="{% url contact-form %}">contact us</a>.
+reset your password, please <a href="{% url 'accounts-password_reset' %}">try again</a>.
+If you have questions or problems, please <a href="{% url 'contact-form' %}">contact us</a>.
 </p>
 {% endif %}
 {% endblock %}
--- a/gpp/templates/accounts/register_failure.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/accounts/register_failure.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,9 +1,10 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Registration Error{% endblock %}
 {% block content %}
 <h2>Registration Error</h2>
 <p>We're sorry, but we don't have any registration information available for the user {{ username }}. Registration
 information is only good for 24 hours, and it may have expired. If you think this may have happened, please
-<a href="{% url accounts.views.register %}">register again</a>. Sorry for the inconvenience.</p>
+<a href="{% url 'accounts.views.register' %}">register again</a>. Sorry for the inconvenience.</p>
 <p>If you keep seeing this message, please contact the site staff for assistance.</p>
 {% endblock %}
--- a/gpp/templates/accounts/register_success.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/accounts/register_success.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,8 +1,9 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Registration Confirmed{% endblock %}
 {% block content %}
 <h2>Congratulations, Your Account Has Been Created</h2>
 <p>Your registration of the user <strong>{{ username }}</strong> has been successful. Welcome to the site!<p>
-<p>Please proceed to the <a href="{% url django.contrib.auth.views.login %}">login page</a> to log into the site
+<p>Please proceed to the <a href="{% url 'django.contrib.auth.views.login' %}">login page</a> to log into the site
 with your username <strong>{{ username }}</strong> and the password you registered with.</p>
 {% endblock %}
--- a/gpp/templates/antispam/suspended.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/antispam/suspended.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Account Suspension Status{% endblock %}
 {% block content %}
 <h2>Account Suspension Status</h2>
@@ -8,7 +9,7 @@
 a review of your post. If this was a mistake, we sincerely apologize and promise
 your account will be restored soon. We regret having to take this drastic measure, but
 the high volume of spam we recieve has forced us to take this action. If you have any
-questions, please feel to <a href="{% url contact-form %}">contact us</a>.
+questions, please feel to <a href="{% url 'contact-form' %}">contact us</a>.
 </p>
 {% else %}
 <p class="success">
--- 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;
--- a/gpp/templates/bio/avatar.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/bio/avatar.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'bio/base.html' %}
+{% load url from future %}
 {% load avatar_tags %}
 {% block title %}Change My Avatar{% endblock %}
 {% block content %}
@@ -18,6 +19,6 @@
    <form enctype="multipart/form-data" method="POST" action=".">{% csrf_token %}
       {{ form.as_p }}
       <input type="submit" value="Update Avatar" />
-      &nbsp;<a href="{% url bio-me %}">Cancel</a>
+      &nbsp;<a href="{% url 'bio-me' %}">Cancel</a>
    </form>
 {% endblock %}
--- a/gpp/templates/bio/edit_elsewhere.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/bio/edit_elsewhere.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'bio/base.html' %}
+{% load url from future %}
 {% block title %}Edit Your Elsewhere Links{% endblock %}
 {% block content %}
 <h2>Edit Your Elsewhere Links</h2>
@@ -83,5 +84,5 @@
 </fieldset>
 </form>
 <hr />
-<p><a href="{% url bio-edit_profile %}">Back to Your Profile</a></p>
+<p><a href="{% url 'bio-edit_profile' %}">Back to Your Profile</a></p>
 {% endblock %}
--- a/gpp/templates/bio/edit_profile.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/bio/edit_profile.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'bio/base.html' %}
+{% load url from future %}
 {% load avatar_tags %}
 {% load elsewhere_tags %}
 {% block title %}Edit Profile{% endblock %}
@@ -8,20 +9,20 @@
 {% block content %}
 <div class="user_profile">
 <h2>Edit Profile for {{ user.username }}</h2>
-<form action="{% url bio-edit_profile %}" method="post">{% csrf_token %}
+<form action="{% url 'bio-edit_profile' %}" method="post">{% csrf_token %}
 <table>
    <tr>
       <td>
-         <a href="{% url bio-change_avatar %}"><img src="{{ MEDIA_URL }}icons/image_edit.png" alt="Change Avatar" /></a>
-         <a href="{% url bio-change_avatar %}">Change Avatar</a></td>
+         <a href="{% url 'bio-change_avatar' %}"><img src="{{ MEDIA_URL }}icons/image_edit.png" alt="Change Avatar" /></a>
+         <a href="{% url 'bio-change_avatar' %}">Change Avatar</a></td>
       <td>{% avatar user %}</td>
    </tr>
    {{ user_form.as_table }}
    {{ profile_form.as_table }}
    <tr>
       <td>
-         <a href="{% url bio-edit_elsewhere %}"><img src="{{ MEDIA_URL }}icons/link_edit.png" alt="Edit Links" /></a>
-         <a href="{% url bio-edit_elsewhere %}">Edit Elsewhere Links</a></td>
+         <a href="{% url 'bio-edit_elsewhere' %}"><img src="{{ MEDIA_URL }}icons/link_edit.png" alt="Edit Links" /></a>
+         <a href="{% url 'bio-edit_elsewhere' %}">Edit Elsewhere Links</a></td>
       <td>{% elsewhere_links user %}</td>
    </tr>
    <tr>
--- a/gpp/templates/bio/members.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/bio/members.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'bio/base.html' %}
+{% load url from future %}
 {% load avatar_tags %}
 {% block title %}Member List{% endblock %}
 {% block bio_css %}
@@ -8,15 +9,15 @@
 {% block content %}
 <h2>Member List</h2>
 <p>Surfguitar101.com currently has {{ num_members }} active members. Looking for a
-particular user? Try our <a href="{% url bio-member_search %}">member search</a>, or
-you can use our <a href="{% url haystack_search %}">search function</a> to search
+particular user? Try our <a href="{% url 'bio-member_search' %}">member search</a>, or
+you can use our <a href="{% url 'haystack_search' %}">search function</a> to search
 user profiles.
 </p>
 {% if page.object_list %}
 <ul class="tab-nav">
-   <li><a href="{% url bio-member_list type='user' %}"
+   <li><a href="{% url 'bio-member_list' type='user' %}"
       {% ifequal type "user" %}class="active" {% endifequal %}>User</a></li>
-   <li><a href="{% url bio-member_list type='date' %}"
+   <li><a href="{% url 'bio-member_list' type='date' %}"
       {% ifequal type "date" %}class="active" {% endifequal %}>Date</a></li>
 </ul>

@@ -33,13 +34,13 @@
 </tr>
 {% for u in page.object_list %}
 <tr class="{% cycle 'even' 'odd' %}">
-   <td><a href="{% url bio-view_profile username=u.username %}">{% avatar u %}</a></td>
-   <td><a href="{% url bio-view_profile username=u.username %}" title="View profile for {{ u.username }}">{{ u.username }}</a></td>
+   <td><a href="{% url 'bio-view_profile' username=u.username %}">{% avatar u %}</a></td>
+   <td><a href="{% url 'bio-view_profile' username=u.username %}" title="View profile for {{ u.username }}">{{ u.username }}</a></td>
    <td>{{ u.get_full_name }}</td>
    <td>{{ u.user_profile.location }}</td>
    <td>{{ u.date_joined|date:"M. d, Y" }}</td>
    <td>
-      {% ifnotequal user u %}<a href="{% url messages-compose_to u.username %}">
+      {% ifnotequal user u %}<a href="{% url 'messages-compose_to' u.username %}">
          <img src="{{ MEDIA_URL }}icons/note.png" alt="PM" title="Send private message" /></a>{% endifnotequal %}
       {% if not u.user_profile.hide_email %}<a href="mailto:{{ u.email }}">
          <img src="{{ MEDIA_URL }}icons/email.png" alt="Email" title="Send Email" /></a>{% endif %}
--- a/gpp/templates/bio/view_profile.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/bio/view_profile.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'bio/base.html' %}
+{% load url from future %}
 {% load avatar_tags %}
 {% load elsewhere_tags %}
 {% load core_tags %}
@@ -25,8 +26,8 @@
    {% if this_is_me %}
    <p>{% avatar subject %}
    <ul>
-      <li><a href="{% url forums-manage_favorites %}">My favorite forum topics</a></li>
-      <li><a href="{% url forums-manage_subscriptions %}">My forum topic subscriptions</a></li>
+      <li><a href="{% url 'forums-manage_favorites' %}">My favorite forum topics</a></li>
+      <li><a href="{% url 'forums-manage_subscriptions' %}">My forum topic subscriptions</a></li>
    </ul>
    </p>
    {% else %}
@@ -78,21 +79,21 @@
 </div>
 {% if this_is_me %}
 <ul class="icon-list">
-   <li><a href="{% url bio-edit_profile %}"><img src="{{ MEDIA_URL }}icons/application_edit.png" alt="Edit Profile" /></a>
-   <a href="{% url bio-edit_profile %}">Edit Profile</a></li>
-   <li><a href="{% url bio-change_avatar %}"><img src="{{ MEDIA_URL }}icons/image_edit.png" alt="Change Avatar" /></a>
-      <a href="{% url bio-change_avatar %}">Change Avatar</a></li>
-   <li><a href="{% url bio-edit_elsewhere %}"><img src="{{ MEDIA_URL }}icons/link_edit.png" alt="Edit Links" /></a>
-   <a href="{% url bio-edit_elsewhere %}">Edit Elsewhere Links</a></li>
-   <li><a href="{% url django.contrib.auth.views.password_change %}"><img src="{{ MEDIA_URL }}icons/key.png" alt="Change Password" /></a>
-      <a href="{% url django.contrib.auth.views.password_change %}">Change Password</a></li>
+   <li><a href="{% url 'bio-edit_profile' %}"><img src="{{ MEDIA_URL }}icons/application_edit.png" alt="Edit Profile" /></a>
+   <a href="{% url 'bio-edit_profile' %}">Edit Profile</a></li>
+   <li><a href="{% url 'bio-change_avatar' %}"><img src="{{ MEDIA_URL }}icons/image_edit.png" alt="Change Avatar" /></a>
+      <a href="{% url 'bio-change_avatar' %}">Change Avatar</a></li>
+   <li><a href="{% url 'bio-edit_elsewhere' %}"><img src="{{ MEDIA_URL }}icons/link_edit.png" alt="Edit Links" /></a>
+   <a href="{% url 'bio-edit_elsewhere' %}">Edit Elsewhere Links</a></li>
+   <li><a href="{% url 'django.contrib.auth.views.password_change' %}"><img src="{{ MEDIA_URL }}icons/key.png" alt="Change Password" /></a>
+      <a href="{% url 'django.contrib.auth.views.password_change' %}">Change Password</a></li>
 </ul>
 {% else %}
 {% if user.is_authenticated %}
 <ul class="icon-list">
-   <li><a href="{% url messages-compose_to subject.username %}"><img src="{{ MEDIA_URL }}icons/note.png" alt="PM" title="Send Private Message" /></a> <a href="{% url messages-compose_to subject.username %}">Send a private message to {{ subject.username }}</a></li>
-   <li><a href="{% url forums-posts_for_user username=subject.username %}"><img src="{{ MEDIA_URL }}icons/comments.png"
-      alt="Forum Posts" title="View forum posts by {{ subject.username }}" /></a> <a href="{% url forums-posts_for_user username=subject.username %}">View forum posts by {{ subject.username }}</a></li>
+   <li><a href="{% url 'messages-compose_to' subject.username %}"><img src="{{ MEDIA_URL }}icons/note.png" alt="PM" title="Send Private Message" /></a> <a href="{% url 'messages-compose_to' subject.username %}">Send a private message to {{ subject.username }}</a></li>
+   <li><a href="{% url 'forums-posts_for_user' username=subject.username %}"><img src="{{ MEDIA_URL }}icons/comments.png"
+      alt="Forum Posts" title="View forum posts by {{ subject.username }}" /></a> <a href="{% url 'forums-posts_for_user' username=subject.username %}">View forum posts by {{ subject.username }}</a></li>
    <li><img src="{{ MEDIA_URL }}icons/flag_red.png" alt="Flag" />
       <a href="#" class="profile-flag" id="fp-{{ profile.id }}">Report this profile</a></li>
 </ul>
--- a/gpp/templates/comments/comment.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/comments/comment.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,8 +1,9 @@
+{% load url from future %}
 {% load avatar_tags %}
 <div class="comment" id="c{{ comment.id }}">
 <div class="comment-list">{{ forloop.counter }}.</div>
 <div class="comment-avatar">
-<a href="{% url bio-view_profile username=comment.user.username%}">{% avatar comment.user %}</a>
+<a href="{% url 'bio-view_profile' username=comment.user.username%}">{% avatar comment.user %}</a>
 </div>
 {% if comment.is_removed %}
 <div class="comment-text-removed"><p><em>This comment has been removed.</em></p></div>
@@ -10,7 +11,7 @@
 <div class="comment-text">{{ comment.html|safe }}</div>
 {% endif %}
 <div class="comment-details">
-<a href="{% url bio-view_profile username=comment.user.username%}"
+<a href="{% url 'bio-view_profile' username=comment.user.username%}"
     title="View profile for {{ comment.user.username }}">{{ comment.user.username }}</a> |
 {{ comment.creation_date|date:"d-M-Y H:i:s" }}
 {% if not comment.is_removed %}
--- a/gpp/templates/comments/comment_form.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/comments/comment_form.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,13 +1,14 @@
+{% load url from future %}
 {% load core_tags %}
 {% if user.is_authenticated %}
-<form action="{% url comments-post %}" method="post" id="comment-form">{% csrf_token %}
+<form action="{% url 'comments-post' %}" method="post" id="comment-form">{% csrf_token %}
 {{ form.as_p }}
 {% comment_dialogs %}
 <input type="submit" name="post" value="Post Comment" id="comment-form-post"/>
 </form>
 {% else %}
 <p>
-Please <a href="{% url accounts-login %}">login</a> or
-<a href="{% url accounts-register %}">register</a> to leave a comment.
+Please <a href="{% url 'accounts-login' %}">login</a> or
+<a href="{% url 'accounts-register' %}">register</a> to leave a comment.
 </p>
 {% endif %}
--- a/gpp/templates/contact/contact_form.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/contact/contact_form.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,10 +1,11 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Contact{% endblock %}
 {% block content %}
 <h2>Contact Us</h2>
 <p>Please use the following form to contact the site management. Your feedback and comments are very
 important to us.</p>
-<form action="{% url contact.views.contact_form %}" method="post">{% csrf_token %}
+<form action="{% url 'contact.views.contact_form' %}" method="post">{% csrf_token %}
 <table>
    <tr><th>{{ form.name.label }}:</th><td>{{ form.name.errors }}{{ form.name }}</td></tr>
    <tr><th>{{ form.email.label }}:</th><td>{{ form.email.errors }}{{ form.email }}</td></tr>
--- a/gpp/templates/core/whos_online_tag.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/core/whos_online_tag.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,10 +1,11 @@
+{% load url from future %}
 <div id="whos-online">
 There {{ total|pluralize:"is,are"}} {{ total }} user{{ total|pluralize }} online: {{ num_users }} registered user{{ num_users|pluralize }} and {{ num_guests }} guest{{ num_guests|pluralize }}.
 {% if num_users %}
 Registered users:
 <ul class="inline-list">
 {% for user in users %}
-<li><a href="{% url bio-view_profile username=user %}">{{ user }}</a></li>
+<li><a href="{% url 'bio-view_profile' username=user %}">{{ user }}</a></li>
 {% endfor %}
 </ul>
 {% endif %}
--- a/gpp/templates/donations/index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/donations/index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Donations{% endblock %}
 {% block content %}
 <h2>Donations</h2>
@@ -11,7 +12,7 @@
 <p>
 We are currently using Paypal to receive donations. You don't have to be a Paypal member to donate;
 major credit cards are also accepted. If you really don't do Paypal, please
-<a href="{% url contact-form %}">contact me</a> and we can work something else out.
+<a href="{% url 'contact-form' %}">contact me</a> and we can work something else out.
 </p>
 <p>Thank you for donating to SurfGuitar101.com!</p>
 <div class="span-9 append-1">
@@ -33,7 +34,7 @@
          {{ anonymous }}
       {% else %}
          {% if donation.user %}
-            <a href="{% url bio-view_profile donation.user.username %}">{{ donation.user.username }}</a>
+            <a href="{% url 'bio-view_profile' donation.user.username %}">{{ donation.user.username }}</a>
          {% else %}
             {{ donation.donor }}
          {% endif %}
@@ -71,7 +72,7 @@
          <li><input name="item_number" type="radio" value="{{ item_number }}" id="name_yes" />
          <label for="name_yes">Yes, list me as {{ user.username }}</label></li>
    {% else %}
-   <p>You are not currently logged in. Please <a href="{% url accounts-login %}">log in</a>
+   <p>You are not currently logged in. Please <a href="{% url 'accounts-login' %}">log in</a>
    if you would like your site username listed with your donation. Otherwise you can have your
    actual name (from Paypal) listed, or you can be listed as {{ anonymous }}.</p>
       <ul class="icon-list">
@@ -84,14 +85,14 @@
    <input type="hidden" name="cmd" value="_donations" />
    <input type="hidden" name="business" value="{{ business }}" />
    <input type="hidden" name="charset" value="utf-8" />
-   <input type="hidden" name="return" value="http://{{ domain }}{% url donations-thanks %}" />
+   <input type="hidden" name="return" value="http://{{ domain }}{% url 'donations-thanks' %}" />
    <input type="hidden" name="currency_code" value="USD" />
    <input type="hidden" name="item_name" value="{{ item_name }}" />
    <input type="hidden" name="rm" value="1" />
    <input type="hidden" name="no_note" value="0" />
    <input type="hidden" name="cn" value="Do you have any comments for {{ domain }}?" />
    <input type="hidden" name="no_shipping" value="1" />
-   <input type="hidden" name="cancel_return" value="http://{{ domain }}{% url donations-index %}" />
+   <input type="hidden" name="cancel_return" value="http://{{ domain }}{% url 'donations-index' %}" />


    <p><input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" name="I1"
--- a/gpp/templates/donations/thanks.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/donations/thanks.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,7 +1,8 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Thanks For The Donation{% endblock %}
 {% block content %}
-<div class="breadcrumbs"><a href="{% url donations-index %}">Donations</a> &raquo; Thanks</div>
+<div class="breadcrumbs"><a href="{% url 'donations-index' %}">Donations</a> &raquo; Thanks</div>
 <h2>Thank-You For The Donation!</h2>
 <p>Thank-you for your donation to <strong>SurfGuitar101.com</strong>, it is greatly appreciated!</p>
 {% endblock %}
--- a/gpp/templates/downloads/download.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/downloads/download.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,3 +1,4 @@
+{% load url from future %}
 {% load comment_tags %}
 {% get_comment_count for download as comment_count %}
 <dt>
@@ -5,11 +6,11 @@
 </dt>
 <dd>
 {{ download.html|safe }}
-<form action="{% url downloads-download download.id %}" method="post">{% csrf_token %}
+<form action="{% url 'downloads-download' download.id %}" method="post">{% csrf_token %}
 <table>
 <tr>
     <th>Added By:</th>
-        <td><a href="{% url bio-view_profile download.user.username %}">{{ download.user.username }}</a></td>
+        <td><a href="{% url 'bio-view_profile' download.user.username %}">{{ download.user.username }}</a></td>
     <th>Date:</th><td>{{ download.date_added|date:"M d, Y" }}</td>
     <th>Size:</th><td>{{ download.size }}</td>
 </tr>
@@ -20,7 +21,7 @@
 <tr>
     <th>Rating:</th><td><div class="rating" id="rating-{{ download.id }}">{{ download.average_score|floatformat }}</div></td>
     <th><img src="{{ MEDIA_URL }}icons/comments.png" alt="Comments" title="Comments" />
-       <a href="{% url downloads-details download.id %}">Comments</a>:</th><td>{{ comment_count }}</td>
+       <a href="{% url 'downloads-details' download.id %}">Comments</a>:</th><td>{{ comment_count }}</td>
 </tr>
 <tr><td><input type="submit" value="Download Now" /></td></tr>
 </table>
--- a/gpp/templates/downloads/download_list.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/downloads/download_list.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load downloads_tags %}
 {% block title %}Downloads: {{ category.title }}{% endblock %}
 {% block custom_css %}
@@ -16,13 +17,13 @@

 {% if page.object_list %}
 <ul class="tab-nav">
-   <li><a href="{% url downloads-category slug=category.slug sort="title" %}"
+   <li><a href="{% url 'downloads-category' slug=category.slug sort="title" %}"
       {% ifequal s "title" %}class="active" {% endifequal %}>Title</a></li>
-   <li><a href="{% url downloads-category slug=category.slug sort="date" %}"
+   <li><a href="{% url 'downloads-category' slug=category.slug sort="date" %}"
       {% ifequal s "date" %}class="active"{% endifequal %}>Date</a></li>
-   <li><a href="{% url downloads-category slug=category.slug sort="rating" %}"
+   <li><a href="{% url 'downloads-category' slug=category.slug sort="rating" %}"
       {% ifequal s "rating" %}class="active"{% endifequal %}>Rating</a></li>
-   <li><a href="{% url downloads-category slug=category.slug sort="hits" %}"
+   <li><a href="{% url 'downloads-category' slug=category.slug sort="hits" %}"
       {% ifequal s "hits" %}class="active"{% endifequal %}>Hits</a></li>
 </ul>
--- a/gpp/templates/downloads/index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/downloads/index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load downloads_tags %}
 {% block title %}Downloads{% endblock %}
 {% block custom_css %}
@@ -13,7 +14,7 @@
 <dl>
 {% for category in categories %}
 <dt>
-<a href="{% url downloads-category slug=category.slug sort="title" %}">{{ category.title }}</a>
+<a href="{% url 'downloads-category' slug=category.slug sort="title" %}">{{ category.title }}</a>
 ({{ category.count }})
 </dt>
 <dd><p>{{ category.description }}</p></dd>
--- a/gpp/templates/downloads/navigation.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/downloads/navigation.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,15 +1,16 @@
+{% load url from future %}
 <div class="app-logo">
 <img src="{{ MEDIA_URL }}icons/downloads-logo.jpg" alt="Downloads Logo" title="Downloads" />
 </div>
 <ul class="app-menu">
-    <li><a href="{% url downloads-index %}">Categories</a></li>
-    <li><a href="{% url downloads-new %}">New</a></li>
-    <li><a href="{% url downloads-popular %}">Popular</a></li>
-    <li><a href="{% url downloads-rating %}">Highest Rated</a></li>
-    <li><a href="{% url downloads-add %}">Add</a></li>
+    <li><a href="{% url 'downloads-index' %}">Categories</a></li>
+    <li><a href="{% url 'downloads-new' %}">New</a></li>
+    <li><a href="{% url 'downloads-popular' %}">Popular</a></li>
+    <li><a href="{% url 'downloads-rating' %}">Highest Rated</a></li>
+    <li><a href="{% url 'downloads-add' %}">Add</a></li>
 </ul>
 <center>
-   <form action="{% url downloads-random %}" method="post">{% csrf_token %}
+   <form action="{% url 'downloads-random' %}" method="post">{% csrf_token %}
       <input type="submit" title="Download a file at random" value="Surprise Me!" />
    </form>
 </center>
--- a/gpp/templates/forums/display_post.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/display_post.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,10 +1,11 @@
+{% load url from future %}
 {% load avatar_tags %}
 {% load forum_tags %}
 <tr class="forum-post {% cycle 'odd' 'even' %}" id="post-{{ post.id }}">
    <td class="forum-post-author">
       <a name="p{{ post.id }}"></a>
-      <a href="{% url bio-view_profile username=post.user.username %}" title="View Profile for {{ post.user.username }}">{{ post.user.username }}</a><br />
-      <a href="{% url bio-view_profile username=post.user.username %}">{% avatar post.user %}</a>
+      <a href="{% url 'bio-view_profile' username=post.user.username %}" title="View Profile for {{ post.user.username }}">{{ post.user.username }}</a><br />
+      <a href="{% url 'bio-view_profile' username=post.user.username %}">{% avatar post.user %}</a>
       Joined: {{ post.user.date_joined|date:"M d, Y" }}<br />
       Posts: {{ post.user_profile.forum_post_count }}<br />
       {% if post.user_profile.location %}
@@ -15,7 +16,7 @@
       {% endfor %}
       {% if user.is_authenticated %}
       <p>
-      <a href="{% url messages-compose_to post.user.username %}">
+      <a href="{% url 'messages-compose_to' post.user.username %}">
       <img src="{{ MEDIA_URL }}icons/note.png" alt="PM" title="Send Private Message to {{ post.user.username }}" /></a>
       {% if not post.user_profile.hide_email %}<a href="mailto:{{ post.user.email }}">
          <img src="{{ MEDIA_URL }}icons/email.png" alt="Email" title="Send Email to {{ post.user.username}}" /></a>{% endif %}
@@ -27,7 +28,7 @@
       {% if post.unread %}<img src="{{ MEDIA_URL }}icons/new.png" alt="New" title="New" />{% endif %}
       <a href="{{ post.get_absolute_url }}"><img src="{{ MEDIA_URL }}icons/link.png" alt="Link" title="Link to this post" /></a>
          Posted on {% forum_date post.creation_date user %}
-         {% if can_moderate %}from IP: <a href="{% url forums-post_ip_info post.id %}">{{ post.user_ip }}</a>{% endif %}
+         {% if can_moderate %}from IP: <a href="{% url 'forums-post_ip_info' post.id %}">{{ post.user_ip }}</a>{% endif %}
       </div>
       <div class="forum-post-body">
          {{ post.html|safe }}
@@ -47,7 +48,7 @@
       {% endif %}
       <div class="forum-post-info-tools">
       {% if can_reply %}
-         <a href="{% url forums-new_post topic_id=post.topic.id %}?quote={{ post.id }}"><img src="{{ MEDIA_URL }}icons/comment.png" alt="Reply with quote" title="Reply with quote" /></a>
+         <a href="{% url 'forums-new_post' topic_id=post.topic.id %}?quote={{ post.id }}"><img src="{{ MEDIA_URL }}icons/comment.png" alt="Reply with quote" title="Reply with quote" /></a>
       {% endif %}
       {% post_edit_button post user can_moderate MEDIA_URL %}
       <a href="#" class="post-flag" id="fp-{{ post.id }}"
@@ -59,9 +60,9 @@
          {% if post.user != user and post.user_profile.is_stranger %}
          <br />
          <span class="quiet">Stranger options:</span>
-         <a href="{% url forums-stranger post.id %}" title="This stranger seems legitimate">
+         <a href="{% url 'forums-stranger' post.id %}" title="This stranger seems legitimate">
             <img src="{{ MEDIA_URL }}icons/tick.png" alt="Acquaintance" /></a>
-         <a href="{% url forums-spammer post.id %}" title="This is spam">
+         <a href="{% url 'forums-spammer' post.id %}" title="This is spam">
             <img src="{{ MEDIA_URL }}icons/exclamation.png" alt="Spammer" /></a>
          {% endif %}
       {% endif %}
--- a/gpp/templates/forums/favorite_status.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/favorite_status.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load forum_tags %}
 {% block title %}Forums: Favorite Topics{% endblock %}
 {% block content %}
@@ -6,14 +7,14 @@
 <p>
 {% if is_favorite %}
 The forum topic <a href="{{ topic.get_absolute_url }}">{{ topic.name }}</a> has been added to your
-<a href="{% url forums-manage_favorites %}">favorites</a>.
+<a href="{% url 'forums-manage_favorites' %}">favorites</a>.
 {% else %}
 The forum topic <a href="{{ topic.get_absolute_url }}">{{ topic.name }}</a> has been removed from your
-<a href="{% url forums-manage_favorites %}">favorites</a>.
+<a href="{% url 'forums-manage_favorites' %}">favorites</a>.
 {% endif %}
 </p>
 <p>
 To manage all your forum topic favorites, please visit your
-<a href="{% url forums-manage_favorites %}">favorites page</a>.
+<a href="{% url 'forums-manage_favorites' %}">favorites page</a>.
 </p>
 {% endblock %}
--- a/gpp/templates/forums/forum_index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/forum_index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load forum_tags %}
 {% block custom_head %}
 {% if feed %}
@@ -11,8 +12,8 @@

 <div class="forum-block">
 {% if user.is_authenticated %}
-<a href="{% url forums-new_topic slug=forum.slug %}">New Topic</a> &bull;
-<form action="{% url forums-catchup slug=forum.slug %}" method="post" style="display:inline">{% csrf_token %}
+<a href="{% url 'forums-new_topic' slug=forum.slug %}">New Topic</a> &bull;
+<form action="{% url 'forums-catchup' slug=forum.slug %}" method="post" style="display:inline">{% csrf_token %}
    <input type="submit" value="Mark All Topics Read" />
 </form>
 {% endif %}
@@ -38,7 +39,7 @@
             {% endif %}
          </td>
          <td class="forum-index_replies">{{ topic.reply_count }}</td>
-         <td class="forum-index_author"><a href="{% url bio-view_profile username=topic.user.username %}" title="View profile for {{ topic.user.username }}">{{ topic.user.username }}</a></td>
+         <td class="forum-index_author"><a href="{% url 'bio-view_profile' username=topic.user.username %}" title="View profile for {{ topic.user.username }}">{{ topic.user.username }}</a></td>
          <td class="forum-index_views">{{ topic.view_count }}</td>
          <td class="forum-index_last_post">
             {% last_post_info topic.last_post %}
@@ -55,13 +56,13 @@
 </table>
 {{ page_nav }}
 {% if user.is_authenticated %}
-<a href="{% url forums-new_topic slug=forum.slug %}">New Topic</a> &bull;
-<form action="{% url forums-catchup slug=forum.slug %}" method="post" style="display:inline">{% csrf_token %}
+<a href="{% url 'forums-new_topic' slug=forum.slug %}">New Topic</a> &bull;
+<form action="{% url 'forums-catchup' slug=forum.slug %}" method="post" style="display:inline">{% csrf_token %}
    <input type="submit" value="Mark All Topics Read" />
 </form>
 {% endif %}
 {% if can_moderate %}
-<p><a href="{% url forums-mod_forum slug=forum.slug %}">Moderate this forum</a></p>
+<p><a href="{% url 'forums-mod_forum' slug=forum.slug %}">Moderate this forum</a></p>
 {% endif %}
 {% current_forum_time user %}
 </div>
--- a/gpp/templates/forums/forum_query.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/forum_query.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,11 +1,12 @@
+{% load url from future %}
 <form action="." method="get" id="forum-query-form">
    <select id="forum-query-select">
-      <option value="{% url forums-unread_topics %}">Show topics with unread posts</option>
-      <option value="{% url forums-unanswered_topics %}">Show unanswered topics</option>
+      <option value="{% url 'forums-unread_topics' %}">Show topics with unread posts</option>
+      <option value="{% url 'forums-unanswered_topics' %}">Show unanswered topics</option>
       {% if user.is_authenticated %}
-      <option value="{% url forums-my_posts %}">Show my posts</option>
-      <option value="{% url forums-manage_favorites %}">Show my favorite topics</option>
-      <option value="{% url forums-manage_subscriptions %}">Show my subscribed topics</option>
+      <option value="{% url 'forums-my_posts' %}">Show my posts</option>
+      <option value="{% url 'forums-manage_favorites' %}">Show my favorite topics</option>
+      <option value="{% url 'forums-manage_subscriptions' %}">Show my subscribed topics</option>
       {% endif %}
    </select>
    <button type="button" id="forum-query-button">Go</button>
--- a/gpp/templates/forums/forum_stats_tag.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/forum_stats_tag.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,6 +1,7 @@
+{% load url from future %}
 <div id="forum-stats">
 Our <strong>{{ user_count }}</strong> users have posted a total of <strong>{{ post_count }}</strong> posts.<br />
-The newest registered user is <a href="{% url bio-view_profile username=latest_user %}">{{ latest_user }}</a>.
+The newest registered user is <a href="{% url 'bio-view_profile' username=latest_user %}">{{ latest_user }}</a>.
 {% if stats %}
 <br />
 The most users ever online was <strong>{{ stats.max_users }}</strong> on {{ stats.max_users_date|date:"P l, N n, Y" }}.
--- a/gpp/templates/forums/last_post_info.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/last_post_info.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,8 +1,9 @@
+{% load url from future %}
 {% load forum_tags %}
 {% if post %}
 <a href="{{ post.get_absolute_url }}" title="Goto last post"><img src="{{ MEDIA_URL }}icons/note_go.png" alt="Goto last post" /></a>
 <a href="{{ post.get_absolute_url }}" title="Goto last post">{% forum_date post.creation_date user %}</a><br />
-<a href="{% url bio-view_profile username=post.user.username %}" title="View profile for {{ post.user.username }}">{{ post.user.username }}</a>
+<a href="{% url 'bio-view_profile' username=post.user.username %}" title="View profile for {{ post.user.username }}">{{ post.user.username }}</a>
 {% else %}
 <i>No posts</i>
 {% endif %}
--- a/gpp/templates/forums/mod_forum.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/mod_forum.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load forum_tags %}
 {% block title %}Moderate Forum: {{ forum.name }}{% endblock %}
 {% block custom_js %}
@@ -28,7 +29,7 @@
             class="forums-topic-icon" />{% endif %}
          <h4><a href="{{ topic.get_absolute_url }}">{{ topic.name }}</a></h4></td>
          <td class="forum-index_replies">{{ topic.reply_count }}</td>
-         <td class="forum-index_author"><a href="{% url bio-view_profile username=topic.user.username %}" title="View profile for {{ topic.user.username }}">{{ topic.user.username }}</a></td>
+         <td class="forum-index_author"><a href="{% url 'bio-view_profile' username=topic.user.username %}" title="View profile for {{ topic.user.username }}">{{ topic.user.username }}</a></td>
          <td class="forum-index_last_post">
             {% last_post_info topic.last_post %}
          </td>
--- a/gpp/templates/forums/navigation_tag.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/navigation_tag.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
-<h2 class="forum-nav"><a href="{% url forums-index %}">SurfGuitar101 Forums</a> &raquo;
+{% load url from future %}
+<h2 class="forum-nav"><a href="{% url 'forums-index' %}">SurfGuitar101 Forums</a> &raquo;
 {% for nav_item in nav_list %}
    {% if not forloop.last %}
       <a href="{{ nav_item.url }}">{{ nav_item.name }}</a> &raquo;
--- a/gpp/templates/forums/new_posts_tag.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/new_posts_tag.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,7 +1,8 @@
+{% load url from future %}
 {% load core_tags %}
 <div>
 <h2>Latest Forum Posts</h2>
-<p>Join us in our <a href="{% url forums-index %}">forums</a> for some lively discussions. Here are the list of forum topics with new posts.</p>
+<p>Join us in our <a href="{% url 'forums-index' %}">forums</a> for some lively discussions. Here are the list of forum topics with new posts.</p>
 {% if topics %}
    <ul>
    {% for topic in topics %}
--- a/gpp/templates/forums/post_edit_button.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/post_edit_button.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,3 +1,4 @@
+{% load url from future %}
 {% if show_button %}
-<a href="{% url forums-edit_post id=post.id %}"><img src="{{ MEDIA_URL }}icons/page_edit.png" alt="Edit post" title="Edit post" /></a>
+<a href="{% url 'forums-edit_post' id=post.id %}"><img src="{{ MEDIA_URL }}icons/page_edit.png" alt="Edit post" title="Edit post" /></a>
 {% endif %}
--- a/gpp/templates/forums/post_ip.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/post_ip.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,18 +1,19 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Post IP Address Info: {{ post.user_ip }}{% endblock %}
 {% block content %}
 <h2>Post IP Address Info: {{ post.user_ip }}</h2>
 <p>
 This <a href="{{ post.get_absolute_url }}">post</a> was created by
-<a href="{% url bio-view_profile username=post.user.username %}">{{ post.user.username }}</a> from the IP address
+<a href="{% url 'bio-view_profile' username=post.user.username %}">{{ post.user.username }}</a> from the IP address
 <a href="http://www.dnsstuff.com/tools/whois/?ip={{ post.user_ip }}">{{ post.user_ip }}</a>.
 </p>
 {% if ip_users %}
 <p>All users who have posted from {{ post.user_ip }}:</p>
 <ul>
 {% for user in ip_users %}
-<li><a href="{% url bio-view_profile username=user %}">{{ user }}</a>
-   (<a href="{% url forums-posts_for_user username=user %}">posts</a>)</li>
+<li><a href="{% url 'bio-view_profile' username=user %}">{{ user }}</a>
+   (<a href="{% url 'forums-posts_for_user' username=user %}">posts</a>)</li>
 {% endfor %}
 </ul>
 {% endif %}
--- a/gpp/templates/forums/spammer.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/spammer.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,12 +1,13 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Deactivate Spammer: {{ post.user.username }}{% endblock %}
 {% block content %}
 <h2>Deactivate Spammer: {{ post.user.username }}</h2>

 {% if can_moderate and can_deactivate %}
 <p>Please confirm that you wish to mark the user
-<a href="{% url bio-view_profile username=post.user.username %}">{{ post.user.username }}</a> as a
-spammer based on <a href="{% url forums-goto_post post.id %}">this post</a>.
+<a href="{% url 'bio-view_profile' username=post.user.username %}">{{ post.user.username }}</a> as a
+spammer based on <a href="{% url 'forums-goto_post' post.id %}">this post</a>.
 If you confirm, the user's account will be deactivated, and all posts and comments
 left by the user will be deleted.</p>
 <p><strong>This is a drastic action, so please be absolutely sure
@@ -24,6 +25,6 @@
 {% endif %}
 <hr />
 <p>
-<a href="{% url forums-goto_post post.id %}">Return to the post</a>.
+<a href="{% url 'forums-goto_post' post.id %}">Return to the post</a>.
 </p>
 {% endblock %}
--- a/gpp/templates/forums/spammer_nailed.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/spammer_nailed.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,16 +1,17 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Spammer Nailed: {{ spammer.username }}{% endblock %}
 {% block content %}
 <h2>Spammer Nailed: {{ spammer.username }}</h2>
 <p>
 {% if success %}
-The user <a href="{% url bio-view_profile username=spammer.username %}">{{ spammer.username }}</a>
+The user <a href="{% url 'bio-view_profile' username=spammer.username %}">{{ spammer.username }}</a>
 has had his/her account deactivated for spamming.
 All forum posts and comments this user has made have been deleted. The site admin has been
 notified of this action. Thanks for helping to keep our site spam-free!
 {% else %}
 Whoops, something went wrong deactivating the account of
-<a href="{% url bio-view_profile username=spammer.username %}">{{ spammer.username }}</a>.
+<a href="{% url 'bio-view_profile' username=spammer.username %}">{{ spammer.username }}</a>.
 Or, possibly some time has passed and the account was reinstated. If you have any questions, contact
 the site admin.
 {% endif %}
--- a/gpp/templates/forums/stranger.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/stranger.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Promote Stranger: {{ post.user.username }}{% endblock %}
 {% block content %}
 <h2>Promote Stranger: {{ post.user.username }}</h2>
@@ -11,8 +12,8 @@
 and moderators won't be able to deactivate them on the spot. You may wish to wait until the user
 has posted at least 10 times before making your decision.</p>
 <p>Please confirm that you wish to promote the new user
-<a href="{% url bio-view_profile username=post.user.username %}">{{ post.user.username }}</a> from
-<em>stranger</em> status based on <a href="{% url forums-goto_post post.id %}">this post</a>.
+<a href="{% url 'bio-view_profile' username=post.user.username %}">{{ post.user.username }}</a> from
+<em>stranger</em> status based on <a href="{% url 'forums-goto_post' post.id %}">this post</a>.
 </p>
 <form action="." method="post">{% csrf_token %}
    <input type="submit" value="Yes, {{ post.user.username }} seems legit and is not a stranger" />
@@ -26,6 +27,6 @@
 {% endif %}
 <hr />
 <p>
-<a href="{% url forums-goto_post post.id %}">Return to the post</a>.
+<a href="{% url 'forums-goto_post' post.id %}">Return to the post</a>.
 </p>
 {% endblock %}
--- a/gpp/templates/forums/subscription_status.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/subscription_status.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load forum_tags %}
 {% block title %}Forums: {% if is_subscribed %}S{% else %}Uns{% endif %}ubscribed to Topic{% endblock %}
 {% block content %}
@@ -14,6 +15,6 @@
 </p>
 <p>
 To manage all your forum topic subscriptions, please visit your
-<a href="{% url forums-manage_subscriptions %}">subscriptions page</a>.
+<a href="{% url 'forums-manage_subscriptions' %}">subscriptions page</a>.
 </p>
 {% endblock %}
--- a/gpp/templates/forums/topic.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/topic.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load forum_tags %}
 {% block title %}Forums: {{ topic.name }}{% endblock %}
 {% block custom_js %}{{ form.media }}{% endblock %}
@@ -20,7 +21,7 @@
 <a href="./?page={{ page.paginator.num_pages }}#forum-reply-form">New Reply</a>
 {% endif %}
 {% endif %}
-&bull; <a href="{% url forums-new_topic slug=forum.slug %}">New Topic</a>
+&bull; <a href="{% url 'forums-new_topic' slug=forum.slug %}">New Topic</a>
 {{ page_nav }}

 <table class="forum-topic" id="forum-topic">
@@ -31,19 +32,19 @@
 {{ page_nav }}
 {% if can_moderate %}
 <div class="forum-mod-controls">
-   <form action="{% url forums-mod_topic_stick topic.id %}" method="post">{% csrf_token %}
+   <form action="{% url 'forums-mod_topic_stick' topic.id %}" method="post">{% csrf_token %}
       <input type="submit" value="{% if topic.sticky %}Unstick{% else %}Stick{% endif %} Topic" />
    </form>
-   <form action="{% url forums-mod_topic_lock topic.id %}" method="post">{% csrf_token %}
+   <form action="{% url 'forums-mod_topic_lock' topic.id %}" method="post">{% csrf_token %}
       <input type="submit" value="{% if topic.locked %}Unlock{% else %}Lock{% endif %} Topic" />
    </form>
-   <form action="{% url forums-mod_topic_delete topic.id %}" method="post">{% csrf_token %}
+   <form action="{% url 'forums-mod_topic_delete' topic.id %}" method="post">{% csrf_token %}
       <input type="submit" value="Delete Topic" id="forum-mod-del-topic" />
    </form>
-   <a href="{% url forums-mod_topic_move topic.id %}"><img src="{{ MEDIA_URL }}icons/application_go.png" alt="Move Topic" title="Move Topic" /></a>
-   <a href="{% url forums-mod_topic_move topic.id %}">Move this topic</a>
-   <a href="{% url forums-mod_topic_split topic.id %}"><img src="{{ MEDIA_URL }}icons/arrow_branch.png" alt="Split Topic" title="Split Topic" /></a>
-   <a href="{% url forums-mod_topic_split topic.id %}">Split this topic</a>
+   <a href="{% url 'forums-mod_topic_move' topic.id %}"><img src="{{ MEDIA_URL }}icons/application_go.png" alt="Move Topic" title="Move Topic" /></a>
+   <a href="{% url 'forums-mod_topic_move' topic.id %}">Move this topic</a>
+   <a href="{% url 'forums-mod_topic_split' topic.id %}"><img src="{{ MEDIA_URL }}icons/arrow_branch.png" alt="Split Topic" title="Split Topic" /></a>
+   <a href="{% url 'forums-mod_topic_split' topic.id %}">Split this topic</a>
 </div>
 {% endif %}

@@ -53,7 +54,7 @@
 {% endif %}

 {% if user.is_authenticated %}
-<form action={% if is_favorite %}"{% url forums-unfavorite_topic topic.id %}"{% else %}"{% url forums-favorite_topic topic.id %}"{% endif %} method="post">{% csrf_token %}
+<form action={% if is_favorite %}"{% url 'forums-unfavorite_topic' topic.id %}"{% else %}"{% url 'forums-favorite_topic' topic.id %}"{% endif %} method="post">{% csrf_token %}
 <fieldset>
    <legend>Favorite Options</legend>
    <p>
@@ -69,12 +70,12 @@
    </p>
    <p>
    To manage all your forum topic favorites, please visit your
-   <a href="{% url forums-manage_favorites %}">favorites page</a>.
+   <a href="{% url 'forums-manage_favorites' %}">favorites page</a>.
    </p>
 </fieldset>
 </form>

-<form action={% if is_subscribed %}"{% url forums-unsubscribe_topic topic.id %}"{% else %}"{% url forums-subscribe_topic topic.id %}"{% endif %} method="post">{% csrf_token %}
+<form action={% if is_subscribed %}"{% url 'forums-unsubscribe_topic' topic.id %}"{% else %}"{% url 'forums-subscribe_topic' topic.id %}"{% endif %} method="post">{% csrf_token %}
 <fieldset>
    <legend>Subscription Options</legend>
    <p>
@@ -90,7 +91,7 @@
    </p>
    <p>
    To manage all your forum topic subscriptions, please visit your
-   <a href="{% url forums-manage_subscriptions %}">subscriptions page</a>.
+   <a href="{% url 'forums-manage_subscriptions' %}">subscriptions page</a>.
    </p>
 </fieldset>
 </form>
--- a/gpp/templates/forums/topic_list.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/forums/topic_list.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load forum_tags %}
 {% block title %}Forums: {{ title }}{% endblock %}
 {% block custom_js %}
@@ -32,7 +33,7 @@
             {% endif %}
          </td>
          <td class="col-2">
-            <a href="{% url bio-view_profile username=topic.user.username %}" title="View profile for {{ topic.user.username }}">{{ topic.user.username }}</a>
+            <a href="{% url 'bio-view_profile' username=topic.user.username %}" title="View profile for {{ topic.user.username }}">{{ topic.user.username }}</a>
          </td>
          <td class="col-3">
             {{ topic.reply_count }}
--- a/gpp/templates/gcalendar/edit.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/gcalendar/edit.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,10 +1,11 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Edit Calendar Events{% endblock %}
 {% block custom_js %}
 <script type="text/javascript" src="{{ MEDIA_URL }}js/gcalendar_edit.js"></script>
 {% endblock %}
 {% block content %}
-<div class="breadcrumbs"><a href="{% url gcalendar-index %}">Calendar</a> &raquo; Edit Events</div>
+<div class="breadcrumbs"><a href="{% url 'gcalendar-index' %}">Calendar</a> &raquo; Edit Events</div>
 <h2>Edit Calendar Events</h2>
 {% if events %}
 <p>You have the following events on our calendar. Click on the event title to edit it, or click the
@@ -16,7 +17,7 @@
 <ul>
 {% for event in events %}
 <li>{{ event.start_date|date:"M d, Y"}} &bull;
-<a href="{% url gcalendar-edit_event event.id %}" title="Edit Event">{{ event.what }}</a>
+<a href="{% url 'gcalendar-edit_event' event.id %}" title="Edit Event">{{ event.what }}</a>
 <a class="gcal-del" id="gcal-{{ event.id }}" href="#"><img src="{{ MEDIA_URL }}icons/cross.png" alt="Delete Event" title="Delete Event" /></a>
 </li>
 {% endfor %}
--- a/gpp/templates/gcalendar/event.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/gcalendar/event.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,11 +1,12 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load core_tags %}
 {% block title %}{{ title }}{% endblock %}
 {% block custom_js %}
 {{ form.media }}
 {% endblock %}
 {% block content %}
-<div class="breadcrumbs"><a href="{% url gcalendar-index %}">Calendar</a> &raquo; {{ title }}</div>
+<div class="breadcrumbs"><a href="{% url 'gcalendar-index' %}">Calendar</a> &raquo; {{ title }}</div>
 <h2>{{ title }}</h2>
 <p>Use this form to add or change an event on our calendar. Please note the following:</p>
 <ul>
@@ -42,5 +43,5 @@
 <tr><td>&nbsp;</td><td>{% comment_dialogs %}<input type="submit" name="submit_button" value="Submit" /></td></tr>
 </table>
 </form>
-<p><a href="{% url gcalendar-index %}">&laquo; Back to the Event Calendar</a></p>
+<p><a href="{% url 'gcalendar-index' %}">&laquo; Back to the Event Calendar</a></p>
 {% endblock %}
--- a/gpp/templates/gcalendar/index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/gcalendar/index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Event Calendar{% endblock %}
 {% block content %}
 <h2>SurfGuitar101 Event Calendar</h2>
@@ -10,10 +11,10 @@

 <ul>
 {% if user.is_authenticated %}
-   <li><a href="{% url gcalendar-add %}"><img src="{{ MEDIA_URL}}icons/calendar_add.png" alt="Add" /></a>
-      <a href="{% url gcalendar-add %}">Add an event to our calendar</a>.</li>
-   <li><a href="{% url gcalendar-edit_events %}"><img src="{{ MEDIA_URL}}icons/calendar_edit.png" alt="Edit" /></a>
-      <a href="{% url gcalendar-edit_events %}">Change or delete an event you previously added</a>.</li>
+   <li><a href="{% url 'gcalendar-add' %}"><img src="{{ MEDIA_URL}}icons/calendar_add.png" alt="Add" /></a>
+      <a href="{% url 'gcalendar-add' %}">Add an event to our calendar</a>.</li>
+   <li><a href="{% url 'gcalendar-edit_events' %}"><img src="{{ MEDIA_URL}}icons/calendar_edit.png" alt="Edit" /></a>
+      <a href="{% url 'gcalendar-edit_events' %}">Change or delete an event you previously added</a>.</li>
 {% endif %}
    <li>
 <a href="http://www.google.com/calendar/feeds/i81lu3fkh57sgqqenogefd9v78%40group.calendar.google.com/public/basic">
--- a/gpp/templates/gcalendar/thanks_add.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/gcalendar/thanks_add.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,9 +1,10 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Event Calendar - Thanks{% endblock %}
 {% block content %}
-<div class="breadcrumbs"><a href="{% url gcalendar-index %}">Calendar</a> &raquo; Thanks</div>
+<div class="breadcrumbs"><a href="{% url 'gcalendar-index' %}">Calendar</a> &raquo; Thanks</div>
 <h2>Thanks for Submitting an Event!</h2>
 <p>Thanks for submitting an event to our calendar. Your event will be reviewed by the staff,
 and should appear on the calendar shortly. You may be contacted if we have any questions.</p>
-<p><a href="{% url gcalendar-index %}">&laquo; Back to the Event Calendar</a></p>
+<p><a href="{% url 'gcalendar-index' %}">&laquo; Back to the Event Calendar</a></p>
 {% endblock %}
--- a/gpp/templates/gcalendar/thanks_edit.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/gcalendar/thanks_edit.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,9 +1,10 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Event Calendar Changes Received{% endblock %}
 {% block content %}
-<div class="breadcrumbs"><a href="{% url gcalendar-index %}">Calendar</a> &raquo; Edit Events</div>
+<div class="breadcrumbs"><a href="{% url 'gcalendar-index' %}">Calendar</a> &raquo; Edit Events</div>
 <h2>Event Calendar Changes Received</h2>
 <p>We've received the changes to your calendar event. Your changes will be reviewed by the staff,
 and should appear on the calendar shortly. You may be contacted if we have any questions.</p>
-<p><a href="{% url gcalendar-index %}">&laquo; Back to the Event Calendar</a></p>
+<p><a href="{% url 'gcalendar-index' %}">&laquo; Back to the Event Calendar</a></p>
 {% endblock %}
--- a/gpp/templates/home.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/home.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load bulletin_tags %}
 {% load news_tags %}
 {% load weblinks_tags %}
@@ -8,7 +9,7 @@
 {% load cache %}
 {% block title %}Home{% endblock %}
 {% block custom_head %}
-<link rel="alternate" type="application/rss+xml" title="SurfGuitar101 News" href="{% url feeds-news %}" />
+<link rel="alternate" type="application/rss+xml" title="SurfGuitar101 News" href="{% url 'feeds-news' %}" />
 {% endblock %}
 {% block custom_css %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/news.css" />
--- a/gpp/templates/membermap/balloon.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/membermap/balloon.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,6 +1,7 @@
+{% load url from future %}
 {% if avatar_url %}
-<a href="{% url bio-view_profile username=user.name %}">
+<a href="{% url 'bio-view_profile' username=user.name %}">
 <img src="{{ avatar_url }}" alt="{{ user.name }}" style="float:left;margin-right:3px;" /></a>
 {% endif %}
-<a href="{% url bio-view_profile username=user.name %}">{{ user.name }}</a>:<br />
+<a href="{% url 'bio-view_profile' username=user.name %}">{{ user.name }}</a>:<br />
 {{ user.message|safe }}
--- a/gpp/templates/membermap/index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/membermap/index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load core_tags %}
 {% block title %}Member Map{% endblock %}
 {% block custom_js %}
@@ -61,8 +62,8 @@
         <p>
         The member map allows members to place themselves on a google map along with a short message.
         This feature is only for registered users of SurfGuitar101.com. Please
-        <a href="{% url accounts-login %}">login</a> or
-        <a href="{% url accounts-register %}">register</a> to use the member map.
+        <a href="{% url 'accounts-login' %}">login</a> or
+        <a href="{% url 'accounts-register' %}">register</a> to use the member map.
         </p>
         {% endif %}
     </div>
--- a/gpp/templates/membermap/markdown.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/membermap/markdown.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
+{% load url from future %}
 {% load markup %}
 {% load smiley_tags %}
 {% load avatar_tags %}
-{% avatar user "left" %}<a href="{% url bio-view_profile username=user.username %}">{{ user.username }}</a>:<br />{{ msg|safe }}
+{% avatar user "left" %}<a href="{% url 'bio-view_profile' username=user.username %}">{{ user.username }}</a>:<br />{{ msg|safe }}
--- a/gpp/templates/messages/base.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/messages/base.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block custom_css %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/tab-nav.css" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/messages.css" />
@@ -7,15 +8,15 @@
 <h2>Your Private Messsages</h2>
 <ul class="tab-nav">
 <li><a {% block compose-class %}{% endblock %}
-   href="{% url messages-compose %}">Compose</a></li>
+   href="{% url 'messages-compose' %}">Compose</a></li>
 <li><a {% block inbox-class %}{% endblock %}
-   href="{% url messages-inbox %}">Inbox</a></li>
+   href="{% url 'messages-inbox' %}">Inbox</a></li>
 <li><a {% block outbox-class %}{% endblock %}
-   href="{% url messages-outbox %}">Outbox</a></li>
+   href="{% url 'messages-outbox' %}">Outbox</a></li>
 <li><a {% block trash-class %}{% endblock %}
-   href="{% url messages-trash %}">Trash</a></li>
+   href="{% url 'messages-trash' %}">Trash</a></li>
 <li><a {% block options-class %}{% endblock %}
-   href="{% url messages-options %}">Options</a></li>
+   href="{% url 'messages-options' %}">Options</a></li>
 </ul>
 {% block messages_content %}
 {% endblock %}
--- a/gpp/templates/messages/inbox.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/messages/inbox.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'messages/base.html' %}
+{% load url from future %}
 {% block title %}Messages: Inbox{% endblock %}
 {% block custom_js %}
    <script type="text/javascript" src="{{ MEDIA_URL }}js/messages/box.js"></script>
@@ -14,7 +15,7 @@
 </ul>
 {% endif %}
 {% if msgs %}
-   <form action="{% url messages-delete_bulk %}" method="post" name="messages_box_form"
+   <form action="{% url 'messages-delete_bulk' %}" method="post" name="messages_box_form"
       onsubmit="return messages_confirm_delete();">{% csrf_token %}
    <table class="messages">
    <tr>
@@ -25,7 +26,7 @@
    </tr>
    {% for msg in msgs %}
    <tr>
-      <td><a href="{% url bio.views.view_profile msg.sender.username %}">
+      <td><a href="{% url 'bio.views.view_profile' msg.sender.username %}">
          {{ msg.sender.username }}</a></td>
       <td>
          {% if msg.unread %}<strong>{% endif %}
--- a/gpp/templates/messages/outbox.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/messages/outbox.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'messages/base.html' %}
+{% load url from future %}
 {% block title %}Messages: Outbox{% endblock %}
 {% block custom_js %}
    <script type="text/javascript" src="{{ MEDIA_URL }}js/messages/box.js"></script>
@@ -14,7 +15,7 @@
 </ul>
 {% endif %}
 {% if msgs %}
-   <form action="{% url messages-delete_bulk %}" method="post" name="messages_box_form"
+   <form action="{% url 'messages-delete_bulk' %}" method="post" name="messages_box_form"
       onsubmit="return messages_confirm_delete();">{% csrf_token %}
    <table class="messages">
    <tr>
@@ -26,7 +27,7 @@
    </tr>
    {% for msg in msgs %}
    <tr>
-      <td><a href="{% url bio.views.view_profile msg.receiver.username %}">
+      <td><a href="{% url 'bio.views.view_profile' msg.receiver.username %}">
          {{ msg.receiver.username }}</a></td>
       <td>
          {% if msg.unread %}<strong>{% endif %}
--- a/gpp/templates/messages/trash.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/messages/trash.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'messages/base.html' %}
+{% load url from future %}
 {% block title %}Messages: Trash{% endblock %}
 {% block custom_js %}
    <script type="text/javascript" src="{{ MEDIA_URL }}js/messages/box.js"></script>
@@ -14,7 +15,7 @@
 </ul>
 {% endif %}
 {% if msgs %}
-   <form action="{% url messages-undelete_bulk %}" method="post" name="messages_box_form"
+   <form action="{% url 'messages-undelete_bulk' %}" method="post" name="messages_box_form"
       onsubmit="return messages_confirm_undelete();">{% csrf_token %}
    <table class="messages">
    <tr>
@@ -26,9 +27,9 @@
    </tr>
    {% for msg in msgs %}
    <tr>
-      <td><a href="{% url bio.views.view_profile msg.sender.username %}">
+      <td><a href="{% url 'bio.views.view_profile' msg.sender.username %}">
          {{ msg.sender.username }}</a></td>
-      <td><a href="{% url bio.views.view_profile msg.receiver.username %}">
+      <td><a href="{% url 'bio.views.view_profile' msg.receiver.username %}">
          {{ msg.receiver.username }}</a></td>
       <td>
          {% if msg.unread %}<strong>{% endif %}
--- a/gpp/templates/messages/view.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/messages/view.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'messages/base.html' %}
+{% load url from future %}
 {% block title %}Messages: {{ msg.subject }}{% endblock %}
 {% block messages_content %}
 <h3>Viewing Message: {{ msg.subject }}</h3>
@@ -21,13 +22,13 @@
 </div>
 {% endif %}
 {% if is_deleted %}
-<form action="{% url messages-undelete msg.id %}" method="post">{% csrf_token %}
+<form action="{% url 'messages-undelete' msg.id %}" method="post">{% csrf_token %}
    {% if box %}<input type="hidden" name="box" value="{{ box }}" />{% endif %}
    <input type="submit" value="Undelete" />
 </form>
 {% else %}
-<a href="{% url messages-reply msg.id %}{% if box %}?box={{ box }}{% endif %}">Reply</a> |
-<form action="{% url messages-delete msg.id %}" method="post" class="messages-button">{% csrf_token %}
+<a href="{% url 'messages-reply' msg.id %}{% if box %}?box={{ box }}{% endif %}">Reply</a> |
+<form action="{% url 'messages-delete' msg.id %}" method="post" class="messages-button">{% csrf_token %}
    {% if box %}<input type="hidden" name="box" value="{{ box }}" />{% endif %}
    <input type="submit" value="Delete" />
 </form>
--- a/gpp/templates/news/archive_index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/news/archive_index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'news/base.html' %}
+{% load url from future %}
 {% block title %}News Archive{% endblock %}
 {% block archive-class %}class="active"{% endblock %}
 {% block news_content %}
@@ -10,7 +11,7 @@
 {% if dates %}
 <ul>
 {% for date in dates %}
-   <li><a href="{% url news-archive_page year=date.year month=date.month %}">
+   <li><a href="{% url 'news-archive_page' year=date.year month=date.month %}">
       {{ date|date:"F, Y" }}</a></li>
 {% endfor %}
 </ul>
--- a/gpp/templates/news/base.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/news/base.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,20 +1,21 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block custom_head %}
-<link rel="alternate" type="application/rss+xml" title="SurfGuitar101 News" href="{% url feeds-news %}" />
+<link rel="alternate" type="application/rss+xml" title="SurfGuitar101 News" href="{% url 'feeds-news' %}" />
 {% endblock %}
 {% block custom_css %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/news.css" />
 {% block news_css %}{% endblock %}
 {% endblock %}
 {% block content %}
-<h2>SurfGuitar101 News &amp; Articles <a href="{% url feeds-news %}"><img src="{{ MEDIA_URL }}icons/feed.png" alt="News Feed" title="News Feed" /></a></h2>
+<h2>SurfGuitar101 News &amp; Articles <a href="{% url 'feeds-news' %}"><img src="{{ MEDIA_URL }}icons/feed.png" alt="News Feed" title="News Feed" /></a></h2>

 <ul class="app-menu">
-<li><a href="{% url news-index_page %}">News Main</a></li>
-<li><a href="{% url news-archive_index %}">Archive</a></li>
-<li><a href="{% url news-category_index %}">Categories</a></li>
-<li><a href="{% url news-tag_index %}">Tags</a></li>
-<li><a href="{% url news-submit %}">Submit News</a></li>
+<li><a href="{% url 'news-index_page' %}">News Main</a></li>
+<li><a href="{% url 'news-archive_index' %}">Archive</a></li>
+<li><a href="{% url 'news-category_index' %}">Categories</a></li>
+<li><a href="{% url 'news-tag_index' %}">Tags</a></li>
+<li><a href="{% url 'news-submit' %}">Submit News</a></li>
 </ul>
 {% block news_content %}
 {% endblock %}
--- a/gpp/templates/news/category_index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/news/category_index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'news/base.html' %}
+{% load url from future %}
 {% block title %}News: Categories{% endblock %}
 {% block categories-class %}class="active"{% endblock %}
 {% block news_content %}
@@ -7,12 +8,12 @@
 This page shows the list of news categories for the site. Under each category we show the
 latest ten stories. To see all the stories in a category, click the icon for that category.
 Each story is also <strong>tagged</strong> with a set of tags. You may also wish to
-<a href="{% url news-tag_index %}">view our stories by their tags</a>.
+<a href="{% url 'news-tag_index' %}">view our stories by their tags</a>.
 </p>

 {% for category, story_set in cat_list %}
    <h3>{{ category.title }}</h3>
-   <p><a href="{% url news-category slug=category.slug %}">
+   <p><a href="{% url 'news-category' slug=category.slug %}">
       <img src="{{ category.icon.url }}" alt="{{ category.title }}" title="{{ category.title }}" />
       </a>
    </p>
--- a/gpp/templates/news/current_news.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/news/current_news.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,8 +1,9 @@
+{% load url from future %}
 {% if stories %}
 <h2>Current News Stories</h2>
 {% for story in stories %}
    {% include 'news/story_summary.html' %}
 {% endfor %}
 <hr />
-<p>For more news stories, check out our <a href="{% url news-index_page %}">news archive</a>.</p>
+<p>For more news stories, check out our <a href="{% url 'news-index_page' %}">news archive</a>.</p>
 {% endif %}
--- a/gpp/templates/news/story.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/news/story.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'news/base.html' %}
+{% load url from future %}
 {% load tagging_tags %}
 {% load comment_tags %}
 {% load script_tags %}
@@ -19,7 +20,7 @@
 </div>
 <hr />
 <div class="news-content">
-   <a href="{% url news-category slug=story.category.slug %}">
+   <a href="{% url 'news-category' slug=story.category.slug %}">
    <img src="{{ story.category.icon.url }}" alt="{{ story.category.title }}" title="{{ story.category.title }}"
       class="news-icon" /></a>
    {{ story.short_text|safe }}
@@ -27,11 +28,11 @@
    <br clear="all" />
    <hr />
    <p>
-   Category: <a href="{% url news-category slug=story.category.slug %}">{{ story.category.title }}</a>
+   Category: <a href="{% url 'news-category' slug=story.category.slug %}">{{ story.category.title }}</a>
    <a href="{{ story.get_absolute_url }}"><img src="{{ MEDIA_URL }}icons/link.png"
       alt="Story Permalink" title="Story Permalink" /></a>
 {% if user.is_authenticated %}
-   <a href="{% url news.views.email_story story.id %}"><img src="{{ MEDIA_URL }}icons/email_go.png"
+   <a href="{% url 'news.views.email_story' story.id %}"><img src="{{ MEDIA_URL }}icons/email_go.png"
       alt="Send this story to a friend" title="Send this story to a friend" /></a>
 {% endif %}
    </p>
@@ -41,7 +42,7 @@
       <img src="{{ MEDIA_URL }}icons/tag_blue.png" alt="Tags" title="Tags" /> Tags:
       <ul>
          {% for tag in story_tags %}
-            <li><a href="{% url news-tag_page tag_name=tag.name %}">{{ tag.name }}</a></li>
+            <li><a href="{% url 'news-tag_page' tag_name=tag.name %}">{{ tag.name }}</a></li>
          {% endfor %}
       </ul>
    </div>
@@ -56,6 +57,6 @@
 {% render_comment_form for story %}
 {% else %}
 <p>Comments are closed for this story. If you'd like to share your thoughts on this story
-with the site staff, you can <a href="{% url contact-form %}">contact us directly</a>.</p>
+with the site staff, you can <a href="{% url 'contact-form' %}">contact us directly</a>.</p>
 {% endif %}
 {% endblock %}
--- a/gpp/templates/news/story_summary.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/news/story_summary.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,3 +1,4 @@
+{% load url from future %}
 {% load tagging_tags %}
 {% load comment_tags %}
 {% get_comment_count for story as comment_count %}
@@ -10,7 +11,7 @@
 <div class="news-details">
    Submitted by {{ story.submitter.username }} on {{ story.date_submitted|date:"F d, Y" }}.
 </div>
-<a href="{% url news-category slug=story.category.slug %}">
+<a href="{% url 'news-category' slug=story.category.slug %}">
 <img src="{{ story.category.icon.url }}" alt="{{ story.category.title }}" title="{{ story.category.title }}"
    class="news-icon" /></a>
 <div class="news-content">
@@ -24,12 +25,12 @@
 {% endif %}
 <hr />
 <p>
-Category: <a href="{% url news-category slug=story.category.slug %}">{{ story.category.title }}</a>
+Category: <a href="{% url 'news-category' slug=story.category.slug %}">{{ story.category.title }}</a>
 <img src="{{ MEDIA_URL }}icons/comments.png" alt="Comments" title="Comments" />
 <a href="{{ story.get_absolute_url }}">{{ comment_count }} comment{{ comment_count|pluralize }}</a>
 <a href="{{ story.get_absolute_url }}"><img src="{{ MEDIA_URL }}icons/link.png" alt="Permalink" title="Permalink" /></a>
 {% if user.is_authenticated %}
-<a href="{% url news.views.email_story story.id %}"><img src="{{ MEDIA_URL }}icons/email_go.png"
+<a href="{% url 'news.views.email_story' story.id %}"><img src="{{ MEDIA_URL }}icons/email_go.png"
    alt="Send this story to a friend" title="Send this story to a friend" /></a>
 {% endif %}
 </p>
@@ -39,7 +40,7 @@
    <img src="{{ MEDIA_URL }}icons/tag_blue.png" alt="Tags" title="Tags" /> Tags:
    <ul>
       {% for tag in story_tags %}
-         <li><a href="{% url news-tag_page tag_name=tag %}">{{ tag }}</a></li>
+         <li><a href="{% url 'news-tag_page' tag_name=tag %}">{{ tag }}</a></li>
       {% endfor %}
    </ul>
 </div>
--- a/gpp/templates/news/submit_news.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/news/submit_news.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'news/base.html' %}
+{% load url from future %}
 {% block title %}News: Submit News{% endblock %}
 {% if add_form %}
    {% block custom_js %}
@@ -13,7 +14,7 @@
       <table>
          {{ add_form.as_table }}
          <tr><td>&nbsp;</td><td><input type="submit" value="Submit" />
-         &nbsp;<a href="{% url news-index_page %}">Cancel</a></td></tr>
+         &nbsp;<a href="{% url 'news-index_page' %}">Cancel</a></td></tr>
       </table>
    </form>
 {% else %}
--- a/gpp/templates/news/tag_index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/news/tag_index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'news/base.html' %}
+{% load url from future %}
 {% block title %}News: Tags{% endblock %}
 {% block tags-class %}class="active"{% endblock %}
 {% block news_content %}
@@ -12,7 +13,7 @@
    <div class="news-tag-cloud">
    <ul>
    {% for tag in tags %}
-      <li><a href="{% url news-tag_page tag_name=tag.name %}">
+      <li><a href="{% url 'news-tag_page' tag_name=tag.name %}">
          <font size="{{ tag.font_size }}">{{ tag.name }}</font></a></li>
    {% endfor %}
    </ul>
--- a/gpp/templates/podcast/base.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/podcast/base.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block content %}
-<h2><a href="{% url podcast-main %}">SurfGuitar101 Podcast</a></h2>
+<h2><a href="{% url 'podcast-main' %}">SurfGuitar101 Podcast</a></h2>
 <img src="{{ channel.image.url }}" alt="Podcast Logo" style="float: left; margin-right:10px;" />
 <p>
 Welcome to the <strong>Surfguitar101 Podcast</strong>! The podcast started as an experiment just to see what it took to create a podcast. The reaction was very positive so hopefully we will start seeing new episodes on a semi-regular basis. You can download the podcast episodes here and we are also listed in iTunes.
@@ -14,7 +15,7 @@
 <a href="mailto:podcast@surfguitar101.com">podcast@surfguitar101.com</a>.
 </p>
 <p>
-Subscribe to the podcast via RSS: <a href="{% url podcast.views.feed %}">Feed</a>
+Subscribe to the podcast via RSS: <a href="{% url 'podcast.views.feed' %}">Feed</a>
 </p>
 <p>
 <strong>Hey iTunes users!</strong> Here is our <a href="http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewPodcast?id=284928526">listing in iTunes</a>. Follow the previous link and then click the subscribe button to let iTunes automatically download episodes for you.
--- a/gpp/templates/podcast/detail.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/podcast/detail.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,8 +1,9 @@
 {% extends 'podcast/base.html' %}
+{% load url from future %}
 {% block title %}Podcast: {{ podcast.title }}{% endblock %}
 {% block podcast-content %}
 <div class="breadcrumbs">
-   <a href="{% url podcast.views.index %}">Podcast Index</a> &gt;&gt; {{ podcast.title }}
+   <a href="{% url 'podcast.views.index' %}">Podcast Index</a> &gt;&gt; {{ podcast.title }}
 </div>
 <h3>{{ podcast.pubdate|date:"F d, Y" }} &bull; {{ podcast.title }}</h3>
 <h4>{{ podcast.subtitle }}</h4>
--- a/gpp/templates/polls/latest_poll_tag.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/polls/latest_poll_tag.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,3 +1,4 @@
+{% load url from future %}
 {% if poll %}
 <div>
    <h2>Latest Poll</h2>
@@ -7,7 +8,7 @@
          <li>{{ choice.choice }}</li>
       {% endfor %}
    </ul>
-   <p>Go <a href="{% url polls-detail poll_id=poll.id %}">see the results and vote</a>
-   or check out <a href="{% url polls-main %}">more polls</a>.</p>
+   <p>Go <a href="{% url 'polls-detail' poll_id=poll.id %}">see the results and vote</a>
+   or check out <a href="{% url 'polls-main' %}">more polls</a>.</p>
 </div>
 {% endif %}
--- a/gpp/templates/polls/poll.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/polls/poll.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load comment_tags %}
 {% block title %}Polls: {{ poll.question }}{% endblock %}
 {% block content %}
@@ -11,7 +12,7 @@
 </ul>
 {% get_comment_count for poll as comment_count %}
 <p>
-This poll has <a href="{% url polls.views.poll_results poll.id %}">{{ comment_count }} comment{{ comment_count|pluralize }}</a>.
+This poll has <a href="{% url 'polls.views.poll_results' poll.id %}">{{ comment_count }} comment{{ comment_count|pluralize }}</a>.
 {% if poll.is_open %}
 Voting for this poll started on {{ poll.start_date|date:"F d, Y" }}.
    {% if poll.end_date %}
@@ -22,10 +23,10 @@
 {% endif %}
 </p>
 <p class="poll-nav">
-<a href="{% url polls.views.poll_results poll.id %}">View Results &amp; Comments</a>
+<a href="{% url 'polls.views.poll_results' poll.id %}">View Results &amp; Comments</a>
 {% if poll.is_open and user.is_authenticated %}
-| <a href="{% url polls.views.poll_vote poll_id=poll.id %}">Vote</a>
+| <a href="{% url 'polls.views.poll_vote' poll_id=poll.id %}">Vote</a>
 {% endif %}
-| <a href="{% url polls.views.poll_index %}">Poll Index</a>
+| <a href="{% url 'polls.views.poll_index' %}">Poll Index</a>
 </p>
 {% endblock %}
--- a/gpp/templates/polls/poll_results.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/polls/poll_results.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load comment_tags %}
 {% load script_tags %}
 {% block title %}Poll Results: {{ poll.question }}{% endblock %}
@@ -28,9 +29,9 @@
 <p class="poll-nav">
 <a href="{{ poll.get_absolute_url }}">Poll Details</a>
 {% if poll.is_open and user.is_authenticated %}
-| <a href="{% url polls.views.poll_vote poll_id=poll.id %}">Vote</a>
+| <a href="{% url 'polls.views.poll_vote' poll_id=poll.id %}">Vote</a>
 {% endif %}
-| <a href="{% url polls.views.poll_index %}">Poll Index</a>
+| <a href="{% url 'polls.views.poll_index' %}">Poll Index</a>
 </p>

 {% get_comment_count for poll as comment_count %}
@@ -42,6 +43,6 @@
 {% render_comment_form for poll %}
 {% else %}
 <p>Comments are closed for this poll. If you'd like to share your thoughts on this poll
-with the site staff, you can <a href="{% url contact-form %}">contact us directly</a>.</p>
+with the site staff, you can <a href="{% url 'contact-form' %}">contact us directly</a>.</p>
 {% endif %}
 {% endblock %}
--- a/gpp/templates/polls/poll_vote.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/polls/poll_vote.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Polls: {{ poll.question }}{% endblock %}
 {% block custom_css %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/polls.css" />
@@ -14,8 +15,8 @@
 </form>
 <p class="poll-nav">
 <a href="{{ poll.get_absolute_url }}">Poll Details</a>
-| <a href="{% url polls.views.poll_results poll.id %}">View Results</a>
-| <a href="{% url polls.views.poll_index %}">Poll Index</a>
+| <a href="{% url 'polls.views.poll_results' poll.id %}">View Results</a>
+| <a href="{% url 'polls.views.poll_index' %}">Poll Index</a>
 </p>
 <p>This poll was published on {{ poll.start_date|date:"F d, Y" }}.</p>
 {% endblock %}
--- a/gpp/templates/potd/potd_block.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/potd/potd_block.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,10 +1,11 @@
 {% extends 'side_block.html' %}
+{% load url from future %}
 {% block block_title %}Photo of the Day{% endblock %}
 {% block block_content %}
 {% if potd %}
 <center>
-<a href="{% url potd-view %}"><img src="{{ potd.thumb.url }}" alt="{{ potd.caption }}" title="{{ potd.caption }}" /></a><br />
-<a href="{% url potd-view %}">{{ potd.caption }}</a>
+<a href="{% url 'potd-view' %}"><img src="{{ potd.thumb.url }}" alt="{{ potd.caption }}" title="{{ potd.caption }}" /></a><br />
+<a href="{% url 'potd-view' %}">{{ potd.caption }}</a>
 </center>
 {% else %}
 <p>No photo at this time.</p>
--- a/gpp/templates/potd/view.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/potd/view.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load comment_tags %}
 {% load script_tags %}
 {% block title %}Photo Of The Day{% endblock %}
@@ -23,7 +24,7 @@
 <p class="caption">{{ potd.caption }}</p>
 <p class="details">
 Submitted by
-<a href="{% url bio-view_profile username=potd.user.username %}">{{ potd.user.username }}</a>
+<a href="{% url 'bio-view_profile' username=potd.user.username %}">{{ potd.user.username }}</a>
 on {{ potd.date_added|date:"d F Y" }}.<br />
 This photo has been Photo of the Day {{ potd.potd_count }} time{{ potd.potd_count|pluralize }}.
 </p>
@@ -43,7 +44,7 @@
 <br />
 {% else %}
 <p>Comments are allowed only on today's photo of the day. If you'd like to share your thoughts on this photo
-with the site staff, you can <a href="{% url contact-form %}">contact us directly</a>.</p>
+with the site staff, you can <a href="{% url 'contact-form' %}">contact us directly</a>.</p>
 {% endif %}
 {% else %}
 <p>We're sorry, there doesn't seem to be a photo of the day right now.</p>
--- a/gpp/templates/shoutbox/missing_shout.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/shoutbox/missing_shout.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,7 +1,8 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% block title %}Shout Not Found{% endblock %}
 {% block content %}
-<div class="breadcrumbs"><a href="{% url shoutbox-history %}">Shoutbox History</a> &raquo; Shout Not Found</div>
+<div class="breadcrumbs"><a href="{% url 'shoutbox-history' %}">Shoutbox History</a> &raquo; Shout Not Found</div>
 <h2>Shout Not Found</h2>
 <p>We're sorry, it looks like that shout no longer exists.</p>
 {% endblock %}
--- a/gpp/templates/shoutbox/shout_detail.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/shoutbox/shout_detail.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,15 +1,16 @@
+{% load url from future %}
 {% load avatar_tags %}
 <tr>
 <th>
-<a href="{% url bio-view_profile username=shout.user.username %}">{% avatar shout.user %}</a>
-<a href="{% url bio-view_profile username=shout.user.username %}">{{ shout.user.username }}</a>
+<a href="{% url 'bio-view_profile' username=shout.user.username %}">{% avatar shout.user %}</a>
+<a href="{% url 'bio-view_profile' username=shout.user.username %}">{{ shout.user.username }}</a>
 </th>
 <td>
 <div {% ifequal user.id shout.user.id %}class="edit" id="shout-{{ shout.id }}"{% endifequal %}>{{ shout.html|safe }}</div>
 </div>
 <br />
 <span class="date">{{ shout.shout_date|date:"D M d Y H:i:s" }}</span><br />
-<a href="{% url shoutbox-view shout.id %}"><img src="{{ MEDIA_URL }}icons/link.png" alt="Permalink" title="Permalink" /></a>
+<a href="{% url 'shoutbox-view' shout.id %}"><img src="{{ MEDIA_URL }}icons/link.png" alt="Permalink" title="Permalink" /></a>
 <a href="#" class="shout-flag" id="shout-flag-{{ shout.id }}"><img src="{{ MEDIA_URL }}icons/flag_red.png" alt="Flag"
    title="Flag this shout as offensive" /></a>
 {% ifequal user.id shout.user.id %}
--- a/gpp/templates/shoutbox/shoutbox.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/shoutbox/shoutbox.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'side_block.html' %}
+{% load url from future %}
 {% load core_tags %}
 {% block block_title %}Shoutbox{% endblock %}
 {% block block_content %}
@@ -13,7 +14,7 @@
 </div>
 <center>
    <button type="button" id="shoutbox-prev" title="Previous">&laquo;</button>
-   <a href="{% url shoutbox-history %}">Shout History</a>
+   <a href="{% url 'shoutbox-history' %}">Shout History</a>
    <button type="button" id="shoutbox-next" title="Next">&raquo;</button>
 </center>
 {% if user.is_authenticated %}
@@ -30,8 +31,8 @@
 </center>
 {% else %}
 <p>
-Please <a href="{% url accounts-login %}">login</a> or
-<a href="{% url accounts-register %}">register</a> to shout.
+Please <a href="{% url 'accounts-login' %}">login</a> or
+<a href="{% url 'accounts-register' %}">register</a> to shout.
 </p>
 {% endif %}
 {% endblock %}
--- a/gpp/templates/shoutbox/view_shout.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/shoutbox/view_shout.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load url from future %}
 {% load script_tags %}
 {% block custom_css %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/shoutbox_app.css" />
@@ -9,7 +10,7 @@
 {% endblock %}
 {% block title %}Shout #{{ shout.id }}{% endblock %}
 {% block content %}
-<div class="breadcrumbs"><a href="{% url shoutbox-history %}">Shoutbox History</a> &raquo; Shout #{{ shout.id }}</div>
+<div class="breadcrumbs"><a href="{% url 'shoutbox-history' %}">Shoutbox History</a> &raquo; Shout #{{ shout.id }}</div>
 <h2>Shout #{{ shout.id }}</h2>
 <div class="shoutbox-history">
 <table>
--- a/gpp/templates/weblinks/add_link.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/weblinks/add_link.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'weblinks/base.html' %}
+{% load url from future %}
 {% block title %}Web Links: Add Link{% endblock %}
 {% block weblinks_content %}
    <h3>Add Link</h3>
@@ -7,7 +8,7 @@
    <table>
       {{ add_form.as_table }}
       <tr><td>&nbsp;</td><td><input type="submit" value="Add Link" />
-         &nbsp;<a href="{% url weblinks-main %}">Cancel</a>
+         &nbsp;<a href="{% url 'weblinks-main' %}">Cancel</a>
          </td></tr>
    </table>
    </form>
--- a/gpp/templates/weblinks/index.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/weblinks/index.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'weblinks/base.html' %}
+{% load url from future %}
 {% block title %}Web Links{% endblock %}
 {% block weblinks_content %}
    <h3>Categories</h3>
@@ -6,7 +7,7 @@
       <p>We have {{ total_links }} links in {{ categories.count }} categories.</p>
       <dl>
       {% for category in categories %}
-      <dt><a href="{% url weblinks-view_links slug=category.slug sort="title" %}">{{ category.title }}</a>
+      <dt><a href="{% url 'weblinks-view_links' slug=category.slug sort="title" %}">{{ category.title }}</a>
        ({{ category.count }})</dt>
          <dd><p>{{ category.description }}</p></dd>
       {% endfor %}
--- a/gpp/templates/weblinks/link.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/weblinks/link.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,13 +1,14 @@
+{% load url from future %}
 <dt>
 <h4><a href="{{ link.url }}">{{ link.title }}</a></h4>
 </dt>
 <dd>
 <p>{{ link.description }}</p>
-<form action="{% url weblinks-visit link.id %}" method="post">{% csrf_token %}
+<form action="{% url 'weblinks-visit' link.id %}" method="post">{% csrf_token %}
 <table class="link-stats">
    <tr>
-      <th>Added by:</th><td><a href="{% url bio-view_profile link.user.username %}">{{ link.user.username }}</a></td>
-      <th>Category:</th><td><a href="{% url weblinks-view_links slug=link.category.slug sort='date' %}">{{ link.category.title }}</a></td>
+      <th>Added by:</th><td><a href="{% url 'bio-view_profile' link.user.username %}">{{ link.user.username }}</a></td>
+      <th>Category:</th><td><a href="{% url 'weblinks-view_links' slug=link.category.slug sort='date' %}">{{ link.category.title }}</a></td>
    </tr>
    <tr>
       <th>Date Added:</th><td>{{ link.date_added|date:"M d, Y" }}</td>
--- a/gpp/templates/weblinks/navigation.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/weblinks/navigation.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,16 +1,17 @@
+{% load url from future %}
 <div class="app-logo">
 <img src="{{ MEDIA_URL }}icons/weblinks-logo.jpg" alt="Links Logo" title="Links" />
 </div>
 <ul class="app-menu">
-<li><a href="{% url weblinks-main %}">Categories</a></li>
-<li><a href="{% url weblinks-new_links %}">New</a></li>
-<li><a href="{% url weblinks-popular_links %}">Popular</a></li>
+<li><a href="{% url 'weblinks-main' %}">Categories</a></li>
+<li><a href="{% url 'weblinks-new_links' %}">New</a></li>
+<li><a href="{% url 'weblinks-popular_links' %}">Popular</a></li>
 {% if user.is_authenticated %}
-<li><a href="{% url weblinks-add_link %}">Add Link</a></li>
+<li><a href="{% url 'weblinks-add_link' %}">Add Link</a></li>
 {% endif %}
 </ul>
 <center>
-   <form action="{% url weblinks-random_link %}" method="post">{% csrf_token %}
+   <form action="{% url 'weblinks-random_link' %}" method="post">{% csrf_token %}
       <input type="submit" value="Visit a Random Link" />
    </form>
 </center>
--- a/gpp/templates/weblinks/view_links.html	Mon Jan 17 04:00:59 2011 +0000
+++ b/gpp/templates/weblinks/view_links.html	Thu Jan 20 04:03:48 2011 +0000
@@ -1,4 +1,5 @@
 {% extends 'weblinks/base.html' %}
+{% load url from future %}
 {% block title %}Web Links: {{ category.title }}{% endblock %}
 {% block weblinks_css %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/tab-nav.css" />
@@ -12,11 +13,11 @@

 {% if page.object_list %}
 <ul class="tab-nav">
-   <li><a href="{% url weblinks-view_links slug=category.slug sort="title" %}"
+   <li><a href="{% url 'weblinks-view_links' slug=category.slug sort="title" %}"
       {% ifequal s "title" %}class="active" {% endifequal %}>Title</a></li>
-   <li><a href="{% url weblinks-view_links slug=category.slug sort="date" %}"
+   <li><a href="{% url 'weblinks-view_links' slug=category.slug sort="date" %}"
       {% ifequal s "date" %}class="active"{% endifequal %}>Date</a></li>
-   <li><a href="{% url weblinks-view_links slug=category.slug sort="hits" %}"
+   <li><a href="{% url 'weblinks-view_links' slug=category.slug sort="hits" %}"
       {% ifequal s "hits" %}class="active"{% endifequal %}>Hits</a></li>
 </ul>