diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 57b7be47..a91802ad 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -15,9 +15,6 @@ - % if _session['user_group'] == 'admin' and plexpy.CONFIG.PMS_PLEXPASS: - - % endif ${next.headIncludes()} diff --git a/data/interfaces/default/css/plexpy-admin.css b/data/interfaces/default/css/plexpy-admin.css deleted file mode 100644 index b435c082..00000000 --- a/data/interfaces/default/css/plexpy-admin.css +++ /dev/null @@ -1,8 +0,0 @@ -.dashboard-activity-container:hover .dashboard-activity-info-platform { - opacity: 0; -} -.dashboard-activity-container:hover .dashboard-activity-terminate-session { - background-color: rgba(0, 0, 0, 0.25); - opacity: 1; - cursor: pointer; -} \ No newline at end of file diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index 40631fdc..4b704bd0 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -737,6 +737,15 @@ a .users-poster-face:hover { -webkit-transition: all .2s ease-in-out; transition: all .2s ease-in-out; } +.dashboard-activity-info-platform-no-terminate { + background-position: center; + background-size: cover; + width: 50px; + height: 50px; + opacity: 1; + -webkit-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; +} .dashboard-activity-terminate-session { width: 100%; height: 100%; @@ -881,6 +890,14 @@ a:hover .dashboard-activity-cover { -moz-box-shadow: inset 0 0 0 2px #e9a049; box-shadow: inset 0 0 0 2px #e9a049; } +.dashboard-activity-container:hover .dashboard-activity-info-platform { + opacity: 0; +} +.dashboard-activity-container:hover .dashboard-activity-terminate-session { + background-color: rgba(0, 0, 0, 0.25); + opacity: 1; + cursor: pointer; +} .dashboard-activity-metadata-wrapper { position: relative; width: 100%; diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 589d4222..489fb421 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -79,32 +79,36 @@ DOCUMENTATION :: END
% endif % endif - % if data['media_type'] == 'movie': - - % elif data['media_type'] == 'episode': - - % elif data['media_type'] == 'track': - - % elif data['media_type'] == 'photo': -
- % elif data['media_type'] == 'clip': -
+ % elif data['media_type']: +
% else:
% endif
-
+
- % if _session['user_group'] == 'admin' and plexpy.CONFIG.PMS_PLEXPASS: + % if _session['user_group'] == 'admin' and plexpy.CONFIG.PMS_PLEXPASS and data['session_id']:
@@ -124,15 +128,16 @@ DOCUMENTATION :: END
  • Quality
    - % if data['media_type'] != 'photo': + % if data['media_type'] != 'photo' and data['quality_profile'] != 'Unknown': <% - br = helpers.cast_to_int(data['stream_bitrate']) or "Unknown" - br_units = "kbps" - if br != "Unknown" and br > 1000: - br = round(br / 1000.0, 1) - br_units = "Mbps" + br = helpers.cast_to_int(data['stream_bitrate']) or '' + if br: + if br > 1000: + br = '(' + str(round(br / 1000.0, 1)) + 'Mbps)' + else: + br = '(' + str(br) + 'kbps)' %> - ${data['quality_profile']} (${br} ${br_units}) + ${data['quality_profile']} ${br} % else: ${data['quality_profile']} % endif @@ -149,7 +154,11 @@ DOCUMENTATION :: END
    + % if data['rating_key']: % if data['media_type'] == 'movie':   @@ -353,6 +364,7 @@ DOCUMENTATION :: END   % endif + % endif % if data['rating_key']: % if data['media_type'] == 'episode': S${data['parent_media_index']} diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 24d2e78d..64fb923c 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -177,10 +177,6 @@
    • -% endif - - +% endif + + @@ -407,26 +407,30 @@ $('#subtitle_decision-' + key).html(subtitle_decision); // Update the stream quality profile and bandwidth - if (s.media_type != 'photo') { - var br = parseInt(s.stream_bitrate) || 'Unknown'; - var br_units = 'kbps' - if (br != "Unknown" && br > 1000) { - br = (br / 1000).toFixed(1); - br_units = 'Mbps'; + if (s.media_type != 'photo' && s.quality_profile != 'Unknown') { + var br = parseInt(s.stream_bitrate) || ''; + if (br) { + if (br > 1000) { + br = ' (' + (br / 1000).toFixed(1) + 'Mbps)'; + } else { + br = ' (' + br + 'kbps)'; + } } - $('#stream_quality-' + key).html(s.quality_profile + ' (' + br + ' ' + br_units + ')'); + $('#stream_quality-' + key).html(s.quality_profile + br); } else { $('#stream_quality-' + key).html(s.quality_profile); } $('#optimized_version-' + key).html(s.optimized_version_profile); var bw = parseInt(s.bandwidth) || 'Unknown'; - var bw_units = 'kbps' - if (bw != "Unknown" && bw > 1000) { - bw = (bw / 1000).toFixed(1); - bw_units = 'Mbps'; + if (bw != "Unknown") { + if (bw > 1000) { + bw = (bw / 1000).toFixed(1) + 'Mbps'; + } else { + bw = bw + ' kbps' + } } - $('#stream-bandwidth-' + key).html(bw + ' ' + bw_units); + $('#stream-bandwidth-' + key).html(bw ); // Update the stream progress times $('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format)); diff --git a/plexpy/session.py b/plexpy/session.py index c3893293..b46a72ad 100644 --- a/plexpy/session.py +++ b/plexpy/session.py @@ -192,7 +192,11 @@ def mask_session_info(list_of_dicts, mask_metadata=True): 'user_thumb': common.DEFAULT_USER_THUMB, 'ip_address': 'N/A', 'machine_id': '', - 'player': 'Player' + 'platform': 'Platform', + 'player': 'Player', + 'quality_profile': 'Unknown', + 'bandwidth': '', + 'location': '' } metadata_to_mask = {'media_index': '0',