summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2014-03-03 22:12:09 +0000
committerTed Trask <ttrask01@yahoo.com>2014-03-03 22:12:09 +0000
commit14e124d2ebb81bb6e3f6af0b13326339c48ced4b (patch)
tree9d1bda76d4634c5852a34ce646bb0ff123add3ee
parenta29dfc6a49adaf2b9cbf348995e07aeeb4041cbf (diff)
downloadacf-core-14e124d2ebb81bb6e3f6af0b13326339c48ced4b.tar.bz2
acf-core-14e124d2ebb81bb6e3f6af0b13326339c48ced4b.tar.xz
Change HTML views to use htmlviewfunctions.displayheader
-rw-r--r--app/acf-util/roles-controller.lua6
-rw-r--r--app/acf-util/roles-read-html.lsp34
-rw-r--r--app/acf-util/roles-viewroles-html.lsp2
-rw-r--r--app/acf-util/welcome-html.lsp5
-rw-r--r--app/debug-html.lsp21
-rw-r--r--app/dispatcherror-html.lsp3
-rw-r--r--app/exception-html.lsp3
-rw-r--r--app/filedetails-html.lsp36
8 files changed, 62 insertions, 48 deletions
diff --git a/app/acf-util/roles-controller.lua b/app/acf-util/roles-controller.lua
index 30cf768..0c9ba85 100644
--- a/app/acf-util/roles-controller.lua
+++ b/app/acf-util/roles-controller.lua
@@ -8,7 +8,7 @@ mymodule.read = function(self)
userid = cfe({ value=self.sessiondata.userinfo.userid, label="User Id" })
roles = cfe({ type="list", value=self.sessiondata.userinfo.roles, label="Roles" })
permissions = cfe({ type="table", value = self.sessiondata.permissions, label="Permissions" })
- return cfe({ type="group", value={userid=userid, roles=roles, permissions=permissions} })
+ return cfe({ type="group", value={userid=userid, roles=roles, permissions=permissions}, label="Roles/Permission list for "..self.sessiondata.userinfo.userid })
end
-- Return roles/permissions for specified user
@@ -29,12 +29,12 @@ mymodule.viewroleperms = function(self)
end
role = cfe({ value=self.clientdata.role, label="Role" })
permissions = self.model.get_role_perms(self, role.value)
- return cfe({ type="group", value={role=role, permissions=permissions} })
+ return cfe({ type="group", value={role=role, permissions=permissions}, label="Permission list for "..role.value })
end
-- Return list of all permissions
mymodule.getpermslist = function(self)
- return cfe({ type="group", value={permissions=self.model.get_perms_list(self)} })
+ return cfe({ type="group", value={permissions=self.model.get_perms_list(self)}, label="Complete permission list" })
end
mymodule.viewroles = function(self)
diff --git a/app/acf-util/roles-read-html.lsp b/app/acf-util/roles-read-html.lsp
index e495473..2f4851d 100644
--- a/app/acf-util/roles-read-html.lsp
+++ b/app/acf-util/roles-read-html.lsp
@@ -1,4 +1,5 @@
<% local view, viewlibrary, page_info, session = ... %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<script type="text/javascript">
@@ -19,27 +20,24 @@
});
</script>
-<% if view.value.userid then %>
- <h1>Roles/Permission list for <%= html.html_escape(view.value.userid.value) %>:</h1>
-<% elseif view.value.role then %>
- <h1>Permission list for <%= html.html_escape(view.value.role.value) %>:</h1>
-<% else %>
- <h1>Complete permission list:</h1>
-<% end %>
+<%
+local header_level = htmlviewfunctions.displayheader(view, page_info)
+%>
-<% if view.value.roles then %>
- <h2><%= html.html_escape(view.value.userid.value) %> is valid in these roles</h2>
- <% for a,b in pairs(view.value.roles.value) do
+<% if view.value.roles then
+ htmlviewfunctions.displayheader(cfe({label=view.value.userid.value.." is valid in these roles"}), page_info, htmlviewfunctions.incrementheader(header_level))
+ for a,b in pairs(view.value.roles.value) do
print("<p>",html.html_escape(b),"</p>")
- end %>
-<% end %>
+ end
+end %>
-<% if view.value.permissions then %>
- <% if view.value.userid then %>
- <h2><%= html.html_escape(view.value.userid.value) %>'s full permissions are</h2>
- <% elseif view.value.role then %>
- <h2><%= html.html_escape(view.value.role.value) %>'s full permissions are</h2>
- <% end %>
+<% if view.value.permissions then
+ if view.value.userid then
+ htmlviewfunctions.displayheader(cfe({label=view.value.userid.value.."'s full permissions are"}), page_info, htmlviewfunctions.incrementheader(header_level))
+ elseif view.value.role then
+ htmlviewfunctions.displayheader(cfe({label=view.value.role.value.."'s full permissions are"}), page_info, htmlviewfunctions.incrementheader(header_level))
+ end
+%>
<table id="permissions" class="tablesorter"><thead>
<tr><th>Controller</th><th>Action(s)</th></tr>
</thead><tbody>
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 200d834..383dd57 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -1,4 +1,4 @@
-<% local view, viewlibrary, page_info, session= ... %>
+<% local view, viewlibrary, page_info, session = ... %>
<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp
index 6a22375..8c3a96d 100644
--- a/app/acf-util/welcome-html.lsp
+++ b/app/acf-util/welcome-html.lsp
@@ -1,6 +1,7 @@
-<% view = ... %>
+<% local view, viewlibrary, page_info, session = ... %>
<% htmlviewfunctions = require("htmlviewfunctions") %>
-<h1>Alpine Configuration Framework</h1>
+
+<% htmlviewfunctions.displayheader(cfe({label="Alpine Configuration Framework"}), page_info) %>
<p>Welcome.</p>
<% --[[
diff --git a/app/debug-html.lsp b/app/debug-html.lsp
index bf593f7..32f82d2 100644
--- a/app/debug-html.lsp
+++ b/app/debug-html.lsp
@@ -1,9 +1,16 @@
<% local data, viewlibrary, page_info, session = ... %>
<% htmlviewfunctions = require("htmlviewfunctions") %>
-<h1>Debugging</h1>
-<h2>View Data:</h2>
-<%= htmlviewfunctions.cfe_unpack(data) %>
-<h2>Session:</h2>
-<%= htmlviewfunctions.cfe_unpack(session) %>
-<h2>Page Info:</h2>
-<%= htmlviewfunctions.cfe_unpack(page_info) %>
+
+<%
+local header_level = htmlviewfunctions.displayheader(cfe({label="Debugging"}), page_info)
+header_level = htmlviewfunctions.incrementheader(header_level)
+
+htmlviewfunctions.displayheader(cfe({label="View Data:"}), page_info, header_level)
+io.write(htmlviewfunctions.cfe_unpack(data))
+
+htmlviewfunctions.displayheader(cfe({label="Session:"}), page_info, header_level)
+io.write(htmlviewfunctions.cfe_unpack(session))
+
+htmlviewfunctions.displayheader(cfe({label="Page Info:"}), page_info, header_level)
+io.write(htmlviewfunctions.cfe_unpack(page_info))
+%>
diff --git a/app/dispatcherror-html.lsp b/app/dispatcherror-html.lsp
index cb23637..fc8d4c5 100644
--- a/app/dispatcherror-html.lsp
+++ b/app/dispatcherror-html.lsp
@@ -1,4 +1,5 @@
<% view, viewlibrary, page_info = ... %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<style type="text/css">
@@ -28,6 +29,6 @@
});
</script>
-<h1>Alpine Configuration Framework</h1>
+<% htmlviewfunctions.displayheader(cfe({label="Alpine Configuration Framework"}), page_info) %>
<p class="errordetail">Dispatch error occured</p>
<p class="hiddendetail">'<%= html.html_escape(view.controller) %>' does not have a '<%= html.html_escape(view.action) %>' action.</p>
diff --git a/app/exception-html.lsp b/app/exception-html.lsp
index 013f457..887cef2 100644
--- a/app/exception-html.lsp
+++ b/app/exception-html.lsp
@@ -1,4 +1,5 @@
<% view, viewlibrary, page_info = ... %>
+<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
<style type="text/css">
@@ -28,6 +29,6 @@
});
</script>
-<h1>Alpine Configuration Framework</h1>
+<% htmlviewfunctions.displayheader(cfe({label="Alpine Configuration Framework"}), page_info) %>
<p class="errordetail">Application error occured</p>
<p class="hiddendetail"><%= html.html_escape(view.message) %></p>
diff --git a/app/filedetails-html.lsp b/app/filedetails-html.lsp
index 2901841..3f023be 100644
--- a/app/filedetails-html.lsp
+++ b/app/filedetails-html.lsp
@@ -2,30 +2,36 @@
<% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %>
-<% if form.type == "form" then %>
-<h1>Configuration</h1>
-<h2>Expert Configuration</h2>
-<% else %>
-<h1>View File</h1>
-<% end %>
-<h3>File Details</h3>
+<%
+local header_level
+if form.type == "form" then
+ header_level = htmlviewfunctions.displayheader(cfe({label="Configuration"}), page_info)
+ header_level = htmlviewfunctions.displayheader(cfe({label="Expert Configuration"}), page_info, htmlviewfunctions.incrementheader(header_level))
+else
+ header_level = htmlviewfunctions.displayheader(cfe({label="View File"}), page_info)
+end
+header_level = htmlviewfunctions.displayheader(cfe({label="File Details"}), page_info, htmlviewfunctions.incrementheader(header_level))
+%>
+
<%
htmlviewfunctions.displayitem(form.value.filename)
htmlviewfunctions.displayitem(form.value.filesize)
htmlviewfunctions.displayitem(form.value.mtime)
%>
-<h3>File Content</h3>
-<% if form.type == "form" then %>
-<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>
-<% htmlviewfunctions.displayformstart(form) %>
-<input type="hidden" name="filename" value="<%= html.html_escape(form.value.filename.value) %>">
-<% end %>
+<%
+htmlviewfunctions.displayheader(cfe({label="File Content"}), page_info, header_level)
+if form.type == "form" then
+ form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
+ htmlviewfunctions.displayformstart(form)
+ form.value.filename.type = "hidden"
+ htmlviewfunctions.displayformitem(form.value.filename)
+end
+%>
<textarea name="filecontent">
<%= html.html_escape(form.value.filecontent.value) %>
</textarea>
-<% if form.value.filecontent.errtxt then %><p class='error'><%= string.gsub(html.html_escape(form.value.filecontent.errtxt), "\n", "<br/>") %></p><% end %>
-<% if form.value.filecontent.descr then %><p class='descr'><%= string.gsub(html.html_escape(form.value.filecontent.descr), "\n", "<br/>") %></p><% end %>
+<% htmlviewfunctions.displayinfo(form.value.filecontent) %>
<% if form.type == "form" then %>
<% htmlviewfunctions.displayformend(form) %>