2 files changed, 26 insertions, 14 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index a53e62b0d..92fa15352 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -71,15 +71,18 @@
                    aria-labelledby="dropdown-sheet-export-{{window_id}}">
                   <a class="dropdown-item" 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>
+                      <i class="fa fa-file-word-o" aria-hidden="true"></i> ODT
                   </a>
                   <a class="dropdown-item" 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>
+                      <i class="fa fa-file-pdf-o" aria-hidden="true"></i> PDF
                   </a>{% for template_name, template_url in extra_templates %}
                   <a class="dropdown-item" href='{{template_url}}'>
-                      {{template_name}} <i class="fa fa-file-word-o" aria-hidden="true"></i>
+                      <i class="fa fa-file-word-o" aria-hidden="true"></i> {{template_name}}
                   </a>{% endfor %}
+                  {% if item.HAS_QR_CODE %}<a class="dropdown-item" href='{% url "qrcode-item" item.APP item.MODEL item.pk %}' target="_blank">
+                     <i class="fa fa-qrcode" aria-hidden="true"></i> {% trans "QR Code" %} 
+                  </a>{% endif %}
               </div>
           </div>
 
diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index e937f1474..6b9c97948 100644
--- a/ishtar_common/templates/ishtar/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
@@ -8,28 +8,37 @@
 </head>
 <body>
 {% endblock %}
-
   <div class="card sheet" id="{{window_id}}">
+
+    {% if output != "ODT" and output != "PDF" %}
     <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"
                    aria-controls="collapse-{{window_id}}">
-              {% else %}
-              <h2>
-              {% endif %}
+    {% else %}
+      {% if item.qrcode.name %}
+      <table class="window-table-head">
+        <tr>
+          <td> <img class="qrcode" src="{{BASE_URL}}{{item.qrcode.url}}"> </td>
+          <td>
+      {% endif %}
+            <h2>
+    {% endif %}
                     {% block head_title %}{% endblock %}
-              {% if output == "ODT" or output == "PDF"%}
-              </h2>
-              {% else %}
+    {% if output == "ODT" or output == "PDF" %}
+            </h2>
+      {% if item.qrcode.name %}
+          </td>
+        </tr>
+      </table>
+      {% endif %}
+    {% 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">
@@ -53,8 +62,8 @@
               </span>
             </a>
           </div>
-          {% endif %}
       </div>
+      {% endif %}
       {% block header_title %}{% endblock %}
     </div>