r7132: - start a convention of making object constructors end in Obj, so we

  now have FormObj(). This follows the style in the ejs manual

- make a new MenuObj object type, with a display_menu() to display
  it. This will make it easier to make different types of
  menus. Currently only veritical simple menus are supported.

4 files changed, 4 insertions, 4 deletions

diff --git a/swat/esptest/exception.esp b/swat/esptest/exception.esp
index 986b616dabc..df62e9a3263 100644
--- a/swat/esptest/exception.esp
+++ b/swat/esptest/exception.esp
@@ -4,7 +4,7 @@
 
 
 <%
-var f = Form("ExceptionTest", 0, 2);
+var f = FormObj("ExceptionTest", 0, 2);
 f.submit[0] = "Generate Exception";
 f.submit[1] = "No Exception";
 
diff --git a/swat/esptest/formtest.esp b/swat/esptest/formtest.esp
index 9f5626624ef..2d7c33e518f 100644
--- a/swat/esptest/formtest.esp
+++ b/swat/esptest/formtest.esp
@@ -1,7 +1,7 @@
 <% page_header("columns", "ESP Form Test"); %>
 
 <%
-var f = Form("FormTest", 3, 2);
+var f = FormObj("FormTest", 3, 2);
 f.element[0].label = "First Name";
 f.element[0].name  = "firstName";
 f.element[0].value = form['firstName'];
diff --git a/swat/esptest/loadparm.esp b/swat/esptest/loadparm.esp
index 5e45e4262c1..738208b745d 100644
--- a/swat/esptest/loadparm.esp
+++ b/swat/esptest/loadparm.esp
@@ -3,7 +3,7 @@
 <h1>Samba4 loadparm test</h1>
 
 <%
-var f = Form("LoadparmTest", 2, 1);
+var f = FormObj("LoadparmTest", 2, 1);
 f.element[0].label = "Share";
 f.element[1].label = "Parameter";
 f.submit[0] = "OK";
diff --git a/swat/esptest/session.esp b/swat/esptest/session.esp
index 6de7edab674..309505bae3e 100644
--- a/swat/esptest/session.esp
+++ b/swat/esptest/session.esp
@@ -3,7 +3,7 @@
 <h1>Samba4 session test</h1>
 
 <%
-var f = Form("SessionTest", 3, 4);
+var f = FormObj("SessionTest", 3, 4);
 f.element[0].label = "Name";
 f.element[1].label = "Value";
 f.element[2].label = "Timeout";