Changeset 695d358


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.

Location:
remit/remit_templates
Files:
6 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 %}

  • remit/remit_templates/index.html

    r0671644 r695d358  
    11{% extends "base.html" %}
     2{% load url from future %}
    23
    34{% block title %}Welcome to Remit{% endblock %}
    … …  
    1213<ul>
    1314    {% if user.is_anonymous %}
    14     <li><a href='{% url login %}'>Login</a></li>
     15    <li><a href='{% url "login" %}'>Login</a></li>
    1516    {% endif %}
    16     <li><a href="{% url request_reimbursement %}">Request reimbursement</a></li>
    17     <li><a href="{% url list_requests %}">List requests</a></li>
     17    <li><a href="{% url "request_reimbursement" %}">Request reimbursement</a></li>
     18    <li><a href="{% url "list_requests" %}">List requests</a></li>
    1819    {% if perms.finance_core.use_reporting %}
    19     <li><a href="{% url reporting %}">Reporting</a></li>
     20    <li><a href="{% url "reporting" %}">Reporting</a></li>
    2021    {% endif %}
    2122    {% if user.is_staff %}
    22     <li><a href='{% url admin:index %}'>Django admin interface</a></li>
     23    <li><a href='{% url "admin:index" %}'>Django admin interface</a></li>
    2324    {% endif %}
    2425    {% if user.is_authenticated %}
    25     <li><a href='{% url logout %}'>Logout</a></li>
     26    <li><a href='{% url "logout" %}'>Logout</a></li>
    2627    {% endif %}
    2728</ul>

  • remit/remit_templates/registration/logged_out.html

    r732d9eb r695d358  
    11{% extends "base.html" %}
     2{% load url from future %}
    23
    34{% block title %}Logged out of Remit{% endblock %}
    … …  
    67<h2>Logged out of Remit</h2>
    78
    8 <p>You have been logged out of Remit. You can return to the <a href='{% url homepage %}'>homepage</a> or <a href='{% url login %}'>login again</a>.</p>
     9<p>You have been logged out of Remit. You can return to the <a href='{% url "homepage" %}'>homepage</a> or <a href='{% url "login" %}'>login again</a>.</p>
    910{% endblock %}

  • remit/remit_templates/registration/login.html

    r1ba734f r695d358  
    11{% extends "base.html" %}
     2{% load url from future %}
    23
    34{% block title %}Log in to Remit{% endblock %}
    … …  
    1112{% endif %}
    1213
    13 <form method="post" action="{% url django.contrib.auth.views.login %}">
     14<form method="post" action="{% url "django.contrib.auth.views.login" %}">
    1415{% csrf_token %}
    1516<table>

  • remit/remit_templates/vouchers/ReimbursementRequest_review.html

    ra5ef930 r695d358  
    11{% extends "base.html" %}
     2{% load url from future %}
    23{% load misc %}
    34
    … …  
    123124{% else %}
    124125{% if perms.vouchers.change_reimbursementrequest %}
    125 <p>Optionally, <a href='{% url admin:vouchers_reimbursementrequest_change rr.pk %}'>change this request first</a>.</p>
     126<p>Optionally, <a href='{% url "admin:vouchers_reimbursementrequest_change" rr.pk %}'>change this request first</a>.</p>
    126127{% endif %}
    127128<form method="post" action="">

  • remit/remit_templates/vouchers/reimbursementrequest_list.html

    rf6f7aff r695d358  
    11{% extends "base.html" %}
     2{% load url from future %}
    23{% load misc %}
    34
    … …  
    5859    <td>
    5960        <input type='checkbox' name='select' value='{{object.pk}}'{%ifin object.pk selected_ids %} checked='checked'{%endifin%}></input>
    60         <a href='{% url review_request object.pk %}'>{{ object.pk }}</a>
     61        <a href='{% url "review_request" object.pk %}'>{{ object.pk }}</a>
    6162    </td>
    6263    <td>
    63         <em><a href='{% url review_request object.pk %}'>{{ object.name }}</a></em>
     64        <em><a href='{% url "review_request" object.pk %}'>{{ object.name }}</a></em>
    6465        {% if object.documentation %}<br /><a href='{{object.documentation.backing_file.url}}'>(view docs)</a>{%endif%}
    6566    </td>
Note: See TracChangeset for help on using the changeset viewer.