Pulling in barcode magic from sample tracker and starting to update it to use ExtJS

[htsworkflow.git] / htsworkflow / frontend / templates / app_base.html

diff --git a/htsworkflow/frontend/templates/app_base.html b/htsworkflow/frontend/templates/app_base.html
index 8a983436152b33917bcc2e5a871406566601465a..9e03aaaa0022598b426193ee8a61128babca24bd 100644 (file)
--- a/htsworkflow/frontend/templates/app_base.html
+++ b/htsworkflow/frontend/templates/app_base.html
@@ -68,12 +68,14 @@
     </div>
     
     <!-- Barcode Magic Div -->
+    <!--
     <div id="bcmagic_div" class="x-hidden">
-        {% include "magic.html" %}
+        {% include "bcmagic/magic.html" %}
     </div>
+    -->
     
     {% block east_region %}
-    <div id="east_region_config" class="x-hidden"></div>
+    <div id="east_region_config" class="x-hidden">{% if east_region_config_div %}{{ east_region_config_div }}{% endif %}</div>
     {% endblock %}
     <div id="east_region_config_error" class="x-hidden">Check contents of div w/ id east_region_config, as the id supplied in text block does not exist.</div>
     
@@ -97,6 +99,16 @@
     <!-- Required login info stuff -->
     <div id="login_info" class="x-hidden" authenticated="{{ user.is_authenticated|lower }}" user="{{ user.username }}" loginurl="{% url django.contrib.auth.views.login %}" logouturl="{% url django.contrib.auth.views.logout_then_login %}"></div>
     
+    <!-- App specific toolbar setup -->
+    <div id="app_toolbar_west">
+        {% block app_toolbar_west %}
+        {% endblock %}
+    </div>
+    <div id="app_toolbar_east">
+        {% block app_toolbar_east %}
+        {% endblock %}
+    </div>
+    
     <!-- Main Content -->
     <div id="body_content" class="x-hidden">
         {% block msg %}