UI: improve sheets

1 files changed, 56 insertions, 50 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index f212ebff6..89263d0de 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -1,56 +1,62 @@
 {% load i18n %}
-{% if previous or next %}
-  <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 changes 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 class="row toolbar">
+  {% if previous or next %}
+  <div class='col-md-2'>
+    <div class="btn-group btn-group-sm" role="group" aria-label="{% trans 'History'%}">
+        {% if previous %}
+          <button type="button" class="btn btn-secondary"
+                  data-toggle="tooltip" data-placement="bottom"
+                  title="{{previous}}"
+                  onclick='load_window("{% url histo_url item.pk previous|date:"c"%}");$("#{{window_id}}").hide();return false;'>
+              <i class="fa fa-step-backward"></i>
+          </button>
+        {% endif %}
+        {% if next %}
+        <button type="button" class="btn btn-secondary"
+                data-toggle="tooltip" data-placement="bottom"
+                onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changes 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 %}");}'
+                title="{% trans 'Restore this version' %}">
+            <i class="fa fa-history"></i>
+        </button>
+        <button type="button" class="btn btn-secondary"
+                data-toggle="tooltip" data-placement="bottom"
+                onclick='load_window("{% url histo_url item.pk next|date:"c" %}");$("#{{window_id}}").hide();return false;'
+                title="{{next}}">
+            <i class="fa fa-step-forward"></i>
+        </button>
+        {% endif %}
+    </div>
   </div>
-{% endif %}
-<div class='tool-left'>
+  <div class='offset-md-6 col-md-4 text-right'>
+  {% else %}
+  <div class='offset-md-8 col-md-4 text-right'>
+  {% endif %}
+      <div class="btn-group btn-group-sm" role="group" aria-label="{% trans 'Actions' %}">
   {% 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 %}
-  {% if pin_action and item.SLUG %}
-  <span class='pin-action' onclick='$.get("{% url 'pin' item.SLUG item.pk %}", function(){load_shortcut_menu(); display_info("{% trans 'Item pined in your shortcut menu.' %}")});' title="{% trans 'Pin' %}">
-  <span class="fa-stack fa-lg">
-    <i class="fa fa-circle fa-stack-2x"></i>
-    <i class="fa fa-thumb-tack fa-stack-1x fa-inverse"></i>
-  </span>
-  </span>{% 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>
+        {% if modify_url %}
+        <a class="btn btn-secondary" href='{% url modify_url item.pk %}'
+           title="{% trans 'Modify' %}">
+            <i class="fa fa-pencil"></i>
+        </a>
+        {% endif %}
+        {% if pin_action and item.SLUG %}
+        <a class="btn btn-secondary" href="#" class='pin-action'
+           onclick='$.get("{% url "pin" item.SLUG item.pk %}", function(){load_shortcut_menu(); display_info("{% trans 'Item pined in your shortcut menu.' %}")});' title="{% trans 'Pin' %}">
+            <i class="fa fa-thumb-tack"></i>
+        </a>
+        {% endif %}
+          <a class="btn btn-secondary" href='{% url show_url item.pk "odt" %}'
+             title='{% trans "Export as OpenOffice.org file"%}'>
+              ODT <i class="fa fa-file-word-o" aria-hidden="true"></i>
+          <a class="btn btn-secondary" href='{% url show_url item.pk "pdf" %}'
+             title='{% trans "Export as PDF file"%}'>
+              PDF <i class="fa fa-file-pdf-o" aria-hidden="true"></i>
+          </a>
+      </div>
+  </div>
 </div>
-<hr class='clear'>
 {% if next %}
-    <p class='info-box'><i class="fa fa-info-circle" aria-hidden="true"></i> <em>{% trans "Relation between items are not historized." %}</em></p>
+<div class="alert alert-warning" role="alert">
+  {% trans "Relation between items are not historized." %}
+</div>
 {% endif %}