@@ -259,23 +262,12 @@ ${next.modalIncludes()}
-
(Patreon has a fee)
- Click the button below to continue to PayPal.
-
+
- Select a cryptocurrency. -
- - -
-
-
-
- - Or click the button below to continue to Coinbase. + Click the button below to continue to Coinbase.
Donate with Crypto @@ -340,7 +323,6 @@ ${next.modalIncludes()} - @@ -301,10 +287,6 @@ return obj; }, {}); - if (!("Total" in chart_visibility)) { - chart_visibility["Total"] = false; - } - return data_series.map(function(s) { var obj = Object.assign({}, s); obj.visible = (chart_visibility[s.name] !== false); @@ -330,9 +312,7 @@ 'Live TV': '#19A0D7', 'Direct Play': '#E5A00D', 'Direct Stream': '#FFFFFF', - 'Transcode': '#F06464', - 'Max. Concurrent Streams': '#96C83C', - 'Total': '#96C83C' + 'Transcode': '#F06464' }; var series_colors = []; $.each(data_series, function(index, series) { @@ -347,7 +327,6 @@ - @@ -377,10 +356,6 @@ break } - if (window.location.hash === '#concurrent-graph') { - current_tab = '#tabs-stream'; - } - $('#yaxis-' + yaxis).prop('checked', true); $('#yaxis-' + yaxis).closest('label').addClass('active'); $('#graph-days').val(current_day_range); @@ -389,8 +364,8 @@ //$(current_tab).addClass('active'); - $('.days').text(current_day_range); - $('.months').text(current_month_range); + $('.days').html(current_day_range); + $('.months').html(current_month_range); // Load user ids and names (for the selector) $.ajax({ @@ -398,35 +373,14 @@ type: 'get', dataType: "json", success: function (data) { - let select = $('#graph-user'); - let by_id = {}; + var select = $('#graph-user'); data.sort(function(a, b) { return a.friendly_name.localeCompare(b.friendly_name); }); data.forEach(function(item) { select.append(''); - by_id[item.user_id] = item.friendly_name; }); - select.selectpicker({ - countSelectedText: function(sel, total) { - if (sel === 0 || sel === total) { - return 'All users'; - } else if (sel > 1) { - return sel + ' users'; - } else { - return select.val().map(function(id) { - return by_id[id]; - }).join(', '); - } - }, - style: 'btn-dark', - actionsBox: true, - selectedTextFormat: 'count', - noneSelectedText: 'All users' - }); - select.selectpicker('render'); - select.selectpicker('selectAll'); } }); @@ -565,33 +519,6 @@ } }); - $.ajax({ - url: "get_concurrent_streams_by_stream_type", - type: 'get', - data: { time_range: time_range, user_id: selected_user_id }, - dataType: "json", - success: function(data) { - var dateArray = []; - $.each(data.categories, function (i, day) { - dateArray.push(moment(day, 'YYYY-MM-DD').valueOf()); - // Highlight the weekend - if ((moment(day, 'YYYY-MM-DD').format('ddd') == 'Sat') || - (moment(day, 'YYYY-MM-DD').format('ddd') == 'Sun')) { - hc_plays_by_day_options.xAxis.plotBands.push({ - from: i-0.5, - to: i+0.5, - color: 'rgba(80,80,80,0.3)' - }); - } - }); - hc_concurrent_streams_by_stream_type_options.yAxis.min = 0; - hc_concurrent_streams_by_stream_type_options.xAxis.categories = dateArray; - hc_concurrent_streams_by_stream_type_options.series = getGraphVisibility(hc_concurrent_streams_by_stream_type_options.chart.renderTo, data.series); - hc_concurrent_streams_by_stream_type_options.colors = getGraphColors(data.series); - var hc_plays_by_stream_type = new Highcharts.Chart(hc_concurrent_streams_by_stream_type_options); - } - }); - $.ajax({ url: "get_plays_by_source_resolution", type: 'get', @@ -648,7 +575,7 @@ } }); - $('#nav-tabs-stream').tab('show'); + $('#nav-tabs-2').tab('show'); } function loadGraphsTab3(time_range, yaxis) { @@ -675,6 +602,11 @@ $('#nav-tabs-total').tab('show'); } + // Set initial state + if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); } + if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); } + if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); } + // Tab1 opened $('#nav-tabs-plays').on('shown.bs.tab', function (e) { e.preventDefault(); @@ -707,7 +639,7 @@ setLocalStorage('graph_days', current_day_range); if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); } if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); } - $('.days').text(current_day_range); + $('.days').html(current_day_range); }); // Month range changed @@ -717,23 +649,12 @@ current_month_range = $(this).val(); setLocalStorage('graph_months', current_month_range); if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); } - $('.months').text(current_month_range); + $('.months').html(current_month_range); }); - let graph_user_last_id = undefined; - // User changed $('#graph-user').on('change', function() { - let val = $(this).val(); - if (val.length === 0 || val.length === $(this).children().length) { - selected_user_id = null; // if all users are selected, just send an empty list - } else { - selected_user_id = val.join(","); - } - if (selected_user_id === graph_user_last_id) { - return; - } - graph_user_last_id = selected_user_id; + selected_user_id = $(this).val() || null; if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); } if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); } if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); } @@ -760,7 +681,6 @@ if (this.points.length > 1) { var total = 0; $.each(this.points, function(i, point) { - if (point.series.name === 'Total') return; s += ''+point.series.name+': '+point.y; total += point.y; }); @@ -787,7 +707,6 @@ if (this.points.length > 1) { var total = 0; $.each(this.points, function(i, point) { - if (point.series.name === 'Total') return; s += '
'+point.series.name+': '+moment.duration(point.y, 'hours').format('D [days] H [hrs] m [mins]'); total += point.y; }); @@ -808,7 +727,6 @@ hc_plays_by_day_options.xAxis.plotBands = []; hc_plays_by_stream_type_options.xAxis.plotBands = []; - hc_concurrent_streams_by_stream_type_options.xAxis.plotBands = []; hc_plays_by_day_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_dayofweek_options.yAxis.labels.formatter = yaxis_format; diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index 8ab8b19e..cf15c87f 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -1,7 +1,6 @@ <%inherit file="base.html"/> <%def name="headIncludes()"> - @@ -32,7 +31,9 @@ % if _session['user_group'] == 'admin':
% elif stat_id == 'top_libraries':
- <% fallback = 'art-live' if row0['live'] else row0['library_art'] %>
-
+
% elif stat_id == 'top_users':
+<% from plexpy.helpers import anon_url %>
+
% elif stat_id == 'top_platforms':
@@ -103,15 +102,15 @@ DOCUMENTATION :: END
if row0['live']:
href = page('info', row0['rating_key'], row0['guid'], history=True, live=row0['live'])
else:
- href = page('info', row0['rating_key'], history=True)
+ href = page('info', row0['rating_key'])
%>
% elif stat_id == 'top_libraries':
- % if row0['library_thumb'].startswith('http'):
-
+ % if row0['thumb'].startswith('http'):
+
% else:
% endif
@@ -148,8 +147,7 @@ DOCUMENTATION :: END
data-rating_key="${row.get('rating_key')}" data-grandparent_rating_key="${row.get('grandparent_rating_key')}" data-guid="${row.get('guid')}" data-title="${row.get('title')}"
data-art="${row.get('art')}" data-thumb="${row.get('thumb')}" data-platform="${row.get('platform_name')}" data-library-type="${row.get('section_type')}"
data-user_id="${row.get('user_id')}" data-user="${row.get('user')}" data-friendly_name="${row.get('friendly_name')}" data-user_thumb="${row.get('user_thumb')}"
- data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}" data-live="${row.get('live')}"
- data-library_art="${row.get('library_art', '')}" data-library_thumb="${row.get('library_thumb', '')}">
+ data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}" data-live="${row.get('live')}">
${loop.index + 1}
% if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'):
@@ -159,7 +157,7 @@ DOCUMENTATION :: END
if row['live']:
href = page('info', row['rating_key'], row['guid'], history=True, live=row['live'])
else:
- href = page('info', row['rating_key'], history=True)
+ href = page('info', row['rating_key'])
%>
${row['title']}
@@ -177,9 +175,7 @@ DOCUMENTATION :: END
% elif stat_id == 'top_platforms':
${row['platform']}
% elif stat_id == 'most_concurrent':
-
- ${row['title']}
-
+ ${row['title']}
% endif
diff --git a/data/interfaces/default/images/Stripe_wordmark_-_white_small_28px.png b/data/interfaces/default/images/Stripe_wordmark_-_white_small_28px.png
deleted file mode 100644
index 960f32ee..00000000
Binary files a/data/interfaces/default/images/Stripe_wordmark_-_white_small_28px.png and /dev/null differ
diff --git a/data/interfaces/default/images/libraries/artist.png b/data/interfaces/default/images/libraries/artist.png
index 7c9c6c03..10a67be0 100644
Binary files a/data/interfaces/default/images/libraries/artist.png and b/data/interfaces/default/images/libraries/artist.png differ
diff --git a/data/interfaces/default/images/libraries/artist.svg b/data/interfaces/default/images/libraries/artist.svg
index 37920c10..b3bfa5b5 100644
--- a/data/interfaces/default/images/libraries/artist.svg
+++ b/data/interfaces/default/images/libraries/artist.svg
@@ -1,11 +1,5 @@
-
-
-
-
+
% endif
+
+
+
@@ -298,8 +320,6 @@
$('#currentActivityHeader-bandwidth-tooltip').tooltip({ container: 'body', placement: 'right', delay: 50 });
- var title = document.title;
-
function getCurrentActivity() {
activity_ready = false;
@@ -370,8 +390,6 @@
$('#currentActivityHeader').show();
- document.title = stream_count + ' stream' + (stream_count > 1 ? 's' : '') + ' | ' + title;
-
sessions.forEach(function (session) {
var s = (typeof Proxy === "function") ? new Proxy(session, defaultHandler) : session;
var key = s.session_key;
@@ -505,15 +523,14 @@
var audio_decision = '';
if (['movie', 'episode', 'clip', 'track'].indexOf(s.media_type) > -1 && s.stream_audio_decision) {
- var audio_language = (s.media_type !== 'track') ? (s.audio_language || 'Unknown') + ' - ' : '';
var a_codec = (s.audio_codec === 'truehd') ? 'TrueHD' : s.audio_codec.toUpperCase();
var sa_codec = (s.stream_audio_codec === 'truehd') ? 'TrueHD' : s.stream_audio_codec.toUpperCase();
if (s.stream_audio_decision === 'transcode') {
- audio_decision = 'Transcode (' + audio_language + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + ' ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+ audio_decision = 'Transcode (' + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + ' ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
} else if (s.stream_audio_decision === 'copy') {
- audio_decision = 'Direct Stream (' + audio_language + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+ audio_decision = 'Direct Stream (' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
} else {
- audio_decision = 'Direct Play (' + audio_language + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+ audio_decision = 'Direct Play (' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
}
}
$('#audio_decision-' + key).html(audio_decision);
@@ -522,13 +539,13 @@
if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.subtitles === 1) {
var subtitle_codec = (s.stream_subtitle_codec && s.stream_subtitle_transient) ? 'None' : s.subtitle_codec.toUpperCase();
if (s.stream_subtitle_decision === 'transcode') {
- subtitle_decision = 'Transcode ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ' ' + s.stream_subtitle_codec.toUpperCase() + ')';
+ subtitle_decision = 'Transcode (' + subtitle_codec + ' ' + s.stream_subtitle_codec.toUpperCase() + ')';
} else if (s.stream_subtitle_decision === 'copy') {
- subtitle_decision = 'Direct Stream ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ')';
+ subtitle_decision = 'Direct Stream (' + subtitle_codec + ')';
} else if (s.stream_subtitle_decision === 'burn') {
- subtitle_decision = 'Burn ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ')';
+ subtitle_decision = 'Burn (' + subtitle_codec + ')';
} else {
- subtitle_decision = 'Direct Play ('+ (s.subtitle_language || 'Unknown')+ ' - ' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')';
+ subtitle_decision = 'Direct Play (' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')';
}
}
$('#subtitle_decision-' + key).html(subtitle_decision);
@@ -566,7 +583,6 @@
// Update the stream progress times
$('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format));
- $('#stream-duration-' + key).html(millisecondsToMinutes(parseInt(s.stream_duration), false));
var stream_view_offset = $('#stream-view-offset-' + key);
stream_view_offset.data('state', s.state);
if (stream_view_offset.data('last_view_offset') !== s.view_offset) {
@@ -604,8 +620,6 @@
} else {
$('#currentActivityHeader').hide();
$('#currentActivity').html('
% endif
- % if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track', 'collection', 'playlist'):
+ % if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track'):
Nothing is currently being played.
');
-
- document.title = title;
}
activity_ready = true;
@@ -782,8 +796,6 @@
var grandparent_rating_key = $(elem).data('grandparent_rating_key');
var guid = $(elem).data('guid');
var live = $(elem).data('live');
- var library_art = $(elem).data('library_art');
- var library_thumb = $(elem).data('library_thumb');
var [height, fallback_poster, fallback_art] = [450, 'poster', 'art'];
if ($.inArray(stat_id, ['top_music', 'popular_music']) > -1) {
[height, fallback_poster, fallback_art] = [300, 'cover', 'art'];
@@ -795,11 +807,11 @@
if (stat_id === 'most_concurrent') {
return
} else if (stat_id === 'top_libraries') {
- $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art || library_art, null, 500, 280, 40, '282828', 3, fallback_art) + ')');
+ $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, null, 500, 280, 40, '282828', 3, fallback_art) + ')');
$('#stats-thumb-' + stat_id).removeClass(function (index, className) {
return (className.match (/(^|\s)svg-icon library-\S+/g) || []).join(' ')});
- if (library_thumb.startsWith('http')) {
- $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', library_thumb, null, 100, 100, null, null, null, 'cover') + ')');
+ if (thumb.startsWith('http')) {
+ $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, null, 300, 300, null, null, null, 'cover') + ')');
} else {
$('#stats-thumb-' + stat_id).css('background-image', '')
.addClass('svg-icon library-' + library_type);
@@ -831,7 +843,7 @@
$('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, img_rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')');
$('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, height, null, null, null, fallback_poster) + ')');
$('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, height, 60, '282828', 3, fallback_poster) + ')');
- $('#library-stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art || library_art, img_rating_key, 500, 280, 40, '282828', 3, library_art || fallback_art) + ')');
+ $('#library-stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, img_rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')');
if (thumb.startsWith('http')) {
$('#library-stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, 300, null, null, null, 'cover') + ')')
.removeClass('svg-icon library-' + stat_id);
@@ -942,14 +954,10 @@
count: recently_added_count,
media_type: recently_added_type
},
- beforeSend: function () {
- $(".dashboard-recent-media-row").animate({ scrollLeft: 0 }, 1000);
- },
complete: function (xhr, status) {
$("#recentlyAdded").html(xhr.responseText);
$('#ajaxMsg').fadeOut();
- highlightScrollerButton("#recently-added");
- paginateScroller("#recently-added", ".paginate-added");
+ highlightAddedScrollerButton();
}
});
}
@@ -965,11 +973,57 @@
recentlyAdded(recently_added_count, recently_added_type);
}
+ function highlightAddedScrollerButton() {
+ var scroller = $("#recently-added-row-scroller");
+ var numElems = scroller.find("li:visible").length;
+ scroller.width(numElems * 175);
+ if (scroller.width() > $("body").find(".container-fluid").width()) {
+ $("#recently-added-page-right").removeClass("disabled");
+ } else {
+ $("#recently-added-page-right").addClass("disabled");
+ }
+ }
+
+ $(window).resize(function () {
+ highlightAddedScrollerButton();
+ });
+
+ function resetScroller() {
+ leftTotal = 0;
+ $("#recently-added-row-scroller").animate({ left: leftTotal }, 1000);
+ $("#recently-added-page-left").addClass("disabled").blur();
+ }
+
+ var leftTotal = 0;
+ $(".paginate").click(function (e) {
+ e.preventDefault();
+ var scroller = $("#recently-added-row-scroller");
+ var containerWidth = $("body").find(".container-fluid").width();
+ var scrollAmount = $(this).data("id") * parseInt((containerWidth - 15) / 175) * 175;
+ var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
+
+ leftTotal = Math.max(Math.min(leftTotal + scrollAmount, 0), leftMax);
+ scroller.animate({ left: leftTotal }, 250);
+
+ if (leftTotal === 0) {
+ $("#recently-added-page-left").addClass("disabled").blur();
+ } else {
+ $("#recently-added-page-left").removeClass("disabled");
+ }
+
+ if (leftTotal === leftMax) {
+ $("#recently-added-page-right").addClass("disabled").blur();
+ } else {
+ $("#recently-added-page-right").removeClass("disabled");
+ }
+ });
+
$('#recently-added-toggles').on('change', function () {
$('#recently-added-toggles > label').removeClass('active');
selected_filter = $('input[name=recently-added-toggle]:checked', '#recently-added-toggles');
$(selected_filter).closest('label').addClass('active');
recently_added_type = $(selected_filter).val();
+ resetScroller();
setLocalStorage('home_stats_recently_added_type', recently_added_type);
recentlyAdded(recently_added_count, recently_added_type);
});
@@ -977,6 +1031,7 @@
$('#recently-added-count').change(function () {
forceMinMax($(this));
recently_added_count = $(this).val();
+ resetScroller();
setLocalStorage('home_stats_recently_added_count', recently_added_count);
recentlyAdded(recently_added_count, recently_added_type);
});
@@ -1008,4 +1063,16 @@
});
% endif
-
+% if _session['user_group'] == 'admin':
+
+% endif
+
\ No newline at end of file
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index ead534a1..0b69d508 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -12,10 +12,8 @@ data :: Usable parameters (if not applicable for media type, blank value will be
== Global keys ==
rating_key Returns the unique identifier for the media item.
media_type Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
-sub_media_type Returns the subtype of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
art Returns the location of the item's artwork
title Returns the name of the movie, show, episode, artist, album, or track.
-edition_title Returns the edition title of a movie.
duration Returns the standard runtime of the media.
content_rating Returns the age rating for the media.
summary Returns a brief description of the media plot.
@@ -214,8 +212,8 @@ DOCUMENTATION :: END
% if _session['user_group'] == 'admin':
% endif
- % elif data['media_type'] in ('artist', 'album', 'track', 'playlist', 'photo_album', 'photo', 'clip') or data['sub_media_type'] in ('artist', 'album', 'track'):
-
+ % elif data['media_type'] in ('artist', 'album', 'track', 'playlist', 'photo_album', 'photo', 'clip'):
+
@@ -268,7 +266,7 @@ DOCUMENTATION :: END
@@ -554,7 +542,7 @@ DOCUMENTATION :: END
${data['parent_title']}
${data['title']}
% elif data['media_type'] == 'track': -${data['grandparent_title']}
+${data['original_title'] or data['grandparent_title']}
${data['parent_title']} - ${data['title']}
T${data['media_index']}
% elif data['media_type'] in ('photo', 'clip'): @@ -284,14 +282,14 @@ DOCUMENTATION :: END padding_height = '' if data['media_type'] == 'movie' or data['live']: padding_height = 'height: 305px;' - elif data['media_type'] in ('artist', 'album', 'playlist', 'photo_album', 'photo') or data['sub_media_type'] in ('artist', 'album', 'track'): + elif data['media_type'] in ('show', 'season', 'collection'): + padding_height = 'height: 270px;' + elif data['media_type'] == 'episode': + padding_height = 'height: 70px;' + elif data['media_type'] in ('artist', 'album', 'playlist', 'photo_album', 'photo'): padding_height = 'height: 150px;' elif data['media_type'] in ('track', 'clip'): padding_height = 'height: 180px;' - elif data['media_type'] == 'episode': - padding_height = 'height: 70px;' - elif data['media_type'] in ('show', 'season', 'collection'): - padding_height = 'height: 270px;' %> -
- % if data['media_type'] == 'track' and data['original_title']:
- Track Artists ${data['original_title']}
- % endif
-
% if data['media_type'] == 'movie':
Year ${data['year']}
@@ -397,19 +390,14 @@ DOCUMENTATION :: END
Runtime ${data['duration']}
% endif
- % if data['edition_title']:
-
- Edition ${data['edition_title']}
-
- % endif
% if data['content_rating']:
Rated ${data['content_rating']}
% endif
- % if media_info['channel_vcn']:
- Channel ${media_info['channel_title'] or (media_info['channel_vcn'] + ' ' + media_info['channel_call_sign'])}
+ % if media_info['channel_identifier']:
+ Channel ${media_info['channel_call_sign']} ${media_info['channel_identifier']}
% endif
% endif
<%
- history_type = data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track', 'collection', 'playlist')
+ history_type = data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track')
history_active = 'active' if history_type else ''
export_active = 'active' if not history_type else ''
%>
@@ -646,7 +634,7 @@ DOCUMENTATION :: END