diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index baf8d67935..b32aebbde6 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -1,7 +1,7 @@  - + ${PluginsTitle}
@@ -11,8 +11,11 @@
${TabMyPlugins} ${TabCatalog} + ${TabChannels}
+ +

@@ -40,9 +43,11 @@

-

This is a supporter-only plugin.
+

+ This is a supporter-only plugin.

- It will require a supporter key in order to register after the 14-day free trial.

+ It will require a supporter key in order to register after the 14-day free trial. +

This is a premium plugin.

diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index 6cd85ffaf8..0672d621d8 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -14,7 +14,6 @@ ${TabNotifications} ${TabPaths} ${TabResume} - ${TabServer} ${TabTranscoding}

diff --git a/dashboard-ui/advancedpaths.html b/dashboard-ui/advancedpaths.html index cd760b91f8..3476d4dc72 100644 --- a/dashboard-ui/advancedpaths.html +++ b/dashboard-ui/advancedpaths.html @@ -14,7 +14,6 @@ ${TabNotifications} ${TabPaths} ${TabResume} - ${TabServer} ${TabTranscoding} diff --git a/dashboard-ui/advancedserversettings.html b/dashboard-ui/advancedserversettings.html index 2835b572f8..2df49ebe5e 100644 --- a/dashboard-ui/advancedserversettings.html +++ b/dashboard-ui/advancedserversettings.html @@ -1,21 +1,19 @@  - ${TitleAdvanced} + ${TitleServer} -
+
- ${TabGeneral} - ${TabNotifications} - ${TabPaths} - ${TabResume} - ${TabServer} - ${TabTranscoding} + ${TabDashboard} + ${TabGeneral} + ${TabAdvanced} + ${TabSecurity}
diff --git a/dashboard-ui/appsplayback.html b/dashboard-ui/appsplayback.html index 640a610f53..03ff4abb63 100644 --- a/dashboard-ui/appsplayback.html +++ b/dashboard-ui/appsplayback.html @@ -13,8 +13,7 @@ ${TabNotifications} ${TabPaths} ${TabResume} - ${TabServer} - ${TabTranscoding} + ${TabTranscoding}
diff --git a/dashboard-ui/branding.html b/dashboard-ui/branding.html deleted file mode 100644 index 047b38d6b8..0000000000 --- a/dashboard-ui/branding.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - ${TitleDashboard} - - -
- -
-
- -
- ${TabHome} - ${TabGeneral} - ${TabInfo} - ${TabBranding} -
- - - -

${HeaderBrandingHelp}

-
- -
    -
  • - - -
    ${LabelLoginDisclaimerHelp}
    -
    • -
-
    -
  • - - -
    • - -
- - -
-
- - - - -
- - diff --git a/dashboard-ui/channelsettings.html b/dashboard-ui/channelsettings.html index dd01308c37..adfaed4dc9 100644 --- a/dashboard-ui/channelsettings.html +++ b/dashboard-ui/channelsettings.html @@ -1,13 +1,19 @@  - ${TitleChannels} + ${PluginsTitle} -
+
+
+ ${TabMyPlugins} + ${TabCatalog} + ${TabChannels} +
+

diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 44f4ca0179..33a88e5344 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -55,7 +55,6 @@ border-spacing: 0; border-collapse: collapse; margin: 0 auto; - max-width: 650px; } .ehsContent td { @@ -63,10 +62,6 @@ border-spacing: 0; } -.squareEhsContent { - max-width: 750px; -} - .homePageSection + .homePageSection { margin-top: 1em; } @@ -85,55 +80,55 @@ @media all and (min-width: 900px) { .ehsContent { - max-width: 880px; + width: 880px; } .squareEhsContent { - max-width: 750px; + width: 750px; } } @media all and (min-width: 1000px) { .ehsContent { - max-width: 905px; + width: 905px; } .squareEhsContent { - max-width: 900px; + width: 900px; } } @media all and (min-width: 1200px) { .ehsContent { - max-width: 925px; + width: 925px; } .squareEhsContent { - max-width: 900px; + width: 900px; } } @media all and (min-width: 1400px) { .ehsContent { - max-width: 1240px; + width: 1080px; } .squareEhsContent { - max-width: 1240px; + width: 1220px; } } @media all and (min-width: 1600px) { .homeEhsContent { - max-width: 1540px; + width: 1440px; } .squareEhsContent { - max-width: 1420px; + width: 1420px; } } @@ -184,9 +179,9 @@ } .galleryImageContainer:hover { - -moz-box-shadow: 0 0 20px 3px #38c; - -webkit-box-shadow: 0 0 20px 3px #38c; - box-shadow: 0 0 20px 3px #38c; + -moz-box-shadow: 0 0 0 5px #38c; + -webkit-box-shadow: 0 0 0 5px #38c; + box-shadow: 0 0 0 5px #38c; } .galleryImage { @@ -376,9 +371,9 @@ a.itemTag:hover { .itemBackdrop { background-size: cover; - background-position: center 15%; + background-position: center 13%; background-repeat: no-repeat; - height: 570px; + height: 600px; position: relative; } @@ -518,26 +513,23 @@ a.itemTag:hover { .detailSectionHeader { background-clip: border-box; - background-color: rgb(20, 20, 20); - border-bottom-color: rgb(31, 31, 31); - border-bottom-style: solid; - border-bottom-width: 1px; - border-left-color: rgb(31, 31, 31); - border-left-style: solid; - border-left-width: 1px; - border-right-color: rgb(31, 31, 31); - border-right-style: solid; - border-right-width: 1px; - border-top-color: rgb(31, 31, 31); - border-top-style: solid; - border-top-width: 1px; + background-color: #141414; font-size: 16px; font-weight: 400; - padding: .7em 0 .7em 1em; + padding: .75em 0 .75em 1em; border-radius: 4px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + position: relative; +} + +.detailSectionHeaderButton { + position: absolute; + right: 0; + top: 7px; + margin-top: 0; + margin-bottom: 0; } .lblDetailTab { @@ -700,21 +692,6 @@ a.itemTag:hover { @media all and (min-width: 1000px) { - .detailPageContent { - max-width: 900px; - } - - .primaryDetailPageContent { - max-width: 850px; - } -} - -@media all and (min-width: 1200px) { - - .detailPageContent { - max-width: 930px; - } - .primaryDetailPageContent { max-width: 850px; } diff --git a/dashboard-ui/css/metadataeditor.css b/dashboard-ui/css/metadataeditor.css index 53ee6065fc..7c13e8ae5d 100644 --- a/dashboard-ui/css/metadataeditor.css +++ b/dashboard-ui/css/metadataeditor.css @@ -197,9 +197,9 @@ } .remoteImage:hover, .searchImageContainer:hover { - -moz-box-shadow: 0 0 12px 7px #38c; - -webkit-box-shadow: 0 0 12px 7px #38c; - box-shadow: 0 0 12px 7px #38c; + -moz-box-shadow: 0 0 0 5px #38c; + -webkit-box-shadow: 0 0 0 5px #38c; + box-shadow: 0 0 0 5px #38c; } .tblLibraryReport img { diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css index e4518badbc..9aadfb013b 100644 --- a/dashboard-ui/css/posteritem.css +++ b/dashboard-ui/css/posteritem.css @@ -51,9 +51,9 @@ } .posterItem:hover .posterItemImage { - -moz-box-shadow: 0 0 12px 7px #38c; - -webkit-box-shadow: 0 0 12px 7px #38c; - box-shadow: 0 0 12px 7px #38c; + -moz-box-shadow: 0 0 0 5px #38c; + -webkit-box-shadow: 0 0 0 5px #38c; + box-shadow: 0 0 0 5px #38c; } .coveredPosterItemImage { @@ -456,11 +456,11 @@ } .backdropPosterItem { - width: 298px; + width: 350px; } .backdropPosterItem .posterItemImage { - height: 167.625px; + height: 196.875px; } .miniBackdropPosterItem { @@ -472,20 +472,23 @@ } .squarePosterItem { - width: 160px; + width: 192px; } .squarePosterItem .posterItemImage { - height: 160px; + height: 192px; } .portraitPosterItem { - width: 144px; + width: 170px; } .portraitPosterItem .posterItemImage { - height: 216px; + height: 255px; } + + .posterItemText { + } } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 3c3714f548..0bfe0e9d62 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -599,9 +599,9 @@ h1 .imageLink { } .posterViewItem:hover, .userItem:hover, .tileItem:hover { - -moz-box-shadow: 0 0 20px 3px #38c; - -webkit-box-shadow: 0 0 20px 3px #38c; - box-shadow: 0 0 20px 3px #38c; + -moz-box-shadow: 0 0 0 5px #38c; + -webkit-box-shadow: 0 0 0 5px #38c; + box-shadow: 0 0 0 5px #38c; } @media all and (min-width: 750px) { @@ -980,9 +980,9 @@ progress { } .activeSession:hover { - -moz-box-shadow: 0 0 20px 1px #38c; - -webkit-box-shadow: 0 0 20px 1px #38c; - box-shadow: 0 0 20px 1px #38c; + -moz-box-shadow: 0 0 10px 3px #38c; + -webkit-box-shadow: 0 0 10px 3px #38c; + box-shadow: 0 0 10px 3px #38c; } .sessionNowPlayingTime { diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css index 0efbe90213..1f763d4c21 100644 --- a/dashboard-ui/css/tileitem.css +++ b/dashboard-ui/css/tileitem.css @@ -5,7 +5,6 @@ font-weight: normal!important; display: block; position: relative; - border-radius: .3125em; -webkit-transition: all 500ms ease; -moz-transition: all 500ms ease; -o-transition: all 500ms ease; diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index 3c0cae6e0e..d2da40c342 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -1,7 +1,7 @@  - ${TitleDashboard} + ${TitleServer}
@@ -10,10 +10,10 @@
- ${TabHome} + ${TabDashboard} ${TabGeneral} - ${TabInfo} - ${TabBranding} + ${TabAdvanced} + ${TabSecurity}
@@ -116,6 +116,44 @@
+ + +
+ + +
+

${HeaderSystemPaths}

+
+

+ ${LabelCache}
+ +

+

+ ${LabelImagesByName}
+ +

+

+ ${LabelLogs}
+ +

+

+ ${LabelMetadata}
+ +

+

+ ${LabelTranscodingTemporaryFiles}
+ +

+
+
+
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html index a49595d3f9..11edcc1185 100644 --- a/dashboard-ui/dashboardgeneral.html +++ b/dashboard-ui/dashboardgeneral.html @@ -1,7 +1,7 @@  - ${TitleDashboard} + ${TitleServer}
@@ -10,10 +10,10 @@
- ${TabHome} + ${TabDashboard} ${TabGeneral} - ${TabInfo} - ${TabBranding} + ${TabAdvanced} + ${TabSecurity}
@@ -36,6 +36,23 @@
+ +
+

${HeaderBranding}

+
+

${HeaderBrandingHelp}

+
+ +
    +
  • + + +
    ${LabelLoginDisclaimerHelp}
    +
    • +
+
+
+
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index 94dedf7e07..0c7289e10c 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -9,6 +9,7 @@
${TabSuggested} ${TabLatest} + ${TabUpcoming} ${TabShows} ${TabEpisodes} ${TabGenres} diff --git a/dashboard-ui/favorites.html b/dashboard-ui/favorites.html index 6864ed4110..1f6f7bcaad 100644 --- a/dashboard-ui/favorites.html +++ b/dashboard-ui/favorites.html @@ -16,7 +16,7 @@
- +
diff --git a/dashboard-ui/homelatest.html b/dashboard-ui/homelatest.html index 94e9acfd81..527c62e54e 100644 --- a/dashboard-ui/homelatest.html +++ b/dashboard-ui/homelatest.html @@ -16,7 +16,7 @@
- +
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 7035a37147..3440a656a9 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -64,6 +64,7 @@
${TabSuggested} ${TabLatest} + ${TabUpcoming} ${TabShows} ${TabEpisodes} ${TabGenres} diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 22b19bbb1d..7f40c1178e 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -25,7 +25,7 @@ @@ -44,6 +44,7 @@
${TabSuggested} ${TabLatest} + ${TabUpcoming} ${TabShows} ${TabEpisodes} ${TabGenres} @@ -254,6 +255,7 @@ diff --git a/dashboard-ui/musicrecommended.html b/dashboard-ui/musicrecommended.html index da87c8a5b3..7392b11e33 100644 --- a/dashboard-ui/musicrecommended.html +++ b/dashboard-ui/musicrecommended.html @@ -18,11 +18,7 @@
-

${HeaderLatestAlbums}

- -
-
-

${HeaderLatestSongs}

+

${HeaderLatestMusic}

diff --git a/dashboard-ui/notificationlist.html b/dashboard-ui/notificationlist.html index 795e3ef785..a2d72c3247 100644 --- a/dashboard-ui/notificationlist.html +++ b/dashboard-ui/notificationlist.html @@ -13,7 +13,6 @@ ${TabGeneral} ${TabNotifications} ${TabPaths} - ${TabServer} ${TabTranscoding} diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html index e7213018a6..5ad3294f3e 100644 --- a/dashboard-ui/notificationsetting.html +++ b/dashboard-ui/notificationsetting.html @@ -14,7 +14,6 @@ ${TabNotifications} ${TabPaths} ${TabResume} - ${TabServer} ${TabTranscoding} diff --git a/dashboard-ui/notificationsettings.html b/dashboard-ui/notificationsettings.html index 4cc7aad55a..d005ade6e2 100644 --- a/dashboard-ui/notificationsettings.html +++ b/dashboard-ui/notificationsettings.html @@ -14,7 +14,6 @@ ${TabNotifications} ${TabPaths} ${TabResume} - ${TabServer} ${TabTranscoding} diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html index a9ff01b023..f9b1dd9ade 100644 --- a/dashboard-ui/plugincatalog.html +++ b/dashboard-ui/plugincatalog.html @@ -10,6 +10,7 @@
diff --git a/dashboard-ui/plugins.html b/dashboard-ui/plugins.html index 2cbd3351f5..71eb3bb3b2 100644 --- a/dashboard-ui/plugins.html +++ b/dashboard-ui/plugins.html @@ -11,6 +11,7 @@
${TabMyPlugins} ${TabCatalog} + ${TabChannels}
diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js index 235f105d42..de3bbaa7e3 100644 --- a/dashboard-ui/scripts/addpluginpage.js +++ b/dashboard-ui/scripts/addpluginpage.js @@ -148,7 +148,7 @@ populateHistory(pkg, page); if (pkg.totalRatings > 0) populateReviews(pkg.id, page); - Dashboard.setPageTitle(pkg.name); + $('.pluginName', page).html(pkg.name); if (pkg.targetSystem == 'Server') { $("#btnInstallDiv", page).show(); diff --git a/dashboard-ui/scripts/branding.js b/dashboard-ui/scripts/branding.js deleted file mode 100644 index b5c89ab817..0000000000 --- a/dashboard-ui/scripts/branding.js +++ /dev/null @@ -1,45 +0,0 @@ -(function ($, document, window) { - - var brandingConfigKey = "branding"; - - function loadPage(page, config) { - - $('#txtLoginDisclaimer', page).val(config.LoginDisclaimer || ''); - - Dashboard.hideLoadingMsg(); - } - - $(document).on('pageshow', "#dashboardBrandingPage", function () { - - Dashboard.showLoadingMsg(); - - var page = this; - - ApiClient.getNamedConfiguration(brandingConfigKey).done(function (config) { - - loadPage(page, config); - }); - - }); - - window.BrandingPage = { - - onSubmit: function () { - Dashboard.showLoadingMsg(); - - var form = this; - - ApiClient.getNamedConfiguration(brandingConfigKey).done(function (config) { - - config.LoginDisclaimer = $('#txtLoginDisclaimer', form).val(); - - ApiClient.updateNamedConfiguration(brandingConfigKey, config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - } - - }; - -})(jQuery, document, window); diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js index e05ed32de1..4c470dd0e8 100644 --- a/dashboard-ui/scripts/dashboardgeneral.js +++ b/dashboard-ui/scripts/dashboardgeneral.js @@ -1,5 +1,7 @@ (function ($, document, window) { + var brandingConfigKey = "branding"; + function loadPage(page, config, languageOptions) { $('#txtServerName', page).val(config.ServerName || ''); @@ -29,6 +31,10 @@ }); + ApiClient.getNamedConfiguration(brandingConfigKey).done(function (config) { + + $('#txtLoginDisclaimer', page).val(config.LoginDisclaimer || ''); + }); }); window.DashboardGeneralPage = { @@ -43,7 +49,16 @@ config.ServerName = $('#txtServerName', form).val(); config.UICulture = $('#selectLocalizationLanguage', form).val(); - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); + ApiClient.updateServerConfiguration(config).done(function() { + + ApiClient.getNamedConfiguration(brandingConfigKey).done(function (brandingConfig) { + + brandingConfig.LoginDisclaimer = $('#txtLoginDisclaimer', form).val(); + + ApiClient.updateNamedConfiguration(brandingConfigKey, brandingConfig).done(Dashboard.processServerConfigurationUpdateResult); + }); + + }); }); // Disable default form submission diff --git a/dashboard-ui/scripts/dashboardinfo.js b/dashboard-ui/scripts/dashboardinfo.js deleted file mode 100644 index 622b83b66e..0000000000 --- a/dashboard-ui/scripts/dashboardinfo.js +++ /dev/null @@ -1,37 +0,0 @@ -(function ($, document, window) { - - function loadPage(page, systemInfo) { - - $('#cachePath', page).html(systemInfo.CachePath); - $('#logPath', page).html(systemInfo.LogPath); - $('#imagesByNamePath', page).html(systemInfo.ItemsByNamePath); - $('#transcodingTemporaryPath', page).html(systemInfo.TranscodingTempPath); - $('#metadataPath', page).html(systemInfo.InternalMetadataPath); - - if (systemInfo.WanAddress) { - - var externalUrl = systemInfo.WanAddress + "/mediabrowser"; - - $('.externalUrl', page).html('Remote access: ' + externalUrl + '').show().trigger('create'); - } else { - $('.externalUrl', page).hide(); - } - - Dashboard.hideLoadingMsg(); - } - - $(document).on('pageshow', "#dashboardInfoPage", function () { - - Dashboard.showLoadingMsg(); - - var page = this; - - ApiClient.getSystemInfo().done(function (systemInfo) { - - loadPage(page, systemInfo); - - }); - - }); - -})(jQuery, document, window); diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index f5adedfe5b..c03d77f3cd 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -34,6 +34,24 @@ DashboardPage.sessionUpdateTimer = setInterval(DashboardPage.refreshSessionsLocally, 60000); }, + renderPaths: function (page, systemInfo) { + + $('#cachePath', page).html(systemInfo.CachePath); + $('#logPath', page).html(systemInfo.LogPath); + $('#imagesByNamePath', page).html(systemInfo.ItemsByNamePath); + $('#transcodingTemporaryPath', page).html(systemInfo.TranscodingTempPath); + $('#metadataPath', page).html(systemInfo.InternalMetadataPath); + + if (systemInfo.WanAddress) { + + var externalUrl = systemInfo.WanAddress + "/mediabrowser"; + + $('.externalUrl', page).html('Remote access: ' + externalUrl + '').show().trigger('create'); + } else { + $('.externalUrl', page).hide(); + } + }, + refreshSessionsLocally: function () { var list = DashboardPage.sessionsList; @@ -78,6 +96,7 @@ $('#btnManualUpdateContainer', page).show(); } + DashboardPage.renderPaths(page, systemInfo); DashboardPage.renderHasPendingRestart(page, systemInfo.HasPendingRestart); }); }, @@ -753,7 +772,7 @@ imgUrl = "css/images/supporter/nonsupporterbadge.png"; text = "Please support Media Browser."; - + $('.supporterIconContainer', page).html('' + text + ''); } }, diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 613adf6ad9..6aa7c573f2 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -53,7 +53,8 @@ showParentTitle: true, overlayText: screenWidth >= 600, selectionPanel: true, - lazy: true + lazy: true, + context: 'tv' }); } diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index c4fe10961f..bbc5fbaf5d 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 ? 10 : (screenWidth >= 800 ? 9 : 8))), + Limit: screenWidth >= 2400 ? 30 : (screenWidth >= 1920 ? 15 : (screenWidth >= 1440 ? 12 : (screenWidth >= 800 ? 9 : 8))), Fields: "PrimaryImageAspectRatio", IsPlayed: false, IsFolder: false @@ -154,7 +154,6 @@ html += '
'; } - $(elem).html(html).trigger('create').createPosterItemMenus(); }); } diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 6ef3984233..8791d664e2 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -591,7 +591,7 @@ var options = { userId: Dashboard.getCurrentUserId(), - limit: item.Type == "MusicAlbum" ? 4 : 6, + limit: item.Type == "MusicAlbum" ? 4 : 5, fields: "PrimaryImageAspectRatio,UserData" }; @@ -872,7 +872,7 @@ html += '' + type.name + ''; if (user.Configuration.IsAdministrator) { - html += 'Edit'; + html += 'Edit'; } html += ''; diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index 5636640fce..9f36af0327 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -7,7 +7,7 @@ MediaLibraryPage.reloadLibrary(page); }, - + reloadLibrary: function (page) { Dashboard.showLoadingMsg(); @@ -327,6 +327,24 @@ $(document).on('pageshow', ".mediaLibraryPage", MediaLibraryPage.onPageShow); +var WizardLibraryPage = { + + next: function () { + + Dashboard.showLoadingMsg(); + + ApiClient.ajax({ + type: "POST", + url: ApiClient.getUrl('System/Configuration/MetadataPlugins/Autoset') + + }).done(function () { + + Dashboard.hideLoadingMsg(); + Dashboard.navigate('wizardsettings.html'); + }); + } +}; + (function ($, document, window) { function pollTasks(page) { diff --git a/dashboard-ui/scripts/movieslatest.js b/dashboard-ui/scripts/movieslatest.js index db2017d747..46941a982f 100644 --- a/dashboard-ui/scripts/movieslatest.js +++ b/dashboard-ui/scripts/movieslatest.js @@ -12,7 +12,7 @@ var options = { IncludeItemTypes: "Movie", - Limit: screenWidth >= 1920 ? 32 : (screenWidth >= 1440 ? 32 : (screenWidth >= 800 ? 28 : 18)), + Limit: screenWidth >= 1920 ? 30 : (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 54f7d07f77..91a9dac5a7 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 >= 1920 ? 4 : (screenWidth >= 1440 ? 4 : 3), + Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1440 ? 6 : 3), Recursive: true, Fields: "PrimaryImageAspectRatio", CollapseBoxSetItems: false, @@ -81,7 +81,7 @@ userId: Dashboard.getCurrentUserId(), categoryLimit: screenWidth >= 1200 ? 4 : 3, - itemLimit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 7), + itemLimit: screenWidth >= 1920 ? 6 : (screenWidth >= 1440 ? 6 : 7), Fields: "PrimaryImageAspectRatio" }); diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js index 617ede0eff..52486be76c 100644 --- a/dashboard-ui/scripts/musicrecommended.js +++ b/dashboard-ui/scripts/musicrecommended.js @@ -10,28 +10,8 @@ var parentId = LibraryMenu.getTopParentId(); var options = { - IncludeItemTypes: "MusicAlbum", - Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 6), - Fields: "PrimaryImageAspectRatio", - ParentId: parentId - }; - - ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) { - - $('#recentlyAddedAlbums', page).html(LibraryBrowser.getPosterViewHtml({ - items: items, - showUnplayedIndicator: false, - showChildCountIndicator: true, - shape: "square", - showTitle: true, - showParentTitle: true - })).createPosterItemMenus(); - - }); - - options = { IncludeItemTypes: "Audio", - Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 6), + Limit: screenWidth >= 1920 ? 14 : (screenWidth >= 1440 ? 14 : 12), Fields: "PrimaryImageAspectRatio", ParentId: parentId }; @@ -54,7 +34,7 @@ SortBy: "DatePlayed", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 6), + Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 7 : 6), Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo", Filters: "IsPlayed", @@ -84,7 +64,7 @@ SortBy: "PlayCount", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: screenWidth >= 1920 ? 16 : (screenWidth >= 1440 ? 16 : 12), + Limit: screenWidth >= 1920 ? 14 : (screenWidth >= 1440 ? 14 : 12), Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo", Filters: "IsPlayed", diff --git a/dashboard-ui/scripts/serversecurity.js b/dashboard-ui/scripts/serversecurity.js new file mode 100644 index 0000000000..5f282702bb --- /dev/null +++ b/dashboard-ui/scripts/serversecurity.js @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index db77f3d150..e27fc2bcae 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -657,7 +657,7 @@ var Dashboard = { var pageElem = page[0]; return [{ - name: "Dashboard", + name: "Server", href: "dashboard.html", selected: page.hasClass("dashboardHomePage") }, { @@ -677,11 +677,6 @@ var Dashboard = { name: "Auto-Organize", href: "autoorganizelog.html", selected: page.hasClass("organizePage") - }, { - name: "Channels", - divider: true, - href: "channelsettings.html", - selected: page.hasClass("channelSettingsPage") }, { name: "DLNA", href: "dlnasettings.html", diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index e36fb7e016..abf98705c1 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -11,27 +11,29 @@ }; query.ParentId = LibraryMenu.getTopParentId(); - + var context = ''; + if (query.ParentId) { $('.scopedLibraryViewNav', page).show(); $('.globalNav', page).hide(); - $('.homeEhsContent', page).css('text-align', 'left'); + $('.ehsContent', page).css('text-align', 'left'); $('.scopedContent', page).show(); + context = 'tv'; loadResume(page); } else { $('.scopedLibraryViewNav', page).hide(); $('.globalNav', page).show(); - $('.homeEhsContent', page).css('text-align', 'center'); + $('.ehsContent', page).css('text-align', 'center'); $('.scopedContent', page).hide(); } - loadNextUp(page); + loadNextUp(page, context || 'home-nextup'); } - function loadNextUp(page) { + function loadNextUp(page, context) { var screenWidth = $(window).width(); @@ -49,13 +51,13 @@ $('.scopedLibraryViewNav', page).show(); $('.globalNav', page).hide(); - $('.ehsContent', page).css('text-align', 'left').removeClass('homeEhsContent'); + $('.ehsContent', page).css('text-align', 'left'); $('.scopedContent', page).show(); } else { $('.scopedLibraryViewNav', page).hide(); $('.globalNav', page).show(); - $('.ehsContent', page).css('text-align', 'center').addClass('homeEhsContent'); + $('.ehsContent', page).css('text-align', 'center'); $('.scopedContent', page).hide(); } @@ -73,7 +75,7 @@ showTitle: true, showParentTitle: true, overlayText: screenWidth >= 600, - context: 'home-nextup', + context: context, lazy: true })).trigger('create').createPosterItemMenus(); @@ -93,7 +95,7 @@ SortOrder: "Descending", IncludeItemTypes: "Episode", Filters: "IsResumable", - Limit: screenWidth >= 1920 ? 5 : 4, + Limit: screenWidth >= 1920 ? 6 : 4, Recursive: true, Fields: "PrimaryImageAspectRatio,SeriesInfo,UserData", ExcludeLocationTypes: "Virtual", @@ -116,7 +118,8 @@ showTitle: true, showParentTitle: true, overlayText: screenWidth >= 600, - lazy: true + lazy: true, + context: 'tv' })).trigger('create').createPosterItemMenus(); diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 0c2b69ba49..219fc213c5 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -34,7 +34,7 @@ updateFilterControls(page); if (view == "Thumb") { - + html = LibraryBrowser.getPosterViewHtml({ items: result.Items, shape: "backdrop", @@ -42,7 +42,7 @@ context: 'tv', lazy: true }); - + $('.itemsContainer', page).removeClass('timelineItemsContainer'); } else if (view == "Banner") { @@ -56,18 +56,6 @@ }); $('.itemsContainer', page).removeClass('timelineItemsContainer'); } - else if (view == "Poster") { - - html = LibraryBrowser.getPosterViewHtml({ - items: result.Items, - shape: "portrait", - context: 'tv', - showTitle: true, - centerText: true, - lazy: true - }); - $('.itemsContainer', page).removeClass('timelineItemsContainer'); - } else if (view == "List") { html = LibraryBrowser.getListViewHtml({ @@ -77,18 +65,18 @@ }); $('.itemsContainer', page).removeClass('timelineItemsContainer'); } - else if (view == "Timeline") { - + else { + + // Poster html = LibraryBrowser.getPosterViewHtml({ items: result.Items, shape: "portrait", context: 'tv', - timeline: true, showTitle: true, + centerText: true, lazy: true }); - - $('.itemsContainer', page).addClass('timelineItemsContainer'); + $('.itemsContainer', page).removeClass('timelineItemsContainer'); } html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js index 58441dc55a..f2b12cf01e 100644 --- a/dashboard-ui/scripts/tvupcoming.js +++ b/dashboard-ui/scripts/tvupcoming.js @@ -13,6 +13,19 @@ query.ParentId = LibraryMenu.getTopParentId(); + var context = ''; + + if (query.ParentId) { + + $('.scopedLibraryViewNav', page).show(); + $('.globalNav', page).hide(); + context = 'tv'; + + } else { + $('.scopedLibraryViewNav', page).hide(); + $('.globalNav', page).show(); + } + ApiClient.getJSON(ApiClient.getUrl("Shows/Upcoming", query)).done(function (result) { var items = result.Items; @@ -31,8 +44,8 @@ showPremiereDate: true, showPremiereDateIndex: true, preferThumb: true, - context: 'home-upcoming', - lazy: true + context: context || 'home-upcoming', + lazy: true, })).trigger('create').createPosterItemMenus(); }); diff --git a/dashboard-ui/scripts/wizardimagesettings.js b/dashboard-ui/scripts/wizardimagesettings.js deleted file mode 100644 index 6ab1b8d17f..0000000000 --- a/dashboard-ui/scripts/wizardimagesettings.js +++ /dev/null @@ -1,54 +0,0 @@ -(function ($, document) { - - function save(page) { - - Dashboard.showLoadingMsg(); - - // After saving chapter task, now save server config - ApiClient.getServerConfiguration().done(function (config) { - - config.EnableUPnP = $('#chkEnableUpnp', page).checked(); - - ApiClient.updateServerConfiguration(config).done(function (result) { - - ApiClient.getNamedConfiguration("chapters").done(function (chapterConfig) { - - chapterConfig.EnableMovieChapterImageExtraction = $('#chkMovies', page).checked(); - - ApiClient.updateNamedConfiguration("chapters", chapterConfig).done(function () { - - Dashboard.hideLoadingMsg(); - - navigateToNextPage(); - }); - }); - }); - }); - } - - function navigateToNextPage() { - - ApiClient.getSystemInfo().done(function (systemInfo) { - - var os = systemInfo.OperatingSystem.toLowerCase(); - - if (os.indexOf('windows') != -1) { - Dashboard.navigate('wizardservice.html'); - } else { - Dashboard.navigate('wizardfinish.html'); - } - - }); - } - - $(document).on('pageinit', "#wizardImageSettingsPage", function () { - - var page = this; - - $('#btnNextPage', page).on('click', function () { - - save(page); - }); - }); - -})(jQuery, document, window); diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js index 3ba11a3b88..4040ed681b 100644 --- a/dashboard-ui/scripts/wizardsettings.js +++ b/dashboard-ui/scripts/wizardsettings.js @@ -50,7 +50,7 @@ function navigateToNextPage() { - Dashboard.navigate('wizardimagesettings.html'); + Dashboard.navigate('wizardservice.html'); } $(document).on('pageshow', "#wizardSettingsPage", function () { diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html new file mode 100644 index 0000000000..c8da60bef2 --- /dev/null +++ b/dashboard-ui/serversecurity.html @@ -0,0 +1,24 @@ + + + + ${TitleServer} + + +
+ + + +
+ + diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html index 082b04222d..e495556f67 100644 --- a/dashboard-ui/tvgenres.html +++ b/dashboard-ui/tvgenres.html @@ -8,6 +8,7 @@
${TabSuggested} ${TabLatest} + ${TabUpcoming} ${TabShows} ${TabEpisodes} ${TabGenres} diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html index 2d49ad1664..baacbfbbbe 100644 --- a/dashboard-ui/tvlatest.html +++ b/dashboard-ui/tvlatest.html @@ -8,6 +8,7 @@
${TabSuggested} ${TabLatest} + ${TabUpcoming} ${TabShows} ${TabEpisodes} ${TabGenres} diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html index 331b86a0e6..7865f694a4 100644 --- a/dashboard-ui/tvpeople.html +++ b/dashboard-ui/tvpeople.html @@ -8,6 +8,7 @@
${TabSuggested} ${TabLatest} + ${TabUpcoming} ${TabShows} ${TabEpisodes} ${TabGenres} diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html index ffd0735442..3f9f5b02c7 100644 --- a/dashboard-ui/tvrecommended.html +++ b/dashboard-ui/tvrecommended.html @@ -16,6 +16,7 @@ diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html index 6ecfc4b7c6..7584e4bf42 100644 --- a/dashboard-ui/tvstudios.html +++ b/dashboard-ui/tvstudios.html @@ -8,6 +8,7 @@
${TabSuggested} ${TabLatest} + ${TabUpcoming} ${TabShows} ${TabEpisodes} ${TabGenres} diff --git a/dashboard-ui/tvupcoming.html b/dashboard-ui/tvupcoming.html index 1979b1b91e..ba4dbb61e4 100644 --- a/dashboard-ui/tvupcoming.html +++ b/dashboard-ui/tvupcoming.html @@ -5,15 +5,25 @@
-
+ +
- +
diff --git a/dashboard-ui/wizardimagesettings.html b/dashboard-ui/wizardimagesettings.html deleted file mode 100644 index 05deb30969..0000000000 --- a/dashboard-ui/wizardimagesettings.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - ${TitleMediaBrowser} - - -
- -
- -
-

- ${LabelConfigureSettings}

- -
- -
- - -
${LabelChapterImageExtractionForMoviesHelp}
-
- -
- - -
${LabelEnableAutomaticPortMappingHelp}
-
- -
- - -
-
- -
-
- - diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html index 2e0f559e9e..58f069b844 100644 --- a/dashboard-ui/wizardlibrary.html +++ b/dashboard-ui/wizardlibrary.html @@ -54,7 +54,7 @@
- +