mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
live tv updates
This commit is contained in:
parent
154b8d50b2
commit
71271abcb1
8 changed files with 44 additions and 17 deletions
|
@ -749,7 +749,7 @@ a.itemTag:hover {
|
||||||
@media all and (min-width: 1440px) {
|
@media all and (min-width: 1440px) {
|
||||||
|
|
||||||
.ehsContent {
|
.ehsContent {
|
||||||
max-width: 980px;
|
max-width: 950px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -759,12 +759,6 @@ a.itemTag:hover {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media all and (min-width: 2300px) {
|
|
||||||
.ehsContent {
|
|
||||||
max-width: 1540px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.detailPageParentLink {
|
.detailPageParentLink {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
<ul data-role="listview" class="ulForm">
|
<ul data-role="listview" class="ulForm">
|
||||||
<li>
|
<li>
|
||||||
<label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
|
<label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
|
||||||
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
|
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
|
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label for="txtPostPaddingSeconds">Post-padding minutes: </label>
|
<label for="txtPostPaddingSeconds">Post-padding minutes: </label>
|
||||||
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
|
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
|
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
|
||||||
|
|
|
@ -41,6 +41,9 @@
|
||||||
<span id="playButtonContainer" style="display: none;">
|
<span id="playButtonContainer" style="display: none;">
|
||||||
<button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
|
<button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
|
||||||
</span>
|
</span>
|
||||||
|
<span id="cancelRecordingButtonContainer" style="display: none;">
|
||||||
|
<button id="btnCancelRecording" type="button" data-icon="delete" data-inline="true" data-mini="true">Cancel Recording</button>
|
||||||
|
</span>
|
||||||
<span id="recordButtonContainer" style="display: none;">
|
<span id="recordButtonContainer" style="display: none;">
|
||||||
<button id="btnRecord" type="button" data-icon="video" data-inline="true" data-mini="true">Record</button>
|
<button id="btnRecord" type="button" data-icon="video" data-inline="true" data-mini="true">Record</button>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
<ul data-role="listview" class="ulForm">
|
<ul data-role="listview" class="ulForm">
|
||||||
<li>
|
<li>
|
||||||
<label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
|
<label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
|
||||||
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
|
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
|
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
|
||||||
|
@ -90,7 +90,7 @@
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label for="txtPostPaddingSeconds">Post-padding minutes: </label>
|
<label for="txtPostPaddingSeconds">Post-padding minutes: </label>
|
||||||
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
|
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
|
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
<ul data-role="listview" class="ulForm">
|
<ul data-role="listview" class="ulForm">
|
||||||
<li>
|
<li>
|
||||||
<label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
|
<label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
|
||||||
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
|
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
|
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<label for="txtPostPaddingSeconds">Post-padding minutes: </label>
|
<label for="txtPostPaddingSeconds">Post-padding minutes: </label>
|
||||||
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
|
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
|
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
|
||||||
|
|
|
@ -2,6 +2,25 @@
|
||||||
|
|
||||||
var currentItem;
|
var currentItem;
|
||||||
|
|
||||||
|
function deleteTimer(page, id) {
|
||||||
|
|
||||||
|
Dashboard.confirm("Are you sure you wish to cancel this recording?", "Confirm Recording Cancellation", function (result) {
|
||||||
|
|
||||||
|
if (result) {
|
||||||
|
|
||||||
|
Dashboard.showLoadingMsg();
|
||||||
|
|
||||||
|
ApiClient.cancelLiveTvTimer(id).done(function () {
|
||||||
|
|
||||||
|
Dashboard.alert('Recording cancelled.');
|
||||||
|
|
||||||
|
reload(page);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function reload(page) {
|
function reload(page) {
|
||||||
|
|
||||||
Dashboard.showLoadingMsg();
|
Dashboard.showLoadingMsg();
|
||||||
|
@ -48,6 +67,12 @@
|
||||||
ApiClient.sendWebSocketMessage("Context", vals.join('|'));
|
ApiClient.sendWebSocketMessage("Context", vals.join('|'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item.TimerId) {
|
||||||
|
$('#cancelRecordingButtonContainer', page).show();
|
||||||
|
} else {
|
||||||
|
$('#cancelRecordingButtonContainer', page).hide();
|
||||||
|
}
|
||||||
|
|
||||||
if (!item.TimerId && !item.SeriesTimerId) {
|
if (!item.TimerId && !item.SeriesTimerId) {
|
||||||
$('#recordButtonContainer', page).show();
|
$('#recordButtonContainer', page).show();
|
||||||
} else {
|
} else {
|
||||||
|
@ -101,6 +126,11 @@
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#btnCancelRecording', page).on('click', function () {
|
||||||
|
|
||||||
|
deleteTimer(page, currentItem.TimerId);
|
||||||
|
});
|
||||||
|
|
||||||
}).on('pageshow', "#liveTvProgramPage", function () {
|
}).on('pageshow', "#liveTvProgramPage", function () {
|
||||||
|
|
||||||
var page = this;
|
var page = this;
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
$('.recordingItems', elem).html(LibraryBrowser.getPosterViewHtml({
|
$('.recordingItems', elem).html(LibraryBrowser.getPosterViewHtml({
|
||||||
|
|
||||||
items: recordings,
|
items: recordings,
|
||||||
shape: "square",
|
shape: "backdrop",
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
showParentTitle: true,
|
showParentTitle: true,
|
||||||
overlayText: true,
|
overlayText: true,
|
||||||
|
@ -79,7 +79,7 @@
|
||||||
apiClient.getLiveTvRecordings({
|
apiClient.getLiveTvRecordings({
|
||||||
|
|
||||||
userId: Dashboard.getCurrentUserId(),
|
userId: Dashboard.getCurrentUserId(),
|
||||||
limit: 15,
|
limit: 12,
|
||||||
isRecording: false
|
isRecording: false
|
||||||
|
|
||||||
}).done(function (result) {
|
}).done(function (result) {
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
var html = LibraryBrowser.getPosterViewHtml({
|
var html = LibraryBrowser.getPosterViewHtml({
|
||||||
|
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "square",
|
shape: "backdrop",
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
showParentTitle: true,
|
showParentTitle: true,
|
||||||
overlayText: true,
|
overlayText: true,
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
var html = LibraryBrowser.getPosterViewHtml({
|
var html = LibraryBrowser.getPosterViewHtml({
|
||||||
|
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "square",
|
shape: "backdrop",
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
showParentTitle: true,
|
showParentTitle: true,
|
||||||
overlayText: true,
|
overlayText: true,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue