r9139: cleanup the layout a bit

[kai/samba.git] / swat / scripting / header_columns.esp
diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp

index c7e58df90bbf4d42b9bf82fa5acb9d9537df4475..2fd57c400cf2d209efd99aa1bac2559302ca3705 100644 (file)
--- a/swat/scripting/header_columns.esp
+++ b/swat/scripting/header_columns.esp
@@ -3,11 +3,14 @@
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
  
+<script type="text/javascript" src="/style/qooxdoo/widgets/qooxdoo.js"></script>
+
    <title>@@global.page.title</title>
  
  <link rel="stylesheet" href="/style/common.css" type="text/css" media="all" />
  <link rel="stylesheet" href="/style/columns.css" type="text/css" media="all" />
  <link rel="stylesheet" href="/style/swat.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/qooxdoo/layouts/application.css" type="text/css" media="all" />
  <link rel="shortcut icon" href="/images/favicon.ico" />
  
  <!--[if gte IE 5.5]>
@@ -62,21 +65,21 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/logo.png'
  
  <div id="nav">
       <% 
-     include("/menu.js");
-     if (global.page.menu) {
-          include(global.page.menu);
-     }
+       include("/menu.js");
+        if (form['menu']) {
+               global.page.menu = form['menu'];
+       }
+        swat_menus[global.page.menu].display();
+        if (global.page.menu != "main") {
+               write('<a href="/">Main Menu</a>');
+       }
       %>
  </div>
  
  <div id="links">
-  <div class="related">
-     <% 
-     include("/docs/menu.js"); 
-     %>
-  </div>
+     <% swat_menus.docs.display(); %>
  </div>
  
   
  <div id="content">
-  <div class="center">
+  <div id="middle" class="center">