r7134: a number of small changes to make the pages HTML compliant. The

builtin web validator in firefox sure is useful!
(This used to be commit aa43111aa5f9a183395ebd840d8f77867730ab23)

diff --git a/swat/docs/menu.js b/swat/docs/menu.js
index b57b454a32c88489d169601265d09be123674e69..5dfc69f9929531322092d5da1f7ed39a84e38c3c 100644 (file)
--- a/swat/docs/menu.js
+++ b/swat/docs/menu.js
@@ -4,9 +4,9 @@ var m = MenuObj("Samba Information", 8);
 m.element[0].label = "Samba4 development";
 m.element[0].link  = "http://devel.samba.org/";
 m.element[1].label = "Recent Checkins";
-m.element[1].link  = "http://build.samba.org/?tree=samba4&function=Recent+Checkins";
+m.element[1].link  = "http://build.samba.org/?tree=samba4;function=Recent+Checkins";
 m.element[2].label = "Recent Builds";
-m.element[2].link  = "http://build.samba.org/?tree=samba4&function=Recent+Builds";
+m.element[2].link  = "http://build.samba.org/?tree=samba4;function=Recent+Builds";
 m.element[3].label = "EJS Information";
 m.element[3].link  = "http://www.appwebserver.org/products/ejs/ejs.html";
 m.element[4].label = "ESP Information";

diff --git a/swat/esptest/include.esp b/swat/esptest/include.esp
index 37772fd03fbf1b7285e74be490720098b1a53040..96afead1f95318a2b43bb2229b0d1bd5c3efc808 100644 (file)
--- a/swat/esptest/include.esp
+++ b/swat/esptest/include.esp
@@ -1,13 +1,13 @@
 <% page_header("columns", "ESP Include Test"); %>
 
-including /scripting/test.ejs<p>
+including /scripting/test.ejs<p/>
 <% include("/scripting/test.ejs"); %>
-calling a function from test.ejs ...<p>
+calling a function from test.ejs ...<p/>
 <% showArray("request", request); %>
 
-including /scripting/test.esp<p>
+including /scripting/test.esp<p/>
 <% include /scripting/test.esp %>
-calling a function from test.esp ...<p>
+calling a function from test.esp ...<p/>
 <% res = testfn('foo'); %>
 result is: @@res
 

diff --git a/swat/esptest/session.esp b/swat/esptest/session.esp
index 309505bae3e349d6c1bf8e36b623a632f8ac443d..4fb4ee7bb4da02667f2b66379279e43bac376c7d 100644 (file)
--- a/swat/esptest/session.esp
+++ b/swat/esptest/session.esp
@@ -45,7 +45,7 @@ if (request['REQUEST_METHOD'] == "POST") {
 }
 
 simple_table(session);
-write("SessionId=" + request['SESSION_ID'] + "<br>\n");
+write("SessionId=" + request['SESSION_ID'] + "<br/>\n");
 %>
 
 <% page_footer(); %>

diff --git a/swat/esptest/showvars.esp b/swat/esptest/showvars.esp
index 40008a0d7d853aabf19d9b92688ce04dd5b9c532..38904edcc52f5fe7988b5984119ed23e66e68c3b 100644 (file)
--- a/swat/esptest/showvars.esp
+++ b/swat/esptest/showvars.esp
@@ -21,6 +21,4 @@
    showArray("session", session);
 %>
 
-</ul>
-
 <% page_footer(); %>

diff --git a/swat/login.esp b/swat/login.esp
index f66249251182f70ac0b097329a7346ae43b5d82c..873ff2f6a6b85a4801a93852de3a291c833c609a 100644 (file)
--- a/swat/login.esp
+++ b/swat/login.esp
@@ -3,7 +3,7 @@
 <%
 
 if (request['SESSION_EXPIRED'] == "True") {
-   write("<b>Your session has expired - please authenticate again<br>\n");
+   write("<b>Your session has expired - please authenticate again<br /></b>\n");
 }
 
 var f = FormObj("login", 2, 1);

diff --git a/swat/scripting/common.js b/swat/scripting/common.js
index d087f0d2a61680d1f1f135c1c2e08a6a0fc8f2ff..d7252b3bf9460bd4e873d05e526c553bc4831e97 100644 (file)
--- a/swat/scripting/common.js
+++ b/swat/scripting/common.js
@@ -129,10 +129,25 @@ function table_element(i, o) {
        }
        write("</td></tr>\n");
 }
+
+/*
+  return the number of elements in an object
+*/
+function elcount(o) {
+       var count = 0;
+       for (i in o) {
+               count++;
+       }
+       return count;
+}
+
 /*
   display a ejs object as a table. The header is optional
 */
 function simple_table(v) {
+       if (elcount(v) == 0) {
+               return;
+       }
        write("<table class=\"data\">\n");
        for (r in v) {
                table_element(r, v);
@@ -145,10 +160,13 @@ function simple_table(v) {
   attribute
 */
 function multi_table(array, header) {
+       if (elcount(v) == 0) {
+               return;
+       }
        write("<table class=\"data\">\n");
        for (i in array) {
                var v = array[i];
-               write("<tr><th colspan=2>" + v[header] + "</th></tr>\n");
+               write('<tr><th colspan="2">' + v[header] + "</th></tr>\n");
                for (r in v) {
                        if (r != header) {
                            table_element(r, v);
@@ -168,7 +186,7 @@ function FormObj(name, num_elements, num_submits)
        f.element = new Array(num_elements);
        f.submit =  new Array(num_submits);
        f.action = session_uri(request.REQUEST_URI);
-       f.class = "form";
+       f.class = "defaultform";
        for (i in f.element) {
                f.element[i] = new Object();
                f.element[i].type = "text";
@@ -193,14 +211,16 @@ function display_form(f) {
        write('<form name="' + f.name +
              '" method="post" action="' + f.action + 
              '" class="' + f.class + '">\n');
-       write("<table>\n");
+       if (f.element.length > 0) {
+               write("<table>\n");
+       }
        for (i in f.element) {
                var e = f.element[i];
                if (e.name == undefined) {
                        e.name = e.label;
                }
                if (e.value == undefined) {
-                       e.value = '""';
+                       e.value = "";
                }
                write("<tr>");
                write("<td>" + e.label + "</td>");
@@ -216,12 +236,15 @@ function display_form(f) {
                        write('</select></td>\n');
                } else {
                        write('<td><input name="' + e.name + '" type="' + 
-                             e.type + '" value="' + e.value + '"></td>\n');
+                             e.type + '" value="' + e.value + '" /></td>\n');
                }
+               write("</tr>");
+       }
+       if (f.element.length > 0) {
+               write("</table>\n");
        }
-       write("</table>\n");
        for (i in f.submit) {
-               write('<input name="submit" type="submit" value="' + f.submit[i] + '">\n');
+               write('<input name="submit" type="submit" value="' + f.submit[i] + '" />\n');
        }
        write("</form>\n");
 }

diff --git a/swat/scripting/test.ejs b/swat/scripting/test.ejs
index e69df9230f53b8922dc7a94989b3b9eaa53e7114..8e7047f51c3ecf05a01191348b8b793fb1171905 100644 (file)
--- a/swat/scripting/test.ejs
+++ b/swat/scripting/test.ejs
@@ -5,6 +5,6 @@
 function showArray(name, array) {
     write("<h3>Array: " + name + "</h3>\n");
     for (v in array) {
-          write(name + "[" + v + "]=" + array[v] + "<br>\n");
+          write(name + "[" + v + "]=" + array[v] + "<br/>\n");
     }
 }