Commit d77bf960 authored by Ted Trask's avatar Ted Trask

Fix issues with tablesorter sorting

parent 7dad3b2d
......@@ -6,13 +6,13 @@ html = require("acf.html")
<%
function convertsize(size)
if string.find(size, "k$") then
return tonumber(string.match(size, "%d*")) * 1024
elseif string.find(string.match(size, "%d*"), "M$") then
return tonumber(size) * 1024 * 1024
return tonumber(string.match(size, "[%d.]*")) * 1024.0
elseif string.find(size, "M$") then
return tonumber(string.match(size, "[%d.]*")) * 1024.0 * 1024.0
elseif string.find(size, "G$") then
return tonumber(string.match(size, "%d*")) + 1024 * 1024 * 1024
return tonumber(string.match(size, "[%d.]*")) + 1024.0 * 1024.0 * 1024.0
else
return tonumber(size)
return tonumber(string.match(size, "[%d.]*"))
end
end
%>
......
......@@ -80,7 +80,7 @@ end
}
$(function(){
$("#loglist").tablesorter({headers: {0:{sorter: false}, 1:{sorter: 'text'}, 5:{sorter: false}, 6:{sorter: false}, 7:{sorter: false}}, widgets: ['zebra']});
$("#loglist").tablesorter({headers: {0:{sorter: false}, 1:{sorter: 'text'}}, widgets: ['zebra']});
$('#chkHead').click(clickhead);
$('.chktbl').click(clicktable);
<% if data.value.focus.value ~= "" then %>
......@@ -188,9 +188,9 @@ end %>
<td <% if data.value.clientip.value == watch.clientip then %> style="font-weight:bold;" <% end %> ><%= html.html_escape(watch.clientip) %></td>
<td <% if data.value.clientuserid.value == watch.clientuserid then %> style="font-weight:bold;" <% end %> ><%= html.html_escape(watch.clientuserid) %></td>
<td><%= html.html_escape(watch.bytes) %></td>
<td><% if watch.badyesno ~= "0" then %><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/dodgy.png' width='13' height='13'><% end %></td>
<td><% if watch.deniedyesno ~= "0" then %> <img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/denied.png' width='13' height='13'><% end %></td>
<td><% if watch.bypassyesno ~= "0" then %> <img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/bypass.png' width='13' height='13'><% end %></td>
<td><span style="display:none"><%= html.html_escape(watch.badyesno) %></span><% if watch.badyesno ~= "0" then %><img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/dodgy.png' width='13' height='13'><% end %></td>
<td><span style="display:none"><%= html.html_escape(watch.deniedyesno) %></span><% if watch.deniedyesno ~= "0" then %> <img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/denied.png' width='13' height='13'><% end %></td>
<td><span style="display:none"><%= html.html_escape(watch.bypassyesno) %></span><% if watch.bypassyesno ~= "0" then %> <img src='<%= html.html_escape(page_info.wwwprefix..page_info.staticdir) %>/bypass.png' width='13' height='13'><% end %></td>
<td><%= html.html_escape(watch.score) %></td>
<td<% if (watch.shortreason and watch.shortreason ~= "" and watch.reason and watch.reason ~= "") then %> title="<%= html.html_escape(watch.reason) %>"<% end %>>
<% if (watch.shortreason and watch.shortreason ~= "") then %>
......
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