upgrade template to django 1.5 url syntax
This commit is contained in:
@@ -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 %}
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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',
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user