diff --git a/UI/Mixins/spoon.js b/UI/Mixins/spoon.js index 137fefcc2..e1ce42494 100644 --- a/UI/Mixins/spoon.js +++ b/UI/Mixins/spoon.js @@ -21,5 +21,9 @@ function bestDateString(sourceDate) { return date.format('{Weekday}'); } + if (date.isAfter(Date.create().addDays(6))) { + return date.relative().replace(' from now', ''); + } + return date.format('{MM}/{dd}/{yyyy}'); } \ No newline at end of file diff --git a/UI/Series/Index/Posters/ItemTemplate.html b/UI/Series/Index/Posters/ItemTemplate.html index 3826996d5..8fa008957 100644 --- a/UI/Series/Index/Posters/ItemTemplate.html +++ b/UI/Series/Index/Posters/ItemTemplate.html @@ -1,29 +1,33 @@ 
- - - +
+
+ {{#unless isContinuing}} +
Ended
+ {{/unless}} + + + +
+
-
{{title}}
+
{{title}}
- {{#if isContinuing}} - {{#if bestDateString}} - {{bestDateString}} +
+ {{#if isContinuing}} + {{#if bestDateString}} + {{bestDateString}} + {{else}} + {{statusText}} + {{/if}} + Season {{seasonCount}} {{else}} - {{statusText}} + {{seasonCount}} Seasons {{/if}} - Season {{seasonCount}} - {{else}} - {{seasonCount}} Seasons - {{/if}} +
- - - - -
\ No newline at end of file diff --git a/UI/Series/series.less b/UI/Series/series.less index 7a797d2ab..643cd5d42 100644 --- a/UI/Series/series.less +++ b/UI/Series/series.less @@ -29,4 +29,41 @@ left: 22px; margin-top: 5px; } + + .title { + font-size: 17px; + text-rendering: optimizelegibility; + } + + .labels { + display: inline-block; + opacity: 0.75; + width: 138px; + + .label { + margin-top: 3px; + display: block; + } + } +} + +.series-poster-container { + position: relative; + overflow: hidden; + display: inline-block; + + .ended-banner { + color: #EEEEEE; + background-color: #B94A48; + -moz-box-shadow: 2px 2px 20px #888; + -moz-transform: rotate(45deg); + -moz-transform-origin: 50% 50%; + -webkit-transform: rotate(45deg); + -webkit-transform-origin: 50% 50%; + position: absolute; + width: 300px; + top: 180px; + left: -120px; + text-align: center; + } } \ No newline at end of file