Adding quotes in url tags (required since django 1.5)

Sergio Oliveira
1 parent eba9ded3
Showing 8 changed files with 25 additions and 25 deletions Show diff stats
src/colab/deprecated/templates/account_request_reset_password.html
src/colab/deprecated/templates/base.html
src/colab/deprecated/templates/email_account-reset-password.html
src/colab/deprecated/templates/email_signup-email-confirmation.html
src/colab/deprecated/templates/home.html
src/colab/deprecated/templates/login.html
src/colab/deprecated/templates/user-profile.html
src/super_archives/templates/message-preview.html
@@ -4,7 +4,7 @@
 {% block main-content %}
 <h2>{% trans "I forgot my password" %}</h2>
-<form method="POST" action="{% url request_reset_password %}">
+<form method="POST" action="{% url 'request_reset_password' %}">
   {% csrf_token %}
   <fieldset class="span-24 center box">
@@ -68,22 +68,22 @@
       <div id="top-menu" class="right">
         {% if not user.is_authenticated %}
         <span class="colborder">
-          <a href="{% url signup %}">{% trans "Sign up" %}</a>
+          <a href="{% url 'signup' %}">{% trans "Sign up" %}</a>
         </span>
         <span>
-          <a href="{% url login %}?next={{ request.path }}">{% trans "Login" %}</a>
+          <a href="{% url 'login' %}?next={{ request.path }}">{% trans "Login" %}</a>
         </span>
         {% else %}
         <span class="colborder">
           {% trans "authenticated as" %} <b>{{ user.username }}</b>
         </span>
         <span class="colborder">
-          <a href="{% url user_profile user.username %}">
+          <a href="{% url 'user_profile' user.username %}">
             {% trans "My Profile" %}
           </a>
         </span>
         <span>
-          <a href="{% url logout %}">
+          <a href="{% url 'logout' %}">
             {% trans "Logout" %}
           </a>
         </span>
@@ -100,7 +100,7 @@
       <div id="header-menu" class="span-24">
         <span class="colborder">
-          <a href="{% url thread_list %}">{% trans "Discussions" %}</a>
+          <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a>
         </span>
         <span class="colborder">
           <a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a>
@@ -137,7 +137,7 @@
     <div id="footer" class="span-24 center">
       {% block footer %}
-        <p><a href="{% url opendata %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a></p>
+        <p><a href="{% url 'opendata' %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a></p>
         <p>{% trans "The contents of this site is published under license" %} <a
           href="http://creativecommons.org/licenses/by-nc-sa/2.0/br/">{% trans "Creative Commons - attribution, non-commercial" %}</a>
         </p>
@@ -14,6 +14,6 @@
 {% endblocktrans %}
 <br/>
-<a href="http://{{ server_name }}{% url reset_password hash %}"> 
-  http://{{ server_name }}{% url reset_password hash %}
+<a href="http://{{ server_name }}{% url 'reset_password' hash %}"> 
+  http://{{ server_name }}{% url 'reset_password' hash %}
 </a>
@@ -4,6 +4,6 @@
 {% trans "To activate your account, please confirm your mail's activation by accessing the following link:" %}
-<a href="http://{{ server_name }}{% url email_verification hash %}"> 
-  http://{{ server_name }}{% url email_verification hash %}
+<a href="http://{{ server_name }}{% url 'email_verification' hash %}"> 
+  http://{{ server_name }}{% url 'email_verification' hash %}
 </a>
@@ -19,7 +19,7 @@
   <div class="span-12 colborder">
     <h3>{% trans "Latest collaborations" %}<a class="rss" target="_blank" 
-        href="{% url rss_latest_colab %}" 
+        href="{% url 'rss_latest_colab' %}" 
         title="{% trans 'RSS - Latest collaborations' %}">
         <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
     </h3>
@@ -29,7 +29,7 @@
       {% endfor %}
     </ul>
     <hr class="space"/>
-    <a class="right" href="{% url search %}?o=modified+desc">
+    <a class="right" href="{% url 'search' %}?o=modified+desc">
       {% trans "View more collaborations..." %}
     </a>
   </div>
