summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2014-03-10 00:51:27 +0000
committerTed Trask <ttrask01@yahoo.com>2014-03-10 00:51:27 +0000
commit0d13dbbc43b7c48eb23246cf4f2c277cbb5942c3 (patch)
treebcb619130450f6f19c40cb50f79111b9793e5e81
parentc7a4b3984140613848d090e8b4d7839e4ffcb26f (diff)
downloadacf-core-0d13dbbc43b7c48eb23246cf4f2c277cbb5942c3.tar.bz2
acf-core-0d13dbbc43b7c48eb23246cf4f2c277cbb5942c3.tar.xz
Modified HTML views to use new htmlviewfunctions functions and replace links with forms created by displayitem
Use .displayitemstart/middle/end
-rw-r--r--app/acf-util/password-status-html.lsp24
-rw-r--r--app/acf-util/roles-model.lua2
-rw-r--r--app/acf-util/roles-viewroles-html.lsp24
-rw-r--r--app/filedetails-html.lsp3
4 files changed, 30 insertions, 23 deletions
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index 189cc63..cdb589d 100644
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -6,15 +6,16 @@
<%
local header_level = htmlviewfunctions.displayheader(form, page_info)
-local newaccount = cfe({ type="link", value={}, label="Create New Account", option="Create", action=page_info.script..page_info.prefix..page_info.controller.."/newuser" })
-newaccount.value.redir = cfe({ type="hidden", value=page_info.orig_action })
-htmlviewfunctions.displayitem(newaccount, htmlviewfunctions.incrementheader(header_level), page_info)
+header_level = 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.displayheader(cfe({label="Existing Accounts"}), page_info, htmlviewfunctions.incrementheader(header_level))
+htmlviewfunctions.displayheader(cfe({label="Existing Accounts"}), page_info, header_level)
for i,user in ipairs(form.value) do
- local name = html.html_escape(user.value.userid.value) %>
- <div class='item'><p class='left'><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/tango/16x16/apps/system-users.png' height='16' width='16'> <%= name %></p>
- <div class='right'>
+ local name = html.html_escape(user.value.userid.value)
+ htmlviewfunctions.displayitemstart() %>
+ <img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/tango/16x16/apps/system-users.png' height='16' width='16'> <%= name %>
+ <% htmlviewfunctions.displayitemmiddle() %>
<table><tbody>
<tr>
<td style='border:none;'><b><%= html.html_escape(user.value.userid.label) %></b></td>
@@ -28,11 +29,12 @@ for i,user in ipairs(form.value) do
</tr><tr>
<td style='border:none;'><b>Option</b></td>
<td style='border:none;'>
- [<a href='edituser?userid=<%= name %>&redir=<%= html.html_escape(page_info.orig_action) %>'>Edit this account</a>]
- [<a href='deleteuser?userid=<%= name %>&submit=true'>Delete this account</a>]
- [<a href='<%= html.html_escape(page_info.script) %>/acf-util/roles/viewuserroles?userid=<%= name %>'>View roles for this account</a>]
+ <% 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) %>
</td>
</tr>
</tbody></table>
- </div></div><!-- end .item -->
+ <% htmlviewfunctions.displayitemend() %>
<% end %>
diff --git a/app/acf-util/roles-model.lua b/app/acf-util/roles-model.lua
index fc2634a..943e786 100644
--- a/app/acf-util/roles-model.lua
+++ b/app/acf-util/roles-model.lua
@@ -10,7 +10,7 @@ mymodule.get_user_roles = function(self, userid)
local userinfo = authenticator.get_userinfo(self, userid) or {}
rls = cfe({ type="list", value=userinfo.roles or {}, label="Roles" })
permissions = cfe({ type="table", value=roles.get_roles_perm(self, rls.value), label="Permissions" })
- return cfe({ type="group", value={roles=rls, permissions=permissions} })
+ return cfe({ type="group", value={roles=rls, permissions=permissions}, label="Roles/Permission list for "..userid })
end
-- Return permissions for specified role
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 383dd57..32593a4 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -24,11 +24,11 @@
<%
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)
+header_level = 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.displayheader(cfe({label="Existing Roles"}), page_info, htmlviewfunctions.incrementheader(header_level))
+htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, header_level)
%>
<table id="list" class="tablesorter"><thead>
<tr><th>Role</th><th>Action</th></tr>
@@ -37,9 +37,12 @@ htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, htmlvi
<% for x,role in pairs(view.value.defined_roles.value) do %>
<tr><td><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/tango/16x16/apps/system-users.png' height='16' width='16'> <%= html.html_escape(role) %></td>
<td>
- [<a href='viewroleperms?role=<%= html.html_escape(role) %>'>View this role</a>]
- [<a href='editrole?role=<%= html.html_escape(role) %>&redir=<%= html.html_escape(page_info.orig_action) %>'>Edit this role</a>]
- [<a href='deleterole?role=<%= html.html_escape(role) %>&submit=true'>Delete this role</a>]
+ <%
+ 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)
+ %>
</td></tr>
<% end %>
<% end %>
@@ -47,8 +50,11 @@ htmlviewfunctions.displayheader(cfe({label="Existing Roles"}), page_info, htmlvi
<% for x,role in pairs(view.value.default_roles.value) do %>
<tr><td><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/tango/16x16/categories/applications-system.png' height='16' width='16'> <%= html.html_escape(role) %></td>
<td>
- [<a href='viewroleperms?role=<%= html.html_escape(role) %>'>View this role</a>]
- [<a href='editrole?role=<%= html.html_escape(role) %>&redir=<%= html.html_escape(page_info.orig_action) %>'>Edit this role</a>]
+ <%
+ 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)
+ %>
</td></tr>
<% end %>
<% end %>
diff --git a/app/filedetails-html.lsp b/app/filedetails-html.lsp
index 3116722..fd0d8dd 100644
--- a/app/filedetails-html.lsp
+++ b/app/filedetails-html.lsp
@@ -25,8 +25,7 @@ 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)
+ htmlviewfunctions.displayformstart(form, page_info)
form.value.filename.type = "hidden"
htmlviewfunctions.displayformitem(form.value.filename)
end