diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index cfc676366a..9997428b7c 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -119,7 +119,11 @@ @media all and (min-width: 1920px) { - .squareEhsContent { + .ehsContent { + width: 1200px; + } + + .squareEhsContent { width: 1200px; } } diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css index 0497a0a21c..c204df4888 100644 --- a/dashboard-ui/css/posteritem.css +++ b/dashboard-ui/css/posteritem.css @@ -1,10 +1,10 @@ .posterItem { margin: 5px 5px; text-shadow: none; - font-weight: normal!important; + font-weight: normal !important; display: inline-block; position: relative; - color: #fff!important; + color: #fff !important; text-decoration: none; text-align: left; -webkit-transition: all 500ms ease; @@ -29,7 +29,7 @@ } .posterItemOverlayInner button:last-child { - margin-right: 0!important; + margin-right: 0 !important; } .posterItemOverlayInner p { @@ -274,11 +274,11 @@ } .sessionPosterItem .posterItemName { - color: #fff!important; + color: #fff !important; } .sessionPosterItem .posterItemDefaultText { - color: #000!important; + color: #000 !important; font-weight: normal !important; top: 42%; } @@ -488,12 +488,21 @@ } } +@media all and (min-width: 1920px) { -@media all and (min-width: 1600px) { - - .myLibraryPosterItem { - width: 16%; - /* Specify a min width just in case the container doesn't have a width */ - min-width: 220px; + .backdropPosterItem { + width: 290px; } + + .backdropPosterItem .posterItemImage { + height: 163.125px; + } + + .portraitPosterItem { + width: 160px; + } + + .portraitPosterItem .posterItemImage { + height: 240px; + } } diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js index b9aceafb07..ccb9bbc568 100644 --- a/dashboard-ui/scripts/favorites.js +++ b/dashboard-ui/scripts/favorites.js @@ -22,7 +22,7 @@ SortOrder: "Ascending", IncludeItemTypes: section.types, Filters: "IsFavorite", - Limit: screenWidth >= 1920 ? 9 : (screenWidth >= 1440 ? 8 : 6), + Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 6), Recursive: true, Fields: "PrimaryImageAspectRatio", CollapseBoxSetItems: false, diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index ae0ba3a146..e608aa48c6 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -129,7 +129,7 @@ var options = { - Limit: screenWidth >= 2400 ? 30 : (screenWidth >= 1920 ? 15 : (screenWidth >= 1440 ? 12 : (screenWidth >= 800 ? 9 : 8))), + Limit: screenWidth >= 2400 ? 24 : (screenWidth >= 1920 ? 20 : (screenWidth >= 1440 ? 12 : (screenWidth >= 800 ? 9 : 8))), Fields: "PrimaryImageAspectRatio", IsPlayed: false, IsFolder: false @@ -279,7 +279,7 @@ SortOrder: "Descending", MediaTypes: "Video", Filters: "IsResumable", - Limit: screenWidth >= 1920 ? 9 : (screenWidth >= 1200 ? 9 : 6), + Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1200 ? 9 : 6), Recursive: true, Fields: "PrimaryImageAspectRatio", CollapseBoxSetItems: false, diff --git a/dashboard-ui/scripts/movieslatest.js b/dashboard-ui/scripts/movieslatest.js index 46941a982f..e70778c5a2 100644 --- a/dashboard-ui/scripts/movieslatest.js +++ b/dashboard-ui/scripts/movieslatest.js @@ -12,7 +12,7 @@ var options = { IncludeItemTypes: "Movie", - Limit: screenWidth >= 1920 ? 30 : (screenWidth >= 1440 ? 30 : (screenWidth >= 800 ? 28 : 18)), + Limit: screenWidth >= 1920 ? 28 : (screenWidth >= 1440 ? 30 : (screenWidth >= 800 ? 28 : 18)), Fields: "PrimaryImageAspectRatio", ParentId: parentId, IsPlayed: false diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index cd9e61a48d..5d85b04d7e 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -50,7 +50,7 @@ SortOrder: "Descending", IncludeItemTypes: "Movie", Filters: "IsResumable", - Limit: (screenWidth >= 1200 ? 6 : 3), + Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1200 ? 6 : 3), Recursive: true, Fields: "PrimaryImageAspectRatio", CollapseBoxSetItems: false, @@ -81,7 +81,7 @@ userId: Dashboard.getCurrentUserId(), categoryLimit: screenWidth >= 1200 ? 4 : 3, - ItemLimit: (screenWidth >= 1200 ? 6 : 5), + ItemLimit: screenWidth >= 1920 ? 7 : (screenWidth >= 1200 ? 6 : 5), Fields: "PrimaryImageAspectRatio" }); diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js index 2a7aa5ed44..be13278b9f 100644 --- a/dashboard-ui/scripts/notifications.js +++ b/dashboard-ui/scripts/notifications.js @@ -17,6 +17,10 @@ self.updateNotificationCount = function () { + if (!Dashboard.getCurrentUserId()) { + return; + } + self.getNotificationsSummary().done(function (summary) { var item = $('.btnNotificationsInner').removeClass('levelNormal').removeClass('levelWarning').removeClass('levelError').html(summary.UnreadCount); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 8f7a971f12..5ec0816083 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -5,7 +5,10 @@ var url = (this.url || '').toLowerCase(); // Bounce to the login screen, but not if a password entry fails, obviously - if (url.indexOf('/password') == -1 && url.indexOf('/authenticate') == -1) { + if (url.indexOf('/password') == -1 && + url.indexOf('/authenticate') == -1 && + !$($.mobile.activePage).is('.standalonePage')) { + Dashboard.logout(false); } } diff --git a/dashboard-ui/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js index 9a3bcb9463..b5a11fa323 100644 --- a/dashboard-ui/scripts/wizardstartpage.js +++ b/dashboard-ui/scripts/wizardstartpage.js @@ -28,7 +28,7 @@ } - $(document).on('pageshow', "#wizardStartPage", function () { + $(document).on('pagebeforeshow', "#wizardStartPage", function () { Dashboard.showLoadingMsg(); var page = this;