2 files changed, 45 insertions, 45 deletions
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'>