From 885c3c0dcb0532f4453014ffb8e4c4ab9f8f52f2 Mon Sep 17 00:00:00 2001
From: djfiander <djfiander@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 27 Mar 2008 01:25:48 +0000
Subject: [PATCH] Using Dojo for layout

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9139 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../web/oilsweb/oilsweb/templates/oils/base.html   |  4 ++++
 .../oilsweb/templates/oils/default/base.html       | 24 ++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
index 1af4618e3e..b2c652afc2 100644
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
@@ -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");
diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html
index ad44b3d992..cb64948f34 100644
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/base.html
@@ -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>
-- 
2.11.0