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

don't duplicate synced items

Browse Source
This commit is contained in:
Luke Pulverenti 2015-08-18 15:45:41 -04:00
parent aff141f716
commit 7b42686295
8 changed files with 67 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -839,7 +839,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
} }
.detailImageContainer img { .detailImageContainer img {
max-width: 100px; max-width: 80px;
} }
.mobileOverview:not(.hide), .mobileGenres { .mobileOverview:not(.hide), .mobileGenres {
@ -861,19 +861,11 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
.backdropDetailPageContent { .backdropDetailPageContent {
text-align: center; text-align: center;
} }
}
@media all and (max-width: 800px) {
.detailImageContainer img {
max-width: 80px;
}
.thumbDetailImageContainer img { .thumbDetailImageContainer img {
max-width: 180px; max-width: 180px;
} }
} }
@media all and (min-width: 750px) { @media all and (min-width: 750px) {
.detailPageContent { .detailPageContent {
width: 950px; width: 950px;

4
dashboard-ui/livetvnewrecording.html
View File

@ -8,9 +8,9 @@
<div data-role="content"> <div data-role="content">
<form class="liveTvNewRecordingForm" style="margin: 0 auto;"> <form class="liveTvNewRecordingForm" style="margin: 0 auto;">
<p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p> <p><span class="itemName inlineItemName"></span></p>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p class="itemMiscInfo miscTvProgramInfo"></p> <p class="itemMiscInfo"></p>
<p> <p>
<span class="itemCommunityRating"></span> <span class="itemCommunityRating"></span>
</p> </p>

2
dashboard-ui/livetvtimer.html
View File

@ -13,7 +13,7 @@
<div style="display: none; vertical-align: top; margin-right: 1em; padding-top: 1em;" class="timerPageImageContainer"> <div style="display: none; vertical-align: top; margin-right: 1em; padding-top: 1em;" class="timerPageImageContainer">
</div> </div>
<div style="display: inline-block; vertical-align: middle;"> <div style="display: inline-block; vertical-align: middle;">
<p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p> <p><span class="itemName inlineItemName"></span></p>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p class="itemMiscInfo miscTvProgramInfo"></p> <p class="itemMiscInfo miscTvProgramInfo"></p>
<p> <p>

79
dashboard-ui/scripts/librarybrowser.js
View File

@ -2564,29 +2564,29 @@
} }
} }
//var tooltipLike = Globalize.translate('TooltipLike'); var tooltipLike = Globalize.translate('TooltipLike');
//var tooltipDislike = Globalize.translate('TooltipDislike'); var tooltipDislike = Globalize.translate('TooltipDislike');
//if (typeof userData.Likes == "undefined") { if (typeof userData.Likes == "undefined") {
// html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike, style); html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike, style);
// html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike, style); html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike, style);
//} }
//else if (userData.Likes) { else if (userData.Likes) {
// html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike, style); html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike, style);
// html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-up', tooltipLike, style); html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-up', tooltipLike, style);
//} }
//else { else {
// html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-down', tooltipDislike, style); html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-down', tooltipDislike, style);
// html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike, style); html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike, style);
//} }
//var tooltipFavorite = Globalize.translate('TooltipFavorite'); var tooltipFavorite = Globalize.translate('TooltipFavorite');
//if (userData.IsFavorite) { if (userData.IsFavorite) {
// html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating btnUserItemRatingOn', 'favorite', tooltipFavorite, style); html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating btnUserItemRatingOn', 'favorite', tooltipFavorite, style);
//} else { } else {
// html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating', 'favorite', tooltipFavorite, style); html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating', 'favorite', tooltipFavorite, style);
//} }
return html; return html;
}, },
@ -2974,6 +2974,25 @@
var miscInfo = []; var miscInfo = [];
var text, date; var text, date;
if (item.IsSeries && !item.IsRepeat) {
require(['livetvcss']);
miscInfo.push('<span class="newTvProgram">' + Globalize.translate('LabelNewProgram') + '</span>');
}
if (item.IsLive) {
miscInfo.push('<span class="liveTvProgram">' + Globalize.translate('LabelLiveProgram') + '</span>');
}
if (item.ChannelId && item.ChannelName) {
if (item.Type == 'Program' || item.Type == 'Recording') {
miscInfo.push('<a class="textlink" href="itemdetails.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>');
}
}
if (item.Type == "Episode" || item.MediaType == 'Photo') { if (item.Type == "Episode" || item.MediaType == 'Photo') {
if (item.PremiereDate) { if (item.PremiereDate) {
@ -3077,6 +3096,17 @@
miscInfo.push(item.OfficialRating); miscInfo.push(item.OfficialRating);
} }
if (item.IsHD) {
miscInfo.push(Globalize.translate('LabelHDProgram'));
}
if (item.Audio) {
miscInfo.push(item.Audio);
}
if (item.Video3DFormat) { if (item.Video3DFormat) {
miscInfo.push("3D"); miscInfo.push("3D");
} }
@ -3095,6 +3125,15 @@
miscInfo.push(html); miscInfo.push(html);
require(['livetvcss']); require(['livetvcss']);
} }
else if (item.TimerId) {
var html = '';
html += '<a href="livetvtimer.html?id=' + item.TimerId + '">';
html += '<div class="timerCircle"></div>';
html += '</a>';
miscInfo.push(html);
require(['livetvcss']);
}
return miscInfo.join('&nbsp;&nbsp;&nbsp;&nbsp;'); return miscInfo.join('&nbsp;&nbsp;&nbsp;&nbsp;');
}, },

