diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2014-03-03 17:22:00 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2014-03-03 17:22:00 +0000 |
| commit | a29dfc6a49adaf2b9cbf348995e07aeeb4041cbf (patch) | |
| tree | c77b38780a2a74d5de8b0708e6c0192a50cc65aa | |
| parent | f7398e612b7ea669020fce518b254c95d54e47ef (diff) | |
| download | acf-core-a29dfc6a49adaf2b9cbf348995e07aeeb4041cbf.tar.bz2 acf-core-a29dfc6a49adaf2b9cbf348995e07aeeb4041cbf.tar.xz | |
Modified roles/viewroles HTML view to make better use of htmlviewfunctions and remove custom HTML
| -rw-r--r-- | app/acf-util/roles-model.lua | 2 | ||||
| -rw-r--r-- | app/acf-util/roles-viewroles-html.lsp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/acf-util/roles-model.lua b/app/acf-util/roles-model.lua index 51c10b1..fc2634a 100644 --- a/app/acf-util/roles-model.lua +++ b/app/acf-util/roles-model.lua @@ -28,7 +28,7 @@ mymodule.view_roles = function(self) local defined_roles_cfe=cfe({ type="list", value=defined_roles, label="Locally-defined roles" }) local default_roles_cfe=cfe({ type="list", value=default_roles, label="System-defined roles" }) - return cfe({ type="group", value={defined_roles=defined_roles_cfe, default_roles=default_roles_cfe} }) + return cfe({ type="group", value={defined_roles=defined_roles_cfe, default_roles=default_roles_cfe}, label="Roles" }) end mymodule.getpermissions = function(self, clientdata) diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp index 59aa4e9..200d834 100644 --- a/app/acf-util/roles-viewroles-html.lsp +++ b/app/acf-util/roles-viewroles-html.lsp @@ -22,14 +22,14 @@ <% htmlviewfunctions.displaycommandresults({"newrole", "editrole", "deleterole"}, session) %> -<h1>Roles</h1> -<h2>Create new role</h2> -<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller) %>/newrole" method="POST"> -<input class="hidden" type="hidden" name="redir" value="<%= html.html_escape(page_info.orig_action) %>" > -<div class='item'><p class='left'></p><div class='right'><input class="submit" type="submit" value="Create"></div></div><!-- end .item --> -</form> +<% +local header_level = htmlviewfunctions.displayheader(view, page_info) +local newrole = cfe({ type="link", value={}, label="Create New Role", option="Create", action=page_info.script..page_info.prefix..page_info.controller.."/newrole" }) +newrole.value.redir = cfe({ type="hidden", value=page_info.orig_action }) +htmlviewfunctions.displayitem(newrole, htmlviewfunctions.incrementheader(header_level), page_info) -<h2>Existing roles</h2> +htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, htmlviewfunctions.incrementheader(header_level)) +%> <table id="list" class="tablesorter"><thead> <tr><th>Role</th><th>Action</th></tr> </thead><tbody> |