diff --git a/gui/slick/js/core.js b/gui/slick/js/core.js index f9da9cabcc0b18c97d19bab4ead0ca862a2e1e46..395d51627cd4b127c15754757d9a4d2745bb2a60 100644 --- a/gui/slick/js/core.js +++ b/gui/slick/js/core.js @@ -2552,6 +2552,102 @@ var SICKRAGE = { window.location.href = url; }); } + }, + errorlogs: { + init: function() { + + }, + index: function() { + + }, + viewlogs: function() { + $('#minLevel,#logFilter,#logSearch').on('keyup change', _.debounce(function () { + if ($('#logSearch').val().length > 0){ + $('#logFilter option[value="<NONE>"]').prop('selected', true); + $('#minLevel option[value=5]').prop('selected', true); + } + $('#minLevel').prop('disabled', true); + $('#logFilter').prop('disabled', true); + document.body.style.cursor='wait'; + var url = srRoot + '/errorlogs/viewlog/?minLevel='+$('select[name=minLevel]').val()+'&logFilter='+$('select[name=logFilter]').val()+'&logSearch='+$('#logSearch').val(); + $.get(url, function(data){ + history.pushState('data', '', url); + $('pre').html($(data).find('pre').html()); + $('#minLevel').prop('disabled', false); + $('#logFilter').prop('disabled', false); + document.body.style.cursor='default'; + }); + }, 500)); + } + }, + schedule: { + init: function() { + + }, + index: function() { + if(isMeta('sickbeard.COMING_EPS_LAYOUT', ['list'])){ + var sortCodes = {'date': 0, 'show': 2, 'network': 5}; + var sort = getMeta('sickbeard.COMING_EPS_SORT'); + var sortList = (sort in sortCodes) ? [[sortCodes[sort], 0]] : [[0, 0]]; + + $('#showListTable:has(tbody tr)').tablesorter({ + widgets: ['stickyHeaders', 'filter', 'columnSelector', 'saveSort'], + sortList: sortList, + textExtraction: { + 0: function(node) { return $(node).find('time').attr('datetime'); }, + 1: function(node) { return $(node).find('time').attr('datetime'); }, + 7: function(node) { return $(node).find('span').text().toLowerCase(); } + }, + headers: { + 0: { sorter: 'realISODate' }, + 1: { sorter: 'realISODate' }, + 2: { sorter: 'loadingNames' }, + 4: { sorter: 'loadingNames' }, + 7: { sorter: 'quality' }, + 8: { sorter: false }, + 9: { sorter: false } + }, + widgetOptions: (function() { + if (metaToBool('sickbeard.FILTER_ROW')) { + return { + 'filter_columnFilters': true, + 'filter_hideFilters': true, + 'filter_saveFilters': true, + 'columnSelector_mediaquery': false + }; + } else { + return { + 'filter_columnFilters': false, + 'columnSelector_mediaquery': false + }; + } + }()) + }); + + $('#srRoot').ajaxEpSearch(); + } + + if(isMeta('sickbeard.COMING_EPS_LAYOUT', ['banner', 'poster'])){ + $('#srRoot').ajaxEpSearch({'size': 16, 'loadingImage': 'loading16' + themeSpinner + '.gif'}); + $('.ep_summary').hide(); + $('.ep_summaryTrigger').click(function() { + $(this).next('.ep_summary').slideToggle('normal', function() { + $(this).prev('.ep_summaryTrigger').attr('src', function(i, src) { + return $(this).next('.ep_summary').is(':visible') ? src.replace('plus','minus') : src.replace('minus','plus'); + }); + }); + }); + } + + $('#popover').popover({ + placement: 'bottom', + html: true, // required if content has HTML + content: '<div id="popover-target"></div>' + }).on('shown.bs.popover', function () { // bootstrap popover event triggered when the popover opens + // call this function to copy the column selection code into the popover + $.tablesorter.columnSelector.attachTo( $('#showListTable'), '#popover-target'); + }); + } } }; diff --git a/gui/slick/js/core.min.js b/gui/slick/js/core.min.js index d2bcff876b96336f0b33a1a06d073d1c1a380954..0e06ff93f99b3066c3b2535c087fcf58fc459014 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/errorlogs.js b/gui/slick/js/new/errorlogs.js deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/gui/slick/js/new/schedule.js b/gui/slick/js/new/schedule.js deleted file mode 100644 index a3b0883ecb474f22158c979f66fdc00babab0b5f..0000000000000000000000000000000000000000 --- a/gui/slick/js/new/schedule.js +++ /dev/null @@ -1,64 +0,0 @@ -$(document).ready(function(){ - if(isMeta('sickbeard.COMING_EPS_LAYOUT', ['list'])){ - var sortCodes = {'date': 0, 'show': 2, 'network': 5}; - var sort = getMeta('sickbeard.COMING_EPS_SORT'); - var sortList = (sort in sortCodes) ? [[sortCodes[sort], 0]] : [[0, 0]]; - - $('#showListTable:has(tbody tr)').tablesorter({ - widgets: ['stickyHeaders', 'filter', 'columnSelector', 'saveSort'], - sortList: sortList, - textExtraction: { - 0: function(node) { return $(node).find('time').attr('datetime'); }, - 1: function(node) { return $(node).find('time').attr('datetime'); }, - 7: function(node) { return $(node).find('span').text().toLowerCase(); } - }, - headers: { - 0: { sorter: 'realISODate' }, - 1: { sorter: 'realISODate' }, - 2: { sorter: 'loadingNames' }, - 4: { sorter: 'loadingNames' }, - 7: { sorter: 'quality' }, - 8: { sorter: false }, - 9: { sorter: false } - }, - widgetOptions: (function() { - if (metaToBool('sickbeard.FILTER_ROW')) { - return { - filter_columnFilters: true, - filter_hideFilters: true, - filter_saveFilters: true, - columnSelector_mediaquery: false - }; - } else { - return { - filter_columnFilters: false, - columnSelector_mediaquery: false - }; - } - }()) - }); - - $('#srRoot').ajaxEpSearch(); - } - - if(isMeta('sickbeard.COMING_EPS_LAYOUT', ['banner', 'poster'])){ - $('#srRoot').ajaxEpSearch({'size': 16, 'loadingImage': 'loading16' + themeSpinner + '.gif'}); - $('.ep_summary').hide(); - $('.ep_summaryTrigger').click(function() { - $(this).next('.ep_summary').slideToggle('normal', function() { - $(this).prev('.ep_summaryTrigger').attr('src', function(i, src) { - return $(this).next('.ep_summary').is(':visible') ? src.replace('plus','minus') : src.replace('minus','plus'); - }); - }); - }); - } - - $('#popover').popover({ - placement: 'bottom', - html: true, // required if content has HTML - content: '<div id="popover-target"></div>' - }).on('shown.bs.popover', function () { // bootstrap popover event triggered when the popover opens - // call this function to copy the column selection code into the popover - $.tablesorter.columnSelector.attachTo( $('#showListTable'), '#popover-target'); - }); -}); diff --git a/gui/slick/js/new/viewlogs.js b/gui/slick/js/new/viewlogs.js deleted file mode 100644 index d8437eebf8e11c4cf0a49cb90e64ed9f60777b3d..0000000000000000000000000000000000000000 --- a/gui/slick/js/new/viewlogs.js +++ /dev/null @@ -1,19 +0,0 @@ -$(document).ready(function(){ - $('#minLevel,#logFilter,#logSearch').on('keyup change', _.debounce(function (e) { - if ($('#logSearch').val().length > 0){ - $('#logFilter option[value="<NONE>"]').prop('selected', true); - $('#minLevel option[value=5]').prop('selected', true); - } - $('#minLevel').prop('disabled', true); - $('#logFilter').prop('disabled', true); - document.body.style.cursor='wait'; - var url = srRoot + '/errorlogs/viewlog/?minLevel='+$('select[name=minLevel]').val()+'&logFilter='+$('select[name=logFilter]').val()+'&logSearch='+$('#logSearch').val(); - $.get(url, function(data){ - history.pushState('data', '', url); - $('pre').html($(data).find('pre').html()); - $('#minLevel').prop('disabled', false); - $('#logFilter').prop('disabled', false); - document.body.style.cursor='default'; - }); - }, 500)); -}); diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 9f07ec9059ec5d7e2803ad935ddda57cc3763477..12d42c81647d538024037ad616a8fa9fbb755994 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -502,7 +502,8 @@ class WebRoot(WebHandler): t = PageTemplate(rh=self, filename='schedule.mako') return t.render(submenu=submenu, next_week=next_week1, today=today, results=results, layout=layout, - title='Schedule', header='Schedule', topmenu='schedule') + title='Schedule', header='Schedule', topmenu='schedule', + controller="schedule", action="index") class CalendarHandler(BaseHandler): @@ -5076,7 +5077,8 @@ class ErrorLogs(WebRoot): return t.render( header="Log File", title="Logs", topmenu="system", logLines=u"".join(data), minLevel=minLevel, logNameFilters=logNameFilters, - logFilter=logFilter, logSearch=logSearch) + logFilter=logFilter, logSearch=logSearch, + controller="errorlogs", action="viewlogs") def submit_errors(self): submitter_result, issue_id = logger.submit_errors()