diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 7b7ea54865..f03cd0e0cc 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -68,11 +68,6 @@ text-decoration: none; font-weight: 400!important; font-size: 15px; -} - - - -.libraryMenuButtonText { display: inline-block; vertical-align: middle; margin-left: .5em; @@ -302,11 +297,15 @@ @media all and (max-width: 600px) { - .libraryMenuButtonText { - display: none; - } - .headerSettingsButton { display: none; } } + + +@media all and (max-width: 500px) { + + .libraryMenuButtonText { + display: none; + } +} diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css index da3e649eb8..a173da6d25 100644 --- a/dashboard-ui/css/posteritem.css +++ b/dashboard-ui/css/posteritem.css @@ -145,7 +145,7 @@ left: 0; line-height: 36px; text-align: left; - padding-left: 43px; + padding: 0 0 0 43px; } .moviesPosterItem .posterItemImage { diff --git a/dashboard-ui/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js index 496fee31e1..f19528333e 100644 --- a/dashboard-ui/scripts/backdrops.js +++ b/dashboard-ui/scripts/backdrops.js @@ -73,7 +73,8 @@ var imgUrl = ApiClient.getScaledImageUrl(item.id, { type: "Backdrop", tag: item.tag, - maxWidth: screenWidth + maxWidth: screenWidth, + quality: 80 }); getElement().css('backgroundImage', 'url(\'' + imgUrl + '\')'); @@ -102,7 +103,7 @@ var val = LocalSettings.val('enableBackdrops', userId); - return val == '1'; + return val != '0'; } $(document).on('pagebeforeshow', ".backdropPage", function () { diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index 50b4317427..8ea46dc110 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -70,11 +70,9 @@ html += '
'; html += '
'; - if (options.showTitle) { - html += "
"; - html += item.Name; - html += "
"; - } + html += "
"; + html += item.Name; + html += "
"; html += ""; } @@ -161,6 +159,8 @@ html += ''; $(elem).html(html); + + handleLibraryLinkNavigations(elem); }); } @@ -228,6 +228,8 @@ $(elem).html(html).createPosterItemMenus(); + + handleLibraryLinkNavigations(elem); }); } @@ -287,8 +289,9 @@ } else if (section == 'librarybuttons') { loadlibraryButtons(elem, userId, index); + } else { - + elem.empty(); } } @@ -299,7 +302,7 @@ var sectionCount = 3; var elem = $('.sections', page); - + if (!elem.html().length) { var html = ''; for (i = 0, length = sectionCount; i < length; i++) { @@ -316,6 +319,16 @@ } } + function handleLibraryLinkNavigations(elem) { + + $('a', elem).on('click', function () { + + var text = $('.posterItemText', this).html(); + + LibraryMenu.setText(text); + }); + } + $(document).on('pagebeforeshow', "#indexPage", function () { var page = this; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 5abe9b6e79..dc2897be40 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -175,6 +175,12 @@ return panel; } + + function setLibraryMenuText(text) { + + $('.libraryMenuButtonText').html('' + text + ''); + + } function getTopParentId() { @@ -184,7 +190,9 @@ window.LibraryMenu = { showLibraryMenu: showLibraryMenu, - getTopParentId: getTopParentId + getTopParentId: getTopParentId, + + setText: setLibraryMenuText }; function updateCastIcon() { diff --git a/dashboard-ui/thirdparty/mediabrowser.apiclient.js b/dashboard-ui/thirdparty/mediabrowser.apiclient.js index 79c8e5c5e8..85e53d8970 100644 --- a/dashboard-ui/thirdparty/mediabrowser.apiclient.js +++ b/dashboard-ui/thirdparty/mediabrowser.apiclient.js @@ -2087,6 +2087,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi } } + options.quality = options.quality || (options.type.toLowerCase() == 'backdrop' ? 80 : 90); } /** @@ -2117,12 +2118,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi url += "/" + options.index; } + normalizeImageOptions(options); + // Don't put these on the query string delete options.type; delete options.index; - normalizeImageOptions(options); - return self.getUrl(url, options); }; @@ -2154,12 +2155,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi url += "/" + options.index; } + normalizeImageOptions(options); + // Don't put these on the query string delete options.type; delete options.index; - normalizeImageOptions(options); - return self.getUrl(url, options); }; @@ -2191,13 +2192,15 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi url += "/" + options.index; } + options.quality = options.quality || (options.type.toLowerCase() == 'backdrop' ? 80 : 90); + // Don't put these on the query string delete options.type; delete options.index; return self.getUrl(url, options); }; - + self.getScaledImageUrl = function (itemId, options) { if (!itemId) { @@ -2212,12 +2215,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi url += "/" + options.index; } + normalizeImageOptions(options); + // Don't put these on the query string delete options.type; delete options.index; - normalizeImageOptions(options); - return self.getUrl(url, options); };