@@ -44,7 +44,7 @@
   <div class="span-12 colborder">
     <h3>{% trans "Discussions Most Relevance" %}<a class="rss" target="_blank" 
-        href="{% url rss_hottest_threads %}" 
+        href="{% url 'rss_hottest_threads' %}" 
         title="{% trans "RSS - Discussions Most Relevance" %}">
         <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
     </h3>
@@ -54,14 +54,14 @@
       {% endfor %}
     </ul>
     <hr class="space"/>
-    <a class="right" href="{% url thread_list %}?order=hottest">
+    <a class="right" href="{% url 'thread_list' %}?order=hottest">
       {% trans "View more discussions relevance..." %}
     </a>
   </div>
   <div class="span-11 last">
     <h3>{% trans "Latest Discussions" %}<a class="rss" target="_blank" 
-        href="{% url rss_latest_threads %}" 
+        href="{% url 'rss_latest_threads' %}" 
         title="{% trans "RSS - Latest Discussions" %}">
         <img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
     </h3>
@@ -71,7 +71,7 @@
       {% endfor %}
     </ul>
     <hr class="space"/>
-    <a class="right" href="{% url thread_list %}">
+    <a class="right" href="{% url 'thread_list' %}">
       {% trans "View more discussions..." %}
     </a>
   </div>
@@ -10,7 +10,7 @@
   {% endif %}
   <div id="login-form-wrapper">
-    <form class="span-24" method="POST" action="{% url login %}">
+    <form class="span-24" method="POST" action="{% url 'login' %}">
       {% csrf_token %}
       <fieldset class="span-10 box">
@@ -27,7 +27,7 @@
         </p>
         <input type="submit" value="Login" />
-        <a class="right" href="{% url request_reset_password %}">{% trans "I forgot my password" %}</a>
+        <a class="right" href="{% url 'request_reset_password' %}">{% trans "I forgot my password" %}</a>
         <input type="hidden" name="next" value="{% firstof next '/' %}" />
       </fieldset>
@@ -40,7 +40,7 @@
         click on the link below and get to work!" %}</p>
         <a class="span-11 center large" 
-           href="{% url signup %}">{% trans "Sign up" %}</a>
+           href="{% url 'signup' %}">{% trans "Sign up" %}</a>
       </fieldset>
     </form>
   </div>
@@ -10,7 +10,7 @@
   {% if not user_profile %}
     <span class="notice span-24">
       <b>{% trans "User not registered." %}</b> {% trans "You are own this profile?" %}
-      <a href="{% url signup %}">{% trans "Click here and sign up." %}</a>
+      <a href="{% url 'signup' %}">{% trans "Click here and sign up." %}</a>
     </span>
   {% else %}
@@ -18,7 +18,7 @@
     {% ifequal request.user.username user_profile.user.username %}
       <span class="success span-24">
         {% trans "Hey, look you here! Want to " %}
-        <a href="{% url user_profile_update request.user %}">{% trans "edit your profile" %}</a>?
+        <a href="{% url 'user_profile_update' request.user %}">{% trans "edit your profile" %}</a>?
       </span>
     {% endifequal %}
@@ -34,7 +34,7 @@
     <div class="span-20 last">
       <div class="span-10">
-        <form action="{% url user_profile_update request.user %}" method='post'>
+        <form action="{% url 'user_profile_update' request.user %}" method='post'>
           {% csrf_token %}
           <h3>{% trans "Personal Information" %}</h3>
@@ -42,7 +42,7 @@
             <li>
               {{ form.username.label_tag }}: {{ user_profile.user.username }}
               {% ifequal request.user.username user_profile.user.username %}
-                (<a href="{% url change_password %}">{% trans "change password" %}</a>)
+                (<a href="{% url 'change_password' %}">{% trans "change password" %}</a>)
               {% endifequal %}
             </li>
             <li>
@@ -11,7 +11,7 @@
   {% endif %}
   {% if doc.mailinglist %}
