mirror of
https://github.com/SickGear/SickGear.git
synced 2025-01-08 11:03:38 +00:00
Merge pull request #521 from adam111316/feature/TidyJS
Change to move JS code out of home template and into dedicated file
This commit is contained in:
adam111316
commit
25c0af27ae
3 changed files with 160 additions and 166 deletions
|
|
@ -77,6 +77,7 @@
|
||||||
* Change to move init-scripts to single folder
|
* Change to move init-scripts to single folder
|
||||||
* Change sickbeard variables to sickgear variables in init-scripts
|
* Change sickbeard variables to sickgear variables in init-scripts
|
||||||
* Change improve the use of multiple plex servers
|
* Change improve the use of multiple plex servers
|
||||||
|
* Change to move JS code out of home template and into dedicated file
|
||||||
|
|
||||||
[develop changelog]
|
[develop changelog]
|
||||||
Enable Alpha Ratio again now that the secure login page over https is fixed
|
Enable Alpha Ratio again now that the secure login page over https is fixed
|
||||||
|
|
|
||||||
|
|
@ -8,158 +8,26 @@
|
||||||
#set global $sbPath = '..'
|
#set global $sbPath = '..'
|
||||||
#set global $topmenu = 'home'
|
#set global $topmenu = 'home'
|
||||||
#set global $page_body_attr = 'show-list'
|
#set global $page_body_attr = 'show-list'
|
||||||
|
#set fuzzydate = 'airdate'
|
||||||
##
|
##
|
||||||
#import os.path
|
#import os.path
|
||||||
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
|
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
|
||||||
|
<script>
|
||||||
<script type="text/javascript" charset="utf-8">
|
var config = {
|
||||||
<!--
|
isPoster: #echo ['!1','!0']['poster' == $sickbeard.HOME_LAYOUT]#,
|
||||||
|
sortArticle: #echo ['!1','!0'][$sickbeard.SORT_ARTICLE]#,
|
||||||
\$.tablesorter.addParser({
|
homeSearchFocus: #echo ['!1','!0'][$sickbeard.HOME_SEARCH_FOCUS]#,
|
||||||
id: 'loadingNames',
|
fuzzyDating: #echo ['!1','!0'][$sickbeard.FUZZY_DATING]#,
|
||||||
is: function(s) {
|
timeZero: #echo ['!1','!0'][$sickbeard.TRIM_ZERO]#,
|
||||||
return false;
|
datePreset: "$sickbeard.DATE_PRESET",
|
||||||
},
|
timePreset: "$sickbeard.TIME_PRESET",
|
||||||
format: function(s) {
|
posterSortby: "$sickbeard.POSTER_SORTBY",
|
||||||
if (s.indexOf('Loading...') == 0)
|
posterSortdir: #echo ['!1','!0'][$sickbeard.POSTER_SORTDIR]#,
|
||||||
return s.replace('Loading...', '000');
|
fuzzydate: ".$fuzzydate",
|
||||||
else
|
};
|
||||||
#if not $sickbeard.SORT_ARTICLE
|
|
||||||
return (s || '').replace(/^(?:(?:A(?!\s+to)n?)|The)\s(\w)/i, '$1');
|
|
||||||
#else
|
|
||||||
return (s || '');
|
|
||||||
#end if
|
|
||||||
},
|
|
||||||
type: 'text'
|
|
||||||
});
|
|
||||||
|
|
||||||
\$.tablesorter.addParser({
|
|
||||||
id: 'quality',
|
|
||||||
is: function(s) {
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
format: function(s) {
|
|
||||||
return s.replace('hd1080p',5).replace('hd720p',4).replace('hd',3).replace('sd',2).replace('any',1).replace('custom',7);
|
|
||||||
},
|
|
||||||
type: 'numeric'
|
|
||||||
});
|
|
||||||
|
|
||||||
\$(document).ready(function(){
|
|
||||||
##
|
|
||||||
#for $curShowlist in $showlists
|
|
||||||
#set $curListID = $curShowlist[0]
|
|
||||||
#if 'poster' != $layout
|
|
||||||
|
|
||||||
\$('#$curListID:has(tbody tr)').tablesorter({
|
|
||||||
sortList: [[5,1],[1,0]],
|
|
||||||
textExtraction: {
|
|
||||||
0: function(node) { return \$(node).find('span').text().toLowerCase(); },
|
|
||||||
2: function(node) { return \$(node).find('span').text().toLowerCase(); },
|
|
||||||
3: function(node) { return \$(node).find('span').text().toLowerCase(); },
|
|
||||||
4: function(node) { return \$(node).find('span').attr('data-progress'); },
|
|
||||||
5: function(node) { return \$(node).find('i').attr('alt'); }
|
|
||||||
},
|
|
||||||
widgets: ['saveSort', 'zebra', 'stickyHeaders', 'filter'],
|
|
||||||
headers: {
|
|
||||||
0: { sorter: 'isoDate' },
|
|
||||||
1: { sorter: 'loadingNames' },
|
|
||||||
3: { sorter: 'quality' },
|
|
||||||
4: { sorter: 'eps' }
|
|
||||||
},
|
|
||||||
widgetOptions: {
|
|
||||||
filter_columnFilters: false,
|
|
||||||
filter_reset: '.resetshows'
|
|
||||||
},
|
|
||||||
sortStable: true
|
|
||||||
});
|
|
||||||
|
|
||||||
\$.tablesorter.filter.bindSearch( '#$curListID', \$('.search') );
|
|
||||||
#else
|
|
||||||
|
|
||||||
var \$container = [\$('#$curListID')]
|
|
||||||
|
|
||||||
jQuery.each(\$container, function (j) {
|
|
||||||
this.isotope({
|
|
||||||
itemSelector: '.show',
|
|
||||||
sortBy: '$sickbeard.POSTER_SORTBY',
|
|
||||||
sortAscending: $sickbeard.POSTER_SORTDIR,
|
|
||||||
layoutMode: 'masonry',
|
|
||||||
masonry: {
|
|
||||||
columnWidth: 12,
|
|
||||||
isFitWidth: true
|
|
||||||
},
|
|
||||||
getSortData: {
|
|
||||||
name: function( itemElem ) {
|
|
||||||
var name = \$( itemElem ).attr('data-name');
|
|
||||||
#if not $sickbeard.SORT_ARTICLE
|
|
||||||
return (name || '').replace(/^(?:(?:A(?!\s+to)n?)|The)\s(\w)/i, '$1');
|
|
||||||
#else
|
|
||||||
return (name || '');
|
|
||||||
#end if
|
|
||||||
},
|
|
||||||
date: function( itemElem ) {
|
|
||||||
var date = \$( itemElem ).attr('data-date');
|
|
||||||
return date.length && parseInt( date, 10 ) || Number.POSITIVE_INFINITY;
|
|
||||||
},
|
|
||||||
network: '[data-network]',
|
|
||||||
progress: function( itemElem ) {
|
|
||||||
var progress = \$( itemElem ).children('.sort-data').attr('data-progress');
|
|
||||||
return progress.length && parseInt( progress, 10 ) || Number.NEGATIVE_INFINITY;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
\$('#postersort').on( 'change', function() {
|
|
||||||
var sortValue = this.value;
|
|
||||||
\$('#$curListID').isotope({ sortBy: sortValue });
|
|
||||||
\$.get(this.options[this.selectedIndex].getAttribute('data-sort'));
|
|
||||||
});
|
|
||||||
|
|
||||||
\$('#postersortdirection').on( 'change', function() {
|
|
||||||
var sortDirection = this.value;
|
|
||||||
sortDirection = sortDirection == 'true';
|
|
||||||
\$('#$curListID').isotope({ sortAscending: sortDirection });
|
|
||||||
\$.get(this.options[this.selectedIndex].getAttribute('data-sort'));
|
|
||||||
});
|
|
||||||
#end if
|
|
||||||
#end for
|
|
||||||
|
|
||||||
#raw
|
|
||||||
$('img#network').on('error', function(){
|
|
||||||
$(this).parent().text($(this).attr('alt'));
|
|
||||||
$(this).remove();
|
|
||||||
});
|
|
||||||
#end raw
|
|
||||||
##
|
|
||||||
#set $fuzzydate = 'airdate'
|
|
||||||
#if $sickbeard.FUZZY_DATING
|
|
||||||
fuzzyMoment({
|
|
||||||
dtInline: #echo ('!1', '!0')['poster' == $layout]#,
|
|
||||||
containerClass: '.${fuzzydate}',
|
|
||||||
dateHasTime: !1,
|
|
||||||
dateFormat: '${sickbeard.DATE_PRESET}',
|
|
||||||
timeFormat: '${sickbeard.TIME_PRESET}',
|
|
||||||
trimZero: #echo ('!1', '!0')[$sickbeard.TRIM_ZERO]#
|
|
||||||
});
|
|
||||||
#end if
|
|
||||||
#if $sickbeard.HOME_SEARCH_FOCUS
|
|
||||||
|
|
||||||
\$('#search_show_name').focus();
|
|
||||||
|
|
||||||
#end if
|
|
||||||
});
|
|
||||||
|
|
||||||
//-->
|
|
||||||
</script>
|
</script>
|
||||||
##
|
<script type="text/javascript" src="$sbRoot/js/home.js?v=$sbPID"></script>
|
||||||
#if $varExists('header')
|
|
||||||
|
|
||||||
<h1 class="header" style="margin-bottom:0">$showlists[0][1]</h1>
|
<h1 class="header" style="margin-bottom:0">$showlists[0][1]</h1>
|
||||||
#else
|
|
||||||
|
|
||||||
<h1 class="title" style="margin-bottom:0">$title</h1>
|
|
||||||
#end if
|
|
||||||
#set $tab = 1
|
#set $tab = 1
|
||||||
#if 'poster' != $layout
|
#if 'poster' != $layout
|
||||||
|
|
||||||
|
|
@ -324,7 +192,7 @@
|
||||||
<div class="show-date">
|
<div class="show-date">
|
||||||
#if $cur_airs_next
|
#if $cur_airs_next
|
||||||
#set $ldatetime = $sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network))
|
#set $ldatetime = $sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network))
|
||||||
<span class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdate($ldatetime)</span>
|
<span class="$fuzzydate">$sbdatetime.sbdatetime.sbfdate($ldatetime)</span>
|
||||||
#else
|
#else
|
||||||
#set $output_html = '?'
|
#set $output_html = '?'
|
||||||
#if None is not $display_status
|
#if None is not $display_status
|
||||||
|
|
@ -471,7 +339,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
#if $cur_airs_next
|
#if $cur_airs_next
|
||||||
#set $ldatetime = $sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network))
|
#set $ldatetime = $sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network))
|
||||||
<td class="text-nowrap"><div class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdate($ldatetime)</div><span class="sort-data">$ldatetime.strftime('%Y%m%d%H%M')</span></td>
|
<td class="text-nowrap"><div class="$fuzzydate">$sbdatetime.sbdatetime.sbfdate($ldatetime)</div><span class="sort-data">$ldatetime.strftime('%Y%m%d%H%M')</span></td>
|
||||||
#else
|
#else
|
||||||
<td></td>
|
<td></td>
|
||||||
#end if
|
#end if
|
||||||
|
|
@ -550,21 +418,6 @@
|
||||||
#end if
|
#end if
|
||||||
#end for
|
#end for
|
||||||
##
|
##
|
||||||
<script type="text/javascript">
|
|
||||||
<!--
|
|
||||||
#raw
|
|
||||||
$(document).ready(function(){
|
|
||||||
$('div[id^="progressbar"]').each(function(k, v){
|
|
||||||
var progress = parseInt($(this).siblings('span[class="sort-data"]').attr('data-progress'), 10) , elId = '#' + $(this).attr('id'), v = 80;
|
|
||||||
$(elId).progressbar({value:progress});
|
|
||||||
if (progress < 80) {
|
|
||||||
v = progress >= 40 ? 60 : (progress >= 20 ? 40 : 20);
|
|
||||||
}
|
|
||||||
$(elId + ' > .ui-progressbar-value').addClass('progress-' + v);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
#end raw
|
|
||||||
//-->
|
|
||||||
</script>
|
|
||||||
|
|
||||||
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
|
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_bottom.tmpl')
|
||||||
140
gui/slick/js/home.js
Normal file
140
gui/slick/js/home.js
Normal file
|
|
@ -0,0 +1,140 @@
|
||||||
|
$.tablesorter.addParser({
|
||||||
|
id: 'loadingNames',
|
||||||
|
is: function (s) {
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
format: function (s) {
|
||||||
|
if (s.indexOf('Loading...') === 0) {
|
||||||
|
return s.replace('Loading...', '000');
|
||||||
|
} else if (config.sortArticle) {
|
||||||
|
return (s || '');
|
||||||
|
} else {
|
||||||
|
return (s || '').replace(/^(?:(?:A(?!\s+to)n?)|The)\s(\w)/i, '$1');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
type: 'text'
|
||||||
|
});
|
||||||
|
|
||||||
|
$.tablesorter.addParser({
|
||||||
|
id: 'quality',
|
||||||
|
is: function (s) {
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
format: function (s) {
|
||||||
|
return s.replace('hd1080p', 5).replace('hd720p', 4).replace('hd', 3).replace('sd', 2).replace('any', 1).replace('custom', 7);
|
||||||
|
},
|
||||||
|
type: 'numeric'
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).ready(function () {
|
||||||
|
if (config.homeSearchFocus) {
|
||||||
|
$('#search_show_name').focus();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config.fuzzyDating) {
|
||||||
|
fuzzyMoment({
|
||||||
|
dtInline: config.isPoster,
|
||||||
|
containerClass: config.fuzzydate,
|
||||||
|
dateHasTime: !1,
|
||||||
|
dateFormat: config.datePreset,
|
||||||
|
timeFormat: config.timePreset,
|
||||||
|
trimZero: config.trimZero
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$('div[id^="progressbar"]').each(function (k, v) {
|
||||||
|
var progress = parseInt($(this).siblings('span[class="sort-data"]').attr('data-progress'), 10), elId = '#' + $(this).attr('id'), v = 80;
|
||||||
|
$(elId).progressbar({value: progress});
|
||||||
|
if (progress < 80) {
|
||||||
|
v = progress >= 40 ? 60 : (progress >= 20 ? 40 : 20);
|
||||||
|
}
|
||||||
|
$(elId + ' > .ui-progressbar-value').addClass('progress-' + v);
|
||||||
|
});
|
||||||
|
|
||||||
|
$('img#network').on('error', function () {
|
||||||
|
$(this).parent().text($(this).attr('alt'));
|
||||||
|
$(this).remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
if (config.isPoster) {
|
||||||
|
$('.container').each(function (i, obj) {
|
||||||
|
$(obj).isotope({
|
||||||
|
itemSelector: '.show',
|
||||||
|
sortBy: config.posterSortby,
|
||||||
|
sortAscending: config.posterSortdir,
|
||||||
|
layoutMode: 'masonry',
|
||||||
|
masonry: {
|
||||||
|
columnWidth: 12,
|
||||||
|
isFitWidth: true
|
||||||
|
},
|
||||||
|
getSortData: {
|
||||||
|
name: function (itemElem) {
|
||||||
|
var name = $(itemElem).attr('data-name');
|
||||||
|
if (config.sortArticle) {
|
||||||
|
return (name || '');
|
||||||
|
} else {
|
||||||
|
return (name || '').replace(/^(?:(?:A(?!\s+to)n?)|The)\s(\w)/i, '$1');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
date: function (itemElem) {
|
||||||
|
var date = $(itemElem).attr('data-date');
|
||||||
|
return date.length && parseInt(date, 10) || Number.POSITIVE_INFINITY;
|
||||||
|
},
|
||||||
|
network: '[data-network]',
|
||||||
|
progress: function (itemElem) {
|
||||||
|
var progress = $(itemElem).children('.sort-data').attr('data-progress');
|
||||||
|
return progress.length && parseInt(progress, 10) || Number.NEGATIVE_INFINITY;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#postersort').on('change', function () {
|
||||||
|
var sortValue = this.value;
|
||||||
|
$(obj).isotope({sortBy: sortValue});
|
||||||
|
$.get(this.options[this.selectedIndex].getAttribute('data-sort'));
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#postersortdirection').on('change', function () {
|
||||||
|
var sortDirection = this.value;
|
||||||
|
sortDirection = sortDirection == 'true';
|
||||||
|
$(obj).isotope({sortAscending: sortDirection});
|
||||||
|
$.get(this.options[this.selectedIndex].getAttribute('data-sort'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
$('.tablesorter').each(function (i, obj) {
|
||||||
|
$(obj).has('tbody tr').tablesorter({
|
||||||
|
sortList: [[5, 1], [1, 0]],
|
||||||
|
textExtraction: {
|
||||||
|
0: function (node) {
|
||||||
|
return $(node).find('span').text().toLowerCase();
|
||||||
|
},
|
||||||
|
2: function (node) {
|
||||||
|
return $(node).find('span').text().toLowerCase();
|
||||||
|
},
|
||||||
|
3: function (node) {
|
||||||
|
return $(node).find('span').text().toLowerCase();
|
||||||
|
},
|
||||||
|
4: function (node) {
|
||||||
|
return $(node).find('span').attr('data-progress');
|
||||||
|
},
|
||||||
|
5: function (node) {
|
||||||
|
return $(node).find('i').attr('alt');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
widgets: ['saveSort', 'zebra', 'stickyHeaders', 'filter'],
|
||||||
|
headers: {
|
||||||
|
0: {sorter: 'isoDate'},
|
||||||
|
1: {sorter: 'loadingNames'},
|
||||||
|
3: {sorter: 'quality'},
|
||||||
|
4: {sorter: 'eps'}
|
||||||
|
},
|
||||||
|
widgetOptions: {
|
||||||
|
filter_columnFilters: false,
|
||||||
|
filter_reset: '.resetshows'
|
||||||
|
},
|
||||||
|
sortStable: true
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
Loading…
Reference in a new issue