# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1239475939 0
# Node ID 9a8801fa63d5355b2b3d99c99d082fd6c235859b
# Parent  33f73b7bd3055047aed6e28eea513524049c94e7
Got rid of the pseudo cancel buttons on various forms. Replaced them with cancel links.

diff -r 33f73b7bd305 -r 9a8801fa63d5 gpp/templates/accounts/password_change.html
--- a/gpp/templates/accounts/password_change.html	Sat Apr 11 18:28:13 2009 +0000
+++ b/gpp/templates/accounts/password_change.html	Sat Apr 11 18:52:19 2009 +0000
@@ -6,7 +6,8 @@
 <table>
 {{ form.as_table }}
 <tr><td>&nbsp;</td><td><input type="submit" value="Change Password" />
-      <input type="button" value="Cancel" onclick="history.back(); return true;" /></td></tr>
+      &nbsp;<a href="{% url bio-me %}">Cancel</a>
+      </td></tr>
 </table>
 </form>
 {% endblock %}
diff -r 33f73b7bd305 -r 9a8801fa63d5 gpp/templates/accounts/register.html
--- a/gpp/templates/accounts/register.html	Sat Apr 11 18:28:13 2009 +0000
+++ b/gpp/templates/accounts/register.html	Sat Apr 11 18:52:19 2009 +0000
@@ -6,7 +6,7 @@
 registering for your account here:</p>
 <ul>
    <li>Your username must be 30 characters or less, please use letters, digits, and underscores
-   only.</li>
+   only (no spaces).</li>
    <li>An email address is required to use this site. A confirmation email will be sent to the
    address you supply, and it is necessary to complete the registration process.</li>
    <li>You must agree to our <a href="{% url legal.views.view "tos" %}" target="_blank">Terms of Service</a>.</li>
@@ -15,8 +15,7 @@
 <form action="." method="post">
 <table>
    {{ form.as_table }}
-   <tr><td>&nbsp;</td><td><input type="submit" value="Submit" />
-         <input type="button" value="Cancel" onclick="history.back(); return true;" /></td></tr>
+   <tr><td>&nbsp;</td><td><input type="submit" value="Register" /></td></tr>
 </table>
 </form>
 {% endblock %}
diff -r 33f73b7bd305 -r 9a8801fa63d5 gpp/templates/bio/avatar.html
--- a/gpp/templates/bio/avatar.html	Sat Apr 11 18:28:13 2009 +0000
+++ b/gpp/templates/bio/avatar.html	Sat Apr 11 18:52:19 2009 +0000
@@ -18,6 +18,6 @@
    <form enctype="multipart/form-data" method="POST" action=".">
       {{ form.as_p }}
       <input type="submit" value="Update Avatar" />
-      <input type="button" value="Cancel" onclick="history.back(); return true;" />
+      &nbsp;<a href="{% url bio-me %}">Cancel</a>
    </form>
 {% endblock %}
diff -r 33f73b7bd305 -r 9a8801fa63d5 gpp/templates/news/send_story.html
--- a/gpp/templates/news/send_story.html	Sat Apr 11 18:28:13 2009 +0000
+++ b/gpp/templates/news/send_story.html	Sat Apr 11 18:52:19 2009 +0000
@@ -13,7 +13,8 @@
       <table>
          {{ send_form.as_table }}
          <tr><td>&nbsp;</td><td><input type="submit" value="Send" />
-            <input type="button" value="Cancel" onclick="history.back(); return true;" /></td></tr>
+            &nbsp;<a href="{{ story.get_absolute_url }}">Cancel</a>
+         </td></tr>
       </table>
    </form>
 {% else %}
diff -r 33f73b7bd305 -r 9a8801fa63d5 gpp/templates/news/submit_news.html
--- a/gpp/templates/news/submit_news.html	Sat Apr 11 18:28:13 2009 +0000
+++ b/gpp/templates/news/submit_news.html	Sat Apr 11 18:52:19 2009 +0000
@@ -13,7 +13,7 @@
       <table>
          {{ add_form.as_table }}
          <tr><td>&nbsp;</td><td><input type="submit" value="Submit" />
-            <input type="button" value="Cancel" onclick="history.back(); return true;" /></td></tr>
+         &nbsp;<a href="{% url news-index_page page=1 %}">Cancel</a></td></tr>
       </table>
    </form>
 {% else %}
diff -r 33f73b7bd305 -r 9a8801fa63d5 gpp/templates/weblinks/add_link.html
--- a/gpp/templates/weblinks/add_link.html	Sat Apr 11 18:28:13 2009 +0000
+++ b/gpp/templates/weblinks/add_link.html	Sat Apr 11 18:52:19 2009 +0000
@@ -7,7 +7,8 @@
    <table>
       {{ add_form.as_table }}
       <tr><td>&nbsp;</td><td><input type="submit" value="Add Link" />
-         <input type="button" value="Cancel" onclick="history.back(); return true;" /></td></tr>
+         &nbsp;<a href="{% url weblinks-main %}">Cancel</a>
+         </td></tr>
    </table>
    </form>
    <br />