Commit 2e9893a0 authored by Ted Trask's avatar Ted Trask

Cleanup HTML including removing DL/DT/DD, use tablesorter where possible, use...

Cleanup HTML including removing DL/DT/DD, use tablesorter where possible, use lowercase tags, remove styling, and use new htmlviewfunctions functions
parent 57f6d90a
<% local form, viewlibrary, page_info, session = ... %> <% local form, viewlibrary, page_info, session = ... %>
<% require("htmlviewfunctions") %> <% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %> <% html = require("acf.html") %>
<H1><%= html.html_escape(form.label) %></H1> <% if #form.value>0 then %>
<DL> <script type="text/javascript">
<% if form.errtxt then %><P CLASS='error'><%= string.gsub(html.html_escape(form.errtxt), "\n", "<BR>") %></P><% end %> if (typeof jQuery == 'undefined') {
<% for i,database in ipairs(form.value) do %> document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>');
<li> }
<% if viewlibrary.check_permission("listtables") then %> </script>
<%= html.link{value = "listtables?database=" .. database, label=database} %>
<% else %> <script type="text/javascript">
<%= html.html_escape(database) %> if (typeof $.tablesorter == 'undefined') {
<% end %> 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 %> <% end %>
<% if #form.value == 0 then %> </tbody></table>
No databases found <% else %>
<p>No databases found</p>
<% end %> <% end %>
</DL> <% htmlviewfunctions.displaysectionend(header_level) %>
<% local form, viewlibrary, page_info, session = ... %> <% local form, viewlibrary, page_info, session = ... %>
<% require("htmlviewfunctions") %> <% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %> <% 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) %> <% htmlviewfunctions.displaycommandresults({"createdatabase"}, session) %>
<H1><%= html.html_escape(form.label) %></H1> <% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %>
<DL> <% htmlviewfunctions.displayinfo(form) %>
<% for i,table in ipairs(form.value) do %> <% if #form.value>0 then %>
<li> <table id="listtables" class="tablesorter"><thead>
<% if viewlibrary.check_permission("viewtable") then %> <tr>
<%= html.link{value = "viewtable?table=" .. table, label=table} %> <th>Action</th>
<% else %> <th>Table</th>
<%= html.html_escape(table) %> </tr>
<% end %> </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 %> <% end %>
<% if #form.value == 0 and viewlibrary.check_permission("createdatabase") then %> </tbody></table>
<DT>Create Database</DT><DD> <% elseif viewlibrary.check_permission("createdatabase") then %>
<form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/createdatabase") %>"> <% htmlviewfunctions.displayitem(cfe({type="form", value={}, label="Create Database", option="Create", action="createdatabase" }), page_info, 0) %>
<input class="submit" type="submit" name="submit" value="Create"></DD> <% else %>
</form> <p>No tables found</p>
</DD>
<% end %> <% end %>
</DL> <% htmlviewfunctions.displaysectionend(header_level) %>
<% local form, viewlibrary, page_info, session = ... %> <% local form, viewlibrary, page_info, session = ... %>
<% require("htmlviewfunctions") %> <% htmlviewfunctions = require("htmlviewfunctions") %>
<% html = require("acf.html") %> <% 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({"deletetableentry", "updatetableentry"}, session) %>
<% htmlviewfunctions.displaycommandresults({"createtableentry"}, session, true) %> <% htmlviewfunctions.displaycommandresults({"createtableentry"}, session, true) %>
<H1><%= html.html_escape(form.label) %> - <%= html.html_escape(form.value.table.value) %></H1> <% form.label = form.label.." - "..form.value.table.value %>
<DL> <% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %>
<TABLE> <table id="list" class="tablesorter"><thead>
<TR style="background:#eee;font-weight:bold;"> <tr>
<% if viewlibrary.check_permission("deletetableentry") or viewlibrary.check_permission("updatetableentry") then %> <% 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 %> <% end %>
<% for i,f in ipairs(form.value.fields.value) do %> <% 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 %> <% 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 %> <% for i,tableentry in ipairs(form.value.entries.value) do %>
<TR> <tr>
<% if viewlibrary.check_permission("deletetableentry") or viewlibrary.check_permission("updatetableentry") then %> <% 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 %> <% if viewlibrary.check_permission("updatetableentry") then %>
<form action="updatetableentry" method="POST"> <% htmlviewfunctions.displayitem(cfe({type="link", value={table=table, id=id, redir=redir}, label="", option="Update", action="updatetableentry"}), page_info, -1) %>
<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>
<% end %> <% end %>
<% if viewlibrary.check_permission("deletetableentry") then %> <% if viewlibrary.check_permission("deletetableentry") then %>
<form action="deletetableentry" method="POST"> <% htmlviewfunctions.displayitem(cfe({type="form", value={table=table, id=id}, label="", option="Delete", action="deletetableentry", class="deletetableentry"}), page_info, -1) %>
<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>
<% end %> <% end %>
</TD> </td>
<% end %> <% end %>
<% for i,f in ipairs(form.value.fields.value) do %> <% 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 %> <% end %>
</TR> </tr>
<% end %>
</TABLE>
<% if form.errtxt then %>
<p class="error"><%= html.html_escape(form.errtxt) %></p>
<% end %> <% end %>
</tbody></table>
<% htmlviewfunctions.displayinfo(form) %>
<% if #form.value.entries.value == 0 then %> <% if #form.value.entries.value == 0 then %>
<p>No entries found</p> <p>No entries found</p>
<% end %> <% end %>
</DL> <% htmlviewfunctions.displaysectionend(header_level) %>
<% if page_info.action == "viewtable" and viewlibrary and viewlibrary.dispatch_component and viewlibrary.check_permission("createtableentry") then <% 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}) viewlibrary.dispatch_component("createtableentry", {table=form.value.table.value})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment