Display of record carts from the shortcut menu (refs #1602) - change record cart links to a more explicit image

11 files changed, 39 insertions, 17 deletions

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index ee1719eda..95a44116d 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -129,8 +129,8 @@
     <td>{{ item.context_record.parcel.short_label }}</td>
     <td class='ref'>{{ find.get_last_find.container.reference|default:""}}</td>
     <td class='string'>{{ find.get_last_find.container.location|default:""}}</td>
-    <td class='link'><a href="#">{% trans "Details" %}</a></td>
-    {#<a href="#" onclick='load_window("{% url show-find find.pk%}");'>{%trans "Details"%}</a></td>#}
+    <td class='link'><a class='display_details' href="#">{% trans "Details" %}</a></td>
+    {#<a href="#" class='display_details' onclick='load_window("{% url show-find find.pk%}");'>{%trans "Details"%}</a></td>#}
   </tr>
   {% empty %}
   <tr><td colspan="9" class='no_items'>{% trans "No find associated to this context record" %}</td></tr>
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index dcf58da09..b329e8279 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -117,7 +117,7 @@
     <td class='string'>{{operation.in_charge|default:""}}</td>
     <td>{{operation.start_date|default:""}}</td>
     <td>{{operation.excavation_end_date|default:""}}</td>
-    <td class='link'><a href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "Details" %}</a></td>
+    <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "Details" %}</a></td>
   </tr>
   {% empty %}
   <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaelogical file" %}</td></tr>
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 77e4f1f1d..b403d29df 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -123,7 +123,7 @@
     <td class='string'>{{ context_record.datings.all|join:", " }}</td>{# periods ?#}
     <td class='string'>{{ context_record.description }}</td>
     <td class='string'>{{ context_record.parcel.section }} - {{context_record.parcel.parcel_number}}</td>
-    <td class='link'><a href="#" onclick='load_window("{%url show-contextrecord context_record.pk ''%}")'>{% trans "Details" %}</a></td>
+    <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-contextrecord context_record.pk ''%}")'>{% trans "Details" %}</a></td>
   </tr>
   {% empty %}
   <tr><td colspan="6" class='no_items'>{% trans "No context record associated to this operation" %}</td></tr>
@@ -166,8 +166,8 @@
     <td class="ref">{{ context_record.parcel.short_label }}</td>
     <td class='ref'>{{ find.get_last_find.container.reference|default:""}}</td>
     <td class='string'>{{ find.get_last_find.container.location|default:""}}</td>
-    <td class='link'><a href="#">{% trans "Details" %}</a></td>
-    {#<a href="#" onclick='load_window("{% url show-find find.pk%}");'>{%trans "Details"%}</a></td>#}
+    <td class='link'><a class='display_details' href="#">{% trans "Details" %}</a></td>
+    {#<a href="#" class='display_details' onclick='load_window("{% url show-find find.pk%}");'>{%trans "Details"%}</a></td>#}
   </tr>
   {% empty %}
   <tr><td colspan="9" class='no_items'>{% trans "No find associated to context record" %} {{context_record.short_label}}</td></tr>
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index b4a079ef8..0a15bfc23 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -105,6 +105,15 @@ function load_window(url, speed, on_success){
     });
 }
 
+function load_current_window(url, model_name){
+    var id = $("#current_" + model_name).val();
+    if (!id) return;
+    url = url.split('/');
+    url[url.length - 1] = id;
+    url.push('');
+    return load_window(url.join('/'));
+}
+
 function load_url(url){
     $("#progress").show();
     $.ajax({
diff --git a/ishtar_common/static/media/images/info.png b/ishtar_common/static/media/images/info.png
new file mode 100644
index 000000000..6d9beb9ed
--- /dev/null
+++ b/ishtar_common/static/media/images/info.png
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index e9f1a8bab..bbd14dd99 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -161,6 +161,16 @@ div#logo{
     background-repeat:no-repeat;
 }
 
+.display_details{
+    display:inline-block;
+    font-size:0;
+    color:transparent;
+    width:18px;
+    height:16px;
+    background-image:url(images/info.png);
+    background-repeat:no-repeat;
+}
+
 div#language_form_div{
     position:absolute;
     right:0;
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%}
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 919a01bc1..c5a04652a 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -65,7 +65,7 @@ jQuery(document).ready(function(){
     colNames:['id', '', {{col_names|safe}}],
     colModel:[
       {name:'id', index:'id', hidden:true},
-      {name:'link', index:'link', width:80},
+      {name:'link', index:'link', width:30},
       {{extra_cols|safe}}
     ],
     sortname: 'value',
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index 64f8fe5c7..e58d84887 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -31,7 +31,7 @@
     <td class='string'>{{person.name|default:""}}</td>
     <td class='string'>{{person.surname|default:""}}</td>
     <td>{% for type in person.person_types.all %}{% if forloop.counter0 %}, {% endif %}{{type.label}}{% endfor %}</td>
-    <td class='link'><a href="#" onclick='load_window("{%url show-person person.pk ''%}")'>{% trans "Details" %}</a></td>
+    <td class='link'><a class='display_details' href="#" onclick='load_window("{%url show-person person.pk ''%}")'>{% trans "Details" %}</a></td>
   </tr>
   {% empty %}
   <tr><td colspan="8" class='no_items'>{% trans "No person in this organization" %}</td></tr>
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index 88fe59f41..47d3bc1cb 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -53,7 +53,7 @@
     <td class='string'>{{operation.in_charge|default:""}}</td>
     <td>{{operation.start_date|default:""}}</td>
     <td>{{operation.excavation_end_date|default:""}}</td>
-    <td class='link'><a href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "Details" %}</a></td>
+    <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "Details" %}</a></td>
   </tr>
   {% empty %}
   <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this person" %}</td></tr>
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 7963dc46a..ba5f30918 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -376,7 +376,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
             if sign == '-':
                 datas = reversed(datas)
             datas = list(datas)[start:end]
-        link_template = "<a href='#' onclick='load_window(\"%%s\")'>%s</a>" % \
+        link_template = "<a class='display_details' href='#' onclick='load_window(\"%%s\")'>%s</a>" % \
                         (unicode(_("Details")))
         if data_type == "json":
             rows = []