monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-03 18:03:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #342 from JackDandy/feature/ChangeDateSortValue

Browse source 
Change values used for date sorting on home page and episode view for im...
This commit is contained in:
JackDandy 2015-05-02 18:00:53 +01:00
commit c9f3106d10
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -27,6 +27,7 @@
* Change to prevent another scheduled search when one of the same type is already running * Change to prevent another scheduled search when one of the same type is already running
* Add custom show lists to home page * Add custom show lists to home page
* Change travis to new container builds for faster unit testing * 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) ### 0.8.3 (2015-04-25 08:48:00 UTC)

4
gui/slick/interfaces/default/episodeView.tmpl
View file

@ -332,7 +332,7 @@
<tr id="show-${show_id}" class="$show_div" data-rawname="$cur_result['show_name']"> <tr id="show-${show_id}" class="$show_div" data-rawname="$cur_result['show_name']">
## forced to use a div to wrap airdate, the column sort went crazy with a span ## forced to use a div to wrap airdate, the column sort went crazy with a span
<td align="center" class="nowrap"> <td align="center" class="nowrap">
<div class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)</div><span class="sort_data">$time.mktime($cur_result['localtime'].timetuple())</span> <div class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)</div><span class="sort_data">$cur_result['localtime'].strftime('%Y%m%d%H%M')</span>
</td> </td>
<td class="tvShow"><a href="$sbRoot/home/displayShow?show=${cur_result['showid']}" data-name="$cur_result['data_show_name']">$cur_result['show_name']</a> <td class="tvShow"><a href="$sbRoot/home/displayShow?show=${cur_result['showid']}" data-name="$cur_result['data_show_name']">$cur_result['show_name']</a>
@ -741,7 +741,7 @@
#set $img_id = ' id="plot-%s"' % $show_id #set $img_id = ' id="plot-%s"' % $show_id
#set $plot_class = ' plot-daybyday' #set $plot_class = ' plot-daybyday'
<div id="show-${show_id}" class="daybyday-show" data-name="$cur_result['data_show_name']" data-season="$cur_result['season']" data-episode="$cur_result['episode']" data-network="$cur_result['data_network']" data-time="$time.mktime($cur_result['localtime'].timetuple())" data-rawname="$cur_result['show_name']"> <div id="show-${show_id}" class="daybyday-show" data-name="$cur_result['data_show_name']" data-season="$cur_result['season']" data-episode="$cur_result['episode']" data-network="$cur_result['data_network']" data-time="$cur_result['localtime'].strftime('%Y%m%d%H%M')" data-rawname="$cur_result['show_name']">
<div class="poster"> <div class="poster">
<a${title_text} href="$sbRoot/home/displayShow?show=${cur_result['showid']}"> <a${title_text} href="$sbRoot/home/displayShow?show=${cur_result['showid']}">
<img${img_id} class="img-responsive${plot_class}" alt="" src="$sbRoot/showPoster/?show=${cur_result['showid']}&amp;which=poster_thumb" /></a> <img${img_id} class="img-responsive${plot_class}" alt="" src="$sbRoot/showPoster/?show=${cur_result['showid']}&amp;which=poster_thumb" /></a>

12
gui/slick/interfaces/default/home.tmpl
View file

@ -288,16 +288,16 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
#set $progressbar_percent = $nom * 100 / $den #set $progressbar_percent = $nom * 100 / $den
#set $data_date = '6000000000.0' #set $data_date = '600000000000'
#if $cur_airs_next: #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 #else if None is not $display_status
#if 'nded' not in $display_status and 1 == int($curShow.paused) #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 #else if 'ontinu' in $display_status
#set $data_date = '5000000000.0' #set $data_date = '500000000000'
#else if 'nded' in $display_status #else if 'nded' in $display_status
#set $data_date = '5000000100.0' #set $data_date = '500000000100'
#end if #end if
#end if #end if
<div class="show" id="show$curShow.indexerid" data-name="$curShow.name" data-date="$data_date" data-network="$curShow.network" data-progress="$progressbar_percent"> <div class="show" id="show$curShow.indexerid" data-name="$curShow.name" data-date="$data_date" data-network="$curShow.network" data-progress="$progressbar_percent">
@ -487,7 +487,7 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
#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 align="center" class="nowrap"><div class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdate($ldatetime)</div><span class="sort_data">$time.mktime($ldatetime.timetuple())</span></td> <td align="center" class="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 align="center" class="nowrap"></td> <td align="center" class="nowrap"></td>
#end if #end if