From 6a25f6d50ad8a0484d2397eb9fd368dcb1ad8d70 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 31 Mar 2014 00:05:00 +0000 Subject: Change prototype of htmlviewfunctions.dislay item to make consistent Note: this breaks backward compatibility --- app/acf-util/password-status-html.lsp | 8 ++++---- app/acf-util/roles-viewroles-html.lsp | 12 ++++++------ 2 files changed, 10 insertions(+), 10 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 91a2ea2..551f798 100644 --- a/app/acf-util/password-status-html.lsp +++ b/app/acf-util/password-status-html.lsp @@ -8,7 +8,7 @@ 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_level2, page_info) +htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Account", option="Create", action="newuser" }), page_info, header_level2) htmlviewfunctions.displaysectionstart(cfe({label="Existing Accounts"}), page_info, header_level2) for i,user in ipairs(form.value) do @@ -30,9 +30,9 @@ for i,user in ipairs(form.value) do Option <% local userid = cfe({type="hidden", value=user.value.userid.value}) %> - <% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid, redir=redir}, label="", option="Edit", action="edituser"}), -1, page_info) %> - <% htmlviewfunctions.displayitem(cfe({type="form", value={userid=userid}, label="", option="Delete", action="deleteuser" }), -1, page_info) %> - <% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid}, label="", option="View Roles", action=page_info.script.."/acf-util/roles/viewuserroles"}), -1, page_info) %> + <% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid, redir=redir}, label="", option="Edit", action="edituser"}), page_info, -1) %> + <% htmlviewfunctions.displayitem(cfe({type="form", value={userid=userid}, label="", option="Delete", action="deleteuser" }), page_info, -1) %> + <% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid}, label="", option="View Roles", action=page_info.script.."/acf-util/roles/viewuserroles"}), page_info, -1) %> diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp index b9b917e..e3730f4 100644 --- a/app/acf-util/roles-viewroles-html.lsp +++ b/app/acf-util/roles-viewroles-html.lsp @@ -26,7 +26,7 @@ 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_level2, page_info) +htmlviewfunctions.displayitem(cfe({ type="link", value={redir=redir}, label="Create New Role", option="Create", action="newrole" }), page_info, header_level2) htmlviewfunctions.displaysectionstart(cfe({label="Existing Roles"}), page_info, header_level2) %> @@ -39,9 +39,9 @@ htmlviewfunctions.displaysectionstart(cfe({label="Existing Roles"}), page_info, <% local r = cfe({type="hidden", value=role}) - htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), -1, page_info) - htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), -1, page_info) - htmlviewfunctions.displayitem(cfe({ type="form", value={role=r}, label="", option="Delete", action="deleterole" }), -1, page_info) + htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), page_info, -1) + htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), page_info, -1) + htmlviewfunctions.displayitem(cfe({ type="form", value={role=r}, label="", option="Delete", action="deleterole" }), page_info, -1) %> <% end %> @@ -52,8 +52,8 @@ htmlviewfunctions.displaysectionstart(cfe({label="Existing Roles"}), page_info, <% local r = cfe({type="hidden", value=role}) - htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), -1, page_info) - htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), -1, page_info) + htmlviewfunctions.displayitem(cfe({ type="link", value={role=r}, label="", option="View", action="viewroleperms" }), page_info, -1) + htmlviewfunctions.displayitem(cfe({ type="link", value={role=r, redir=redir}, label="", option="Edit", action="editrole" }), page_info, -1) %> <% end %> -- cgit v1.2.3