-  <a href="{% url super_archives.views.list_messages %}?list={{ doc.mailinglist }}">
+  <a href="{% url 'super_archives.views.list_messages' %}?list={{ doc.mailinglist }}">
     <span class="tag">{{ doc.mailinglist }}</span>
   </a>
   {% endif %}
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	{% block main-content %}	4	{% block main-content %}
5	<h2>{% trans "I forgot my password" %}</h2>	5	<h2>{% trans "I forgot my password" %}</h2>
6		6
7	-<form method="POST" action="{% url request_reset_password %}">	7	+<form method="POST" action="{% url 'request_reset_password' %}">
8	{% csrf_token %}	8	{% csrf_token %}
9		9
10	<fieldset class="span-24 center box">	10	<fieldset class="span-24 center box">
	@@ -68,22 +68,22 @@		@@ -68,22 +68,22 @@
68	<div id="top-menu" class="right">	68	<div id="top-menu" class="right">
69	{% if not user.is_authenticated %}	69	{% if not user.is_authenticated %}
70	<span class="colborder">	70	<span class="colborder">
71	- <a href="{% url signup %}">{% trans "Sign up" %}</a>	71	+ <a href="{% url 'signup' %}">{% trans "Sign up" %}</a>
72	</span>	72	</span>
73	<span>	73	<span>
74	- <a href="{% url login %}?next={{ request.path }}">{% trans "Login" %}</a>	74	+ <a href="{% url 'login' %}?next={{ request.path }}">{% trans "Login" %}</a>
75	</span>	75	</span>
76	{% else %}	76	{% else %}
77	<span class="colborder">	77	<span class="colborder">
78	{% trans "authenticated as" %} <b>{{ user.username }}</b>	78	{% trans "authenticated as" %} <b>{{ user.username }}</b>
79	</span>	79	</span>
80	<span class="colborder">	80	<span class="colborder">
81	- <a href="{% url user_profile user.username %}">	81	+ <a href="{% url 'user_profile' user.username %}">
82	{% trans "My Profile" %}	82	{% trans "My Profile" %}
83	</a>	83	</a>
84	</span>	84	</span>
85	<span>	85	<span>
86	- <a href="{% url logout %}">	86	+ <a href="{% url 'logout' %}">
87	{% trans "Logout" %}	87	{% trans "Logout" %}
88	</a>	88	</a>
89	</span>	89	</span>
	@@ -100,7 +100,7 @@		@@ -100,7 +100,7 @@
100	<div id="header-menu" class="span-24">	100	<div id="header-menu" class="span-24">
101		101
102	<span class="colborder">	102	<span class="colborder">
103	- <a href="{% url thread_list %}">{% trans "Discussions" %}</a>	103	+ <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a>
104	</span>	104	</span>
105	<span class="colborder">	105	<span class="colborder">
106	<a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a>	106	<a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a>
	@@ -137,7 +137,7 @@		@@ -137,7 +137,7 @@
