diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 7112e22c6c..b6d8902482 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -533,73 +533,6 @@ } -/** homePageSquareCard */ -.homePageSquareCard .cardPadder { - padding-bottom: 100%; -} - - -.homePageSquareCard { - width: 50%; -} - -@media all and (min-width: 540px) { - - .homePageSquareCard { - width: 33.33%; - } -} - -@media all and (min-width: 800px) { - - .homePageSquareCard { - width: 25%; - } -} - -@media all and (min-width: 1000px) { - - .homePageSquareCard { - width: 20%; - } -} - -@media all and (min-width: 1200px) { - - .homePageSquareCard { - width: 16.666666666666666666666666666667%; - } -} - -@media all and (min-width: 1280px) { - - .homePageSquareCard { - width: 14.285714285714285714285714285714%; - } -} - -@media all and (min-width: 1600px) { - - .homePageSquareCard { - width: 14.285714285714285714285714285714%; - } -} - -@media all and (min-width: 1920px) { - - .homePageSquareCard { - width: 11.11111111111111111%; - } -} - -@media all and (min-width: 2200px) { - - .homePageSquareCard { - width: 10%; - } -} - - /** homePagePortraitCard */ .homePagePortraitCard .cardPadder { padding-bottom: 150%; diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js index 2ec6f7734e..b76ff398ea 100644 --- a/dashboard-ui/scripts/favorites.js +++ b/dashboard-ui/scripts/favorites.js @@ -7,7 +7,7 @@ { name: Globalize.translate('HeaderFavoriteShows'), types: "Series", id: "favoriteShows", shape: 'homePageBackdrop', preferThumb: true, showTitle: false }, { name: Globalize.translate('HeaderFavoriteEpisodes'), types: "Episode", id: "favoriteEpisode", shape: 'homePageBackdrop', preferThumb: false, showTitle: true, showParentTitle: true }, { name: Globalize.translate('HeaderFavoriteGames'), types: "Game", id: "favoriteGames", shape: 'autohome', preferThumb: false, showTitle: true }, - { name: Globalize.translate('HeaderFavoriteAlbums'), types: "MusicAlbum", id: "favoriteAlbums", shape: 'homePageSquare', preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true } + { name: Globalize.translate('HeaderFavoriteAlbums'), types: "MusicAlbum", id: "favoriteAlbums", shape: 'square', preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true } ]; } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 4bf4177f5d..56aeebc958 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -953,10 +953,10 @@ options.shape = options.shape == 'auto' ? 'backdrop' : 'homePageBackdrop'; } else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .33) { options.coverImage = true; - options.shape = options.shape == 'auto' ? 'square' : 'homePageSquare'; + options.shape = 'square'; } else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.3333334) < .01) { options.coverImage = true; - options.shape = options.shape == 'auto' ? 'square' : 'homePageSquare'; + options.shape = 'square'; } else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) { options.shape = 'banner'; options.coverImage = true; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 616a796cd6..c5949eb5a7 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -82,7 +82,7 @@ html += '' + Globalize.translate('ButtonMetadataManager') + ''; html += '' + Globalize.translate('ButtonReports') + ''; html += ''; - html += '' + Globalize.translate('ButtonSync') + ''; + //html += '' + Globalize.translate('ButtonSync') + ''; return html; } diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js index b23d3c32fe..ec69cec79c 100644 --- a/dashboard-ui/scripts/livetvsuggested.js +++ b/dashboard-ui/scripts/livetvsuggested.js @@ -15,7 +15,7 @@ var html = LibraryBrowser.getPosterViewHtml({ items: result.Items, - shape: "homePageSquare", + shape: "square", showTitle: true, showParentTitle: true, overlayText: true, @@ -38,7 +38,7 @@ var html = LibraryBrowser.getPosterViewHtml({ items: result.Items, - shape: "homePageSquare", + shape: "square", showTitle: true, showParentTitle: true, overlayText: true, diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js index 81b0cfd58b..2ccbe712e1 100644 --- a/dashboard-ui/scripts/musicrecommended.js +++ b/dashboard-ui/scripts/musicrecommended.js @@ -11,7 +11,7 @@ var options = { IncludeItemTypes: "Audio", - Limit: screenWidth >= 1920 ? 24 : (screenWidth >= 1600 ? 21 : (screenWidth >= 1200 ? 21 : 12)), + Limit: 20, Fields: "PrimaryImageAspectRatio,SyncInfo", ParentId: parentId, ImageTypeLimit: 1, @@ -24,7 +24,7 @@ items: items, showUnplayedIndicator: false, showChildCountIndicator: true, - shape: "homePageSquare", + shape: "square", showTitle: true, showParentTitle: true })).createCardMenus(); @@ -36,7 +36,7 @@ SortBy: "DatePlayed", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1600 ? 7 : (screenWidth >= 1200 ? 7 : 6)), + Limit: 10, Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo,SyncInfo", Filters: "IsPlayed", @@ -56,7 +56,7 @@ $('#recentlyPlayedSongs', page).html(LibraryBrowser.getPosterViewHtml({ items: result.Items, showUnplayedIndicator: false, - shape: "homePageSquare", + shape: "square", showTitle: true, showParentTitle: true, defaultAction: 'play' @@ -70,7 +70,7 @@ SortBy: "PlayCount", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: screenWidth >= 1920 ? 16 : (screenWidth >= 1600 ? 14 : (screenWidth >= 1200 ? 14 : 12)), + Limit: 20, Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo,SyncInfo", Filters: "IsPlayed", @@ -90,7 +90,7 @@ $('#topPlayedSongs', page).html(LibraryBrowser.getPosterViewHtml({ items: result.Items, showUnplayedIndicator: false, - shape: "homePageSquare", + shape: "square", showTitle: true, showParentTitle: true, defaultAction: 'play' diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js index ad26fca0a4..fd486a580c 100644 --- a/dashboard-ui/scripts/selectserver.js +++ b/dashboard-ui/scripts/selectserver.js @@ -43,7 +43,7 @@ var html = ''; - var cssClass = "card homePageSquareCard bottomPaddedCard"; + var cssClass = "card squareCard bottomPaddedCard"; html += "
"; @@ -260,7 +260,7 @@ var html = ''; - var cssClass = "card homePageSquareCard alternateHover bottomPaddedCard"; + var cssClass = "card squareCard alternateHover bottomPaddedCard"; html += "
"; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 20e4ed4f5d..318143933a 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -760,10 +760,10 @@ var Dashboard = { name: Globalize.translate('TabPlayback'), href: "playbackconfiguration.html", selected: page.hasClass('playbackConfigurationPage') - }, { - name: Globalize.translate('TabSync'), - href: "syncactivity.html", - selected: page.hasClass('syncConfigurationPage') + //}, { + // name: Globalize.translate('TabSync'), + // href: "syncactivity.html", + // selected: page.hasClass('syncConfigurationPage') }, { divider: true, name: Globalize.translate('TabAutoOrganize'), diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index 4311d1599b..12b6387626 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -203,7 +203,7 @@ function isAvailable(item, user) { - //return false; + return false; return item.SupportsSync; } @@ -226,7 +226,7 @@ Dashboard.getCurrentUser().done(function (user) { if (user.Policy.EnableSync) { - $('.categorySyncButton', page).show(); + $('.categorySyncButton', page).hide(); } else { $('.categorySyncButton', page).hide(); }