1 files changed, 16 insertions, 10 deletions
diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index 54a2f767d..e937f1474 100644
--- a/ishtar_common/templates/ishtar/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
@@ -13,13 +13,23 @@
     <div class="card-header" data-sheet-id="{{sheet_id}}" role="tab" id='head-{{window_id}}'>
       <div class="row">
           <div class="col-9">
+              {% if output != "ODT" and output != "PDF"%}
               <h5 class="mb-0">
-                <a class="card-label" data-toggle="collapse" href="#collapse-{{window_id}}" aria-expanded="true"
+                <a class="card-label" data-toggle="collapse"
+                    href="#collapse-{{window_id}}" aria-expanded="true"
                    aria-controls="collapse-{{window_id}}">
+              {% else %}
+              <h2>
+              {% endif %}
                     {% block head_title %}{% endblock %}
+              {% if output == "ODT" or output == "PDF"%}
+              </h2>
+              {% else %}
                 </a>
               </h5>
+              {% endif %}
           </div>
+          {% if output != "ODT" and output != "PDF"%}
           <div class='col-2 text-center'>
               <a href='#' class='previous_page'>
                 <span class="fa-stack">
@@ -42,24 +52,19 @@
                 <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>
+          {% endif %}
       </div>
       {% block header_title %}{% endblock %}
     </div>
 
     <div id="collapse-{{window_id}}" class="collapse show" role="tabpanel"
          aria-labelledby="heading-{{window_id}}" data-parent="#window">
+      {% if output != "ODT" and output != "PDF"%}
       {% block toolbar %}{% endblock %}
+      {% endif %}
       <div class="card-body">
+        {% if output != "ODT" and output != "PDF"%}
         {% block head_sheet %}
         <script type="text/javascript">
         var last_window='{{window_id}}';
@@ -97,6 +102,7 @@
         });
         </script>
         {% endblock %}
+        {% endif %}
         <div class="body">
         {% block content %}
         {% endblock %}