UI: adpat all sheet to the new layout. Administrativ act: can modify from sheet. Organization: can modify from sheet.

7 files changed, 58 insertions, 64 deletions

diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index c6a15243a..44f4b0ba8 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -12,13 +12,13 @@
 <div id='pager_{{name}}'></div>
 
 <div id='foot_{{name}}' class='gridfooter'>
+
 {% if source_full %}
-{% trans "Export as CSV" %} ({{encoding}})
-<a class='{{sname}}-csv' href='{{source}}csv' target='_blank'>{% trans "simple" %}</a> - 
-<a class='{{sname}}-csv-full' href='{{source_full}}csv' target='_blank'>{% trans "full" %}</a>
+<a class='badge {{sname}}-csv' href='{{source}}csv' target='_blank' title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
+<a class='badge {{sname}}-csv-full' href='{{source_full}}csv' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>
 {% else %}
-<a class='{{sname}}-csv' href="{{source}}csv" target="_blank">{% trans "Export as CSV" %} ({{encoding}})</a>
-{% endif %}
+<a class='{{sname}}-csv' href="{{source}}csv" target="_blank" title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
+{% endif %} {{encoding}}
 </div>
 
 {% if multiple %}
diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index 9a17419a8..c225a5822 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -1,46 +1,47 @@
 {% load url from future %}
 {% load i18n %}
 {% if previous or next %}
-<div class='tool-left'>
-{% if previous %}
-<a class='history-nav' href="#" onclick='load_window("{% url histo_url item.pk previous|date:"c"%}");$("#{{window_id}}").hide();return false;' title="{%trans 'Previous version'%}">
-<span class="fa-stack">
-  <i class="fa fa-circle fa-stack-2x"></i>
-  <i class="fa fa-step-backward fa-stack-1x fa-inverse"></i>
-</span>
-<br/>{{previous}}
-</a>
-{% else %}
-<span class='history-nav'> </span>
-{% endif %}
-{% if next %}
-<a class='history-nav' title="{% trans 'Restore this version' %}" href="#" onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changement made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'>
-<span class="fa-stack fa-lg">
-  <i class="fa fa-circle fa-stack-2x"></i>
-  <i class="fa fa-exchange fa-stack-1x fa-inverse"></i>
-</span>
-<br/>{% trans "Restore" %}
-</a>
-<a class='history-nav' href="#" onclick='load_window("{% url histo_url item.pk next|date:"c" %}");$("#{{window_id}}").hide();return false;' title="{%trans 'Next version'%}">
-<span class="fa-stack">
-  <i class="fa fa-circle fa-stack-2x"></i>
-  <i class="fa fa-step-forward fa-stack-1x fa-inverse"></i>
-</span>
-<br/>{{next}}
-</a>
-{% else %}
-<span class='history-nav'> </span>
-<span class='history-nav'> </span>
+  <div class='tool-right'>
+    {% if previous %}
+    <a class='history-nav' href="#" onclick='load_window("{% url histo_url item.pk previous|date:"c"%}");$("#{{window_id}}").hide();return false;' title="{%trans 'Previous version'%}">
+    <span class="fa-stack">
+      <i class="fa fa-circle fa-stack-2x"></i>
+      <i class="fa fa-step-backward fa-stack-1x fa-inverse"></i>
+    </span>
+    <br/>{{previous}}
+    </a>
+    {% else %}
+    <span class='history-nav'> </span>
+    {% endif %}
+    {% if next %}
+    <a class='history-nav' title="{% trans 'Restore this version' %}" href="#" onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changement made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'>
+    <span class="fa-stack fa-lg">
+      <i class="fa fa-circle fa-stack-2x"></i>
+      <i class="fa fa-history fa-stack-1x fa-inverse"></i>
+    </span>
+    <br/>{% trans "Restore" %}
+    </a>
+    <a class='history-nav' href="#" onclick='load_window("{% url histo_url item.pk next|date:"c" %}");$("#{{window_id}}").hide();return false;' title="{%trans 'Next version'%}">
+    <span class="fa-stack">
+      <i class="fa fa-circle fa-stack-2x"></i>
+      <i class="fa fa-step-forward fa-stack-1x fa-inverse"></i>
+    </span>
+    <br/>{{next}}
+    </a>
+    {% else %}
+    <span class='history-nav'> </span>
+    <span class='history-nav'> </span>
+    {% endif %}
+  </div>
 {% endif %}
