diff --git a/gui/slick/js/core.js b/gui/slick/js/core.js index 2fb725650a49a358b5f11dc53e20c34cac136e50..376e8a63dfd60b72b423f8185bc6df97b8beb4fa 100644 --- a/gui/slick/js/core.js +++ b/gui/slick/js/core.js @@ -2236,6 +2236,23 @@ var SICKRAGE = { }, postProcess: function() { $('#episodeDir').fileBrowser({ title: 'Select Unprocessed Episode Folder', key: 'postprocessPath' }); + }, + status: function() { + $("#schedulerStatusTable").tablesorter({ + widgets: ['saveSort', 'zebra'], + textExtraction: { + 5: function(node) { return $(node).data('seconds'); }, + 6: function(node) { return $(node).data('seconds'); } + }, + headers: { + 5: { sorter: 'digit' }, + 6: { sorter: 'digit' } + } + }); + $("#queueStatusTable").tablesorter({ + widgets: ['saveSort', 'zebra'], + sortList: [[3,0], [4,0], [2,1]] + }); } }, manage: { diff --git a/gui/slick/js/core.min.js b/gui/slick/js/core.min.js index 760b08a88b139929b632e36e4cbb084ab59dc2be..f903506d2b0ab222b3add749dd85ad68fcb12026 100644 Binary files a/gui/slick/js/core.min.js and b/gui/slick/js/core.min.js differ diff --git a/gui/slick/js/new/status.js b/gui/slick/js/new/status.js deleted file mode 100644 index 3c3c461cd66050c43490bd4083a0db5ee59e5a8a..0000000000000000000000000000000000000000 --- a/gui/slick/js/new/status.js +++ /dev/null @@ -1,9 +0,0 @@ -$(document).ready(function() { - $("#schedulerStatusTable").tablesorter({ - widgets: ['saveSort', 'zebra'] - }); - $("#queueStatusTable").tablesorter({ - widgets: ['saveSort', 'zebra'], - sortList: [[3,0], [4,0], [2,1]] - }); -}); diff --git a/gui/slick/views/status.mako b/gui/slick/views/status.mako index 9162b62ae9314a18a10554983c4dca2e7169a996..35ae7ec4181fe18f6e8e470df95e6d1d78cf2288 100644 --- a/gui/slick/views/status.mako +++ b/gui/slick/views/status.mako @@ -95,10 +95,10 @@ <td align="right"></td> % endif <% cycleTime = (service.cycleTime.microseconds + (service.cycleTime.seconds + service.cycleTime.days * 24 * 3600) * 10**6) / 10**6 %> - <td align="right">${helpers.pretty_time_delta(cycleTime)}</td> + <td align="right" data-seconds="${cycleTime}">${helpers.pretty_time_delta(cycleTime)}</td> % if service.enable: <% timeLeft = (service.timeLeft().microseconds + (service.timeLeft().seconds + service.timeLeft().days * 24 * 3600) * 10**6) / 10**6 %> - <td align="right">${helpers.pretty_time_delta(timeLeft)}</td> + <td align="right" data-seconds="${timeLeft}">${helpers.pretty_time_delta(timeLeft)}</td> % else: <td></td> % endif diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index c35ab144898ce169d9cfd2fee6840a69b84f7804..9f07ec9059ec5d7e2803ad935ddda57cc3763477 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -1077,7 +1077,8 @@ class Home(WebRoot): rootDir[subject] = helpers.getDiskSpaceUsage(subject) t = PageTemplate(rh=self, filename="status.mako") - return t.render(title='Status', header='Status', topmenu='system', tvdirFree=tvdirFree, rootDir=rootDir) + return t.render(title='Status', header='Status', topmenu='system', tvdirFree=tvdirFree, rootDir=rootDir, + controller="home", action="status") def shutdown(self, pid=None): if not Shutdown.stop(pid):