diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index 3340ec3d93..8dbb65362d 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -11,6 +11,7 @@
General + Server Transcoding
@@ -34,14 +35,6 @@ Dev builds are the bleeding edge. Released often, these build have not been tested. The application may crash and entire features may not work at all. -
  • - - -
    • -
  • diff --git a/dashboard-ui/advancedserversettings.html b/dashboard-ui/advancedserversettings.html new file mode 100644 index 0000000000..7c7e999e27 --- /dev/null +++ b/dashboard-ui/advancedserversettings.html @@ -0,0 +1,49 @@ + + + + Advanced + + +
    + +
    +
    + +
    + General + Server + Transcoding +
    + + +
      +
    • + + +
      • + +
    +
      +
    • + + +
      • + +
    + +
    +
    + + +
    + + diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html index 29af53fc38..976bf5a508 100644 --- a/dashboard-ui/encodingsettings.html +++ b/dashboard-ui/encodingsettings.html @@ -11,6 +11,7 @@
    General + Server Transcoding
    @@ -51,17 +52,17 @@
    - This folder contains server cache files, such as images. + This folder contains working files used by the media browser transcoder.
  • diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js index 71d0821126..ddbd7a8f6e 100644 --- a/dashboard-ui/scripts/advancedconfigurationpage.js +++ b/dashboard-ui/scripts/advancedconfigurationpage.js @@ -16,17 +16,7 @@ $('#fldRunAtStartup', page).hide(); } - if (systemInfo.SupportsNativeWebSocket) { - - $('#fldWebSocketPortNumber', page).hide(); - } else { - $('#fldWebSocketPortNumber', page).show(); - } - $('#selectAutomaticUpdateLevel', page).val(config.SystemUpdateLevel).selectmenu('refresh').trigger('change'); - $('#txtWebSocketPortNumber', page).val(config.LegacyWebSocketPortNumber); - - $('#txtPortNumber', page).val(config.HttpServerPortNumber); $('#chkDebugLog', page).checked(config.EnableDebugLevelLogging).checkboxradio("refresh"); $('#chkRunAtStartup', page).checked(config.RunAtStartup).checkboxradio("refresh"); @@ -136,9 +126,6 @@ config.CachePath = ''; } - config.LegacyWebSocketPortNumber = $('#txtWebSocketPortNumber', form).val(); - - config.HttpServerPortNumber = $('#txtPortNumber', form).val(); config.EnableDebugLevelLogging = $('#chkDebugLog', form).checked(); config.RunAtStartup = $('#chkRunAtStartup', form).checked(); diff --git a/dashboard-ui/scripts/advancedserversettings.js b/dashboard-ui/scripts/advancedserversettings.js new file mode 100644 index 0000000000..66bf30d5af --- /dev/null +++ b/dashboard-ui/scripts/advancedserversettings.js @@ -0,0 +1,58 @@ +(function ($, document, window) { + + function loadPage(page, config, systemInfo) { + + if (systemInfo.SupportsNativeWebSocket) { + + $('#fldWebSocketPortNumber', page).hide(); + } else { + $('#fldWebSocketPortNumber', page).show(); + } + + $('#txtWebSocketPortNumber', page).val(config.LegacyWebSocketPortNumber); + + $('#txtPortNumber', page).val(config.HttpServerPortNumber); + + Dashboard.hideLoadingMsg(); + } + + $(document).on('pageshow', "#advancedServerSettingsPage", function () { + + Dashboard.showLoadingMsg(); + + var page = this; + + var promise1 = ApiClient.getServerConfiguration(); + + var promise2 = ApiClient.getSystemInfo(); + + $.when(promise1, promise2).done(function (response1, response2) { + + loadPage(page, response1[0], response2[0]); + + }); + + }); + + window.AdvancedServerSettingsPage = { + + onSubmit: function () { + Dashboard.showLoadingMsg(); + + var form = this; + + ApiClient.getServerConfiguration().done(function (config) { + + config.LegacyWebSocketPortNumber = $('#txtWebSocketPortNumber', form).val(); + config.HttpServerPortNumber = $('#txtPortNumber', form).val(); + + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); + }); + + // Disable default form submission + return false; + } + + }; + +})(jQuery, document, window);