[open-ils-commits] r9139 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils: . default

[svn at svn.open-ils.org]

Author: djfiander
Date: 2008-03-26 21:25:48 -0400 (Wed, 26 Mar 2008)
New Revision: 9139

Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html
Log:
Using Dojo for layout

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html	2008-03-26 15:58:44 UTC (rev 9138)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html	2008-03-27 01:25:48 UTC (rev 9139)
@@ -36,6 +36,10 @@
             djConfig="parseOnLoad: true"></script>
     <script type="text/javascript">
         dojo.require("dojo.parser");
+
+	dojo.require("dijit.layout.LayoutContainer")
+	dojo.require("dijit.layout.ContentPane")
+
 	dojo.require("dijit.form.Form")
 	dojo.require("dijit.form.Button");
 	dojo.require("dijit.form.TextBox");

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html	2008-03-26 15:58:44 UTC (rev 9138)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html	2008-03-27 01:25:48 UTC (rev 9139)
@@ -2,22 +2,28 @@
 <%inherit file='../base.html'/>
 
 <%def name='block_body_content()'>
-    <div id='oils-base-body-block' class='tundra'> 
-        <div id='oils-base-header-block'>
+    <div id="oils-base-body-block" class="tundra"
+	 dojoType="dijit.layout.LayoutContainer"> 
+
+        <div id="oils-base-header-block"
+	     dojoType="dijit.layout.ContentPane" layoutAlign="top">
             ${self.block_header()}
         </div>
-        <div id='oils-base-main-block' class='container'>
-            <div id='oils-base-navigate-block'>
+
+        <div id="oils-base-main-block"
+             dojoType="dijit.layout.LayoutContainer" layoutAlign="client">
+            <div id="oils-base-navigate-block"
+		 dojoType="dijit.layout.ContentPane" layoutAlign="left">
                 ${self.block_navigate()}
             </div>
-            <div id='oils-base-content-block'>
+            <div id="oils-base-content-block"
+		 dojoType="dijit.layout.ContentPane" layoutAlign="client">
                 ${self.block_global_content()}
             </div>
-            <div id='oils-base-sidebar-block'>
-                ${self.block_sidebar()}
-            </div>
         </div>
-        <div id='oils-base-footer-block'>
+
+        <div id="oils-base-footer-block"
+             dojoType="dijit.layout.ContentPane" layoutAlign="bottom">
             ${self.block_footer()}
         </div>
     </div>