1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update playlist xml saving

This commit is contained in:
Luke Pulverenti 2014-08-04 23:41:56 -04:00
parent ba247c8a15
commit 90c301e86f
10 changed files with 141 additions and 74 deletions

View file

@ -62,13 +62,13 @@
html += '<div class="tvProgramTime">';
if (program.IsLive) {
html += '<span class="liveTvProgram">LIVE&nbsp;&nbsp;</span>';
html += '<span class="liveTvProgram">'+Globalize.translate('LabelLiveProgram')+'&nbsp;&nbsp;</span>';
}
else if (program.IsPremiere) {
html += '<span class="premiereTvProgram">PREMIERE&nbsp;&nbsp;</span>';
html += '<span class="premiereTvProgram">'+Globalize.translate('LabelPremiereProgram')+'&nbsp;&nbsp;</span>';
}
else if (program.IsSeries && !program.IsRepeat) {
html += '<span class="newTvProgram">NEW&nbsp;&nbsp;</span>';
html += '<span class="newTvProgram">'+Globalize.translate('newTvProgram')+'&nbsp;&nbsp;</span>';
}
var minutes = program.RunTimeTicks / 600000000;
@ -242,13 +242,13 @@
if (obj.IsSeries && !obj.IsRepeat) {
html.push('<span class="newTvProgram">NEW</span>');
html.push('<span class="newTvProgram">'+Globalize.translate('LabelNewProgram')+'</span>');
}
if (obj.IsLive) {
html.push('<span class="liveTvProgram">LIVE</span>');
html.push('<span class="liveTvProgram">'+Globalize.translate('LabelLiveProgram')+'</span>');
}
@ -258,7 +258,7 @@
if (obj.IsHD) {
html.push('HD');
html.push(Globalize.translate('LabelHDProgram'));
}
@ -271,7 +271,7 @@
html = html.join('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
if (obj.SeriesTimerId) {
html += '<a href="livetvseriestimer.html?id=' + obj.SeriesTimerId + '" title="View Series Recording">';
html += '<a href="livetvseriestimer.html?id=' + obj.SeriesTimerId + '" title="'+Globalize.translate('ButtonViewSeriesRecording')+'">';
html += '<div class="timerCircle seriesTimerCircle"></div>';
html += '<div class="timerCircle seriesTimerCircle"></div>';
html += '<div class="timerCircle seriesTimerCircle"></div>';
@ -301,7 +301,7 @@
}
elem.html('Original air date:&nbsp;&nbsp;' + airDate).show();
elem.html(Globalize.translate('ValueOriginalAirDate').replace('{0}', airDate)).show();
} else {
elem.hide();
}

View file

@ -9,7 +9,7 @@
return LibraryBrowser.getPosterViewHtml({
items: channels,
shape: "miniBackdrop",
shape: "smallBackdrop",
centerText: true
});
}

View file

@ -267,13 +267,13 @@
html += '<div class="guideProgramTime">';
if (program.IsLive) {
html += '<span class="liveTvProgram">LIVE&nbsp;&nbsp;</span>';
html += '<span class="liveTvProgram">'+Globalize.translate('LabelLiveProgram')+'&nbsp;&nbsp;</span>';
}
else if (program.IsPremiere) {
html += '<span class="premiereTvProgram">PREMIERE&nbsp;&nbsp;</span>';
html += '<span class="premiereTvProgram">'+Globalize.translate('LabelPremiereProgram')+'&nbsp;&nbsp;</span>';
}
else if (program.IsSeries && !program.IsRepeat) {
html += '<span class="newTvProgram">NEW&nbsp;&nbsp;</span>';
html += '<span class="newTvProgram">'+Globalize.translate('LabelNewProgram')+'&nbsp;&nbsp;</span>';
}
html += LiveTvHelpers.getDisplayTime(program.StartDateLocal);

View file

@ -1,6 +1,7 @@
(function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('List', 'List');
var currentItem;
// The base query options
var query = {
@ -31,6 +32,21 @@
var user = response2[0];
var item = response3[0];
currentItem = item;
if (MediaController.canPlay(item)) {
$('.btnPlay', page).removeClass('hide');
}
else {
$('.btnPlay', page).addClass('hide');
}
if (item.LocalTrailerCount && item.PlayAccess == 'Full') {
$('.btnPlayTrailer', page).removeClass('hide');
} else {
$('.btnPlayTrailer', page).addClass('hide');
}
// Scroll back up so they can see the results from the beginning
$(document).scrollTop(0);
@ -126,6 +142,18 @@
reloadItems(page);
});
$('.btnPlay', page).on('click', function () {
var userdata = currentItem.UserData || {};
var mediaType = currentItem.MediaType;
if (currentItem.Type == "MusicArtist" || currentItem.Type == "MusicAlbum") {
mediaType = "Audio";
}
LibraryBrowser.showPlayMenu(this, currentItem.Id, currentItem.Type, currentItem.IsFolder, mediaType, userdata.PlaybackPositionTicks);
});
}).on('pagebeforeshow', "#playlistEditorPage", function () {
var page = this;