From fdb322876d573f7e18947e53667b3ee83e3ba226 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 23 Jul 2005 10:58:09 +0000
Subject: r8722: make the menu handling considerably saner and easier to
 follow. The whole menu hierarchy is now in /menu.js (This used to be commit
 c2a450bb9967caa666628f067a8e732227854ce2)

---
 swat/scripting/header_columns.esp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'swat/scripting/header_columns.esp')

diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp
index 0320e66283..20238b588e 100644
--- a/swat/scripting/header_columns.esp
+++ b/swat/scripting/header_columns.esp
@@ -62,20 +62,20 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/logo.png'
 
 <div id="nav">
      <% 
-     if (global.page.menu) {
-          include(global.page.menu);
-	  write('<a href="/">Main Menu</a>');
-     } else {
-	  include("/menu.js");
-     }
+	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"); 
-     %>
+     <% swat_menus.docs.display(); %>
   </div>
 </div>
 
-- 
cgit