Ignore:
Timestamp:
Jun 15, 2014, 10:06:46 PM (11 years ago)
Author:
Alex Dehnert <adehnert@…>
Branches:
master
Children:
6479b5c
Parents:
2e4e1fb
git-author:
Alex Dehnert <adehnert@…> (06/15/14 21:36:47)
git-committer:
Alex Dehnert <adehnert@…> (06/15/14 22:06:46)
Message:

Django 1.6: use new {% url %} syntax

Starting in Django 1.5, the argument to {% url %} is treated as a variable,
rather than a literal. To get a literal, we need to enclose the argument in
quotes. For Django 1.4 support, we also want to do {% load url from future %}
-- probably in more places than just base.html, but we'll see.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • remit/remit_templates/base.html

    rc3e751d r695d358  
     1{% load url from future %}
    12<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    23
    … …  
    1415  <body>
    1516    <ul class='tab-navigation'>
    16         <li{% ifequal pagename "homepage" %} class='selected'{% endifequal %}><a href="{% url homepage %}">Home</a></li>
    17         <li{% ifequal pagename "request_reimbursement" %} class='selected'{% endifequal %}><a href="{% url request_reimbursement %}">Request reimbursement</a></li>
    18         <li{% ifequal pagename "list_requests" %} class='selected'{% endifequal %}><a href="{% url list_requests %}">List requests</a></li>
     17        <li{% ifequal pagename "homepage" %} class='selected'{% endifequal %}><a href="{% url "homepage" %}">Home</a></li>
     18        <li{% ifequal pagename "request_reimbursement" %} class='selected'{% endifequal %}><a href="{% url "request_reimbursement" %}">Request reimbursement</a></li>
     19        <li{% ifequal pagename "list_requests" %} class='selected'{% endifequal %}><a href="{% url "list_requests" %}">List requests</a></li>
    1920        {% if perms.finance_core.use_reporting %}
    20         <li{% ifequal pagename "reporting" %} class='selected'{% endifequal %}><a href="{% url reporting %}">Reporting</a></li>
     21        <li{% ifequal pagename "reporting" %} class='selected'{% endifequal %}><a href="{% url "reporting" %}">Reporting</a></li>
    2122        {% endif %}
    2223        {% if user.is_staff %}
    23         <li><a href='{% url admin:index %}'>Django Admin</a></li>
     24        <li><a href='{% url "admin:index" %}'>Django Admin</a></li>
    2425        {% endif %}
    2526    </ul>
    … …  
    3334            <p>Welcome, <span class='username'>{{user.username}}</span>.</p>
    3435            {% endif %}
    35             <p><a href='{% url logout %}'>Logout</a></p>
     36            <p><a href='{% url "logout" %}'>Logout</a></p>
    3637        </div>
    3738        {% endif %}
Note: See TracChangeset for help on using the changeset viewer.