monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-05 17:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #331 from JackDandy/feature/ChangeTextsDayByDay

Browse source 
Change network names to only display on top line of Day by Day layout on...
This commit is contained in:
JackDandy 2015-04-28 19:16:43 +01:00
commit a86a52778e
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -1,5 +1,7 @@
### 0.x.x (2015-xx-xx xx:xx:xx UTC)
* Change network names to only display on top line of Day by Day layout on Episode View
* Reposition country part of network name into the hover over in Day by Day layout
* Add ToTV provider
* Fix Backlog scheduler initialization and change backlog frequency from minutes to days
* Change to consolidate and tidy some provider code

7
gui/slick/css/style.css
View file

@ -1848,6 +1848,7 @@ h2.day, h2.network{
margin-right:auto
}
.day-of-week .text .airtime .network,
.day-of-week .text .airtime,
.day-of-week .text .episode{
overflow:hidden;
@ -1856,6 +1857,12 @@ h2.day, h2.network{
font-size:12px
}
.day-of-week .text .airtime .network{
white-space:nowrap;
text-align:right;
max-width:50%
}
.day-of-week .text .episode .season,
.day-of-week .text .episode .number{
font-weight:900

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

@ -1,5 +1,6 @@
#import sickbeard
#import datetime
#import re
#from sickbeard.common import *
#from sickbeard import sbdatetime
#from sickbeard.helpers import anon_url
@ -748,7 +749,8 @@
<div class="state#if len($cur_result['state']) then ' %s" title="%s"' % ($cur_result['state'], $cur_result['state-title']) else '"' #></div>
<div class="text">
<div class="airtime">
<span class="time">${airtime}</span> <span class="network pull-right grey-text">$cur_result['network']</span>
#set $match = re.search(r'(.*)\s(\(\w+\))$', $cur_result['network'], re.I | re.M)
<span class="time">${airtime}</span> <span class="network pull-right grey-text"#echo '>%s' % $cur_result['network'] if None is $match else ' title="%s">%s' % ($match.group(2), $match.group(1))#</span>
</div>
<div class="episode" title="$cur_result['name']">
<span class="season"><%= '%i' % int(cur_result['season']) %></span>x<span class="number"><%= '%02i' % int(cur_result['episode']) %></span>

4
sickbeard/webserve.py
View file

@ -493,6 +493,10 @@ class MainHandler(WebHandler):
else:
t.layout = sickbeard.EPISODE_VIEW_LAYOUT
# network countries
cache_db = db.DBConnection('cache.db')
t.country_results = ['(%s)' % x['tvrage_country'] for x in cache_db.select('SELECT distinct(tvrage_country) FROM [network_conversions] where tvdb_network like "%(" || tvrage_country || ")" order by tvrage_country')]
return t.respond()
def _genericMessage(self, subject, message):