137		137
138	<div id="footer" class="span-24 center">	138	<div id="footer" class="span-24 center">
139	{% block footer %}	139	{% block footer %}
140	- <p><a href="{% url opendata %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a></p>	140	+ <p><a href="{% url 'opendata' %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a></p>
141	<p>{% trans "The contents of this site is published under license" %} <a	141	<p>{% trans "The contents of this site is published under license" %} <a
142	href="http://creativecommons.org/licenses/by-nc-sa/2.0/br/">{% trans "Creative Commons - attribution, non-commercial" %}</a>	142	href="http://creativecommons.org/licenses/by-nc-sa/2.0/br/">{% trans "Creative Commons - attribution, non-commercial" %}</a>
143	</p>	143	</p>
	@@ -14,6 +14,6 @@		@@ -14,6 +14,6 @@
14	{% endblocktrans %}	14	{% endblocktrans %}
15	<br/>	15	<br/>
16		16
17	-<a href="http://{{ server_name }}{% url reset_password hash %}">
18	- http://{{ server_name }}{% url reset_password hash %}	17	+<a href="http://{{ server_name }}{% url 'reset_password' hash %}">
		18	+ http://{{ server_name }}{% url 'reset_password' hash %}
19	</a>	19	</a>
	@@ -4,6 +4,6 @@		@@ -4,6 +4,6 @@
4		4
5	{% trans "To activate your account, please confirm your mail's activation by accessing the following link:" %}	5	{% trans "To activate your account, please confirm your mail's activation by accessing the following link:" %}
6		6
7	-<a href="http://{{ server_name }}{% url email_verification hash %}">
8	- http://{{ server_name }}{% url email_verification hash %}	7	+<a href="http://{{ server_name }}{% url 'email_verification' hash %}">
		8	+ http://{{ server_name }}{% url 'email_verification' hash %}
9	</a>	9	</a>
	@@ -19,7 +19,7 @@		@@ -19,7 +19,7 @@
19		19
20	<div class="span-12 colborder">	20	<div class="span-12 colborder">
21	<h3>{% trans "Latest collaborations" %}<a class="rss" target="_blank"	21	<h3>{% trans "Latest collaborations" %}<a class="rss" target="_blank"
22	- href="{% url rss_latest_colab %}"	22	+ href="{% url 'rss_latest_colab' %}"
23	title="{% trans 'RSS - Latest collaborations' %}">	23	title="{% trans 'RSS - Latest collaborations' %}">
24	<img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>	24	<img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
25	</h3>	25	</h3>
	@@ -29,7 +29,7 @@		@@ -29,7 +29,7 @@
29	{% endfor %}	29	{% endfor %}
30	</ul>	30	</ul>
31	<hr class="space"/>	31	<hr class="space"/>
32	- <a class="right" href="{% url search %}?o=modified+desc">	32	+ <a class="right" href="{% url 'search' %}?o=modified+desc">
33	{% trans "View more collaborations..." %}	33	{% trans "View more collaborations..." %}
34	</a>	34	</a>
35	</div>	35	</div>
	@@ -44,7 +44,7 @@		@@ -44,7 +44,7 @@
44		44
45	<div class="span-12 colborder">	45	<div class="span-12 colborder">
46	<h3>{% trans "Discussions Most Relevance" %}<a class="rss" target="_blank"	46	<h3>{% trans "Discussions Most Relevance" %}<a class="rss" target="_blank"
47	- href="{% url rss_hottest_threads %}"	47	+ href="{% url 'rss_hottest_threads' %}"
48	title="{% trans "RSS - Discussions Most Relevance" %}">	48	title="{% trans "RSS - Discussions Most Relevance" %}">
49	<img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>	49	<img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
50	</h3>	50	</h3>
	@@ -54,14 +54,14 @@		@@ -54,14 +54,14 @@
54	{% endfor %}	54	{% endfor %}
55	</ul>	55	</ul>
56	<hr class="space"/>	56	<hr class="space"/>
57	- <a class="right" href="{% url thread_list %}?order=hottest">	57	+ <a class="right" href="{% url 'thread_list' %}?order=hottest">
58	{% trans "View more discussions relevance..." %}	58	{% trans "View more discussions relevance..." %}
59	</a>	59	</a>
60	</div>	60	</div>
61		61
62	<div class="span-11 last">	62	<div class="span-11 last">
63	<h3>{% trans "Latest Discussions" %}<a class="rss" target="_blank"	63	<h3>{% trans "Latest Discussions" %}<a class="rss" target="_blank"
64	- href="{% url rss_latest_threads %}"	64	+ href="{% url 'rss_latest_threads' %}"
65	title="{% trans "RSS - Latest Discussions" %}">	65	title="{% trans "RSS - Latest Discussions" %}">
66	<img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>	66	<img src="{{ STATIC_URL }}img/rss.png" alt="{% trans 'RSS' %}"/></a>
67	</h3>	67	</h3>
	@@ -71,7 +71,7 @@		@@ -71,7 +71,7 @@
71	{% endfor %}	71	{% endfor %}
72	</ul>	72	</ul>
73	<hr class="space"/>	73	<hr class="space"/>
74	- <a class="right" href="{% url thread_list %}">	74	+ <a class="right" href="{% url 'thread_list' %}">
75	{% trans "View more discussions..." %}	75	{% trans "View more discussions..." %}
76	</a>	76	</a>
77	</div>	77	</div>
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	{% endif %}	10	{% endif %}
11		11
12	<div id="login-form-wrapper">	12	<div id="login-form-wrapper">
13	- <form class="span-24" method="POST" action="{% url login %}">	13	+ <form class="span-24" method="POST" action="{% url 'login' %}">
14	{% csrf_token %}	14	{% csrf_token %}
15		15
16	<fieldset class="span-10 box">	16	<fieldset class="span-10 box">
	@@ -27,7 +27,7 @@		@@ -27,7 +27,7 @@
27	</p>	27	</p>
28		28
29	<input type="submit" value="Login" />	29	<input type="submit" value="Login" />
30	- <a class="right" href="{% url request_reset_password %}">{% trans "I forgot my password" %}</a>	30	+ <a class="right" href="{% url 'request_reset_password' %}">{% trans "I forgot my password" %}</a>
31		31
32	<input type="hidden" name="next" value="{% firstof next '/' %}" />	32	<input type="hidden" name="next" value="{% firstof next '/' %}" />
33	</fieldset>	33	</fieldset>
	@@ -40,7 +40,7 @@		@@ -40,7 +40,7 @@
40	click on the link below and get to work!" %}</p>	40	click on the link below and get to work!" %}</p>
41		41
42	<a class="span-11 center large"	42	<a class="span-11 center large"
43	- href="{% url signup %}">{% trans "Sign up" %}</a>	43	+ href="{% url 'signup' %}">{% trans "Sign up" %}</a>
44	</fieldset>	44	</fieldset>
45	</form>	45	</form>
46	</div>	46	</div>
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	{% if not user_profile %}	10	{% if not user_profile %}
11	<span class="notice span-24">	11	<span class="notice span-24">
12	<b>{% trans "User not registered." %}</b> {% trans "You are own this profile?" %}	12	<b>{% trans "User not registered." %}</b> {% trans "You are own this profile?" %}
13	- <a href="{% url signup %}">{% trans "Click here and sign up." %}</a>	13	+ <a href="{% url 'signup' %}">{% trans "Click here and sign up." %}</a>
14	</span>	14	</span>
15		15
16	{% else %}	16	{% else %}
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	{% ifequal request.user.username user_profile.user.username %}	18	{% ifequal request.user.username user_profile.user.username %}
19	<span class="success span-24">	19	<span class="success span-24">
20	{% trans "Hey, look you here! Want to " %}	20	{% trans "Hey, look you here! Want to " %}
21	- <a href="{% url user_profile_update request.user %}">{% trans "edit your profile" %}</a>?	21	+ <a href="{% url 'user_profile_update' request.user %}">{% trans "edit your profile" %}</a>?
22	</span>	22	</span>
23	{% endifequal %}	23	{% endifequal %}
24		24
	@@ -34,7 +34,7 @@		@@ -34,7 +34,7 @@
