diff --git a/data/interfaces/default/css/plexwatch.css b/data/interfaces/default/css/plexwatch.css index 53579937..fb3b643d 100644 --- a/data/interfaces/default/css/plexwatch.css +++ b/data/interfaces/default/css/plexwatch.css @@ -6648,10 +6648,13 @@ button.close { z-index: 1; } .dashboard-activity-poster-face { - height: 152px; + height: 141px; width: 250px; position: relative; top: 0px; + background-color: rgba(255,255,255,.03); + margin-bottom: 11px; + text-align: center; } .dashboard-activity-poster-face img { bottom: 0; @@ -6682,8 +6685,14 @@ button.close { -ms-backface-visibility: hidden; -o-backface-visibility: hidden; backface-visibility: hidden; - height: 141px; - width: 250px; + height: 140px; + min-width: 140px; +} +.dashboard-activity-poster-music-bg { + position:absolute; + width:100%; + height:100%; + opacity: 0.7; } .dashboard-activity-metadata-user { text-overflow: ellipsis; diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html index 1b09eb4b..e3541290 100644 --- a/data/interfaces/default/current_activity.html +++ b/data/interfaces/default/current_activity.html @@ -58,7 +58,10 @@ DOCUMENTATION :: END % else:
- + % if a['type'] == 'track': +
+ % endif +
% endif
diff --git a/data/interfaces/default/images/cover.png b/data/interfaces/default/images/cover.png new file mode 100644 index 00000000..6b63617a Binary files /dev/null and b/data/interfaces/default/images/cover.png differ diff --git a/plexpy/common.py b/plexpy/common.py index 848f5ef9..c0f270d7 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -37,4 +37,5 @@ notify_strings[NOTIFY_STARTED] = "Playback started" notify_strings[NOTIFY_STOPPED] = "Playback stopped" DEFAULT_USER_THUMB = "interfaces/default/images/gravatar-default-80x80.png" -DEFAULT_POSTER_THUMB = "interfaces/default/images/poster.png" \ No newline at end of file +DEFAULT_POSTER_THUMB = "interfaces/default/images/poster.png" +DEFAULT_COVER_THUMB = "interfaces/default/images/cover.png" \ No newline at end of file diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 2e32e819..e298aa3d 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -551,25 +551,30 @@ class WebInterface(object): @cherrypy.expose def pms_image_proxy(self, img='', width='0', height='0', fallback=None, **kwargs): - if img != '': - try: - pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_image(img, width, height) - cherrypy.response.headers['Content-type'] = result[1] - return result[0] - except: - logger.warn('Image proxy queried but errors occured.') - if fallback == 'poster': - logger.info('Trying fallback image...') - try: - fallback_image = open(self.interface_dir + common.DEFAULT_POSTER_THUMB, 'rb') - cherrypy.response.headers['Content-type'] = 'image/png' - return fallback_image - except IOError, e: - logger.error('Unable to read fallback image. %s' % e) - return None - else: - logger.warn('Image proxy queried but no parameters received.') + try: + pms_connect = pmsconnect.PmsConnect() + result = pms_connect.get_image(img, width, height) + cherrypy.response.headers['Content-type'] = result[1] + return result[0] + except: + logger.warn('Image proxy queried but errors occured.') + if fallback == 'poster': + logger.info('Trying fallback image...') + try: + fallback_image = open(self.interface_dir + common.DEFAULT_POSTER_THUMB, 'rb') + cherrypy.response.headers['Content-type'] = 'image/png' + return fallback_image + except IOError, e: + logger.error('Unable to read fallback image. %s' % e) + elif fallback == 'cover': + logger.info('Trying fallback image...') + try: + fallback_image = open(self.interface_dir + common.DEFAULT_COVER_THUMB, 'rb') + cherrypy.response.headers['Content-type'] = 'image/png' + return fallback_image + except IOError, e: + logger.error('Unable to read fallback image. %s' % e) + return None @cherrypy.expose