53
dashboard-ui/scripts/livetvcomponents.js
View File

@ -24,57 +24,6 @@
}); });
}, },
renderMiscProgramInfo: function (elem, obj) {
var html = [];
if (obj.IsSeries && !obj.IsRepeat) {
html.push('<span class="newTvProgram">' + Globalize.translate('LabelNewProgram') + '</span>');
}
if (obj.IsLive) {
html.push('<span class="liveTvProgram">' + Globalize.translate('LabelLiveProgram') + '</span>');
}
if (obj.ChannelId) {
html.push('<a class="textlink" href="itemdetails.html?id=' + obj.ChannelId + '">' + obj.ChannelName + '</a>');
}
if (obj.IsHD) {
html.push(Globalize.translate('LabelHDProgram'));
}
if (obj.Audio) {
html.push(obj.Audio);
}
html = html.join('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
if (obj.SeriesTimerId) {
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>';
html += '</a>';
}
else if (obj.TimerId) {
html += '<a href="livetvtimer.html?id=' + obj.TimerId + '">';
html += '<div class="timerCircle"></div>';
html += '</a>';
}
elem.html(html).trigger('create');
},
renderOriginalAirDate: function (elem, item) { renderOriginalAirDate: function (elem, item) {
var airDate = item.OriginalAirDate; var airDate = item.OriginalAirDate;
@ -181,7 +130,7 @@
}); });
LibraryBrowser.renderGenres($('.itemGenres', popup), item, 'livetv', 3); LibraryBrowser.renderGenres($('.itemGenres', popup), item, 'livetv', 3);
LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', popup), item); $('.miscTvProgramInfo', popup).html(LibraryBrowser.getMiscInfoHtml(item)).trigger('create');
popup.parents().prev('.ui-popup-screen').remove(); popup.parents().prev('.ui-popup-screen').remove();
currentPosterItem = elem; currentPosterItem = elem;

3
dashboard-ui/scripts/livetvitems.js
View File

@ -10,7 +10,8 @@
UserId: Dashboard.getCurrentUserId(), UserId: Dashboard.getCurrentUserId(),
SortBy: "StartDate,SortName", SortBy: "StartDate,SortName",
SortOrder: "Ascending", SortOrder: "Ascending",
StartIndex: 0 StartIndex: 0,
HasAired: false
}; };
function getSavedQueryKey() { function getSavedQueryKey() {

2
dashboard-ui/scripts/livetvnewrecording.js
View File

@ -19,8 +19,6 @@
$('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(program)); $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(program));
LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', page), program);
$('#chkNewOnly', page).checked(defaultTimer.RecordNewOnly); $('#chkNewOnly', page).checked(defaultTimer.RecordNewOnly);
$('#chkAllChannels', page).checked(defaultTimer.RecordAnyChannel); $('#chkAllChannels', page).checked(defaultTimer.RecordAnyChannel);
$('#chkAnyTime', page).checked(defaultTimer.RecordAnyTime); $('#chkAnyTime', page).checked(defaultTimer.RecordAnyTime);

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

@ -53,9 +53,7 @@
$('.timerPageImageContainer', page).hide(); $('.timerPageImageContainer', page).hide();
} }
$('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item)); $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(programInfo));
LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', page), programInfo);
$('#txtPrePaddingMinutes', page).val(item.PrePaddingSeconds / 60); $('#txtPrePaddingMinutes', page).val(item.PrePaddingSeconds / 60);
$('#txtPostPaddingMinutes', page).val(item.PostPaddingSeconds / 60); $('#txtPostPaddingMinutes', page).val(item.PostPaddingSeconds / 60);