From 4ffb67938358cbfedec0ac1fc75ba438c0af060f Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Thu, 16 Jan 2014 22:20:15 +0100
Subject: Display of record carts from the shortcut menu (refs #1602) - change
 record cart links to a more explicit image

---
 ishtar_common/templates/base.html | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'ishtar_common/templates/base.html')
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index e235df60a..baab57409 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load url from future%}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -26,10 +27,10 @@
         {% block header %}
         {% if user.is_authenticated %}
         {% trans "Logged in" %}: {{ user.username }}
-        (<a href="{% url auth_logout %}">{% trans "Log out" %}</a> |
-        <a href="{% url auth_password_change %}">{% trans "Change password" %}</a>)
+        (<a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a> |
+        <a href="{% url 'auth_password_change' %}">{% trans "Change password" %}</a>)
         {% else %}
-        <strong><a href="{% url auth_login %}">{% trans "Log in" %}</a></strong>
+        <strong><a href="{% url 'auth_login' %}">{% trans "Log in" %}</a></strong>
         {% endif %}
         {% if LANGUAGES|length > 1 %}
         <div id="language_form_div">
@@ -58,7 +59,7 @@
     </div>
     <div id="context_menu">
         {% block context %}{% if current_menu %}
-        <form method="post" action="{% url update-current-item %}">
+        <form method="post" action="{% url 'update-current-item' %}">
         <fieldset>
         <legend>{% trans "Default selected items"%}</legend>
         <table id='current_items'>
@@ -70,7 +71,9 @@
                     <option value=''>--</option>
                     {% for val, label, selected in items %}<option value='{{val}}'{%if selected%} selected="selected"{%endif%}>{{label}}</option>
                   {% endfor %}</select>
-                </td>
+                </td>{% with 'show-'|add:model_name as model_url%}
+                <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></td>
+                {% endwith %}
             </tr>
         {% endfor %}
         </table>
@@ -92,10 +95,10 @@
         {% if menu_item.childs %}<li id='section-{{forloop.parentloop.counter}}-{{forloop.counter}}'>{{menu_item.label}}
             <ul>
                 {% for menu_subitem in menu_item.childs %}{%if menu_subitem.available%}
-                <li id='section-{{forloop.parentloop.parentloop.counter}}-{{forloop.parentloop.counter}}-{{forloop.counter}}'{%ifequal menu_subitem.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_subitem.idx%}'>{{menu_subitem.label}}</a></li>
+                <li id='section-{{forloop.parentloop.parentloop.counter}}-{{forloop.parentloop.counter}}-{{forloop.counter}}'{%ifequal menu_subitem.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url 'action' menu_subitem.idx%}'>{{menu_subitem.label}}</a></li>
             {%endif%}{% endfor %}</ul></li>
         {%else%}
-        <li{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_item.idx%}'>{{menu_item.label}}</a></li>
+        <li{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url 'action' menu_item.idx%}'>{{menu_item.label}}</a></li>
         {%endif%}{% endif %}{% endfor %}
       </ul>
       </li>{%endif%}
-- 
cgit v1.2.3

