From a15984cf2eacb65eed22a39cacc9641a7b39032a Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Fri, 25 Apr 2014 07:00:06 +0000
Subject: Changes to use new htmlviewfunctions functions

---
 tinydns-listpermissions-html.lsp | 59 ++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 18 deletions(-)

(limited to 'tinydns-listpermissions-html.lsp')

diff --git a/tinydns-listpermissions-html.lsp b/tinydns-listpermissions-html.lsp
index 0662aba..eb7ecc6 100644
--- a/tinydns-listpermissions-html.lsp
+++ b/tinydns-listpermissions-html.lsp
@@ -16,37 +16,60 @@
 
 <script type="text/javascript">
 	$(document).ready(function() {
-		$("#userlist").tablesorter({widgets: ['zebra']});
-		$("#rolelist").tablesorter({widgets: ['zebra']});
+		$("#userlist").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']});
+		$("#rolelist").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']});
 	});
 </script>
 
 <% htmlviewfunctions.displaycommandresults({"edituserpermissions", "editrolepermissions"}, session) %>
 
-<h1><%= html.html_escape(view.label) %></h1>
-
-<h2>User Permissions</h2>
+<% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
+<% local header_level2 = htmlviewfunctions.displaysectionstart(cfe({label="User Permissions"}), page_info, htmlviewfunctions.incrementheader(header_level)) %>
 <table id="userlist" class="tablesorter"><thead>
-<tr><th>User</th><th>Permissions</th>
+	<tr>
+		<th>Action</th>
+		<th>User</th>
+		<th>Permissions</th>
+	</tr>
 </thead><tbody>
+<% local userid = cfe({ type="hidden", value="" }) %>
+<% local redir = cfe({ type="hidden", value=page_info.orig_action }) %>
 <% for i,user in ipairs(view.value.user) do %>
-	<tr><td><%= html.link{value=page_info.script .. page_info.prefix .. page_info.controller .. "/edituserpermissions?userid=" .. user.id .. "&redir="..page_info.orig_action, label=user.id} %></td><td>
-	<% for y,allowed in pairs(user.allowed) do
-		print(html.html_escape(allowed), "<br/>")
-	end %>
-	</td></tr>
+	<% userid.value = user.id %>
+	<tr>
+		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={userid=userid, redir=redir}, label="", option="Edit", action="edituserpermissions"}), page_info, -1) %></td>
+		<td><%= html.html_escape(user.id) %></td>
+		<td>
+		<% for y,allowed in pairs(user.allowed) do
+			print(html.html_escape(allowed), "<br/>")
+		end %>
+		</td>
+	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
 
-<h2>Role Permissions</h2>
+<% htmlviewfunctions.displaysectionstart(cfe({label="Role Permissions"}), page_info, header_level2) %>
 <table id="rolelist" class="tablesorter"><thead>
-<tr><th>Role</th><th>Permissions</th>
+	<tr>
+		<th>Action</th>
+		<th>Role</th>
+		<th>Permissions</th>
+	</tr>
 </thead><tbody>
+<% local rolecfe = cfe({ type="hidden", value="" }) %>
 <% for i,role in ipairs(view.value.role) do %>
-	<tr><td><%= html.link{value=page_info.script .. page_info.prefix .. page_info.controller .. "/editrolepermissions?role=" .. role.id .. "&redir="..page_info.orig_action, label=role.id} %></td><td>
-	<% for y,allowed in pairs(role.allowed) do
-		print(html.html_escape(allowed), "<br/>")
-	end %>
-	</td></tr>
+	<% rolecfe.value = role.id %>
+	<tr>
+		<td><% htmlviewfunctions.displayitem(cfe({type="link", value={role=rolecfe, redir=redir}, label="", option="Edit", action="editrolepermissions"}), page_info, -1) %></td>
+		<td><%= html.html_escape(role.id) %></td>
+		<td>
+		<% for y,allowed in pairs(role.allowed) do
+			print(html.html_escape(allowed), "<br/>")
+		end %>
+		</td>
+	</tr>
 <% end %>
 </tbody></table>
+<% htmlviewfunctions.displaysectionend(header_level2) %>
+<% htmlviewfunctions.displaysectionend(header_level) %>
-- 
cgit v1.2.3