diff --git a/login.lp b/login.lp index fc50cf53..ebef4f10 100644 --- a/login.lp +++ b/login.lp @@ -8,7 +8,6 @@ --]] mg.include('scripts/pi-hole/lua/header.lp','r') -wrongpassword = false ?> @@ -25,14 +24,12 @@ wrongpassword = false
\ - ') end ?> +
-
"> +
@@ -56,12 +53,12 @@ wrongpassword = false
-
"> +
Forgot password?

diff --git a/scripts/pi-hole/js/login.js b/scripts/pi-hole/js/login.js index 947cc242..83a0ae8b 100644 --- a/scripts/pi-hole/js/login.js +++ b/scripts/pi-hole/js/login.js @@ -40,7 +40,24 @@ function redirect() { window.location.replace(target); } +function wrongPassword(is_wrong) { + if (is_wrong) { + $("#pw-field").addClass("has-error"); + $("#error-label").show(); + $("#forgot-pw-box").removeClass("box-info").removeClass("collapsed-box").addClass("box-danger"); + $("#forgot-pw-box .box-body").show(); + $("#forgot-pw-toggle-icon").removeClass("fa-plus").addClass("fa-minus"); + } else { + $("#pw-field").removeClass("has-error"); + $("#error-label").hide(); + $("#forgot-pw-box").addClass("box-info").addClass("collapsed-box").removeClass("box-danger"); + $("#forgot-pw-box .box-body").hide(); + $("#forgot-pw-toggle-icon").removeClass("fa-minus").addClass("fa-plus"); + } +} + function doLogin(response) { + wrongPassword(false); $.ajax({ url: "/api/auth", method: "POST", @@ -51,9 +68,8 @@ function doLogin(response) { }) .fail(function (data) { if (data.status === 401) { - // Login failed - $("#pw-field").addClass("has-error"); - $("#error-label").show(); + // Login failed, show error message + wrongPassword(true); } }); }