diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 292b9d4b4b..3a7c56b7fb 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -839,7 +839,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .detailImageContainer img { - max-width: 100px; + max-width: 80px; } .mobileOverview:not(.hide), .mobileGenres { @@ -861,19 +861,11 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { .backdropDetailPageContent { text-align: center; } -} - -@media all and (max-width: 800px) { - - .detailImageContainer img { - max-width: 80px; - } .thumbDetailImageContainer img { max-width: 180px; } } - @media all and (min-width: 750px) { .detailPageContent { width: 950px; diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html index ae6e7388e6..99a4e194ab 100644 --- a/dashboard-ui/livetvnewrecording.html +++ b/dashboard-ui/livetvnewrecording.html @@ -8,9 +8,9 @@
-

+

-

+

diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html index 3a8f2b94a3..9a33e127a3 100644 --- a/dashboard-ui/livetvtimer.html +++ b/dashboard-ui/livetvtimer.html @@ -13,7 +13,7 @@
-

+

diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 61ed97d814..c04a698215 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -2564,29 +2564,29 @@ } } - //var tooltipLike = Globalize.translate('TooltipLike'); - //var tooltipDislike = Globalize.translate('TooltipDislike'); + var tooltipLike = Globalize.translate('TooltipLike'); + var tooltipDislike = Globalize.translate('TooltipDislike'); - //if (typeof userData.Likes == "undefined") { - // html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike, style); - // html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike, style); - //} - //else if (userData.Likes) { - // html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike, style); - // html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-up', tooltipLike, style); - //} - //else { - // html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-down', tooltipDislike, style); - // html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike, style); - //} + if (typeof userData.Likes == "undefined") { + html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike, style); + html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike, style); + } + else if (userData.Likes) { + html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike, style); + html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-up', tooltipLike, style); + } + else { + html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-down', tooltipDislike, style); + html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike, style); + } - //var tooltipFavorite = Globalize.translate('TooltipFavorite'); - //if (userData.IsFavorite) { + var tooltipFavorite = Globalize.translate('TooltipFavorite'); + if (userData.IsFavorite) { - // html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating btnUserItemRatingOn', 'favorite', tooltipFavorite, style); - //} else { - // html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating', 'favorite', tooltipFavorite, style); - //} + html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating btnUserItemRatingOn', 'favorite', tooltipFavorite, style); + } else { + html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating', 'favorite', tooltipFavorite, style); + } return html; }, @@ -2974,6 +2974,25 @@ var miscInfo = []; var text, date; + if (item.IsSeries && !item.IsRepeat) { + + require(['livetvcss']); + miscInfo.push('' + Globalize.translate('LabelNewProgram') + ''); + + } + + if (item.IsLive) { + + miscInfo.push('' + Globalize.translate('LabelLiveProgram') + ''); + + } + + if (item.ChannelId && item.ChannelName) { + if (item.Type == 'Program' || item.Type == 'Recording') { + miscInfo.push('' + item.ChannelName + ''); + } + } + if (item.Type == "Episode" || item.MediaType == 'Photo') { if (item.PremiereDate) { @@ -3077,6 +3096,17 @@ miscInfo.push(item.OfficialRating); } + if (item.IsHD) { + + miscInfo.push(Globalize.translate('LabelHDProgram')); + } + + if (item.Audio) { + + miscInfo.push(item.Audio); + + } + if (item.Video3DFormat) { miscInfo.push("3D"); } @@ -3095,6 +3125,15 @@ miscInfo.push(html); require(['livetvcss']); } + else if (item.TimerId) { + + var html = ''; + html += ''; + html += '

'; + html += ''; + miscInfo.push(html); + require(['livetvcss']); + } return miscInfo.join('    '); }, diff --git a/dashboard-ui/scripts/livetvcomponents.js b/dashboard-ui/scripts/livetvcomponents.js index cb898c5c19..3104547d09 100644 --- a/dashboard-ui/scripts/livetvcomponents.js +++ b/dashboard-ui/scripts/livetvcomponents.js @@ -24,57 +24,6 @@ }); }, - renderMiscProgramInfo: function (elem, obj) { - - var html = []; - - if (obj.IsSeries && !obj.IsRepeat) { - - html.push('' + Globalize.translate('LabelNewProgram') + ''); - - } - - if (obj.IsLive) { - - html.push('' + Globalize.translate('LabelLiveProgram') + ''); - - } - - if (obj.ChannelId) { - html.push('' + obj.ChannelName + ''); - } - - if (obj.IsHD) { - - html.push(Globalize.translate('LabelHDProgram')); - - } - - if (obj.Audio) { - - html.push(obj.Audio); - - } - - html = html.join('     '); - - if (obj.SeriesTimerId) { - html += ''; - html += '
'; - html += '
'; - html += '
'; - html += ''; - } - else if (obj.TimerId) { - - html += ''; - html += '
'; - html += ''; - } - - elem.html(html).trigger('create'); - }, - renderOriginalAirDate: function (elem, item) { var airDate = item.OriginalAirDate; @@ -181,7 +130,7 @@ }); 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(); currentPosterItem = elem; diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js index 2a55572d72..c0f8c11590 100644 --- a/dashboard-ui/scripts/livetvitems.js +++ b/dashboard-ui/scripts/livetvitems.js @@ -10,7 +10,8 @@ UserId: Dashboard.getCurrentUserId(), SortBy: "StartDate,SortName", SortOrder: "Ascending", - StartIndex: 0 + StartIndex: 0, + HasAired: false }; function getSavedQueryKey() { diff --git a/dashboard-ui/scripts/livetvnewrecording.js b/dashboard-ui/scripts/livetvnewrecording.js index 4d9ffd07e4..2efd263d46 100644 --- a/dashboard-ui/scripts/livetvnewrecording.js +++ b/dashboard-ui/scripts/livetvnewrecording.js @@ -19,8 +19,6 @@ $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(program)); - LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', page), program); - $('#chkNewOnly', page).checked(defaultTimer.RecordNewOnly); $('#chkAllChannels', page).checked(defaultTimer.RecordAnyChannel); $('#chkAnyTime', page).checked(defaultTimer.RecordAnyTime); diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js index 36b652b90d..7240052269 100644 --- a/dashboard-ui/scripts/livetvtimer.js +++ b/dashboard-ui/scripts/livetvtimer.js @@ -53,9 +53,7 @@ $('.timerPageImageContainer', page).hide(); } - $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item)); - - LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', page), programInfo); + $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(programInfo)); $('#txtPrePaddingMinutes', page).val(item.PrePaddingSeconds / 60); $('#txtPostPaddingMinutes', page).val(item.PostPaddingSeconds / 60);