From b147b21af0f78fc76c170589badbd8407c92dfd9 Mon Sep 17 00:00:00 2001 From: Étienne Loks 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 ++++++++++------- ishtar_common/templates/blocks/JQueryJqGrid.html | 2 +- ishtar_common/templates/ishtar/sheet_organization.html | 2 +- ishtar_common/templates/ishtar/sheet_person.html | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) (limited to 'ishtar_common/templates') 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%} @@ -26,10 +27,10 @@ {% block header %} {% if user.is_authenticated %} {% trans "Logged in" %}: {{ user.username }} - ({% trans "Log out" %} | - {% trans "Change password" %}) + ({% trans "Log out" %} | + {% trans "Change password" %}) {% else %} - {% trans "Log in" %} + {% trans "Log in" %} {% endif %} {% if LANGUAGES|length > 1 %}
@@ -58,7 +59,7 @@
{% block context %}{% if current_menu %} -
+
{% trans "Default selected items"%} @@ -70,7 +71,9 @@ {% for val, label, selected in items %} {% endfor %} - + {% with 'show-'|add:model_name as model_url%} + + {% endwith %} {% endfor %}
{% trans "Details" %}
@@ -92,10 +95,10 @@ {% if menu_item.childs %}
  • {{menu_item.label}}
    • {%else%} - {{menu_item.label}} + {{menu_item.label}} {%endif%}{% endif %}{% endfor %} {%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 @@ {{person.name|default:""}} {{person.surname|default:""}} {% for type in person.person_types.all %}{% if forloop.counter0 %}, {% endif %}{{type.label}}{% endfor %} - {% trans "Details" %} + {% trans "Details" %} {% empty %} {% trans "No person in this organization" %} 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 @@ {{operation.in_charge|default:""}} {{operation.start_date|default:""}} {{operation.excavation_end_date|default:""}} - {% trans "Details" %} + {% trans "Details" %} {% empty %} {% trans "No operation associated to this person" %} -- cgit v1.2.3