diff --git a/couchpotato/core/media/show/_base/static/show.css b/couchpotato/core/media/show/_base/static/show.css index f8d7bf0..0b223b7 100755 --- a/couchpotato/core/media/show/_base/static/show.css +++ b/couchpotato/core/media/show/_base/static/show.css @@ -378,6 +378,32 @@ display: none; } + .shows .data .eta { + display: none; + } + + .shows.details_list .data .eta { + position: absolute; + bottom: 0; + right: 0; + display: block; + min-height: 20px; + text-align: right; + font-style: italic; + opacity: .8; + font-size: 11px; + } + + .shows.details_list .movie:hover .data .eta { + display: none; + } + + .shows.thumbs_list .data .eta { + display: block; + position: absolute; + bottom: 40px; + } + .shows .data .quality { position: absolute; bottom: 2px; diff --git a/couchpotato/core/media/show/_base/static/show.js b/couchpotato/core/media/show/_base/static/show.js index 99b4297..6019721 100755 --- a/couchpotato/core/media/show/_base/static/show.js +++ b/couchpotato/core/media/show/_base/static/show.js @@ -140,7 +140,22 @@ var Show = new Class({ self.el.addClass('status_'+self.get('status')); - self.el.adopt( + var eta = null, + eta_date = null, + now = Math.round(+new Date()/1000); + + if(self.data.info.release_date) + [self.data.info.release_date.dvd, self.data.info.release_date.theater].each(function(timestamp){ + if (timestamp > 0 && (eta == null || Math.abs(timestamp - now) < Math.abs(eta - now))) + eta = timestamp; + }); + + if(eta){ + eta_date = new Date(eta * 1000); + eta_date = eta_date.toLocaleString('en-us', { month: "long" }) + ' ' + eta_date.getFullYear(); + } + + self.el.adopt( self.select_checkbox = new Element('input[type=checkbox].inlay', { 'events': { 'change': function(){ @@ -170,6 +185,10 @@ var Show = new Class({ self.description = new Element('div.description.tiny_scroll', { 'text': self.data.info.plot }), + self.eta = eta_date && (now+8035200 > eta) ? new Element('div.eta', { + 'text': eta_date, + 'title': 'ETA' + }) : null, self.quality = new Element('div.quality', { 'events': { 'click': function(e){