From 0333a9aa3e0839771855713a7e8cc6c1f83884d8 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Tue, 14 Oct 2014 05:13:59 +0100 Subject: [PATCH] Various tweaks to UI including additional use of fuzzy dates. Add a parameter to FuzzyMoments to output dates inline. Add fuzzy dates to compact view of History page. add fuzzy dates to poster view cards of Home page. Tweak Home page poster view cards to span the date displayed across the first line. Tweak Home page poster view cards to display download stats on left and network logo on right. Tweak the two columns of Show Summary on the displayShow page to hold content. Add title "Filters" and tweak the layout of filters sections on the displayShow page. Move display value for show air date from Next Episode to the Airs field on the comingEpisodes page. Add fuzzy dates to the Airs field in banner and poster views on the comingEpisodes page. Tweak CSS for showSummary. Tweak CSS for poster view cards line-height. --- gui/slick/css/default.css | 10 ++-- .../interfaces/default/comingEpisodes.tmpl | 19 +++++++- gui/slick/interfaces/default/displayShow.tmpl | 24 +++++----- gui/slick/interfaces/default/history.tmpl | 2 +- gui/slick/interfaces/default/home.tmpl | 47 ++++++++++--------- gui/slick/js/fuzzyMoment.js | 4 +- 6 files changed, 62 insertions(+), 44 deletions(-) diff --git a/gui/slick/css/default.css b/gui/slick/css/default.css index c7202783..9307ba12 100644 --- a/gui/slick/css/default.css +++ b/gui/slick/css/default.css @@ -2467,7 +2467,7 @@ ul.tags li a{ -moz-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; - padding: 5px 10px; + padding: 5px 0 0 10px; margin-bottom: -3px; text-shadow: 0px 1px rgba(0, 0, 0, 0.8); background: #333; @@ -5066,7 +5066,7 @@ posterlist.css font-size: 11px; text-align: left; display: block; - line-height: 18px; + line-height: 13px; } .show-status { @@ -5074,7 +5074,7 @@ posterlist.css font-size: 11px; text-align: left; display: block; - line-height: 34px; + line-height: 15px; } .show-network-image { @@ -5085,9 +5085,9 @@ posterlist.css .show-dlstats { text-shadow: 1px 1px #000; font-size: 11px; - text-align: right; + text-align: left; display: block; - line-height: 18px; + line-height: 15px; } #sort-by { diff --git a/gui/slick/interfaces/default/comingEpisodes.tmpl b/gui/slick/interfaces/default/comingEpisodes.tmpl index 16ae0202..a0df614c 100644 --- a/gui/slick/interfaces/default/comingEpisodes.tmpl +++ b/gui/slick/interfaces/default/comingEpisodes.tmpl @@ -245,6 +245,20 @@ }); }); }); + + #set $fuzzydate = 'airdate' + #if $sickbeard.FUZZY_DATING: + fuzzyMoment({ + dtInline : true, + dtGlue : ' at ', + containerClass : '.${fuzzydate}', + dateHasTime : true, + dateFormat : '${sickbeard.DATE_PRESET}', + timeFormat : '${sickbeard.TIME_PRESET}', + trimZero : #if $sickbeard.TRIM_ZERO then "true" else "false"# + }); + #end if + }); //--> @@ -388,10 +402,11 @@ - Next Episode: <%="S%02i" % int(cur_result["season"])+"E%02i" % int(cur_result["episode"]) %> - $cur_result["name"] ($sbdatetime.sbdatetime.fromtimestamp($time.mktime($cur_result["localtime"].timetuple())).sbfdate().decode($sickbeard.SYS_ENCODING)) + Next Episode: <%="S%02i" % int(cur_result["season"])+"E%02i" % int(cur_result["episode"]) %> - $cur_result["name"]
- Airs: $sbdatetime.sbdatetime.fromtimestamp($time.mktime($cur_result["localtime"].timetuple())).sbftime().decode($sickbeard.SYS_ENCODING) on $cur_result["network"] + + Airs: $sbdatetime.sbdatetime.sbfdatetime($cur_result["localtime"]).decode($sickbeard.SYS_ENCODING) on $cur_result["network"]
diff --git a/gui/slick/interfaces/default/displayShow.tmpl b/gui/slick/interfaces/default/displayShow.tmpl index 292a218f..f7aad4e5 100644 --- a/gui/slick/interfaces/default/displayShow.tmpl +++ b/gui/slick/interfaces/default/displayShow.tmpl @@ -194,7 +194,7 @@
- +
#if $show.network and $show.airs: #else if $show.network: @@ -243,7 +243,7 @@
Originally Airs: $show.airs #if not $network_timezones.test_timeformat($show.airs) then " (invalid Timeformat) " else ""# on $show.network
- +
#if $sickbeard.USE_SUBTITLES @@ -279,18 +279,18 @@ - -
- - - - - -
-
- +
+ Filters: + + + + +
+ +
+
diff --git a/gui/slick/interfaces/default/history.tmpl b/gui/slick/interfaces/default/history.tmpl index 75c601b0..1a6b492d 100644 --- a/gui/slick/interfaces/default/history.tmpl +++ b/gui/slick/interfaces/default/history.tmpl @@ -186,7 +186,7 @@ #for $hItem in $compactResults:
#set $curdatetime = $datetime.datetime.strptime(str($hItem["actions"][0]["time"]), $history.dateFormat) - + diff --git a/gui/slick/interfaces/default/home.tmpl b/gui/slick/interfaces/default/home.tmpl index 8e4e072f..598e9725 100644 --- a/gui/slick/interfaces/default/home.tmpl +++ b/gui/slick/interfaces/default/home.tmpl @@ -247,6 +247,7 @@ function invertSort(){ #set $fuzzydate = 'airdate' #if $sickbeard.FUZZY_DATING: fuzzyMoment({ + dtInline : #if $layout == 'poster' then "true" else "false"#, containerClass : '.${fuzzydate}', dateHasTime : false, dateFormat : '${sickbeard.DATE_PRESET}', @@ -365,14 +366,14 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name)) #set $progressbar_percent = $nom * 100 / $den #if "a" in sickbeard.DATE_PRESET: - #set $showheight = "344px" - #set $tableheight = "62px" + #set $showheight = "334px" + #set $tableheight = "52px" #else if "B" in sickbeard.DATE_PRESET: #set $showheight = "374px" #set $tableheight = "92px" #else if "A" in sickbeard.DATE_PRESET: - #set $showheight = "344px" - #set $tableheight = "62px" + #set $showheight = "334px" + #set $tableheight = "52px" #else #set $showheight = "323px" #set $tableheight = "42px" @@ -410,15 +411,14 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
Info Language:$show.lang
Subtitles: \"Y"
$sbdatetime.sbdatetime.sbfdatetime($curdatetime, show_seconds=True)$time.mktime($curdatetime.timetuple())
$sbdatetime.sbdatetime.sbfdatetime($curdatetime, show_seconds=True)
$time.mktime($curdatetime.timetuple())		 $hItem["show_name"] - <%="S%02i" % int(hItem["season"])+"E%02i" % int(hItem["episode"]) %>#if "proper" in $hItem["resource"].lower or "repack" in $hItem["resource"].lower then ' Proper' else ""#
- + - - + - - - - + + + +
+ #if $cur_airs_next #set $ldatetime = $network_timezones.parse_date_time($cur_airs_next,$curShow.airs,$curShow.network) -
Next Ep: $sbdatetime.sbdatetime.sbfdate($ldatetime)
+
Next Ep: $sbdatetime.sbdatetime.sbfdate($ldatetime)
#else if $curShow.status != "Ended" and int($curShow.paused) == 1:
Paused
#else if $curShow.status: @@ -427,28 +427,29 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
?
#end if 		- #if $layout != 'simple': - #if $curShow.network: - $curShow.network - #else: - No Network - #end if - #else: - $curShow.network - #end if -
$download_stat -
+
#if $curShow.quality in $qualityPresets: $qualityPresetStrings[$curShow.quality] #else: Custom #end if
+ #if $layout != 'simple': + #if $curShow.network: + $curShow.network + #else: + No Network + #end if + #else: + $curShow.network + #end if +
diff --git a/gui/slick/js/fuzzyMoment.js b/gui/slick/js/fuzzyMoment.js index d80a6efb..510ca941 100644 --- a/gui/slick/js/fuzzyMoment.js +++ b/gui/slick/js/fuzzyMoment.js @@ -7,6 +7,7 @@ * timeFormat string The python token time formatting * trimZero Whether to trim leading "0"s (default : false) * dtGlue string To insert between the output of date and time (default: '
') + * dtInline Bool Whether to output date inline or use more than one line */ function fuzzyMoment(fmConfig) { @@ -16,6 +17,7 @@ timeFormat = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.timeFormat)) ? '' : fmConfig.timeFormat), trimZero = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.trimZero)) ? false : !!fmConfig.trimZero), dtGlue = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dtGlue)) ? '
' : fmConfig.dtGlue), + dtInline = (/undefined/i.test(typeof(fmConfig)) || /undefined/i.test(typeof(fmConfig.dtInline)) ? false : fmConfig.dtInline), jd = (function (str) { var token_map = ['a', 'ddd', 'A', 'dddd', 'b', 'MMM', 'B', 'MMMM', 'd', 'DD', 'm', 'MM', 'y', 'YY', 'Y', 'YYYY', 'x', 'L', @@ -134,7 +136,7 @@ qTipTime = true; var month = airdate.diff(today, 'month'); if (1 == parseInt(airdate.year() - today.year())) - result += '
(Next Year)'; + result += (dtInline ? ' ' : '
') + '(Next Year)'; } titleThis = true; }