diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2009-09-07 15:11:21 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2009-09-07 15:11:21 +0000 |
| commit | 339b03b28881dbd1370071918433ccc75279d81b (patch) | |
| tree | 858b00b812611e1cb78ff9c61944e6a06bf3b15f | |
| parent | 1acd3b8975e1a26ab93a2e3a157da3fd820b7893 (diff) | |
| download | acf-core-339b03b28881dbd1370071918433ccc75279d81b.tar.bz2 acf-core-339b03b28881dbd1370071918433ccc75279d81b.tar.xz | |
Put viewroles in a table, changed some wording for new roles and users.
| -rwxr-xr-x | app/acf-util/password-controller.lua | 2 | ||||
| -rwxr-xr-x | app/acf-util/password-status-html.lsp | 2 | ||||
| -rw-r--r-- | app/acf-util/roles-controller.lua | 2 | ||||
| -rw-r--r-- | app/acf-util/roles-viewroles-html.lsp | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/acf-util/password-controller.lua b/app/acf-util/password-controller.lua index b2fab85..8260d82 100755 --- a/app/acf-util/password-controller.lua +++ b/app/acf-util/password-controller.lua @@ -60,7 +60,7 @@ function newuser(self) return self.model.read_user(self) end, function(value) return self.model.create_user(self, value) - end, self.clientdata, "Save", "New User Settings", "Saved user") + end, self.clientdata, "Create", "Create New User", "Created user") end function deleteuser(self) diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp index 714dfae..045d770 100755 --- a/app/acf-util/password-status-html.lsp +++ b/app/acf-util/password-status-html.lsp @@ -14,7 +14,7 @@ io.write("</span>") <H2>Create new account</H2> <form action="<%= page_info.script .. page_info.prefix .. page_info.controller %>/newuser" method="POST"> <input class="hidden" type="hidden" name="redir" value="<%= html.html_escape(page_info.orig_action) %>" > -<dl><dt></dt><dd><input class="submit" type="submit" value="New User"></dd></dl> +<dl><dt></dt><dd><input class="submit" type="submit" value="Create"></dd></dl> </form> <H2>Existing account</H2> <DL> diff --git a/app/acf-util/roles-controller.lua b/app/acf-util/roles-controller.lua index 738f54f..27ddef7 100644 --- a/app/acf-util/roles-controller.lua +++ b/app/acf-util/roles-controller.lua @@ -47,7 +47,7 @@ newrole = function(self) return controllerfunctions.handle_form(self, function() return self.model.getpermissions(self) end, function(value) return self.model.setpermissions(self, value, true) end, - self.clientdata, "Save", "Create New Role", "New Role Created") + self.clientdata, "Create", "Create New Role", "New Role Created") end editrole = function(self) diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp index 46fdfc2..9575ac6 100644 --- a/app/acf-util/roles-viewroles-html.lsp +++ b/app/acf-util/roles-viewroles-html.lsp @@ -11,20 +11,20 @@ <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) %>" > -<dl><dt></dt><dd><input class="submit" type="submit" value="New Role"></dd></dl> +<dl><dt></dt><dd><input class="submit" type="submit" value="Create"></dd></dl> </form> <H2>Existing roles</H2> <% if view.value.default_roles then %> - <dl> + <table> <% for x,role in pairs(view.value.default_roles.value) do %> - <dt><img src='/skins/static/tango/16x16/categories/applications-system.png' height='16' width='16'> <%= html.html_escape(role) %></dt> + <tr><td><dt><img src='/skins/static/tango/16x16/categories/applications-system.png' height='16' width='16'> <%= html.html_escape(role) %></dt> <dd> [<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>] - </dd> + </dd></td></tr> <% end %> - </dl> + </table> <% end %> <% if view.value.defined_roles then %> <dl> |