From 74d744cfc28b917ae3e03bd1aff923b9a6306a62 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Sat, 2 May 2015 13:44:21 +0100 Subject: [PATCH] Change values used for date sorting on home page and episode view for improved compatibility with posix systems. --- CHANGES.md | 1 + gui/slick/interfaces/default/episodeView.tmpl | 4 ++-- gui/slick/interfaces/default/home.tmpl | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 773f7e2a..41ae87cf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -27,6 +27,7 @@ * Change to prevent another scheduled search when one of the same type is already running * Add custom show lists to home page * Change travis to new container builds for faster unit testing +* Change values used for date sorting on home page and episode view for improved compatibility with posix systems ### 0.8.3 (2015-04-25 08:48:00 UTC) diff --git a/gui/slick/interfaces/default/episodeView.tmpl b/gui/slick/interfaces/default/episodeView.tmpl index a730397f..fc204e38 100644 --- a/gui/slick/interfaces/default/episodeView.tmpl +++ b/gui/slick/interfaces/default/episodeView.tmpl @@ -332,7 +332,7 @@ ## forced to use a div to wrap airdate, the column sort went crazy with a span -
$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)
$time.mktime($cur_result['localtime'].timetuple()) +
$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)
$cur_result['localtime'].strftime('%Y%m%d%H%M') $cur_result['show_name'] @@ -741,7 +741,7 @@ #set $img_id = ' id="plot-%s"' % $show_id #set $plot_class = ' plot-daybyday' -
+
diff --git a/gui/slick/interfaces/default/home.tmpl b/gui/slick/interfaces/default/home.tmpl index 1b10e29d..362341b0 100644 --- a/gui/slick/interfaces/default/home.tmpl +++ b/gui/slick/interfaces/default/home.tmpl @@ -288,16 +288,16 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) #set $progressbar_percent = $nom * 100 / $den -#set $data_date = '6000000000.0' +#set $data_date = '600000000000' #if $cur_airs_next: - #set $data_date = $time.mktime($sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network)).timetuple()) + #set $data_date = $sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($cur_airs_next, $curShow.airs, $curShow.network)).strftime('%Y%m%d%H%M') #else if None is not $display_status #if 'nded' not in $display_status and 1 == int($curShow.paused) - #set $data_date = '5000000500.0' + #set $data_date = '500000000500' #else if 'ontinu' in $display_status - #set $data_date = '5000000000.0' + #set $data_date = '500000000000' #else if 'nded' in $display_status - #set $data_date = '5000000100.0' + #set $data_date = '500000000100' #end if #end if
@@ -487,7 +487,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) #if $cur_airs_next #set $ldatetime = $sbdatetime.sbdatetime.convert_to_setting($network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network)) -
$sbdatetime.sbdatetime.sbfdate($ldatetime)
$time.mktime($ldatetime.timetuple()) +
$sbdatetime.sbdatetime.sbfdate($ldatetime)
$ldatetime.strftime('%Y%m%d%H%M') #else: #end if