projects / htsworkflow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c606ca4)
Updated left side of toolbar to be generated from html
authorBrandon King <kingb@caltech.edu>
Tue, 23 Jun 2009 01:03:08 +0000 (01:03 +0000)
committerBrandon King <kingb@caltech.edu>
Tue, 23 Jun 2009 01:03:08 +0000 (01:03 +0000)
templates/app.html patch | blob | history
www/js/htsw.js patch | blob | history

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>
diff --git a/www/js/htsw.js b/www/js/htsw.js
index d51ef2c9be15c7d393c03b6eba41be5a2fc36246..b0cc2579787aa03d612d184f528123624621a487 100644 (file)
--- a/www/js/htsw.js
+++ b/www/js/htsw.js
@@ -96,10 +96,10 @@ $(document).ready(function(){
                     id: 'main_toolbar',
                     xtype: 'toolbar',
                     //height: 100,
-                    items: [{
+                    /*items: [{
                         text: "Demo Button",
                         handler: function() { quick_msg('Messages can be fun!'); }
-                    }],
+                    }],*/
                     margins: '2 0 0 0'
             }],
             height: 60 
@@ -122,7 +122,26 @@ $(document).ready(function(){
     //-------------------------------
     var main_tb = Ext.getCmp('main_toolbar');
     
-    var add_buttons_from_html = function(main_tb){
+    var add_buttons_from_html_left = function(main_tb){
+        var left_tbar_data = Ext.fly('left_tbar_data');
+        var div_array = left_tbar_data.query('div');
+        var div_id = null;
+        // Loop through each div since it defines a button and link or a spacer and add it to the right side of the toolbar
+        Ext.each(div_array, function(divobj) {
+            div_id = divobj.id;
+            if (div_id == 'spacer'){
+                main_tb.add('-');
+            } else {
+                main_tb.add({
+                    text: div_id,
+                    handler: function() { goto_url(divobj.getAttribute('href')); }
+                });
+            }
+        });
+        //return right_tbar_data;
+    }
+    
+    var add_buttons_from_html_right = function(main_tb){
         var right_tbar_data = Ext.fly('right_tbar_data');
         var div_array = right_tbar_data.query('div');
         var div_id = null;
@@ -141,6 +160,9 @@ $(document).ready(function(){
         //return right_tbar_data;
     }
     
+    add_buttons_from_html_left(main_tb);
+    
+    // Shifts the remaining toolbar options to the right side.
     main_tb.add({ xtype: 'tbfill' });
     var user_info = Ext.fly('login_info');
     var logout_url = user_info.getAttribute('logouturl');
@@ -152,7 +174,7 @@ $(document).ready(function(){
                         text: 'User: ' + user_info.getAttribute('user')
                     });
         main_tb.add('-');
-        add_buttons_from_html(main_tb);
+        add_buttons_from_html_right(main_tb);
         main_tb.add('-');
        main_tb.add({
                         text: 'Logout',
htsworkflow sequencing LIMS software