From 320c701d126adefa356502d78089847976a970eb Mon Sep 17 00:00:00 2001
From: Simone Federici <sfederici@geniusbytes.com>
Date: Sun, 15 Jun 2014 10:38:26 +0200
Subject: [PATCH] upgrade template to django 1.5 url syntax

---
 .../templates/generic_list_horizontal_subtemplate.html      | 2 +-
 apps/common/templates/generic_list_subtemplate.html         | 2 +-
 apps/documents/templates/document_print.html                | 4 ++--
 apps/main/templates/base.html                               | 6 +++---
 apps/web_theme/templates/web_theme_base.html                | 2 +-
 settings.py                                                 | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/common/templates/generic_list_horizontal_subtemplate.html b/apps/common/templates/generic_list_horizontal_subtemplate.html
index 8b62536db7..625209595b 100644
--- a/apps/common/templates/generic_list_horizontal_subtemplate.html
+++ b/apps/common/templates/generic_list_horizontal_subtemplate.html
@@ -29,7 +29,7 @@
     <div class="inner">
 {% endif %}
 
-        {#<form action="{% url multi_object_action_view %}" class="form" method="get">#}
+        {#<form action="{% url 'multi_object_action_view' %}" class="form" method="get">#}
 
             {% if object_list %}
                 {% if multi_select or multi_select_as_buttons %}
diff --git a/apps/common/templates/generic_list_subtemplate.html b/apps/common/templates/generic_list_subtemplate.html
index 6d826f3f07..5ee8cc0ccf 100644
--- a/apps/common/templates/generic_list_subtemplate.html
+++ b/apps/common/templates/generic_list_subtemplate.html
@@ -30,7 +30,7 @@
     <div class="inner">
 {% endif %}
 
-        <form action="{% url multi_object_action_view %}" class="form multi_select" method="get">
+        <form action="{% url 'multi_object_action_view' %}" class="form multi_select" method="get">
 
             {% if object_list %}
                 {% if multi_select or multi_select_as_buttons %}
diff --git a/apps/documents/templates/document_print.html b/apps/documents/templates/document_print.html
index 35f08abaf8..66841fd6e6 100644
--- a/apps/documents/templates/document_print.html
+++ b/apps/documents/templates/document_print.html
@@ -50,8 +50,8 @@
         {% for page in pages %}
             {#{% get_document_size object %}#}
             <div class="{% if forloop.counter > 1 and not forloop.last %}break{% endif %}">
-                {#<img src="{% url document_display_print object.id %}?page={{ page.page_number }}" {% if document_aspect > page_aspect %}width="97%"{% else %}height="97%"{% endif %} />#}
-                <img src="{% url document_display_print object.id %}?page={{ page.page_number }}" />
+                {#<img src="{% url 'document_display_print' object.id %}?page={{ page.page_number }}" {% if document_aspect > page_aspect %}width="97%"{% else %}height="97%"{% endif %} />#}
+                <img src="{% url 'document_display_print' object.id %}?page={{ page.page_number }}" />
             </div>
         {% endfor %}
 
diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 4fb55da75d..91a10c831a 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -195,14 +195,14 @@
             {% trans "Anonymous" %}
         {% else %}
             {{ user.get_full_name|default:user }}
-                <a href="{% url current_user_details %}" title="{% trans 'User details' %}"><span class="famfam active famfam-vcard"></span></a>
+                <a href="{% url 'current_user_details' %}" title="{% trans 'User details' %}"><span class="famfam active famfam-vcard"></span></a>
         {% endif %}
     </li>
 
     {% get_setting "MIDDLEWARE_CLASSES" as middleware_classes %}
     {% if "django.middleware.locale.LocaleMiddleware" in middleware_classes %}
         <li>
-            <form action="{% url set_language %}" method="post">{% csrf_token %}
+            <form action="{% url 'set_language' %}" method="post">{% csrf_token %}
                 <select name="language" onchange="this.form.submit()">
                     {% for lang in LANGUAGES %}
                         <option value="{{ lang.0 }}" {% if lang.0 == LANGUAGE_CODE %}selected="selected"{% endif %}>{{ lang.0|language_name_local|capfirst }}</option>
@@ -212,7 +212,7 @@
         </li>
     {% endif %}
     {% get_setting "LOGIN_URL" as login_url %}
-    <li><a class="logout" href="{% if not user.is_authenticated %}{% url login_view %}?next=/{% else %}{% url logout_view %}{% endif %}">{% if not user.is_authenticated %}{% trans "Login" %}{% else %}{% trans "Logout" %}{% endif %}</a></li>
+    <li><a class="logout" href="{% if not user.is_authenticated %}{% url 'login_view' %}?next=/{% else %}{% url 'logout_view' %}{% endif %}">{% if not user.is_authenticated %}{% trans "Login" %}{% else %}{% trans "Logout" %}{% endif %}</a></li>
 {% endblock %}
 
 {% block web_theme_main_navigation %}
diff --git a/apps/web_theme/templates/web_theme_base.html b/apps/web_theme/templates/web_theme_base.html
index 6be9dbe15c..507c89eb04 100644
--- a/apps/web_theme/templates/web_theme_base.html
+++ b/apps/web_theme/templates/web_theme_base.html
@@ -76,7 +76,7 @@
             {% else %}
                 {% if not web_theme_hide_menus %}
                     <div id="header">
-                        <h1><a href="{% url home %}">{% block web_theme_project_name %}{% endblock %}</a></h1>
+                        <h1><a href="{% url 'home' %}">{% block web_theme_project_name %}{% endblock %}</a></h1>
                         <div id="main-navigation">
                             <ul class="wat-cf" style="width: 73%;">
                                 {% block web_theme_main_navigation %}{% endblock %}
diff --git a/settings.py b/settings.py
index 09e081c025..0c95aef0f3 100644
--- a/settings.py
+++ b/settings.py
@@ -114,7 +114,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-#    'common.middleware.login_required_middleware.LoginRequiredMiddleware',
+    'common.middleware.login_required_middleware.LoginRequiredMiddleware',
     'permissions.middleware.permission_denied_middleware.PermissionDeniedMiddleware',
     'pagination.middleware.PaginationMiddleware',
 )