From df80810456f4a13d48eba24bfa1fa79b360c8426 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 2 Feb 2012 20:59:08 +0000
Subject: Changed viewfunctions.lua to htmlviewfunctions.lua and made it an
 actual module

It should have been a module all along, but wasn't
Unfortunately, this means changes to pretty much every view file
---
 app/acf-util/logon-html.lsp           | 4 ++--
 app/acf-util/logon-logout-html.lsp    | 4 ++--
 app/acf-util/password-html.lsp        | 4 ++--
 app/acf-util/password-status-html.lsp | 4 ++--
 app/acf-util/roles-editrole-html.lsp  | 8 ++++----
 app/acf-util/roles-viewroles-html.lsp | 4 ++--
 app/acf-util/skins-read-html.lsp      | 4 ++--
 app/acf-util/welcome-html.lsp         | 8 ++++----
 8 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'app/acf-util')

diff --git a/app/acf-util/logon-html.lsp b/app/acf-util/logon-html.lsp
index 2400c90..29ced43 100644
--- a/app/acf-util/logon-html.lsp
+++ b/app/acf-util/logon-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
 <script type="text/javascript">
@@ -13,5 +13,5 @@
 	form.value.password.type = "password"
 	form.value.redir.type = "hidden"
 	local order = { "userid", "password" }
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/app/acf-util/logon-logout-html.lsp b/app/acf-util/logon-logout-html.lsp
index 54aa9bb..765eb4f 100644
--- a/app/acf-util/logon-logout-html.lsp
+++ b/app/acf-util/logon-logout-html.lsp
@@ -1,7 +1,7 @@
 <% local view= ... %> 
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 <h1>Log Out</h1>
 
-<%= cfe_unpack(view) %>
+<%= htmlviewfunctions.cfe_unpack(view) %>
 
 <%= html.html_escape(view.logout.value) %>
diff --git a/app/acf-util/password-html.lsp b/app/acf-util/password-html.lsp
index 82551fc..bc50fb7 100644
--- a/app/acf-util/password-html.lsp
+++ b/app/acf-util/password-html.lsp
@@ -1,5 +1,5 @@
 <% local form, viewlibrary, pageinfo = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <% 
@@ -12,5 +12,5 @@
 		form.value.userid.readonly = true
 	end
 	local order = { "userid", "username", "roles", "password", "password_confirm" }
-	displayform(form, order)
+	htmlviewfunctions.displayform(form, order)
 %>
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index 01eafe7..58f194d 100644
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -1,7 +1,7 @@
 <% local form, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %>
 
 <H1>User Accounts</H1>
 <H2>Create new account</H2>
diff --git a/app/acf-util/roles-editrole-html.lsp b/app/acf-util/roles-editrole-html.lsp
index 5d1582f..d464cd1 100644
--- a/app/acf-util/roles-editrole-html.lsp
+++ b/app/acf-util/roles-editrole-html.lsp
@@ -1,14 +1,14 @@
 <% local form, viewtable, page_info = ... %> 
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
 <H1><%= html.html_escape(form.label) %></H1>
 <%
-	displayformstart(form, page_info)
+	htmlviewfunctions.displayformstart(form, page_info)
 	-- If editing existing role, disable role
 	if page_info.action ~= "newrole" then
 		form.value.role.readonly = true
 	end
-	displayformitem(form.value.role, "role")
+	htmlviewfunctions.displayformitem(form.value.role, "role")
 
 	-- copied this code from viewfunctions so we can disable the default boxes
 	local myitem = form.value.permissions
@@ -63,5 +63,5 @@
 	if myitem.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(myitem.errtxt), "\n", "<BR>") .. "</P>\n") end
 	io.write("</DD>\n")
 
-	displayformend(form)
+	htmlviewfunctions.displayformend(form)
 %>
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 5221fce..04b4a98 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -1,7 +1,7 @@
 <% local view, viewlibrary, page_info, session= ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"newrole", "editrole", "deleterole"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"newrole", "editrole", "deleterole"}, session) %>
 
 <H1>Roles</H1>
 <H2>Create new role</H2>
diff --git a/app/acf-util/skins-read-html.lsp b/app/acf-util/skins-read-html.lsp
index 95547a5..2d43b49 100644
--- a/app/acf-util/skins-read-html.lsp
+++ b/app/acf-util/skins-read-html.lsp
@@ -1,7 +1,7 @@
 <% local view, viewlibrary, page_info, session = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 
-<% displaycommandresults({"update"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"update"}, session) %>
 
 <h1>Available skins</h1>
 
diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp
index 85ff3a8..6a1fc17 100644
--- a/app/acf-util/welcome-html.lsp
+++ b/app/acf-util/welcome-html.lsp
@@ -1,10 +1,10 @@
 <% view = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
 <h1>Alpine Configuration Framework</h1>
 <DL><p>Welcome.</p></DL>
 
 <% --[[
-	io.write(cfe_unpack(view))
-	io.write(cfe_unpack(FORM))
-	io.write(cfe_unpack(ENV))
+	io.write(htmlviewfunctions.cfe_unpack(view))
+	io.write(htmlviewfunctions.cfe_unpack(FORM))
+	io.write(htmlviewfunctions.cfe_unpack(ENV))
 --]] %>
-- 
cgit v1.2.3