aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2015-01-13 11:43:42 +0000
committerPaul Eggleton <paul.eggleton@linux.intel.com>2015-01-14 11:34:11 +0000
commitd3a2dd6f73ceaeeda06902d18fd5bd09fae2751a (patch)
tree97f5cbd97847e3e1fc661f2197cb6a6fafcee415
parent5b7e7f23fc6200b031b189bc221ce0aef18bf72b (diff)
downloadbuildhistory-web-d3a2dd6f73ceaeeda06902d18fd5bd09fae2751a.tar.gz
buildhistory-web-d3a2dd6f73ceaeeda06902d18fd5bd09fae2751a.tar.bz2
buildhistory-web-d3a2dd6f73ceaeeda06902d18fd5bd09fae2751a.zip
Move to new style tags in templates for 1.6 upgrade
{% url myview %} becomes {% url "myview" %} The old style tags were depreciated in 1.5 and if not corrected will throw: "Error: 'url' requires a non-empty first argument. The syntax changed in Django 1.5, see the docs." Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
-rw-r--r--templates/404.html2
-rw-r--r--templates/base.html10
-rw-r--r--templates/registration/activate.html2
-rw-r--r--templates/registration/activation_email.txt2
-rw-r--r--templates/registration/login.html4
-rw-r--r--templates/registration/password_reset_complete.html2
-rw-r--r--templates/registration/password_reset_email.html2
-rw-r--r--templates/warningmgr/detail.html14
-rw-r--r--templates/warningmgr/index.html4
9 files changed, 21 insertions, 21 deletions
diff --git a/templates/404.html b/templates/404.html
index 68bd774..e046f50 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -22,7 +22,7 @@
<p>The page you requested was not found.</p>
-<p><a href="{% url warning_list %}">Return to the front page</a></p>
+<p><a href="{% url "warning_list" %}">Return to the front page</a></p>
{% endautoescape %}
{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 730b27e..f721f10 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -30,8 +30,8 @@
</a>
{% block header %}
<ul class="nav">
- <li {% if not reviewed %}class="active"{% endif %}><a href="{% url warning_list %}">{% trans "queue" %}</a></li>
- <li {% if reviewed %}class="active"{% endif %}><a href="{% url warning_list_reviewed %}">{% trans "reviewed" %}</a></li>
+ <li {% if not reviewed %}class="active"{% endif %}><a href="{% url "warning_list" %}">{% trans "queue" %}</a></li>
+ <li {% if reviewed %}class="active"{% endif %}><a href="{% url "warning_list_reviewed" %}">{% trans "reviewed" %}</a></li>
</ul>
<ul class="nav pull-right">
{% if user.is_authenticated %}
@@ -41,13 +41,13 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="{% url auth_logout %}">{% trans "Log out" %}</a></li>
- <li><a href="{% url auth_password_change %}">{% trans "Change password" %}</a></li>
+ <li><a href="{% url "auth_logout" %}">{% trans "Log out" %}</a></li>
+ <li><a href="{% url "auth_password_change" %}">{% trans "Change password" %}</a></li>
</ul>
</li>
{% else %}
<li>
- <a href="{% url auth_login %}">{% trans "log in" %}</a>
+ <a href="{% url "auth_login" %}">{% trans "log in" %}</a>
</li>
{% endif %}
</ul>
diff --git a/templates/registration/activate.html b/templates/registration/activate.html
index e85121e..6e24890 100644
--- a/templates/registration/activate.html
+++ b/templates/registration/activate.html
@@ -7,7 +7,7 @@
<p>{% trans "Account successfully activated" %}</p>
-<p><a href="{% url auth_login %}">{% trans "Log in" %}</a></p>
+<p><a href="{% url "auth_login" %}">{% trans "Log in" %}</a></p>
{% else %}
diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt
index 0820fce..736ea8a 100644
--- a/templates/registration/activation_email.txt
+++ b/templates/registration/activation_email.txt
@@ -7,7 +7,7 @@ link is valid for {{ expiration_days }} days.
{% endblocktrans %}
-http://{{ site.domain }}{% url registration_activate activation_key %}
+http://{{ site.domain }}{% url "registration_activate" activation_key %}
{% blocktrans %}
If you did not make this request, please ignore this message.
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 7e3d615..7f8a153 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -10,8 +10,8 @@
{% csrf_token %}
</form>
-<p>{% trans "Forgot password" %}? <a href="{% url auth_password_reset %}">{% trans "Reset it" %}</a>!</p>
-<p>{% trans "Don't have an account" %}? <a href="{% url registration_register %}">{% trans "Create one now" %}</a>!</p>
+<p>{% trans "Forgot password" %}? <a href="{% url "auth_password_reset" %}">{% trans "Reset it" %}</a>!</p>
+<p>{% trans "Don't have an account" %}? <a href="{% url "registration_register" %}">{% trans "Create one now" %}</a>!</p>
{% endblock %}
diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html
index ef3637c..d9f3879 100644
--- a/templates/registration/password_reset_complete.html
+++ b/templates/registration/password_reset_complete.html
@@ -5,6 +5,6 @@
<p>{% trans "Password reset successfully" %}</p>
-<p><a href="{% url auth_login %}">{% trans "Log in" %}</a></p>
+<p><a href="{% url "auth_login" %}">{% trans "Log in" %}</a></p>
{% endblock %}
diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html
index a55c869..f219c68 100644
--- a/templates/registration/password_reset_email.html
+++ b/templates/registration/password_reset_email.html
@@ -1,5 +1,5 @@
{% load i18n %}
{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}:
{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url auth_password_reset_confirm uidb36=uid, token=token %}
+{{ protocol }}://{{ domain }}{% url "auth_password_reset_confirm" uidb36=uid, token=token %}
{% endblock %}
diff --git a/templates/warningmgr/detail.html b/templates/warningmgr/detail.html
index 5762430..e515861 100644
--- a/templates/warningmgr/detail.html
+++ b/templates/warningmgr/detail.html
@@ -59,16 +59,16 @@
<div class="well">
{% if user.is_authenticated %}
{% if warningitem.status != "N" %}
- <a href="{% url unreview warningitem.id %}" class="btn">Un-review</a>
+ <a href="{% url "unreview" warningitem.id %}" class="btn">Un-review</a>
{% endif %}
{% if warningitem.status == "N" %}
- <a href="{% url actionreq warningitem.id %}" class="btn">Action Required</a>
- <a href="{% url resolve warningitem.id %}" class="btn">Resolve</a>
- <a href="{% url ignore warningitem.id %}" class="btn">Ignore</a>
+ <a href="{% url "actionreq" warningitem.id %}" class="btn">Action Required</a>
+ <a href="{% url "resolve" warningitem.id %}" class="btn">Resolve</a>
+ <a href="{% url "ignore" warningitem.id %}" class="btn">Ignore</a>
{% endif %}
{% if warningitem.status == "A" %}
- <a href="{% url resolve warningitem.id %}" class="btn">Resolve</a>
- <a href="{% url ignore warningitem.id %}" class="btn">Ignore</a>
+ <a href="{% url "resolve" warningitem.id %}" class="btn">Resolve</a>
+ <a href="{% url "ignore" warningitem.id %}" class="btn">Ignore</a>
{% endif %}
{% endif %}
</div>
@@ -87,7 +87,7 @@
<h3>Post a comment</h3>
{% if user.is_authenticated and perms.warningmgr.change_warningitem %}
{% if error_message %}<div class="alert alert-error">{{ error_message }}</div>{% endif %}
-<form action="{% url postcomment warningitem.id %}" method="post" class="well">
+<form action="{% url "postcomment" warningitem.id %}" method="post" class="well">
{% csrf_token %}
<textarea rows="10" name="comment_text"></textarea>
<br>
diff --git a/templates/warningmgr/index.html b/templates/warningmgr/index.html
index 853208e..02d29b8 100644
--- a/templates/warningmgr/index.html
+++ b/templates/warningmgr/index.html
@@ -15,7 +15,7 @@
{% autoescape on %}
{% if user.is_authenticated %}
- <form action="{% url multi_action %}" method="post">
+ <form action="{% url "multi_action" %}" method="post">
{% csrf_token %}
{% endif %}
{% if warning_list %}
@@ -41,7 +41,7 @@
{% if user.is_authenticated %}
<td><input type="checkbox" name="selecteditems" value="{{ warningitem.id }}"></td>
{% endif %}
- <td><a href="{% url warning_item warningitem.id %}">{{ warningitem.summary }}</td>
+ <td><a href="{% url "warning_item" warningitem.id %}">{{ warningitem.summary }}</td>
<td>
{% if warningitem.status == "N" %}
<span class="label label-warning">