From dc3b5e7811c1c41f20466e2b83d465c3dff6e7f2 Mon Sep 17 00:00:00 2001
From: Alexis Tyler <xo@wvvw.me>
Date: Thu, 19 Nov 2015 16:25:37 +1030
Subject: [PATCH] move logs and schedule to core
---
gui/slick/js/core.js | 96 ++++++++++++++++++++++++++++++++++
gui/slick/js/core.min.js | Bin 58759 -> 61091 bytes
gui/slick/js/new/errorlogs.js | 0
gui/slick/js/new/schedule.js | 64 -----------------------
gui/slick/js/new/viewlogs.js | 19 -------
sickbeard/webserve.py | 6 ++-
6 files changed, 100 insertions(+), 85 deletions(-)
delete mode 100644 gui/slick/js/new/errorlogs.js
delete mode 100644 gui/slick/js/new/schedule.js
delete mode 100644 gui/slick/js/new/viewlogs.js
diff --git a/gui/slick/js/core.js b/gui/slick/js/core.js
index f9da9cabc..395d51627 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
GIT binary patch
delta 1365
zcmZoa&Aj+7^M>drTso;mMfpWJ`RT=zrB|w2)asOFrj~=aR%xYq$t9Wjc^aD4DjG`4
zxtV!Bsb#4-I?6fu>28@hC8<SVW^ig^QF6xQjeer_@p>t#N%^ID$*CG>nsf5gA?lPg
z^~w@+G&J>cQuESFGVBc0)HGBy)DdPX<QIS}jV?>fDNVIivhnlxbG1{7RoB!jD9SI;
zP%2K%Nlh+EO;OTOG|<#Rc9?=OidNHDC9HZ-HBDBu5}BND&dv$<6iB4rKvO3rKe;qF
zHLpZ3DL<uBuehW#Csi-Gw5T}0$X2O5F|$O;x-79sA<?$DC@4R_L|aK89+3LbAk?>q
zg_*6AwhGMY(RqovskSf~kR!nXqOGI`cY<v_hI+Uhng&RyLd*vRB7_eMWos3^^wbiK
zL>+i^BxzP>WEPj?7gg#Nlon?Mmn4>?YAB^7mLw|aC@JYAf<vc3zbI8nQ!k?=H%CK7
zBS}*)Ei*4gL#Y5EstHyHPZN_Bt;G1ikpXunNXP<jAf}|IC6?xtDAj7#>X;fBXlmBh
z>J%quq^6YSOg?x<c(U$F;rh%pjm%=-)RIIErQ*!w?4;Dhq7*%6e_u~O_juQU;CLU$
zNdM3fC7o!coXp}9rC3ePYDlb9rzDo7S{djRXXKY#8R_JumXzlgWm}on>Ll5wr<UL`
zGT1*TL`hR8*)~ZbQ#nr|(LOplF*+$$#~?P=DmvN#L|cQB9mr&#%;J*Cl~;5p$E?*5
z*HJ1?EK3c}FDg-r)hW&|Dgnt_B~QMzx_R=HiwcwFAIWm-WTYmhq!txhRU1scw^m~E
z-L-a;JJ<0unoky7Cn95ERSnXYT4beYSgT`+%&VPza9!u*{EcRl^ES${)oN(gYU)hB
zuv^MbvzEvJN=nSjOD$5;Q7XtUE=es?iq%w8)0li=w{%W%W>u<{p_xujequ^yUb<&)
zVtT5T5|n3Xrlehxk(!$tT#yMeKwC*KJu^+I7MuX|QVZgXOLKD*iz-3sB{L;e16@3%
zC^J1hwMa=*FF7YOIeT&dqlkK5YDI~L5~}9noXnKeko@%YoKy{^y!@iv#GJ_oc*N^d
z%TQDzj7uyjDbi3XE=pEHr0ztWB+crg)RNMoJOvevl8nq^O+9RuWfp5FS(RlLXC~#O
zDrwp$=@q3G<Rm7iYA6-tlol)LDCK76l@=>$S|!OLq#$BC5G9(mU^w~5wjGlVcSvlG
IdZNn+0HGMwM*si-
delta 14
WcmZ2{m%05k^M>dro6FzoFaiKK`v(jF
diff --git a/gui/slick/js/new/errorlogs.js b/gui/slick/js/new/errorlogs.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/gui/slick/js/new/schedule.js b/gui/slick/js/new/schedule.js
deleted file mode 100644
index a3b0883ec..000000000
--- 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 d8437eebf..000000000
--- 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 9f07ec905..12d42c816 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()
--
GitLab