Change HTML views to use htmlviewfunctions.displayheader

4 files changed, 23 insertions, 24 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>
 
 <% --[[