diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index db5e0f6f59..b4f62f67d1 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -38,7 +38,7 @@ .libraryPage > .ui-content { padding-top: 10px; - padding-bottom: 100px; + padding-bottom: 50px; } .libraryPage .currentUsername { @@ -56,7 +56,7 @@ border-spacing: 0; border-collapse: collapse; margin: 0 auto; - max-width: 1540px; + max-width: 650px; } .ehsContent td { @@ -65,7 +65,51 @@ } .squareEhsContent { - max-width: 1420px; + max-width: 750px; +} + +@media all and (min-width: 1000px) { + + .ehsContent { + max-width: 905px; + } + + .squareEhsContent { + max-width: 750px; + } +} + +@media all and (min-width: 1200px) { + + .ehsContent { + max-width: 925px; + } + + .squareEhsContent { + max-width: 900px; + } +} + +@media all and (min-width: 1400px) { + + .ehsContent { + max-width: 1240px; + } + + .squareEhsContent { + max-width: 1240px; + } +} + +@media all and (min-width: 1600px) { + + .ehsContent { + max-width: 1540px; + } + + .squareEhsContent { + max-width: 1420px; + } } .detailPageContent { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 287a79b712..91dc189330 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -90,13 +90,13 @@ h2 { font-size: 1.68em; } -a, a.ui-link { +/*a, a.ui-link { font-weight: normal; } .ui-controlgroup a, a.ui-btn { font-weight: bold; -} +}*/ h1 a { text-decoration: none; diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html index e1fc5f25c7..f0acb43b13 100644 --- a/dashboard-ui/index.html +++ b/dashboard-ui/index.html @@ -6,17 +6,16 @@
- -
+

${HeaderMyLibrary}

+ +
+
+
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 265950aa03..7377c0f181 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -32,6 +32,18 @@ DashboardPage.reloadSystemInfo(page); DashboardPage.reloadNews(page); + + DashboardPage.sessionUpdateTimer = setInterval(DashboardPage.refreshSessionsLocally, 60000); + }, + + refreshSessionsLocally: function () { + + var list = DashboardPage.sessionsList; + + if (list) { + console.log('refreshSessionsLocally'); + DashboardPage.renderActiveConnections($.mobile.activePage, list); + } }, reloadSystemInfo: function (page) { @@ -122,6 +134,10 @@ $(ApiClient).off("websocketmessage", DashboardPage.onWebSocketMessage).off("websocketopen", DashboardPage.onWebSocketConnectionChange).off("websocketerror", DashboardPage.onWebSocketConnectionChange).off("websocketclose", DashboardPage.onWebSocketConnectionChange); DashboardPage.stopInterval(); + + if (DashboardPage.sessionUpdateTimer) { + clearInterval(DashboardPage.sessionUpdateTimer); + } }, startInterval: function () { @@ -190,6 +206,8 @@ var html = ''; + DashboardPage.sessionsList = sessions; + var parentElement = $('.activeDevices', page); $('.activeSession', parentElement).addClass('deadSession'); diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index e3fc936530..b8496b79f9 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -27,9 +27,9 @@ html += '
'; html += '
'; - + if (nextUp && nextUp.ImageTags && nextUp.ImageTags.Primary) { - + html += '
'; imgUrl = ApiClient.getImageUrl(nextUp.Id, { @@ -113,6 +113,24 @@ var options = { + SortBy: "SortName", + Fields: "PrimaryImageAspectRatio" + }; + + ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { + + $('.myLibrary', page).html(LibraryBrowser.getPosterViewHtml({ + items: result.Items, + shape: 'smallBackdrop', + showTitle: true, + centerText: true + + })).createPosterItemMenus(); + + }); + + options = { + SortBy: "DatePlayed", SortOrder: "Descending", MediaTypes: "Video", @@ -124,7 +142,7 @@ ExcludeLocationTypes: "Virtual" }; - var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { + ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { if (result.Items.length) { $('#resumableSection', page).show(); @@ -156,7 +174,7 @@ ExcludeLocationTypes: "Virtual,Remote" }; - var promise2 = ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { + ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) { $('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({ @@ -168,9 +186,6 @@ })).createPosterItemMenus(); }); - - //var allPromise = $.when(promise1, promise2); - //reloadSpotlight(page, allPromise); }); })(jQuery, document, ApiClient); \ No newline at end of file diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 004bcca608..c28434e844 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -64,7 +64,7 @@ clearProgressInterval(); - var intervalTime = ApiClient.isWebSocketOpen() ? 2000 : 20000; + var intervalTime = ApiClient.isWebSocketOpen() ? 1200 : 20000; currentProgressInterval = setInterval(function () { diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js index 2f218a6c54..c7ee7f0e68 100644 --- a/dashboard-ui/scripts/musicrecommended.js +++ b/dashboard-ui/scripts/musicrecommended.js @@ -13,7 +13,7 @@ SortBy: "DateCreated", SortOrder: "Descending", IncludeItemTypes: "MusicAlbum", - Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 5), + Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 7 : 5), Recursive: true, Fields: "PrimaryImageAspectRatio", ParentId: parentId @@ -36,7 +36,7 @@ SortBy: "DateCreated", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 5), + Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 7 : 5), Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo", ParentId: parentId @@ -59,7 +59,7 @@ SortBy: "DatePlayed", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 5), + Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 7 : 5), Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo", Filters: "IsPlayed", diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js index c8927826f0..14de3e3a59 100644 --- a/dashboard-ui/scripts/nowplayingpage.js +++ b/dashboard-ui/scripts/nowplayingpage.js @@ -19,7 +19,7 @@ if (chapter.ImageTag) { imgUrl = ApiClient.getImageUrl(itemId, { - maxwidth: 600, + width: 800, tag: chapter.ImageTag, type: "Chapter", index: i diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js index b4c8295135..c120c9d651 100644 --- a/dashboard-ui/scripts/remotecontrol.js +++ b/dashboard-ui/scripts/remotecontrol.js @@ -197,7 +197,7 @@ if (ApiClient.isWebSocketOpen()) { - ApiClient.sendWebSocketMessage("SessionsStart", "100,900"); + ApiClient.sendWebSocketMessage("SessionsStart", "100,800"); } }; diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index a153ccfd10..e33d886381 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -12,7 +12,7 @@ SortOrder: "Descending", IncludeItemTypes: "Episode", Filters: "IsResumable", - Limit: screenWidth >= 1920 ? 5 : (screenWidth >= 1440 ? 4 : 3), + Limit: screenWidth >= 1920 ? 5 : 4, Recursive: true, Fields: "PrimaryImageAspectRatio,SeriesInfo,UserData", ExcludeLocationTypes: "Virtual", diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html index fd515b52db..5f6edfe17d 100644 --- a/dashboard-ui/tvshows.html +++ b/dashboard-ui/tvshows.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabLatest}