UI: improve sheets

1 files changed, 50 insertions, 49 deletions

diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index 2392cdd9d..6fa247200 100644
--- a/ishtar_common/templates/ishtar/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
@@ -15,56 +15,58 @@
 
   <div class="card sheet" id="{{window_id}}">
     <div class="card-header" role="tab" id='head-{{window_id}}'>
-      <h5 class="mb-0">
-        <a data-toggle="collapse" href="#collapse-{{window_id}}" aria-expanded="true"
-           aria-controls="collapse-{{window_id}}">
-            {% block head_title %}{% endblock %}
-        </a>
-      </h5>
-      <a href='#' class='previous_page'>
-        <span class="fa-stack fa-lg">
-          <i class="fa fa-circle fa-stack-2x"></i>
-          <i class="fa fa-arrow-left fa-stack-1x fa-inverse"></i>
-        </span>
-      </a>
-      <div class='close-buttons'>
-        <a href='#' onclick='$("#{{window_id}}").hide()' title="{% trans 'Close' %}">
-          <span class="fa-stack">
-            <i class="fa fa-circle fa-stack-2x"></i>
-            <i class="fa fa-times fa-stack-1x fa-inverse"></i>
-          </span>
-        </a>
-        {% comment %}
-        <a href='#' onclick='closeAllWindows();' title="{% trans "Close all windows" %}">
-          <span class="fa-stack">
-            <i class="fa fa-files-o fa-stack-2x"></i>
-            <i class="fa fa-circle fa-stack-15x"></i>
-            <i class="fa fa-times fa-stack-1x fa-inverse"></i>
-          </span>
-        </a>
-        {% endcomment %}
+      <div class="row">
+          <div class="col">
+              <h5 class="mb-0">
+                <a data-toggle="collapse" href="#collapse-{{window_id}}" aria-expanded="true"
+                   aria-controls="collapse-{{window_id}}">
+                    {% block head_title %}{% endblock %}
+                </a>
+              </h5>
+          </div>
+          <div class='col text-center'>
+              <a href='#' class='previous_page'>
+                <span class="fa-stack">
+                  <i class="fa fa-circle fa-stack-2x"></i>
+                  <i class="fa fa-arrow-left fa-stack-1x fa-inverse"></i>
+                </span>
+              </a>
+              <a href='#' class='next_page'>
+                <span class="fa-stack">
+                  <i class="fa fa-circle fa-stack-2x"></i>
+                  <i class="fa fa-arrow-right fa-stack-1x fa-inverse"></i>
+                </span>
+              </a>
+          </div>
+          <div class='col text-right'>
+            <a href='#' onclick='$("#{{window_id}}").hide()' title="{% trans 'Close' %}">
+              <span class="fa-stack">
+                <i class="fa fa-circle fa-stack-2x"></i>
+                <i class="fa fa-times fa-stack-1x fa-inverse"></i>
+              </span>
+            </a>
+            {% comment %}
+            <a href='#' onclick='closeAllWindows();' title="{% trans "Close all windows" %}">
+              <span class="fa-stack">
+                <i class="fa fa-files-o fa-stack-2x"></i>
+                <i class="fa fa-circle fa-stack-15x"></i>
+                <i class="fa fa-times fa-stack-1x fa-inverse"></i>
+              </span>
+            </a>
+            {% endcomment %}
+          </div>
       </div>
-      <a href='#' class='next_page'>
-        <span class="fa-stack fa-lg">
-          <i class="fa fa-circle fa-stack-2x"></i>
-          <i class="fa fa-arrow-right fa-stack-1x fa-inverse"></i>
-        </span>
-      </a>
       {% block header_title %}{% endblock %}
     </div>
 
     <div id="collapse-{{window_id}}" class="collapse show" role="tabpanel"
          aria-labelledby="heading-{{window_id}}" data-parent="#window">
+      {% block toolbar %}{% endblock %}
       <div class="card-body">
         {% block head_sheet %}
-        <script type="text/javascript">var last_window='{{window_id}}';</script>
+        <script type="text/javascript">
+        var last_window='{{window_id}}';
 
-        <div class="head">
-
-
-        </div>
-
-        <script type="text/javascript" language='javascript'>
         jQuery(document).ready(function(){
             if (! get_next_table_id({{item.pk}})){
                 jQuery('.next_page').hide();
@@ -74,21 +76,20 @@
             }
             jQuery(".next_page").click(function() {
                 load_window("{{current_window_url}}" + get_next_table_id({{item.pk}}) + "/",
-                            '', function(){$("#{{window_id}}").hide();});
+                            '', function(){$("#{{window_id}}").remove();});
             });
             jQuery(".previous_page").click(function() {
                 load_window("{{current_window_url}}" + get_previous_table_id({{item.pk}}) + "/",
-                            '', function(){$("#{{window_id}}").hide();});
+                            '', function(){$("#{{window_id}}").remove();});
             });
         });
         </script>
         {% endblock %}
-         </div>
-    <div class="body">
-    {% block toolbar %}{% endblock %}
-    {% block content %}
-    {% endblock %}
-    </div>
+        <div class="body">
+        {% block content %}
+        {% endblock %}
+        </div>
+      </div>
     </div>
   </div>
 </div>