diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-07-23 10:58:09 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:59 -0500 |
commit | fdb322876d573f7e18947e53667b3ee83e3ba226 (patch) | |
tree | 39fc9d05e8f0ce95b95b048433ad77a387342261 /swat/esptest | |
parent | 64f31e424b3db792a1edb909195eb592a9460aaf (diff) | |
download | samba-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/esptest')
-rw-r--r-- | swat/esptest/exception.esp | 2 | ||||
-rw-r--r-- | swat/esptest/formtest.esp | 2 | ||||
-rw-r--r-- | swat/esptest/include.esp | 2 | ||||
-rw-r--r-- | swat/esptest/index.esp | 2 | ||||
-rw-r--r-- | swat/esptest/ldb.esp | 2 | ||||
-rw-r--r-- | swat/esptest/loadparm.esp | 2 | ||||
-rw-r--r-- | swat/esptest/menu.js | 12 | ||||
-rw-r--r-- | swat/esptest/samr.esp | 2 | ||||
-rw-r--r-- | swat/esptest/session.esp | 2 | ||||
-rw-r--r-- | swat/esptest/showvars.esp | 2 |
10 files changed, 9 insertions, 21 deletions
diff --git a/swat/esptest/exception.esp b/swat/esptest/exception.esp index f32aaeb610..ff28d6318e 100644 --- a/swat/esptest/exception.esp +++ b/swat/esptest/exception.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP Exception test", "/esptest/menu.js"); +<% page_header("columns", "ESP Exception test", "esptest"); include("/scripting/forms.js"); %> diff --git a/swat/esptest/formtest.esp b/swat/esptest/formtest.esp index 32ad4a04b2..2310849895 100644 --- a/swat/esptest/formtest.esp +++ b/swat/esptest/formtest.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP Form Test", "/esptest/menu.js"); +<% page_header("columns", "ESP Form Test", "esptest"); include("/scripting/forms.js"); %> diff --git a/swat/esptest/include.esp b/swat/esptest/include.esp index fc53a9b1f4..5d558d59dc 100644 --- a/swat/esptest/include.esp +++ b/swat/esptest/include.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP Include Test", "/esptest/menu.js"); %> +<% page_header("columns", "ESP Include Test", "esptest"); %> including /scripting/test.ejs<p/> <% include("/scripting/test.ejs"); %> diff --git a/swat/esptest/index.esp b/swat/esptest/index.esp index fbbed9b3c4..663f82c599 100644 --- a/swat/esptest/index.esp +++ b/swat/esptest/index.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP Tests", "/esptest/menu.js"); %> +<% page_header("columns", "ESP Tests", "esptest"); %> <h1>ESP Test functions</h1> diff --git a/swat/esptest/ldb.esp b/swat/esptest/ldb.esp index 1b1e7cd669..93bc9e0d81 100644 --- a/swat/esptest/ldb.esp +++ b/swat/esptest/ldb.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP ldb test", "/esptest/menu.js"); %> +<% page_header("columns", "ESP ldb test", "esptest"); %> <h1>Samba4 ldb test</h1> diff --git a/swat/esptest/loadparm.esp b/swat/esptest/loadparm.esp index 2783c8e647..9581af0262 100644 --- a/swat/esptest/loadparm.esp +++ b/swat/esptest/loadparm.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP loadparm test", "/esptest/menu.js" ); +<% page_header("columns", "ESP loadparm test", "esptest" ); include("/scripting/forms.js"); %> diff --git a/swat/esptest/menu.js b/swat/esptest/menu.js deleted file mode 100644 index d46561f311..0000000000 --- a/swat/esptest/menu.js +++ /dev/null @@ -1,12 +0,0 @@ -/* show a menu for the esp test pages */ -simple_menu( - "ESP Tests", - "ldb database", session_uri("/esptest/ldb.esp"), - "samr calls", session_uri("/esptest/samr.esp"), - "html forms", session_uri("/esptest/formtest.esp"), - "esp includes", session_uri("/esptest/include.esp"), - "session variables", session_uri("/esptest/session.esp"), - "loadparm access", session_uri("/esptest/loadparm.esp"), - "exception handling", session_uri("/esptest/exception.esp"), - "environment variables", session_uri("/esptest/showvars.esp")); - diff --git a/swat/esptest/samr.esp b/swat/esptest/samr.esp index 53e20a23ab..65902e0ce4 100644 --- a/swat/esptest/samr.esp +++ b/swat/esptest/samr.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP samr test", "/esptest/menu.js"); +<% page_header("columns", "ESP samr test", "esptest"); libinclude("base.js"); libinclude("samr.js"); diff --git a/swat/esptest/session.esp b/swat/esptest/session.esp index 6637c782c0..6213dde62f 100644 --- a/swat/esptest/session.esp +++ b/swat/esptest/session.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP session test", "/esptest/menu.js"); +<% page_header("columns", "ESP session test", "esptest"); include("/scripting/forms.js"); %> diff --git a/swat/esptest/showvars.esp b/swat/esptest/showvars.esp index 6763f2b6dd..dc55b1e58b 100644 --- a/swat/esptest/showvars.esp +++ b/swat/esptest/showvars.esp @@ -1,4 +1,4 @@ -<% page_header("columns", "ESP standard variables test", "/esptest/menu.js"); %> +<% page_header("columns", "ESP standard variables test", "esptest"); %> <h1>Samba4 showvars test</h1> |