From c3a34422a5dd618f7f27e6c391d3662f326505c6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 20 Sep 2015 11:34:47 -0400 Subject: [PATCH 1/2] fix forgot password --- dashboard-ui/forgotpassword.html | 17 ++++++----------- dashboard-ui/forgotpasswordpin.html | 19 ++++++++----------- dashboard-ui/scripts/forgotpasswordpin.js | 7 +++++-- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/dashboard-ui/forgotpassword.html b/dashboard-ui/forgotpassword.html index 1ce4bc46f6..b1f6c66e9d 100644 --- a/dashboard-ui/forgotpassword.html +++ b/dashboard-ui/forgotpassword.html @@ -14,24 +14,19 @@

${HeaderForgotPassword}

- - +
${LabelForgotPasswordUsernameHelp}

-

- -

-

- - ${ButtonCancel} - -

+ ${ButtonCancel} + diff --git a/dashboard-ui/forgotpasswordpin.html b/dashboard-ui/forgotpasswordpin.html index c4ce4017de..5bd2b0b63e 100644 --- a/dashboard-ui/forgotpasswordpin.html +++ b/dashboard-ui/forgotpasswordpin.html @@ -13,22 +13,19 @@

${HeaderPasswordReset}

- - +
+ +

-

- -

-

- - ${ButtonCancel} - -

+ ${ButtonCancel} +
diff --git a/dashboard-ui/scripts/forgotpasswordpin.js b/dashboard-ui/scripts/forgotpasswordpin.js index 5914be6f37..81790b8d49 100644 --- a/dashboard-ui/scripts/forgotpasswordpin.js +++ b/dashboard-ui/scripts/forgotpasswordpin.js @@ -51,8 +51,11 @@ return false; } - $(document).on('pageinit', '#forgotPasswordPinPage', function () { - $('.forgotPasswordPinForm').off('submit', onSubmit).on('submit', onSubmit); + $(document).on('pageinit', '.forgotPasswordPinPage', function () { + + var page = this; + + $('form', page).off('submit', onSubmit).on('submit', onSubmit); }); })(window); \ No newline at end of file From 40fbd797932ca78a3ab358f1616d8f283f63fee9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 20 Sep 2015 12:15:25 -0400 Subject: [PATCH 2/2] update video frame analysis setting --- dashboard-ui/metadataadvanced.html | 6 ------ dashboard-ui/scripts/metadataadvanced.js | 6 ++---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html index ed9ff773e4..adabf405aa 100644 --- a/dashboard-ui/metadataadvanced.html +++ b/dashboard-ui/metadataadvanced.html @@ -176,12 +176,6 @@ ${OptionEnableVideoFrameAnalysis}
${OptionEnableVideoFrameAnalysisHelp}
-
-
- -
MB
-
-

diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js index b5196e21dc..9a0c71cae9 100644 --- a/dashboard-ui/scripts/metadataadvanced.js +++ b/dashboard-ui/scripts/metadataadvanced.js @@ -14,8 +14,7 @@ $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh"); $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh"); - $('.chkEnableVideoFrameAnalysis', page).checked(config.EnableVideoFrameAnalysis); - $('.txtVideoFrameAnalysisLimit', page).val((config.VideoFrameAnalysisLimitBytes / 1000000) || ''); + $('.chkEnableVideoFrameAnalysis', page).checked(config.EnableVideoFrameByFrameAnalysis); Dashboard.hideLoadingMsg(); } @@ -272,8 +271,7 @@ config.SaveMetadataHidden = $('#chkSaveMetadataHidden', form).checked(); - config.EnableVideoFrameAnalysis = $('.chkEnableVideoFrameAnalysis', form).checked(); - config.VideoFrameAnalysisLimitBytes = parseInt(parseFloat(($('.txtVideoFrameAnalysisLimit', form).val() || '0')) * 1000000); + config.EnableVideoFrameByFrameAnalysis = $('.chkEnableVideoFrameAnalysis', form).checked(); config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked(); config.EnableTmdbUpdates = $('#chkEnableTmdbUpdates', form).checked();