diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css index 7c42347231..45a6cd9d6a 100644 --- a/dashboard-ui/css/posteritem.css +++ b/dashboard-ui/css/posteritem.css @@ -16,9 +16,9 @@ } .posterItem:hover { - -moz-box-shadow: 0 0 20px 3px #52B54B; - -webkit-box-shadow: 0 0 20px 3px #52B54B; - box-shadow: 0 0 20px 3px #52B54B; + -moz-box-shadow: 0 0 15px 8px #2572EB; + -webkit-box-shadow: 0 0 25px 8px #2572EB; + box-shadow: 0 0 15px 8px #2572EB; } @@ -31,7 +31,7 @@ background-repeat: no-repeat; background-position: center bottom; background-color: #000; - border: 2px solid #1b1b1b; + border: 2px solid #202020; position: relative; } @@ -81,20 +81,21 @@ right: 0; } - -.posterItemText + .posterItemText { - padding-top: 2px; -} - -.posterItemTextOverlay .posterItemText { - background-color: transparent; - padding-left: 5px; -} - - .posterItemTextOverlay .posterItemText:first-child { - font-weight: bold; + .posterItemTextOverlay .posterItemText { + background-color: transparent; + padding-left: 5px; + padding: 0 5px 5px; } + .posterItemTextOverlay .posterItemText:first-child { + font-weight: bold; + font-size: 14px; + } + + .posterItemTextOverlay .posterItemText:last-child { + padding-bottom: 8px; + } + .posterItemTextCentered { text-align: center; } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index fc96030edc..602005d4cb 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -231,7 +231,11 @@ } else if (item.Type == "Genre" || item.Type == "Studio" || item.Type == "Person" || item.Type == "MusicArtist" || item.Type == "MusicGenre" || item.Type == "GameGenre") { - html += LibraryBrowser.getItemCountsHtml(options, item); + var itemCountHtml = LibraryBrowser.getItemCountsHtml(options, item); + + if (itemCountHtml) { + html += '

' + itemCountHtml + '

'; + } } else if (item.Type == "Game") { @@ -335,7 +339,7 @@ } } - return counts.length ? '

' + counts.join(' • ') + '

' : ''; + return counts.join(' • '); }, getSongHeaderCellHtml: function (text, cssClass, enableSorting, sortField, selectedSortField, sortDirection) { @@ -727,7 +731,7 @@ } else if (options.preferThumb && item.ParentThumbItemId) { - imgUrl = ApiClient.getThumbImageUrl(item, { + imgUrl = ApiClient.getThumbImageUrl(item.ParentThumbItemId, { type: "Thumb", maxwidth: 576 }); @@ -790,7 +794,7 @@ } else if (item.ImageTags && item.ImageTags.Thumb) { - imgUrl = ApiClient.getImageUrl(item, { + imgUrl = ApiClient.getImageUrl(item.Id, { type: "Thumb", maxwidth: 576, tag: item.ImageTags.Thumb @@ -912,6 +916,17 @@ html += name; html += ""; } + + if (options.showItemCounts) { + + var itemCountHtml = LibraryBrowser.getItemCountsHtml(options, item); + + if (itemCountHtml) { + html += "
"; + html += itemCountHtml; + html += "
"; + } + } if (options.showPremiereDate && item.PremiereDate) { diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index e9c35e869c..6fbd83307e 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -35,6 +35,16 @@ $('.itemVideo').addClass('fullscreenVideo'); } } + + function exitFullScreen() { + if (document.exitFullscreen) { + document.exitFullscreen(); + } else if (document.mozExitFullScreen) { + document.mozExitFullScreen(); + } else if (document.webkitExitFullscreen) { + document.webkitExitFullscreen(); + } + } function isFullScreen() { return document.fullscreenEnabled || document.mozFullscreenEnabled || document.webkitIsFullScreen || document.mozFullScreen ? true : false; @@ -1316,6 +1326,9 @@ $('#nowPlayingBar').hide(); + if (isFullScreen()) { + exitFullScreen(); + } }; self.isPlaying = function () { diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index 569183a3d7..d0a2448567 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -29,10 +29,13 @@ var checkSortOption = $('.radioSortBy:checked', page); $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - html += LibraryBrowser.getPosterDetailViewHtml({ + html = LibraryBrowser.getPosterViewHtml({ items: result.Items, - context: "movies", - shape: "backdrop" + shape: "backdrop", + preferThumb: true, + context: 'movies', + showItemCounts: true, + centerText: true }); html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index a23520437c..4ef4d579a1 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -321,7 +321,7 @@ var Dashboard = { var onclick = removeOnHide ? "$(\"#" + options.id + "\").remove();" : "$(\"#" + options.id + "\").hide();"; if (options.allowHide !== false) { - options.html += ""; + options.html += ""; } if (options.forceShow) { diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index d993e9dfa8..46bdeeddbf 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -29,19 +29,16 @@ var checkSortOption = $('.radioSortBy:checked', page); $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create'); - //html += LibraryBrowser.getPosterViewHtml({ - // items: result.Items, - // useAverageAspectRatio: true, - // shape: "backdrop", - // showTitle: false, - // overlayText: false, - // context: 'tv' - //}); - - html += LibraryBrowser.getPosterDetailViewHtml({ + html += LibraryBrowser.getPosterViewHtml({ items: result.Items, - context: "tv", - shape: "backdrop" + useAverageAspectRatio: true, + shape: "backdrop", + showTitle: false, + overlayText: false, + context: 'tv', + preferThumb: true, + showItemCounts: true, + centerText: true }); html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);