Added start of inventory summary view and cleaned up inventory template location

[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 4e59ef50d109c9edd4b0bf30b942c47221540740..1ba9fcdceab0e005587dd2b8375fdeaa6ee541f0 100644 (file)
--- a/htsworkflow/frontend/templates/app_base.html
+++ b/htsworkflow/frontend/templates/app_base.html
@@ -10,10 +10,14 @@
     <!-- App Stuff -->
     <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
     <link rel="stylesheet" type="text/css" href="/static/js/ext-3.0-rc2/resources/css/ext-all.css" />
-    <script type="text/javascript" src="/static/js/jquery-1.3.2.js"></script>
+    <script type="text/javascript" src="/static/js/jquery-1.3.2.min.js"></script>
     <script type="text/javascript" src="/static/js/ext-3.0-rc2/adapter/jquery/ext-jquery-adapter.js"></script>
     <script type="text/javascript" src="/static/js/ext-3.0-rc2/ext-all.js"></script>
     <!--<script type="text/javascript" src="/static/js/menu.js"></script>-->
+    
+    {% block additional_javascript %}
+    {% endblock %}
+    
     <script type="text/javascript" src="/static/js/htsw.js"></script>
     <!--{{ media }}-->
     <!--
@@ -40,42 +44,28 @@
                     <a href="#">Add</a><br />
                 </li>
         </ul>
-        <ul id="Containers" class="x-hidden">
-            <li>
-                <img src="/static/img/s.gif" class="icon-show-all" />
-                <a href="#">Index</a>
-            </li>
-            <li>
-                <img src="/static/img/s.gif" class="icon-show-all" />
-                <a href="#">Add</a>
-            </li>
-        </ul>
-        <ul id="Samples" class="x-hidden">
-            <li>
-                <img src="/static/img/s.gif" class="icon-show-all" />
-                <a href="#">Index</a>
-            </li>
-            <li>
-                <img src="/static/img/s.gif" class="icon-show-all" />
-                <a href="#">Homeless</a>
-            </li>
-            <li>
-                <img src="/static/img/s.gif" class="icon-show-all" />
-                <a href="#">Add</a>
-            </li>
-        </ul>
         {% endblock %}
     </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">{% 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>
     
     <!-- Left side tool bar -->
     <div id="left_tbar_data" class="x-hidden">
         {% block left_tbar_menu %}
-        <div id="Flowcells-Libraries" href="{% url htsworkflow.frontend.samples.views.library %}"></div>
+        <div id="Flowcells-Libraries Tracker" href="{% url htsworkflow.frontend.samples.views.library %}"></div>
+        {% if user.is_authenticated %}
+        <div id="Inventory Tracker" href="{% url htsworkflow.frontend.inventory.views.index %}"></div>
+        {% endif %}
         {% endblock %}
     </div>
     
@@ -92,6 +82,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 %}