Updated left side of toolbar to be generated from html

[htsworkflow.git] / templates / app.html
diff --git a/templates/app.html b/templates/app.html

index a673869e9801a2cac85bf0a08a87c29aaaf2f404..26e1ee7f39636e03d0c1bd92604f26f8574ab575 100644 (file)
--- a/templates/app.html
+++ b/templates/app.html
@@ -2,13 +2,7 @@
  <html lang="en">
  <head>
      <title>{% block title %}{{ app_name }} - {{ page_name }}{% endblock %}</title>
-    <!--<link type="text/css" rel="stylesheet" href="/static/theme/ui.all.css" />-->
      <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
-    <!--
-    <script type="text/javascript" src="/static/js/jquery-1.3.2.js"></script>
-    <script type="text/javascript" src="/static/js/jquery-ui-personalized-1.6rc6.js"></script>
-    <script type="text/javascript" src="/static/js/menu.js"></script>
-    -->
      <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/ext-3.0-rc2/adapter/jquery/ext-jquery-adapter.js"></script>
@@ -16,15 +10,6 @@
      <script type="text/javascript" src="/static/js/menu.js"></script>
      <script type="text/javascript" src="/static/js/htsw.js"></script>
      <!--{{ media }}-->
-    <!--
-    {% if select %}
-        <script type="text/javascript">
-        $(document).ready(function(){
-            select_menu('{{ select }}');
-        });
-        </script>
-    {% endif %}
-    -->
      <!--
          Barcode Magic Media should probably go last if you want
          the barcode magic input to be selected upon page load.
@@ -38,6 +23,7 @@
      
      <!-- West Dynamic Panels -->
      <div id="west_panel_items" class="x-hidden">
+        {% block dynamic_panels %}
          <ul id="Freezers" class="x-hidden">
                  <li>
                      <img src="/static/images/s.gif" class="icon-show-all" />
@@ -72,6 +58,7 @@
                  <a href="{% url samplebc.samples.views.sample_add %}">Add</a>
              </li>
          </ul>
+        {% endblock %}
      </div>
      
      <!-- Barcode Magic Div -->
@@ -79,21 +66,34 @@
          {% include "magic.html" %}
      </div>
      
+    <!-- Left side tool bar -->
+    <div id="left_tbar_data" class="x-hidden">
+        {% block left_tbar_menu %}
+        <div id="Sample Tracker" href="{% url samplebc.samples.views.freezer_index %}"></div>
+        {% endblock %}
+    </div>
+    
+    <!-- Right side tool bar -->
      <div id="right_tbar_data" class="x-hidden">
+        {% block right_tbar_menu %}
          <!--<div id="spacer"></div>-->
          <div id="Admin" href="/admin/"></div>
          <div id="Profile" href="{% url samplebc.samples.views.user_profile %}"></div>
          <div id="Password Change" href="{% url django.contrib.auth.views.password_change %}"></div>
+        {% endblock %}
      </div>
+    
+    <!-- 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>
      
+    <!-- Main Content -->
      <div id="body_content">
          {% block msg %}
          <div class="msg">{{ msg }}</div>
          {% endblock %}
-    {% block content %}
+        {% block content %}
          {{ body }}
-    {% endblock %}
+        {% endblock %}
      </div>
  </body>
  </html>