diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 8f951655..34bd91ba 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -781,6 +781,21 @@ a .users-poster-face:hover { display: none; z-index: -1; } +.dashboard-activity-terminate-session { + width: 50px; + height: 50px; + position: absolute; + top: 0; + left: 0; + font-size: 30px; + color: #eee; + z-index: 1; + text-align: center; + padding-top: 5px; +} +.dashboard-activity-terminate-session:hover { + color: #e9a049; +} .dashboard-activity-button-info { width: 50px; height: 50px; diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 3f0730c3..29699636 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -64,7 +64,7 @@ DOCUMENTATION :: END from urllib import quote import plexpy %> -
+
% if (data['media_type'] == 'movie' or data['media_type'] == 'episode' or data['media_type'] == 'track') and data['rating_key']: @@ -74,15 +74,15 @@ DOCUMENTATION :: END
% if not data['art'].startswith('interfaces') or not data['thumb'].startswith('interfaces'): % if (data['media_type'] == 'movie' and not plexpy.CONFIG.PMS_USE_BIF) or (plexpy.CONFIG.PMS_USE_BIF and not data['view_offset']): -
+
% elif (data['media_type'] == 'episode' and not plexpy.CONFIG.PMS_USE_BIF) or (plexpy.CONFIG.PMS_USE_BIF and not data['view_offset']): -
+
% elif plexpy.CONFIG.PMS_USE_BIF: % else: % if data['media_type'] == 'track': -
-
+
+
% elif data['media_type'] == 'clip': % if data['art'].startswith('http'):
@@ -91,26 +91,30 @@ DOCUMENTATION :: END % else: % if data['art']: -
+
% else: -
+
% endif % endif % elif data['media_type'] == 'photo': -
+
% else: -
+
% endif % endif % else:
% endif - % if _session['user_group'] == 'admin': - + % if _session['user_group'] == 'admin' and plexpy.CONFIG.PMS_PLEXPASS: + % endif
-
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index d7e71f73..74ab3705 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -141,6 +141,40 @@
% endif +% if _session['user_group'] == 'admin': + +% endif + <%def name="javascriptIncludes()"> @@ -357,6 +391,7 @@ complete: function(xhr, status) { $('#currentActivity').append(xhr.responseText); $('#instance-' + session.session_key).find('.dashboard-activity-poster-face').hide().fadeIn(1000); + $('#terminate-button-' + session.session_key + ' span').tooltip({ container: 'body', placement: 'right', delay: 50 }); $('#bufferbar-' + session.session_key).tooltip({ container: 'body', placement: 'right', delay: 50 }); $('#bar-' + session.session_key).tooltip({ container: 'body', placement: 'right', delay: 50 }); } @@ -379,20 +414,67 @@ $('#currentActivity').on('click', '.btn-activity-info', function (e) { e.preventDefault(); $($(this).attr('data-target')).toggle(); - var key = $(this).data('id'); + var key = $(this).data('key'); blurArtwork(key); + $('#terminate-button-' + key).toggle(); }); // Add hover class to dashboard-instance $('#currentActivity').on('mouseover', '.dashboard-hover-container', function () { $(this).closest('.dashboard-instance').addClass('hover'); - }); - $('#currentActivity').on('mouseleave', '.dashboard-hover-container', function () { - var id = $(this).closest('.dashboard-instance').data('id'); - if (!($('#stream-' + id).is(':visible'))) { - $(this).closest('.dashboard-instance').removeClass('hover'); + var key = $(this).closest('.dashboard-instance').data('key'); + if (!($('#stream-' + key).is(':visible'))) { + $('#terminate-button-' + key).fadeIn(200); } }); + $('#currentActivity').on('mouseleave', '.dashboard-hover-container', function () { + var key = $(this).closest('.dashboard-instance').data('key'); + if (!($('#stream-' + key).is(':visible'))) { + $(this).closest('.dashboard-instance').removeClass('hover'); + $('#terminate-button-' + key).fadeOut(200); + } + }); + + % if _session['user_group'] == 'admin': + // Terminate session + $('#currentActivity').on('click', '.dashboard-activity-terminate-session', function (e) { + e.preventDefault(); + var session_id = $(this).data('id'); + var key = $(this).data('key'); + var instance = $('#instance-' + key); + + $('#terminate-user').text(instance.find('.dashboard-activity-metadata-user').text()); + $('#terminate-title').text(instance.find('.dashboard-activity-metadata-title').text()); + $('#terminate-subtitle').text(instance.find('.dashboard-activity-metadata-subtitle').text()); + + $('#terminate-session-modal').modal(); + $('#terminate-session-modal').one('click', '#confirm-terminate-session', function () { + var message = $('#terminate-message').val(); + + showMsg('Terminating session', true); + + $.ajax({ + url: 'terminate_session', + data: { + session_id: session_id, + message: message + }, + async: true, + success: function (data) { + if (data.result === 'success') { + setTimeout(function() { + currentActivityHeader(); + getCurrentActivity(); + showMsg(' ' + data.message, false, true, 5000); + }, 2500); + } else { + showMsg(' ' + data.message, false, true, 5000, true); + } + } + }); + }); + }); + % endif % endif % if 'watch_stats' in config['home_sections']: diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index d21a4869..736785ef 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -1268,7 +1268,7 @@ class PmsConnect(object): 'location': helpers.get_xml_attr(session_info, 'location') } else: - session_details = {} + session_details = {'session_id': ''} # Get the transcode details if session.getElementsByTagName('TranscodeSession'):