summaryrefslogtreecommitdiff
path: root/swat/scripting/header_columns.esp
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-23 10:58:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:59 -0500
commitfdb322876d573f7e18947e53667b3ee83e3ba226 (patch)
tree39fc9d05e8f0ce95b95b048433ad77a387342261 /swat/scripting/header_columns.esp
parent64f31e424b3db792a1edb909195eb592a9460aaf (diff)
downloadsamba-fdb322876d573f7e18947e53667b3ee83e3ba226.tar.gz
samba-fdb322876d573f7e18947e53667b3ee83e3ba226.tar.bz2
samba-fdb322876d573f7e18947e53667b3ee83e3ba226.zip
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)
Diffstat (limited to 'swat/scripting/header_columns.esp')
-rw-r--r--swat/scripting/header_columns.esp18
1 files changed, 9 insertions, 9 deletions
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>