diff --git a/dashboard-ui/advancedmetadata.html b/dashboard-ui/advancedmetadata.html index 9ba525af40..252df7de7f 100644 --- a/dashboard-ui/advancedmetadata.html +++ b/dashboard-ui/advancedmetadata.html @@ -21,10 +21,13 @@
-
  • - +
    • diff --git a/dashboard-ui/uisettings.html b/dashboard-ui/clientsettings.html similarity index 78% rename from dashboard-ui/uisettings.html rename to dashboard-ui/clientsettings.html index afa7aa5e66..6f1fa13e24 100644 --- a/dashboard-ui/uisettings.html +++ b/dashboard-ui/clientsettings.html @@ -1,55 +1,58 @@  - Display Settings + Client Settings -
    +
    -
    +
    • - +
      US zip code / City, State, Country / City, Country
    • -
    • - +
      Titles are assumed unplayed before this time
    • - +
      Titles are assumed fully played after this time
    • - +
      Titles shorter than this will not be resumable
      • -
    • - +
    @@ -58,9 +61,8 @@
    diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html index 65a879c65d..0b90c40e4f 100644 --- a/dashboard-ui/metadata.html +++ b/dashboard-ui/metadata.html @@ -18,29 +18,32 @@ diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html index 069ee0f5fc..a33080f251 100644 --- a/dashboard-ui/metadataimages.html +++ b/dashboard-ui/metadataimages.html @@ -18,7 +18,7 @@
    • - +
      When enabled, images will be refreshed periodically @@ -26,26 +26,26 @@
    • - +

    Enable additional image downloading:

    Movies

    - + - + - + - + - + @@ -55,16 +55,16 @@

    TV Series

    - + - + - + - +
    @@ -73,13 +73,13 @@

    TV Seasons

    - + - + - +
    @@ -88,16 +88,16 @@

    Music Artists

    - + - + - + - +
    @@ -105,10 +105,10 @@

    Music Albums

    - + - +
    @@ -118,7 +118,7 @@
    • - @@ -129,7 +129,7 @@
    • - @@ -138,17 +138,20 @@
    • -
      • -
    • - +
    diff --git a/dashboard-ui/scripts/advancedmetadataconfigurationpage.js b/dashboard-ui/scripts/advancedmetadataconfigurationpage.js index 6144ee6836..83943efe67 100644 --- a/dashboard-ui/scripts/advancedmetadataconfigurationpage.js +++ b/dashboard-ui/scripts/advancedmetadataconfigurationpage.js @@ -33,7 +33,7 @@ var checkedAttribute = configuration.InternetProviderExcludeTypes.indexOf(type) != -1 ? ' checked="checked"' : ''; - html += ''; + html += ''; html += ''; } @@ -42,15 +42,11 @@ $('#divItemTypes', page).html(html).trigger("create"); }, - submit: function () { - - $('.btnSubmit', $.mobile.activePage)[0].click(); - - }, - onSubmit: function () { var form = this; + Dashboard.showLoadingMsg(); + ApiClient.getServerConfiguration().done(function (config) { config.InternetProviderExcludeTypes = $.map($('.chkItemType:checked', form), function (currentCheckbox) { @@ -58,7 +54,7 @@ return currentCheckbox.getAttribute('data-itemtype'); }); - ApiClient.updateServerConfiguration(config); + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); // Disable default form submission diff --git a/dashboard-ui/scripts/clientsettings.js b/dashboard-ui/scripts/clientsettings.js new file mode 100644 index 0000000000..0b97bd465f --- /dev/null +++ b/dashboard-ui/scripts/clientsettings.js @@ -0,0 +1,50 @@ +(function ($, document, window) { + + $(document).on('pageshow', "#clientSettingsPage", function () { + + Dashboard.showLoadingMsg(); + + var page = this; + + ApiClient.getServerConfiguration().done(function (config) { + + $('#txtWeatherLocation', page).val(config.WeatherLocation); + $('#txtMinResumePct', page).val(config.MinResumePct); + $('#txtMaxResumePct', page).val(config.MaxResumePct); + $('#txtMinResumeDuration', page).val(config.MinResumeDurationSeconds); + $('#selectWeatherUnit', page).val(config.WeatherUnit).selectmenu("refresh"); + + $('input:first', page).focus(); + + Dashboard.hideLoadingMsg(); + }); + }); + + function clientSettingsPage() { + + var self = this; + + self.onSubmit = function () { + var form = this; + + Dashboard.showLoadingMsg(); + + ApiClient.getServerConfiguration().done(function (config) { + + config.WeatherLocation = $('#txtWeatherLocation', form).val(); + config.WeatherUnit = $('#selectWeatherUnit', form).val(); + config.MinResumePct = $('#txtMinResumePct', form).val(); + config.MaxResumePct = $('#txtMaxResumePct', form).val(); + config.MinResumeDurationSeconds = $('#txtMinResumeDuration', form).val(); + + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); + }); + + // Disable default form submission + return false; + }; + } + + window.ClientSettingsPage = new clientSettingsPage(); + +})($, document, window); diff --git a/dashboard-ui/scripts/displaysettingspage.js b/dashboard-ui/scripts/displaysettingspage.js deleted file mode 100644 index da87a106f7..0000000000 --- a/dashboard-ui/scripts/displaysettingspage.js +++ /dev/null @@ -1,46 +0,0 @@ -var DisplaySettingsPage = { - - onPageShow: function () { - Dashboard.showLoadingMsg(); - - var page = this; - - ApiClient.getServerConfiguration().done(function (config) { - - $('#txtWeatherLocation', page).val(config.WeatherLocation); - $('#txtMinResumePct', page).val(config.MinResumePct); - $('#txtMaxResumePct', page).val(config.MaxResumePct); - $('#txtMinResumeDuration', page).val(config.MinResumeDurationSeconds); - $('#selectWeatherUnit', page).val(config.WeatherUnit).selectmenu("refresh"); - - Dashboard.hideLoadingMsg(); - }); - - }, - - submit: function() { - - $('.btnSubmit', $.mobile.activePage)[0].click(); - - }, - - onSubmit: function () { - var form = this; - - ApiClient.getServerConfiguration().done(function (config) { - - config.WeatherLocation = $('#txtWeatherLocation', form).val(); - config.WeatherUnit = $('#selectWeatherUnit', form).val(); - config.MinResumePct = $('#txtMinResumePct', form).val(); - config.MaxResumePct = $('#txtMaxResumePct', form).val(); - config.MinResumeDurationSeconds = $('#txtMinResumeDuration', form).val(); - - ApiClient.updateServerConfiguration(config); - }); - - // Disable default form submission - return false; - } -}; - -$(document).on('pageshow', "#displaySettingsPage", DisplaySettingsPage.onPageShow); diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js index bfb7b78811..8d7dab0323 100644 --- a/dashboard-ui/scripts/metadataconfigurationpage.js +++ b/dashboard-ui/scripts/metadataconfigurationpage.js @@ -79,15 +79,11 @@ $('#selectLanguage', '#metadataConfigurationPage').html(html).selectmenu("refresh"); }, - submit: function () { - - $('.btnSubmit', $.mobile.activePage)[0].click(); - - }, - onSubmit: function () { var form = this; + Dashboard.showLoadingMsg(); + ApiClient.getServerConfiguration().done(function (config) { config.EnableInternetProviders = $('#chkEnableInternetProviders', form).checked(); @@ -96,7 +92,7 @@ config.PreferredMetadataLanguage = $('#selectLanguage', form).val(); config.MetadataCountryCode = $('#selectCountry', form).val(); - ApiClient.updateServerConfiguration(config); + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); // Disable default form submission diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js index c50cd37d73..19648007c1 100644 --- a/dashboard-ui/scripts/metadataimagespage.js +++ b/dashboard-ui/scripts/metadataimagespage.js @@ -42,15 +42,11 @@ Dashboard.hideLoadingMsg(); }, - submit: function () { - - $('.btnSubmit', $.mobile.activePage)[0].click(); - - }, - onSubmit: function () { var form = this; + Dashboard.showLoadingMsg(); + ApiClient.getServerConfiguration().done(function (config) { config.TmdbFetchedProfileSize = $('#selectTmdbPersonImageDownloadSize', form).val(); @@ -79,7 +75,7 @@ config.DownloadMusicAlbumImages.Primary = $('#chkDownloadAlbumPrimary', form).checked(); config.DownloadMusicAlbumImages.Backdrops = $('#chkDownloadAlbumBackdrops', form).checked(); - ApiClient.updateServerConfiguration(config); + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); // Disable default form submission diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index d226223bde..84dd0d80aa 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -775,9 +775,9 @@ var Dashboard = { href: "userprofiles.html", selected: page.hasClass("userProfilesConfigurationPage") || (pageElem.id == "mediaLibraryPage" && getParameterByName('userId')) }, { - name: "Display Settings", - href: "uisettings.html", - selected: pageElem.id == "displaySettingsPage" + name: "Client Settings", + href: "clientsettings.html", + selected: pageElem.id == "clientSettingsPage" }, { name: "Advanced", href: "advanced.html",