diff options
author | Ted Trask <ttrask01@yahoo.com> | 2009-12-10 15:28:22 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2009-12-10 15:28:22 +0000 |
commit | 301d65975de493a790a970445595f50ac12d41dd (patch) | |
tree | 195ff62dff78fda92024e06ae3c64d036747a4aa | |
parent | 5fb5da5efb77f3a64586cafd80b1fbfade2fb009 (diff) | |
download | acf-tinydns-301d65975de493a790a970445595f50ac12d41dd.tar.bz2 acf-tinydns-301d65975de493a790a970445595f50ac12d41dd.tar.xz |
UI fix, bumped to 0.3.2v0.3.2
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | tinydns-listfiles-html.lsp | 6 | ||||
-rw-r--r-- | tinydns-listpermissions-html.lsp | 8 | ||||
-rw-r--r-- | tinydns-model.lua | 6 | ||||
-rw-r--r-- | tinydns-view-html.lsp | 2 |
5 files changed, 17 insertions, 7 deletions
@@ -1,6 +1,6 @@ APP_NAME=tinydns PACKAGE=acf-$(APP_NAME) -VERSION=0.3.1 +VERSION=0.3.2 APP_DIST=\ tinydns* \ diff --git a/tinydns-listfiles-html.lsp b/tinydns-listfiles-html.lsp index 8cf7656..72e3311 100644 --- a/tinydns-listfiles-html.lsp +++ b/tinydns-listfiles-html.lsp @@ -7,7 +7,7 @@ require("viewfunctions") <h1>Configuration</h1> <h2>Edit/View existing Domains</h2> -<TABLE> +<DL><TABLE> <TR style="background:#eee;font-weight:bold;"> <TD style="padding-right:20px;white-space:nowrap;text-align:left;" class="header">Action</TD> <TD style="padding-right:20px;white-space:nowrap;text-align:right;" class="header">Size</TD> @@ -30,6 +30,10 @@ require("viewfunctions") </TR> <% end %> </TABLE> +<% if #form.value == 0 then %> + No domains defined +<% end %> +</DL> <% if viewlibrary and viewlibrary.dispatch_component and session.permissions[page_info.controller].newfile then local newfileform = viewlibrary.dispatch_component("newfile", nil, true) %> diff --git a/tinydns-listpermissions-html.lsp b/tinydns-listpermissions-html.lsp index 55d09b5..608e7c5 100644 --- a/tinydns-listpermissions-html.lsp +++ b/tinydns-listpermissions-html.lsp @@ -9,7 +9,7 @@ <H1><%= html.html_escape(view.label) %></H1> <H2>User Permissions</H2> -<TABLE> +<DL><TABLE> <TR><TD CLASS='header'>User</TD><TD CLASS='header'>Permissions</TD> <% 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> @@ -18,10 +18,10 @@ end %> <TD></TR> <% end %> -</TABLE> +</TABLE></DL> <H2>Role Permissions</H2> -<TABLE> +<DL><TABLE> <TR><TD CLASS='header'>Role</TD><TD CLASS='header'>Permissions</TD> <% 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> @@ -30,4 +30,4 @@ end %> <TD></TR> <% end %> -</TABLE> +</TABLE></DL> diff --git a/tinydns-model.lua b/tinydns-model.lua index 6da055f..5a59c89 100644 --- a/tinydns-model.lua +++ b/tinydns-model.lua @@ -381,6 +381,9 @@ function getuserpermissions(self, userid) local cnffile = {} recursedir(configdir, cnffile) local allowed = cfe({ type="multi", value=allowedlist, label="TinyDNS Permissions", option=cnffile, descr="If no permissions are defined, then all are allowed" }) + if #cnffile == 0 then + allowed.errtxt = "No domains defined" + end local user = cfe({ value=userid, label="User Name" }) local output = cfe({ type="group", value={userid=user, allowed=allowed}, label="TinyDNS Permissions" }) validateuserpermissions(self, output) @@ -405,6 +408,9 @@ function getrolepermissions(self, role) local cnffile = {} recursedir(configdir, cnffile) local allowed = cfe({ type="multi", value=allowedlist, label="TinyDNS Permissions", option=cnffile, descr="If no permissions are defined, then all are allowed" }) + if #cnffile == 0 then + allowed.errtxt = "No domains defined" + end local rol = cfe({ value=role, label="Role" }) local output = cfe({ type="group", value={role=rol, allowed=allowed}, label="TinyDNS Permissions" }) validaterolepermissions(self, output) diff --git a/tinydns-view-html.lsp b/tinydns-view-html.lsp index 35052ab..0c72d72 100644 --- a/tinydns-view-html.lsp +++ b/tinydns-view-html.lsp @@ -110,8 +110,8 @@ end %> <H2>Records</H2> -<form id="filter-list">Filter: <input name="filter" id="filter" value="" maxlength="30" size="30" type="text"></form> <DL id="records"> +<form id="filter-list">Filter: <input name="filter" id="filter" value="" maxlength="30" size="30" type="text"></form> <ul> <% local indent = {} for j,entry in ipairs(view.value) do |