diff options
author | Ted Trask <ttrask01@yahoo.com> | 2014-06-28 20:59:24 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2014-06-28 20:59:24 +0000 |
commit | 2e9893a02d83e1b0c93756ae16dd67e91ef5f2c3 (patch) | |
tree | b923ebb184e01971e87e8aef4ee5fb81447751ea | |
parent | 57f6d90ad110cff20b54506105a36241f69b25b9 (diff) | |
download | acf-db-2e9893a02d83e1b0c93756ae16dd67e91ef5f2c3.tar.bz2 acf-db-2e9893a02d83e1b0c93756ae16dd67e91ef5f2c3.tar.xz |
Cleanup HTML including removing DL/DT/DD, use tablesorter where possible, use lowercase tags, remove styling, and use new htmlviewfunctions functions
-rw-r--r-- | db-listdatabases-html.lsp | 59 | ||||
-rw-r--r-- | db-listtables-html.lsp | 64 | ||||
-rw-r--r-- | db-viewtable-html.lsp | 70 |
3 files changed, 134 insertions, 59 deletions
diff --git a/db-listdatabases-html.lsp b/db-listdatabases-html.lsp index 4fd9362..b4c6694 100644 --- a/db-listdatabases-html.lsp +++ b/db-listdatabases-html.lsp @@ -1,19 +1,50 @@ <% local form, viewlibrary, page_info, session = ... %> -<% require("htmlviewfunctions") %> +<% htmlviewfunctions = require("htmlviewfunctions") %> <% html = require("acf.html") %> -<H1><%= html.html_escape(form.label) %></H1> -<DL> -<% if form.errtxt then %><P CLASS='error'><%= string.gsub(html.html_escape(form.errtxt), "\n", "<BR>") %></P><% end %> -<% for i,database in ipairs(form.value) do %> - <li> - <% if viewlibrary.check_permission("listtables") then %> - <%= html.link{value = "listtables?database=" .. database, label=database} %> - <% else %> - <%= html.html_escape(database) %> - <% end %> +<% if #form.value>0 then %> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + $(document).ready(function() { + $("#listdatabases").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']}); + }); +</script> +<% end %> + +<% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %> +<% htmlviewfunctions.displayinfo(form) %> +<% if #form.value>0 then %> +<table id="listdatabases" class="tablesorter"><thead> + <tr> + <th>Action</th> + <th>Database</th> + </tr> +</thead><tbody> +<% local database = cfe({ type="hidden" }) %> +<% for i,dbase in ipairs(form.value) do %> + <% database.value = dbase %> + <tr> + <td> + <% if viewlibrary.check_permission("listtables") then %> + <% htmlviewfunctions.displayitem(cfe({type="link", value={database=database}, label="", option="View", action="listtables"}), page_info, -1) %> + <% end %> + </td> + <td><%= html.html_escape(dbase) %></td> + </tr> <% end %> -<% if #form.value == 0 then %> -No databases found +</tbody></table> +<% else %> +<p>No databases found</p> <% end %> -</DL> +<% htmlviewfunctions.displaysectionend(header_level) %> diff --git a/db-listtables-html.lsp b/db-listtables-html.lsp index fec3ac4..23ecfc4 100644 --- a/db-listtables-html.lsp +++ b/db-listtables-html.lsp @@ -1,24 +1,54 @@ <% local form, viewlibrary, page_info, session = ... %> -<% require("htmlviewfunctions") %> +<% htmlviewfunctions = require("htmlviewfunctions") %> <% html = require("acf.html") %> +<% if #form.value>0 then %> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + $(document).ready(function() { + $("#listtables").tablesorter({headers: {0:{sorter: false}}, widgets: ['zebra']}); + }); +</script> +<% end %> + <% htmlviewfunctions.displaycommandresults({"createdatabase"}, session) %> -<H1><%= html.html_escape(form.label) %></H1> -<DL> -<% for i,table in ipairs(form.value) do %> - <li> - <% if viewlibrary.check_permission("viewtable") then %> - <%= html.link{value = "viewtable?table=" .. table, label=table} %> - <% else %> - <%= html.html_escape(table) %> - <% end %> +<% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %> +<% htmlviewfunctions.displayinfo(form) %> +<% if #form.value>0 then %> +<table id="listtables" class="tablesorter"><thead> + <tr> + <th>Action</th> + <th>Table</th> + </tr> +</thead><tbody> +<% local table = cfe({ type="hidden" }) %> +<% for i,tab in ipairs(form.value) do %> + <% table.value = tab %> + <tr> + <td> + <% if viewlibrary.check_permission("viewtable") then %> + <% htmlviewfunctions.displayitem(cfe({type="link", value={table=table}, label="", option="View", action="viewtable"}), page_info, -1) %> + <% end %> + </td> + <td><%= html.html_escape(tab) %></td> + </tr> <% end %> -<% if #form.value == 0 and viewlibrary.check_permission("createdatabase") then %> -<DT>Create Database</DT><DD> -<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/createdatabase") %>"> -<input class="submit" type="submit" name="submit" value="Create"></DD> -</form> -</DD> +</tbody></table> +<% elseif viewlibrary.check_permission("createdatabase") then %> + <% htmlviewfunctions.displayitem(cfe({type="form", value={}, label="Create Database", option="Create", action="createdatabase" }), page_info, 0) %> +<% else %> +<p>No tables found</p> <% end %> -</DL> +<% htmlviewfunctions.displaysectionend(header_level) %> diff --git a/db-viewtable-html.lsp b/db-viewtable-html.lsp index e1531d0..1d64ece 100644 --- a/db-viewtable-html.lsp +++ b/db-viewtable-html.lsp @@ -1,54 +1,68 @@ <% local form, viewlibrary, page_info, session = ... %> -<% require("htmlviewfunctions") %> +<% htmlviewfunctions = require("htmlviewfunctions") %> <% html = require("acf.html") %> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + $(document).ready(function() { + $("#list").tablesorter({widgets: ['zebra']}); + $(".deletetableentry").click(function(){ return confirm("Are you sure you want to delete this entry?")}); + }); +</script> + <% htmlviewfunctions.displaycommandresults({"deletetableentry", "updatetableentry"}, session) %> <% htmlviewfunctions.displaycommandresults({"createtableentry"}, session, true) %> -<H1><%= html.html_escape(form.label) %> - <%= html.html_escape(form.value.table.value) %></H1> -<DL> -<TABLE> - <TR style="background:#eee;font-weight:bold;"> +<% form.label = form.label.." - "..form.value.table.value %> +<% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %> +<table id="list" class="tablesorter"><thead> + <tr> <% if viewlibrary.check_permission("deletetableentry") or viewlibrary.check_permission("updatetableentry") then %> - <TD style="padding-right:20px;white-space:nowrap;" class="header">Action</TD> + <th>Action</th> <% end %> <% for i,f in ipairs(form.value.fields.value) do %> - <TD style="padding-right:20px;white-space:nowrap;" class="header"><%= html.html_escape(f) %></TD> + <th><%= html.html_escape(f) %></th> <% end %> - </TR> - + </tr> +</thead><tbody> +<% local redir = cfe({ type="hidden", value=page_info.orig_action.."?table="..form.value.table.value }) %> +<% local table = cfe({ type="hidden", value=form.value.table.value }) %> +<% local id = cfe({ type="hidden" }) %> <% for i,tableentry in ipairs(form.value.entries.value) do %> - <TR> + <tr> <% if viewlibrary.check_permission("deletetableentry") or viewlibrary.check_permission("updatetableentry") then %> - <TD style="padding-right:20px;white-space:nowrap;"> + <% id.value = tableentry.id %> + <td> <% if viewlibrary.check_permission("updatetableentry") then %> - <form action="updatetableentry" method="POST"> - <input class="hidden" type="hidden" name="table" value="<%= html.html_escape(form.value.table.value) %>"> - <input class="hidden" type="hidden" name="id" value="<%= html.html_escape(tableentry.id) %>"> - <input class="hidden" type="hidden" name="redir" value="<%= html.html_escape(page_info.orig_action.."?table="..form.value.table.value) %>"> - <input class="submit" type="submit" value="Update"></form> + <% htmlviewfunctions.displayitem(cfe({type="link", value={table=table, id=id, redir=redir}, label="", option="Update", action="updatetableentry"}), page_info, -1) %> <% end %> <% if viewlibrary.check_permission("deletetableentry") then %> - <form action="deletetableentry" method="POST"> - <input class="hidden" type="hidden" name="table" value="<%= html.html_escape(form.value.table.value) %>"> - <input class="hidden" type="hidden" name="id" value="<%= html.html_escape(tableentry.id) %>"> - <input class="submit" type="submit" name="submit" value="Delete"></form> + <% htmlviewfunctions.displayitem(cfe({type="form", value={table=table, id=id}, label="", option="Delete", action="deletetableentry", class="deletetableentry"}), page_info, -1) %> <% end %> - </TD> + </td> <% end %> <% for i,f in ipairs(form.value.fields.value) do %> - <TD><%= html.html_escape(tableentry[f]) %></TD> + <td><%= html.html_escape(tableentry[f]) %></td> <% end %> - </TR> -<% end %> -</TABLE> -<% if form.errtxt then %> -<p class="error"><%= html.html_escape(form.errtxt) %></p> + </tr> <% end %> +</tbody></table> +<% htmlviewfunctions.displayinfo(form) %> <% if #form.value.entries.value == 0 then %> <p>No entries found</p> <% end %> -</DL> +<% htmlviewfunctions.displaysectionend(header_level) %> <% if page_info.action == "viewtable" and viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("createtableentry") then viewlibrary.dispatch_component("createtableentry", {table=form.value.table.value}) |