From 150453bff3ceafe7ff4c40742f0348a2a8d272f0 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Wed, 11 May 2016 20:59:19 -0700 Subject: [PATCH] Fix current activity artwork for tracks --- data/interfaces/default/css/plexpy.css | 4 ++++ data/interfaces/default/current_activity_instance.html | 10 +++++++--- data/interfaces/default/index.html | 10 ++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 0c69955b..6450dcc4 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -570,6 +570,10 @@ a .users-poster-face:hover { margin-left: 5px; float: left; } +#dashboard-checking-activity, +#dashboard-no-activity { + margin-bottom: 20px; +} .dashboard-instance { float: left; position: relative; diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 121b2ced..5a51b99b 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -60,6 +60,10 @@ DOCUMENTATION :: END % if data is not None: +<% + from plexpy import helpers + data['indexes'] = helpers.cast_to_int(data['indexes']) +%>
% if (data['media_type'] == 'movie' or data['media_type'] == 'episode' or data['media_type'] == 'track') and data['rating_key']: @@ -80,9 +84,9 @@ DOCUMENTATION :: END
% elif data['media_type'] == 'clip': - % if data['art'][:4] == 'http': + % if data['art'].startswith('http'):
- % elif data['thumb'][:4] == 'http': + % elif data['thumb'].startswith('http'):
% else: % if data['art']: @@ -92,7 +96,7 @@ DOCUMENTATION :: END % endif % endif % elif data['media_type'] == 'photo': -
+
% else:
% endif diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index fa9d9364..36d2887e 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -14,7 +14,6 @@
Checking for activity...
-
@@ -108,7 +107,6 @@ $('#dashboard-checking-activity').remove(); var current_activity = $.parseJSON(xhr.responseText); - console.log(current_activity) var stream_count = parseInt(current_activity.stream_count); var sessions = current_activity.sessions; @@ -147,7 +145,7 @@ $('#play-state-' + key).html(state_icon); // if using bif indexes, update the bif thumbnail - if (s.indexes == 1) { + if (s.indexes) { var bif_poster = $('#bif-' + key); bif_poster.animate({ opacity: 0 }, { duration: 1000, queue: false }); bif_poster.after($('
Nothing is currently being played.
'); + $('#currentActivity').html('
Nothing is currently being played.
'); } } }); @@ -216,6 +214,10 @@ $('#currentActivity').on('click', '.btn-activity-info', function (e) { e.preventDefault(); $($(this).attr('data-target')).toggle(); + var id = $(this).closest('.dashboard-instance').data('id'); + var filterVal = $('#stream-' + id).is(':visible') ? 'blur(5px)' : ''; + $($(this).closest('.dashboard-activity-poster').find('.dashboard-activity-poster-face, .dashboard-activity-cover-face')) + .css('filter',filterVal).css('webkitFilter',filterVal).css('mozFilter',filterVal).css('oFilter',filterVal).css('msFilter',filterVal); }); // Add hover class to dashboard-instance