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

Merge branch 'feature/ChangeShowTime' into dev

Browse source
This commit is contained in:
JackDandy 2023-04-27 12:56:27 +01:00
commit 1f3e1416d4
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -16,6 +16,7 @@
* Change add jobs to centralise scheduler activities
* Change refactor scene_exceptions
* Add config to change media process log message if there is no media to process
* Change view-show text "invalid timeformat" to "time unknown"
### 3.28.0 (2023-04-12 13:05:00 UTC)

7
gui/slick/interfaces/default/displayShow.tmpl
View file

@ -113,10 +113,7 @@
<div class="clearfix" style="margin-bottom:15px"></div>
#if $show_message
<div class="alert alert-info">
$show_message
</div>
<div class="alert alert-info">$show_message</div>
#end if
<div class="display-show-container">
<div id="posterCol" class="hidden-xs">
@ -278,7 +275,7 @@
#if $show_obj.airs
#set $showairs = '%s%s' % ($re.sub(r'(?:s|nes|rs|ur)?day', '', $re.sub(r'(y)[^\w]+', r'\1, ', $show_obj.airs)),
('', ' <span class="red-text" style="font-weight:bold">(invalid timeformat)</span>')[not $network_timezones.test_timeformat($show_obj.airs)])
('', ' <span class="red-text" style="font-weight:bold">(time unknown)</span>')[not $network_timezones.test_timeformat($show_obj.airs)])
#set $showairs = $showairs.replace('Sat, Sun', 'Sat - Sun').replace('Mon, Tue, Wed, Thu, Fri', 'Mon - Fri').replace('Mon, Tue, Wed, Thu', 'Mon - Thu').replace('Tue, Wed, Thu', 'Tue - Thu')
<div>
<span class="details-title">Air#echo ('s', 'ed')[$show_ended]#</span>

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

@ -186,9 +186,7 @@
<div class="bfr"><img src="$sbRoot/images/loading16${theme_suffix}.gif"><img src="$sbRoot/images/loading16-red.gif"><img src="$sbRoot/images/queued.png"><img src="$sbRoot/images/search16.png"><img src="$sbRoot/images/no16.png"><img src="$sbRoot/images/yes16.png"></div>
#if $show_message
<div class="alert alert-info" style="margin:-40px 0 50px">
$show_message
</div>
<div class="alert alert-info" style="margin:-40px 0 50px">$show_message</div>
#end if
#if $varExists('header')