34		34
35	<div class="span-20 last">	35	<div class="span-20 last">
36	<div class="span-10">	36	<div class="span-10">
37	- <form action="{% url user_profile_update request.user %}" method='post'>	37	+ <form action="{% url 'user_profile_update' request.user %}" method='post'>
38	{% csrf_token %}	38	{% csrf_token %}
39		39
40	<h3>{% trans "Personal Information" %}</h3>	40	<h3>{% trans "Personal Information" %}</h3>
	@@ -42,7 +42,7 @@		@@ -42,7 +42,7 @@
42	<li>	42	<li>
43	{{ form.username.label_tag }}: {{ user_profile.user.username }}	43	{{ form.username.label_tag }}: {{ user_profile.user.username }}
44	{% ifequal request.user.username user_profile.user.username %}	44	{% ifequal request.user.username user_profile.user.username %}
45	- (<a href="{% url change_password %}">{% trans "change password" %}</a>)	45	+ (<a href="{% url 'change_password' %}">{% trans "change password" %}</a>)
46	{% endifequal %}	46	{% endifequal %}
47	</li>	47	</li>
48	<li>	48	<li>
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	{% endif %}	11	{% endif %}
12		12
13	{% if doc.mailinglist %}	13	{% if doc.mailinglist %}
14	- <a href="{% url super_archives.views.list_messages %}?list={{ doc.mailinglist }}">	14	+ <a href="{% url 'super_archives.views.list_messages' %}?list={{ doc.mailinglist }}">
15	<span class="tag">{{ doc.mailinglist }}</span>	15	<span class="tag">{{ doc.mailinglist }}</span>
16	</a>	16	</a>
17	{% endif %}	17	{% endif %}