From 0c5f445ce36bb8951ddb3ed3dffac0ae23b984d8 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 17 Mar 2014 16:20:12 +0000 Subject: Change htmlviewfunctions.displayheader to .displaysectionstart and added .displaysectionend function --- app/acf-util/password-status-html.lsp | 16 ++++++++++------ app/acf-util/roles-read-html.lsp | 18 +++++++++++++----- app/acf-util/roles-viewroles-html.lsp | 12 ++++++++---- app/acf-util/welcome-html.lsp | 3 ++- 4 files changed, 33 insertions(+), 16 deletions(-) (limited to 'app/acf-util') diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp index cdb589d..91a2ea2 100644 --- a/app/acf-util/password-status-html.lsp +++ b/app/acf-util/password-status-html.lsp @@ -5,12 +5,12 @@ <% htmlviewfunctions.displaycommandresults({"newuser", "edituser", "deleteuser"}, session) %> <% -local header_level = htmlviewfunctions.displayheader(form, page_info) -header_level = htmlviewfunctions.incrementheader(header_level) +local header_level = htmlviewfunctions.displaysectionstart(form, page_info) +local header_level2 = htmlviewfunctions.incrementheader(header_level) local redir = cfe({ type="hidden", value=page_info.orig_action }) -htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Account", option="Create", action="newuser" }), header_level, page_info) +htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Account", option="Create", action="newuser" }), header_level2, page_info) -htmlviewfunctions.displayheader(cfe({label="Existing Accounts"}), page_info, header_level) +htmlviewfunctions.displaysectionstart(cfe({label="Existing Accounts"}), page_info, header_level2) for i,user in ipairs(form.value) do local name = html.html_escape(user.value.userid.value) htmlviewfunctions.displayitemstart() %> @@ -36,5 +36,9 @@ for i,user in ipairs(form.value) do - <% htmlviewfunctions.displayitemend() %> -<% end %> +<% + htmlviewfunctions.displayitemend() +end +htmlviewfunctions.displaysectionend(header_level2) +htmlviewfunctions.displaysectionend(header_level) +%> diff --git a/app/acf-util/roles-read-html.lsp b/app/acf-util/roles-read-html.lsp index 2f4851d..87772b7 100644 --- a/app/acf-util/roles-read-html.lsp +++ b/app/acf-util/roles-read-html.lsp @@ -21,21 +21,23 @@ <% -local header_level = htmlviewfunctions.displayheader(view, page_info) +local header_level = htmlviewfunctions.displaysectionstart(view, page_info) +local header_level2 = htmlviewfunctions.incrementheader(header_level) %> <% if view.value.roles then - htmlviewfunctions.displayheader(cfe({label=view.value.userid.value.." is valid in these roles"}), page_info, htmlviewfunctions.incrementheader(header_level)) + htmlviewfunctions.displaysectionstart(cfe({label=view.value.userid.value.." is valid in these roles"}), page_info, header_level2) for a,b in pairs(view.value.roles.value) do print("

",html.html_escape(b),"

") end + htmlviewfunctions.displaysectionend(header_level2) 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)) + htmlviewfunctions.displaysectionstart(cfe({label=view.value.userid.value.."'s full permissions are"}), page_info, header_level2) elseif view.value.role then - htmlviewfunctions.displayheader(cfe({label=view.value.role.value.."'s full permissions are"}), page_info, htmlviewfunctions.incrementheader(header_level)) + htmlviewfunctions.displaysectionstart(cfe({label=view.value.role.value.."'s full permissions are"}), page_info, header_level2) end %> @@ -70,4 +72,10 @@ end %> end %>
-<% end %> +<% + if view.value.userid or view.value.role then + htmlviewfunctions.displaysectionend(header_level2) + end +end +htmlviewfunctions.displaysectionend(header_level) +%> diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp index 32593a4..b9b917e 100644 --- a/app/acf-util/roles-viewroles-html.lsp +++ b/app/acf-util/roles-viewroles-html.lsp @@ -23,12 +23,12 @@ <% htmlviewfunctions.displaycommandresults({"newrole", "editrole", "deleterole"}, session) %> <% -local header_level = htmlviewfunctions.displayheader(view, page_info) -header_level = htmlviewfunctions.incrementheader(header_level) +local header_level = htmlviewfunctions.displaysectionstart(view, page_info) +local header_level2 = htmlviewfunctions.incrementheader(header_level) local redir = cfe({ type="hidden", value=page_info.orig_action }) -htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Role", option="Create", action="newrole" }), header_level, page_info) +htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Role", option="Create", action="newrole" }), header_level2, page_info) -htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, header_level) +htmlviewfunctions.displaysectionstart(cfe({label="Existing Roles"}), page_info, header_level2) %> @@ -59,3 +59,7 @@ htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, header <% end %> <% end %>
RoleAction
+<% +htmlviewfunctions.displaysectionend(header_level2) +htmlviewfunctions.displaysectionend(header_level) +%> diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp index 8c3a96d..b83bc7e 100644 --- a/app/acf-util/welcome-html.lsp +++ b/app/acf-util/welcome-html.lsp @@ -1,7 +1,7 @@ <% local view, viewlibrary, page_info, session = ... %> <% htmlviewfunctions = require("htmlviewfunctions") %> -<% htmlviewfunctions.displayheader(cfe({label="Alpine Configuration Framework"}), page_info) %> +<% local header_level = htmlviewfunctions.displaysectionstart(cfe({label="Alpine Configuration Framework"}), page_info) %>

Welcome.

<% --[[ @@ -9,3 +9,4 @@ io.write(htmlviewfunctions.cfe_unpack(FORM)) io.write(htmlviewfunctions.cfe_unpack(ENV)) --]] %> +<% htmlviewfunctions.displaysectionend(header_level) %> -- cgit v1.2.3