-</div>
-{% endif %}
-<div class='tool-right'>
-<a href='{% url modify_url item.pk %}' title="{% trans 'Modify' %}">
-<span class="fa-stack fa-lg">
-  <i class="fa fa-circle fa-stack-2x"></i>
-  <i class="fa fa-pencil fa-stack-1x fa-inverse"></i>
-</span>
-</a>
-<a class='badge' href='{% url show_url item.pk "odt" %}' title='{% trans "Export as OpenOffice.org file"%}'>ODT</a> <a class='badge' href='{% url show_url item.pk "pdf" %}' title='{% trans "Export as PDF file"%}'>PDF</a>
+<div class='tool-left'>
+  {% block extra_actions %}{% endblock %}
+  {% if modify_url %}<a href='{% url modify_url item.pk %}' title="{% trans 'Modify' %}">
+  <span class="fa-stack fa-lg">
+    <i class="fa fa-circle fa-stack-2x"></i>
+    <i class="fa fa-pencil fa-stack-1x fa-inverse"></i>
+  </span>
+  </a>{% endif %}
+  <a class='badge' href='{% url show_url item.pk "odt" %}' title='{% trans "Export as OpenOffice.org file"%}'>ODT</a> <a class='badge' href='{% url show_url item.pk "pdf" %}' title='{% trans "Export as PDF file"%}'>PDF</a>
 </div>
 <hr class='clear'>
diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
index 8850bd34a..4a81a64fb 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
@@ -6,12 +6,11 @@
 
 <div id='foot_{{name}}' class='gridfooter'>
 {% if source_full %}
-{% trans "Export as CSV" %} ({{encoding}})
-<a href='{{simple_source}}csv{{ source_attrs|safe }}' target='_blank'>{% trans "simple" %}</a> - 
-<a href='{{source_full}}csv{{ source_attrs|safe }}' target='_blank'>{% trans "full" %}</a>
+<a class="badge" href='{{simple_source}}csv{{ source_attrs|safe }}' target='_blank' title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
+<a class="badge" href='{{source_full}}csv{{ source_attrs|safe }}' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>
 {% else %}
-<a href="{{simple_source}}csv{{ source_attrs|safe }}" target="_blank">{% trans "Export as CSV" %} ({{encoding}})</a>
-{% endif %}
+<a class="badge" href="{{simple_source}}csv{{ source_attrs|safe }}" target="_blank" title="{% trans 'Export as CSV' %}">CSV</a>
+{% endif %} {{encoding}}
 </div>
 
 <script type="text/javascript" language='javascript'>
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index 8deeebf98..2ece97a8b 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -1,14 +1,10 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n %}
+{% load i18n window_header %}
 
-{% block head_sheet %}
-{{block.super}}
-<h1>{% trans "Organization"%}</h1>
-{% endblock %}
+{% block head_title %}{% trans "Organization" %}{% endblock %}
 
 {% block content %}
-<div class='tool'>{%trans "Export as:"%} <a href='{% url show-organization item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-organization item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
-
+{% window_nav item window_id 'show-organization' 'organization_modify' %}
 <p><label>{% trans "Name" %}</label> <span class='value'>{{item.name}}</span></p>
 <p><label>{%trans "Created by:"%}</label> <span class='value'>{{ item.history_creator.ishtaruser.full_label }}</span></p>
 {% if item.address %}<p><label>{% trans "Address" %}</label> <span class='value'>{{item.address}}</span></p> {% endif %}
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index 3c554acdf..f5c42c11a 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -1,10 +1,9 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n window_field window_tables %}
-
-{% block header_title %}<h1>{% trans "Person"%}</h1>{% endblock %}
-{% block toolbar %}{% with current_action='person_modification' %}{% include "ishtar/sheet_toolbar.html" %}{% endwith %}{% endblock %}
+{% load i18n window_field window_tables window_header %}
 
+{% block head_title %}{% trans "Person"%}{% endblock %}
 {% block content %}
+{% window_nav item window_id 'show-person' 'person_modify' %}
 <h3>{% trans "Identity" %}</h3>
 
 {% field "Name" item.name %}
diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html
index bda22ed35..653087753 100644
--- a/ishtar_common/templates/ishtar/sheet_source.html
+++ b/ishtar_common/templates/ishtar/sheet_source.html
@@ -1,7 +1,8 @@
 {% extends "ishtar/sheet.html" %}
 {% load i18n window_field link_to_window %}
-{% block toolbar %}{% with current_action='operation_source_modification' %}{% include "ishtar/sheet_toolbar.html" %}{% endwith %}{% endblock %}
+
 {% block content %}
+{% block window_nav %}{% endblock %}
 {% block general %}
 {% field "Title" item.title %}
 {% field "Index" item.index %}
diff --git a/ishtar_common/templates/ishtar/sheet_toolbar.html b/ishtar_common/templates/ishtar/sheet_toolbar.html
deleted file mode 100644
index d9d4cc1a5..000000000
--- a/ishtar_common/templates/ishtar/sheet_toolbar.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% load i18n link_to_window %}<div class='tool'>{% trans "Export as:" %} <a href='{{item|link_to_odt}}'>{%trans "OpenOffice.org file"%}</a>, <a href='{{item|link_to_pdf}}'>{%trans "PDF file"%}</a></div>
-{% modify_toolbar item current_action %}