# HG changeset patch # User Brian Neal # Date 1295496228 0 # Node ID daa2916f5b34e36ae35722a90e066ab7fb701c81 # Parent 8a0bae48b6cafd624aa42d149ebebe8657917ca4 Fixing 145; New url tag behavior (forwards compatibility) in Django 1.3. diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/500.html --- 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 @@ -

Internal Server Error

+

Whoops! Internal Server Error

We're sorry, that page is currently unavailable due to a server misconfiguration.

-

The server administrator has been notified, and we apologise for any inconvenience.

+

The server administrator has been notified, and we apologize for any inconvenience.

diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/accounts/login.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 %}

Login

@@ -12,9 +13,9 @@ {% endblock %} diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/accounts/password_change.html --- 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 %}

Change Password

@@ -6,7 +7,7 @@ {{ form.as_table }}
  -  Cancel +  Cancel
diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/accounts/password_reset_complete.html --- 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 %}

Password Reset Complete

-Your password has been successfully changed. You may now login. +Your password has been successfully changed. You may now login.

{% endblock %} diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/accounts/password_reset_confirm.html --- 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 %}

Reset Password

@@ -16,8 +17,8 @@ {% else %}

We're sorry, the link you provided is invalid or has expired. If you are trying to -reset your password, please try again. -If you have questions or problems, please contact us. +reset your password, please try again. +If you have questions or problems, please contact us.

{% endif %} {% endblock %} diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/accounts/register_failure.html --- 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 %}

Registration Error

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 -register again. Sorry for the inconvenience.

+register again. Sorry for the inconvenience.

If you keep seeing this message, please contact the site staff for assistance.

{% endblock %} diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/accounts/register_success.html --- 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 %}

Congratulations, Your Account Has Been Created

Your registration of the user {{ username }} has been successful. Welcome to the site!

-

Please proceed to the login page to log into the site +

Please proceed to the login page to log into the site with your username {{ username }} and the password you registered with.

{% endblock %} diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/antispam/suspended.html --- 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 %}

Account Suspension Status

@@ -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 contact us. +questions, please feel to contact us.

{% else %}

diff -r 8a0bae48b6ca -r daa2916f5b34 gpp/templates/base.html --- 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 %} @@ -37,37 +38,37 @@

{% cache 300 potd_block %} {% photo_of_the_day %} @@ -83,7 +84,7 @@