cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

live tv updates

Browse Source
This commit is contained in:
Luke Pulverenti 2014-01-13 00:41:00 -05:00
parent 154b8d50b2
commit 71271abcb1
8 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dashboard-ui/css/librarybrowser.css
View File

@ -749,7 +749,7 @@ a.itemTag:hover {
@media all and (min-width: 1440px) {
.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 {
text-decoration: none;
}

4
dashboard-ui/livetvnewrecording.html
View File

@ -82,7 +82,7 @@
<ul data-role="listview" class="ulForm">
<li>
<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>
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@ -93,7 +93,7 @@
</li>
<li>
<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>
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />

3
dashboard-ui/livetvprogram.html
View File

@ -41,6 +41,9 @@
<span id="playButtonContainer" style="display: none;">
<button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
</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;">
<button id="btnRecord" type="button" data-icon="video" data-inline="true" data-mini="true">Record</button>
</span>

4
dashboard-ui/livetvseriestimer.html
View File

@ -79,7 +79,7 @@
<ul data-role="listview" class="ulForm">
<li>
<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>
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@ -90,7 +90,7 @@
</li>
<li>
<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>
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />

4
dashboard-ui/livetvtimer.html
View File

@ -46,7 +46,7 @@
<ul data-role="listview" class="ulForm">
<li>
<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>
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@ -57,7 +57,7 @@
</li>
<li>
<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>
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />

30
dashboard-ui/scripts/livetvprogram.js
View File

@ -2,6 +2,25 @@
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) {
Dashboard.showLoadingMsg();
@ -48,6 +67,12 @@
ApiClient.sendWebSocketMessage("Context", vals.join('|'));
}
if (item.TimerId) {
$('#cancelRecordingButtonContainer', page).show();
} else {
$('#cancelRecordingButtonContainer', page).hide();
}
if (!item.TimerId && !item.SeriesTimerId) {
$('#recordButtonContainer', page).show();
} else {
@ -101,6 +126,11 @@
});
});
$('#btnCancelRecording', page).on('click', function () {
deleteTimer(page, currentItem.TimerId);
});
}).on('pageshow', "#liveTvProgramPage", function () {
var page = this;

4
dashboard-ui/scripts/livetvrecordings.js
View File

@ -52,7 +52,7 @@
$('.recordingItems', elem).html(LibraryBrowser.getPosterViewHtml({
items: recordings,
shape: "square",
shape: "backdrop",
showTitle: true,
showParentTitle: true,
overlayText: true,
@ -79,7 +79,7 @@
apiClient.getLiveTvRecordings({
userId: Dashboard.getCurrentUserId(),
limit: 15,
limit: 12,
isRecording: false
}).done(function (result) {

4
dashboard-ui/scripts/livetvsuggested.js
View File

@ -15,7 +15,7 @@
var html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
shape: "backdrop",
showTitle: true,
showParentTitle: true,
overlayText: true,
@ -38,7 +38,7 @@
var html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
shape: "backdrop",
showTitle: true,
showParentTitle: true,
overlayText: true,