mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
updated nuget + live tv
This commit is contained in:
parent
07241dc539
commit
fadec6653a
14 changed files with 109 additions and 27 deletions
|
@ -37,7 +37,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div style="display: inline-block; vertical-align: bottom;">
|
<div style="display: inline-block; vertical-align: bottom;">
|
||||||
<div class="fldRefresh" style="display: none;">
|
<div class="fldRefresh" style="display: none;">
|
||||||
<button id="btnRefresh" type="button" data-icon="refresh" data-mini="true" data-inline="true">Full Metadata Refresh</button>
|
<button id="btnRefresh" type="button" data-icon="refresh" data-mini="true" data-inline="true">Refresh Metadata</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="display: inline-block; vertical-align: bottom;">
|
<div style="display: inline-block; vertical-align: bottom;">
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div style="vertical-align: bottom; display: inline-block;">
|
<div style="vertical-align: bottom; display: inline-block;">
|
||||||
<div id="fldDelete" style="display: none;">
|
<div id="fldDelete" style="display: none;">
|
||||||
<button id="btnDelete" type="button" data-icon="delete" data-mini="true" data-inline="true">Delete Item</button>
|
<button id="btnDelete" type="button" data-icon="delete" data-mini="true" data-inline="true">Delete</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
<a href="livetvguide.html">Guide</a>
|
<a href="livetvguide.html">Guide</a>
|
||||||
<a href="livetvchannels.html" class="ui-btn-active">Channels</a>
|
<a href="livetvchannels.html" class="ui-btn-active">Channels</a>
|
||||||
<a href="livetvrecordings.html">Recordings</a>
|
<a href="livetvrecordings.html">Recordings</a>
|
||||||
<a href="livetvtimers.html">Timers</a>
|
<a href="livetvtimers.html">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html">Series Timers</a>
|
||||||
</div>
|
</div>
|
||||||
<div id="itemBackdrop" class="itemBackdrop noBackdrop">
|
<div id="itemBackdrop" class="itemBackdrop noBackdrop">
|
||||||
<div class="itemBackdropContent">
|
<div class="itemBackdropContent">
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
<a href="livetvguide.html">Guide</a>
|
<a href="livetvguide.html">Guide</a>
|
||||||
<a href="livetvchannels.html" class="ui-btn-active">Channels</a>
|
<a href="livetvchannels.html" class="ui-btn-active">Channels</a>
|
||||||
<a href="livetvrecordings.html">Recordings</a>
|
<a href="livetvrecordings.html">Recordings</a>
|
||||||
<a href="livetvtimers.html">Timers</a>
|
<a href="livetvtimers.html">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html">Series Timers</a>
|
||||||
</div>
|
</div>
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="viewSettings">
|
<div class="viewSettings">
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
<a href="livetvguide.html" class="ui-btn-active">Guide</a>
|
<a href="livetvguide.html" class="ui-btn-active">Guide</a>
|
||||||
<a href="livetvchannels.html">Channels</a>
|
<a href="livetvchannels.html">Channels</a>
|
||||||
<a href="livetvrecordings.html">Recordings</a>
|
<a href="livetvrecordings.html">Recordings</a>
|
||||||
<a href="livetvtimers.html">Timers</a>
|
<a href="livetvtimers.html">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html">Series Timers</a>
|
||||||
</div>
|
</div>
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
<a href="livetvguide.html">Guide</a>
|
<a href="livetvguide.html">Guide</a>
|
||||||
<a href="livetvchannels.html">Channels</a>
|
<a href="livetvchannels.html">Channels</a>
|
||||||
<a href="livetvrecordings.html" class="ui-btn-active">Recordings</a>
|
<a href="livetvrecordings.html" class="ui-btn-active">Recordings</a>
|
||||||
<a href="livetvtimers.html">Timers</a>
|
<a href="livetvtimers.html">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html">Series Timers</a>
|
||||||
</div>
|
</div>
|
||||||
<div id="itemBackdrop" class="itemBackdrop noBackdrop">
|
<div id="itemBackdrop" class="itemBackdrop noBackdrop">
|
||||||
<div class="itemBackdropContent">
|
<div class="itemBackdropContent">
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
<a href="livetvguide.html">Guide</a>
|
<a href="livetvguide.html">Guide</a>
|
||||||
<a href="livetvchannels.html">Channels</a>
|
<a href="livetvchannels.html">Channels</a>
|
||||||
<a href="livetvrecordings.html" class="ui-btn-active">Recordings</a>
|
<a href="livetvrecordings.html" class="ui-btn-active">Recordings</a>
|
||||||
<a href="livetvtimers.html">Timers</a>
|
<a href="livetvtimers.html">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html">Series Timers</a>
|
||||||
</div>
|
</div>
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="itemsContainer">
|
<div class="itemsContainer">
|
||||||
|
|
21
dashboard-ui/livetvseriestimer.html
Normal file
21
dashboard-ui/livetvseriestimer.html
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Media Browser</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage" data-theme="a" data-view="livetv">
|
||||||
|
<div class="libraryViewNav">
|
||||||
|
<a href="livetvguide.html">Guide</a>
|
||||||
|
<a href="livetvchannels.html">Channels</a>
|
||||||
|
<a href="livetvrecordings.html">Recordings</a>
|
||||||
|
<a href="livetvtimers.html">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html" class="ui-btn-active">Series Timers</a>
|
||||||
|
</div>
|
||||||
|
<div data-role="content">
|
||||||
|
<br />
|
||||||
|
<div id="items" class="itemsContainer"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
21
dashboard-ui/livetvseriestimers.html
Normal file
21
dashboard-ui/livetvseriestimers.html
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Media Browser</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="liveTvSeriesTimersPage" data-role="page" class="page libraryPage" data-theme="a" data-view="livetv">
|
||||||
|
<div class="libraryViewNav">
|
||||||
|
<a href="livetvguide.html">Guide</a>
|
||||||
|
<a href="livetvchannels.html">Channels</a>
|
||||||
|
<a href="livetvrecordings.html">Recordings</a>
|
||||||
|
<a href="livetvtimers.html">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html" class="ui-btn-active">Series Timers</a>
|
||||||
|
</div>
|
||||||
|
<div data-role="content">
|
||||||
|
<br />
|
||||||
|
<div id="items" class="itemsContainer"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -9,16 +9,22 @@
|
||||||
<a href="livetvguide.html">Guide</a>
|
<a href="livetvguide.html">Guide</a>
|
||||||
<a href="livetvchannels.html">Channels</a>
|
<a href="livetvchannels.html">Channels</a>
|
||||||
<a href="livetvrecordings.html">Recordings</a>
|
<a href="livetvrecordings.html">Recordings</a>
|
||||||
<a href="livetvtimers.html" class="ui-btn-active">Timers</a>
|
<a href="livetvtimers.html" class="ui-btn-active">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html">Series Timers</a>
|
||||||
</div>
|
</div>
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<form style="margin: 0 auto;">
|
<form style="margin: 0 auto;">
|
||||||
<h1>Timer Info</h1>
|
<p><span class="itemName inlineItemName program"></span><span class="itemMiscInfo" style="display: inline;"></span></p>
|
||||||
|
|
||||||
<p class="program"></p>
|
|
||||||
<p class="channel"></p>
|
<p class="channel"></p>
|
||||||
<p class="overview"></p>
|
<p class="overview"></p>
|
||||||
|
|
||||||
|
<p style="margin-top: 2em;">
|
||||||
|
<span class="status"></span>
|
||||||
|
<a id="btnCancelTimer" href="#" style="margin-left: 2em;">Cancel Timer</a>
|
||||||
|
<span class="seriesTimerLink" style="margin-left: 2em;"></span>
|
||||||
|
</p>
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
<a href="livetvguide.html">Guide</a>
|
<a href="livetvguide.html">Guide</a>
|
||||||
<a href="livetvchannels.html">Channels</a>
|
<a href="livetvchannels.html">Channels</a>
|
||||||
<a href="livetvrecordings.html">Recordings</a>
|
<a href="livetvrecordings.html">Recordings</a>
|
||||||
<a href="livetvtimers.html" class="ui-btn-active">Timers</a>
|
<a href="livetvtimers.html" class="ui-btn-active">Upcoming Timers</a>
|
||||||
|
<a href="livetvseriestimers.html">Series Timers</a>
|
||||||
</div>
|
</div>
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<br />
|
<br />
|
||||||
|
|
1
dashboard-ui/scripts/livetvseriestimer.js
Normal file
1
dashboard-ui/scripts/livetvseriestimer.js
Normal file
|
@ -0,0 +1 @@
|
||||||
|
|
1
dashboard-ui/scripts/livetvseriestimers.js
Normal file
1
dashboard-ui/scripts/livetvseriestimers.js
Normal file
|
@ -0,0 +1 @@
|
||||||
|
|
|
@ -2,6 +2,25 @@
|
||||||
|
|
||||||
var currentItem;
|
var currentItem;
|
||||||
|
|
||||||
|
function deleteTimer(page, id) {
|
||||||
|
|
||||||
|
Dashboard.confirm("Are you sure you wish to cancel this timer?", "Confirm Timer Cancellation", function (result) {
|
||||||
|
|
||||||
|
if (result) {
|
||||||
|
|
||||||
|
Dashboard.showLoadingMsg();
|
||||||
|
|
||||||
|
ApiClient.cancelLiveTvTimer(id).done(function () {
|
||||||
|
|
||||||
|
Dashboard.alert('Timer deleted');
|
||||||
|
|
||||||
|
reload(page);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function renderTimer(page, item) {
|
function renderTimer(page, item) {
|
||||||
|
|
||||||
currentItem = item;
|
currentItem = item;
|
||||||
|
@ -15,6 +34,17 @@
|
||||||
$('#txtRequiredPrePaddingSeconds', page).val(item.RequiredPrePaddingSeconds);
|
$('#txtRequiredPrePaddingSeconds', page).val(item.RequiredPrePaddingSeconds);
|
||||||
$('#txtRequiredPostPaddingSeconds', page).val(item.RequiredPostPaddingSeconds);
|
$('#txtRequiredPostPaddingSeconds', page).val(item.RequiredPostPaddingSeconds);
|
||||||
|
|
||||||
|
$('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item));
|
||||||
|
$('.status', page).html('Status: ' + item.Status);
|
||||||
|
|
||||||
|
if (item.SeriesTimerId) {
|
||||||
|
|
||||||
|
$('.seriesTimerLink', page).html('<a href="livetvseriestimer.html?id=' + item.SeriesTimerId + '">View Series</a>').show().trigger('create');
|
||||||
|
|
||||||
|
} else {
|
||||||
|
$('.seriesTimerLink', page).hide();
|
||||||
|
}
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,6 +65,12 @@
|
||||||
|
|
||||||
var page = this;
|
var page = this;
|
||||||
|
|
||||||
|
$('#btnCancelTimer', page).on('click', function () {
|
||||||
|
|
||||||
|
deleteTimer(page, currentItem.Id);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
}).on('pagebeforeshow', "#liveTvTimerPage", function () {
|
}).on('pagebeforeshow', "#liveTvTimerPage", function () {
|
||||||
|
|
||||||
var page = this;
|
var page = this;
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
(function ($, document, apiClient) {
|
(function ($, document, apiClient) {
|
||||||
|
|
||||||
function editTimer(page, id) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
function deleteTimer(page, id) {
|
function deleteTimer(page, id) {
|
||||||
|
|
||||||
Dashboard.confirm("Are you sure you wish to cancel this timer?", "Confirm Timer Cancellation", function (result) {
|
Dashboard.confirm("Are you sure you wish to cancel this timer?", "Confirm Timer Cancellation", function (result) {
|
||||||
|
@ -40,7 +36,7 @@
|
||||||
html += '<th>Start</th>';
|
html += '<th>Start</th>';
|
||||||
html += '<th class="tabletColumn">Length</th>';
|
html += '<th class="tabletColumn">Length</th>';
|
||||||
html += '<th class="tabletColumn">Status</th>';
|
html += '<th class="tabletColumn">Status</th>';
|
||||||
html += '<th class="desktopColumn">Recurring</th>';
|
html += '<th class="desktopColumn">Series</th>';
|
||||||
|
|
||||||
html += '</tr>';
|
html += '</tr>';
|
||||||
|
|
||||||
|
@ -86,9 +82,10 @@
|
||||||
|
|
||||||
html += '<td class="desktopColumn">';
|
html += '<td class="desktopColumn">';
|
||||||
|
|
||||||
if (timer.IsRecurring) {
|
if (timer.SeriesTimerId) {
|
||||||
html += ' ';
|
html += '<a href="livetvseriestimer.html?id=' + timer.SeriesTimerId + '">';
|
||||||
html += '✓';
|
html += 'View';
|
||||||
|
html += '</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '</td>';
|
html += '</td>';
|
||||||
|
@ -100,13 +97,6 @@
|
||||||
|
|
||||||
var elem = $('#items', page).html(html).trigger('create');
|
var elem = $('#items', page).html(html).trigger('create');
|
||||||
|
|
||||||
$('.btnEditTimer', elem).on('click', function () {
|
|
||||||
|
|
||||||
var id = this.getAttribute('data-timerid');
|
|
||||||
|
|
||||||
editTimer(page, id);
|
|
||||||
});
|
|
||||||
|
|
||||||
$('.btnDeleteTimer', elem).on('click', function () {
|
$('.btnDeleteTimer', elem).on('click', function () {
|
||||||
|
|
||||||
var id = this.getAttribute('data-timerid');
|
var id = this.getAttribute('data-timerid');
|
||||||
|
@ -120,7 +110,7 @@
|
||||||
function reload(page) {
|
function reload(page) {
|
||||||
|
|
||||||
Dashboard.showLoadingMsg();
|
Dashboard.showLoadingMsg();
|
||||||
|
|
||||||
apiClient.getLiveTvTimers().done(function (result) {
|
apiClient.getLiveTvTimers().done(function (result) {
|
||||||
|
|
||||||
renderTimers(page, result.Items);
|
renderTimers(page, result.Items);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue