diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css index 5f1d90a0..15f44892 100644 --- a/data/interfaces/default/css/tautulli.css +++ b/data/interfaces/default/css/tautulli.css @@ -2425,6 +2425,18 @@ a .library-user-instance-box:hover { .home-padded-header .button-bar { float: left; } +#history-option-container { + float: right; + background-color: #333; + padding: 1rem; + border-radius: 0.6rem; +} +.history-option-bar { + margin: 0.2rem; +} +.history-option-button-group { + display: table-cell; +} .home-platforms { } .home-platforms ul, diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index cf15c87f..c31dd9f9 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -16,57 +16,74 @@ % endif
-
+
History
-
- % if _session['user_group'] == 'admin': - -
- +
+
+ % if _session['user_group'] == 'admin': + +
+ +
+ % endif + % if _session['user_group'] == 'admin': +
+ +
+ % endif
- % endif - % if _session['user_group'] == 'admin': -
- +
+
+ +
+
- % endif -
- - - - +
+
+ + + + +
+
+ + + +
+
+ + + +
-
- - - -
-
- -
-
@@ -145,7 +162,7 @@ } }); - function loadHistoryTable(media_type, transcode_decision, selected_user_id) { + function loadHistoryTable(media_type, network_type, transcode_decision, selected_user_id) { history_table_options.ajax = { url: 'get_history', type: 'POST', @@ -153,6 +170,7 @@ return { json_data: JSON.stringify(d), media_type: media_type, + network_type: network_type, transcode_decision: transcode_decision, user_id: selected_user_id }; @@ -170,16 +188,25 @@ $('#media_type-selection').on('change', function () { $('#media_type-selection > label').removeClass('active'); - var selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection'); + let selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection'); $(selected_filter).closest('label').addClass('active'); media_type = $(selected_filter).map(function () { return $(this).val(); }).get().join(','); setLocalStorage('history_media_type', media_type); history_table.draw(); }); + $('#network_type-selection').on('change', function () { + $('#network_type-selection > label').removeClass('active'); + let selected_filter = $('input[name=network_type-filter]:checked', '#network_type-selection'); + $(selected_filter).closest('label').addClass('active'); + network_type = $(selected_filter).map(function () { return $(this).val(); }).get().join(','); + setLocalStorage('history_network_type', network_type); + history_table.draw(); + }); + $('#transcode_decision-selection').on('change', function () { $('#transcode_decision-selection > label').removeClass('active'); - var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection'); + let selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection'); $(selected_filter).closest('label').addClass('active'); transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(','); setLocalStorage('history_transcode_decision', transcode_decision); @@ -192,23 +219,30 @@ }); } - var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"; + const selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}"; - var media_type = getLocalStorage('history_media_type', 'all'); + const media_type = getLocalStorage('history_media_type', 'all'); $.each(media_type.split(','), function (i, item) { - var history_media_type = $('#history-media_type-' + item); + let history_media_type = $('#history-media_type-' + item); history_media_type.prop('checked', true); history_media_type.closest('label').addClass('active'); }); - var transcode_decision = getLocalStorage('history_transcode_decision', 'all'); + const network_type = getLocalStorage('history_network_type', ''); + $.each(network_type.split(','), function (i, item) { + let history_network_type = $('#history-network_type-' + item); + history_network_type.prop('checked', true); + history_network_type.closest('label').addClass('active'); + }); + + const transcode_decision = getLocalStorage('history_transcode_decision', 'all'); $.each(transcode_decision.split(','), function (i, item) { - var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_')); + let history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_')); history_transcode_decision.prop('checked', true); history_transcode_decision.closest('label').addClass('active'); }); - loadHistoryTable(media_type, transcode_decision, selected_user_id); + loadHistoryTable(media_type, network_type, transcode_decision, selected_user_id); % if _session['user_group'] == 'admin': $('#row-edit-mode').on('click', function() { diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html index 59de6497..d1a56012 100644 --- a/data/interfaces/default/library.html +++ b/data/interfaces/default/library.html @@ -216,6 +216,17 @@ DOCUMENTATION :: END
% endif +
+ + + +