diff options
| -rw-r--r-- | did-editdefinition-html.lsp | 6 | ||||
| -rw-r--r-- | did-html.lsp | 4 | ||||
| -rw-r--r-- | did-status-html.lsp | 22 | ||||
| -rw-r--r-- | did-viewactivitylog-html.lsp | 3 |
4 files changed, 23 insertions, 12 deletions
diff --git a/did-editdefinition-html.lsp b/did-editdefinition-html.lsp index ef4af3e..8eaa2a7 100644 --- a/did-editdefinition-html.lsp +++ b/did-editdefinition-html.lsp @@ -101,7 +101,6 @@ require("json") <H1><%= html.html_escape(form.label) %></H1> <% displayformstart(form, page_info) %> -<DL> <% local order = {"did", "description", "identification", "department", "rules"} if page_info.action == "editdefinition" then @@ -114,8 +113,11 @@ require("json") %> </DL> <H2>Rules</H2> -<div id="rules"> +<DL><div id="rules"> </div> <% if form.value.rules.errtxt then %><P CLASS='error'><%= string.gsub(html.html_escape(form.value.rules.errtxt), "\n", "<BR>") %></P><% end %> +</DL> +<H2>Save Changes</H2> +<DL> <% displayformend(form) %> diff --git a/did-html.lsp b/did-html.lsp index 5ebb4e1..1ed5ecd 100644 --- a/did-html.lsp +++ b/did-html.lsp @@ -25,6 +25,7 @@ function newPopup(url) { <% end %> <H1><%= html.html_escape(data.label) %></H1> +<DL> <% displaypagination(pagedata, page_info) %> <TABLE> <TR style="background:#eee;font-weight:bold;"> @@ -67,10 +68,9 @@ function newPopup(url) { <% end %> <% if session.permissions[page_info.controller].publishall then %> -<DL> <form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/publishall") %>"> <DT>Publish All DIDs</DT> <DD><input class="submit" type="submit" value="Publish"></DD> </form> -</DL> <% end %> +</DL> diff --git a/did-status-html.lsp b/did-status-html.lsp index 33c75b9..cf28312 100644 --- a/did-status-html.lsp +++ b/did-status-html.lsp @@ -5,23 +5,31 @@ require("viewfunctions") <% displaycommandresults({"createdatabase"}, session, true) %> <H1>DID Database Status</H1> +<DL> <% local status if viewlibrary and viewlibrary.dispatch_component then if session.permissions.postgresql and session.permissions.postgresql.status then status = viewlibrary.dispatch_component("postgresql/postgresql/status", nil, true) end -end -if status then %> -<p>Database is <%= status.value.status.value %> +end %> + +<DT>Database status</DT><DD> +<% if status then %> +<%= status.value.status.value %> <% else %> -<p>Database status unknown +Unknown <% end %> +</DD> +<DT>DID Database</DT><DD> <% if data.value then %> -<p>DID Database present +Present <% else %> -<p>DID Database missing +Missing +<% end %> +</DD> +</DL> + <% if viewlibrary and viewlibrary.dispatch_component then viewlibrary.dispatch_component("createdatabase") end %> -<% end %> diff --git a/did-viewactivitylog-html.lsp b/did-viewactivitylog-html.lsp index f5ab305..6499c7a 100644 --- a/did-viewactivitylog-html.lsp +++ b/did-viewactivitylog-html.lsp @@ -1,6 +1,6 @@ <% local data, viewlibrary, page_info, session = ... %> <H1><%= html.html_escape(data.label) %></H1> -<TABLE> +<DL><TABLE> <TR style="background:#eee;font-weight:bold;"> <TD style="padding-right:20px;white-space:nowrap;" class="header">Date</TD> <TD style="padding-right:20px;white-space:nowrap;" class="header">Message</TD> @@ -22,3 +22,4 @@ <% if #data.value == 0 then %> <p>No history found</p> <% end %> +</DL> |