From 1a57e3d12f8b394ee7ab4e66439e40d90a89a287 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 9 Apr 2015 13:30:18 -0400 Subject: [PATCH] added sync cpu settings --- dashboard-ui/css/card.css | 8 ++++---- dashboard-ui/scripts/syncsettings.js | 4 ++++ dashboard-ui/syncsettings.html | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 4640ec5979..072fce75f0 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -353,10 +353,6 @@ width: 14.285714285714285714285714285714%; } - .backdropCard { - width: 20%; - } - .portraitCard { width: 14.285714285714285714285714285714%; } @@ -380,6 +376,10 @@ .smallBackdropCard { width: 12.5%; } + + .backdropCard { + width: 20%; + } } diff --git a/dashboard-ui/scripts/syncsettings.js b/dashboard-ui/scripts/syncsettings.js index d75cc826d2..bd7b83fd97 100644 --- a/dashboard-ui/scripts/syncsettings.js +++ b/dashboard-ui/scripts/syncsettings.js @@ -4,6 +4,8 @@ $('#txtSyncTempPath', page).val(config.TemporaryPath || ''); $('#txtUploadSpeedLimit', page).val(config.UploadSpeedLimitBytes / 1000000); + $('#txtCpuCoreLimit', page).val(config.TranscodingCpuCoreLimit); + $('#chkEnableFullSpeedConversion', page).checked(config.EnableFullSpeedTranscoding).checkboxradio('refresh'); Dashboard.hideLoadingMsg(); } @@ -53,6 +55,8 @@ config.TemporaryPath = $('#txtSyncTempPath', form).val(); config.UploadSpeedLimitBytes = parseInt(parseFloat(($('#txtUploadSpeedLimit', form).val() || '0')) * 1000000); + config.TranscodingCpuCoreLimit = parseInt($('#txtCpuCoreLimit', form).val()); + config.EnableFullSpeedTranscoding = $('#chkEnableFullSpeedConversion', form).checked(); ApiClient.updateNamedConfiguration("sync", config).done(Dashboard.processServerConfigurationUpdateResult); }); diff --git a/dashboard-ui/syncsettings.html b/dashboard-ui/syncsettings.html index 9ae3e06036..23958076eb 100644 --- a/dashboard-ui/syncsettings.html +++ b/dashboard-ui/syncsettings.html @@ -32,6 +32,20 @@ +
  • + + +
    + ${LabelConversionCpuCoreLimitHelp} +
    +
  • +
  • + + +
    + ${OptionEnableFullSpeedConversionHelp} +
    +