From 6e22caab7651e238d552c05ed14d38250b6369f0 Mon Sep 17 00:00:00 2001 From: Steve Beaver Date: Mon, 14 Aug 2017 12:48:30 -0400 Subject: New login design back-ported from 2.4 (cherry picked from commit 1605d94079fed5822ef1069eee05541d0ebc20ca) --- src/etc/inc/authgui.inc | 260 +++++++++++++++++++++++++++++-------------- src/usr/local/www/system.php | 17 +++ 2 files changed, 194 insertions(+), 83 deletions(-) (limited to 'src') diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index 9437d23..81992c9 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -137,33 +137,78 @@ function display_error_form($http_code, $desc) { return; } - $cssfile = "/css/pfSense.css"; - - if (isset($user_settings['webgui']['webguicss'])) { - if (file_exists("/usr/local/www/css/" . $user_settings['webgui']['webguicss'])) { - $cssfile = "/css/" . $user_settings['webgui']['webguicss']; - } - } + $logincssfile = "#770101"; ?> - - - - <?=gettext("Error: not allowed"); ?> - - -
-
-
- - + + + + + <?=gettext("Error"); ?> + + + +
+
+
+
+
+
+ + pfSense Logo + + + + + + + + + + + +
+
+
+ + +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+ +
-
- + + + - - - - <?=gettext("Login"); ?> - - - -
-
-
+ + + + + <?=gettext("Login"); ?> + + + + +
+
+
+
+
+
+ + pfSense Logo + + + + + + + + + + + +
+
+
+ +

+ +
+

If this forwarding is unexpected, it should be verified that a man-in-the-middle attack is not taking place.")); - } - - $loginautocomplete = isset($config['system']['webgui']['loginautocomplete']) ? '' : 'autocomplete="off"'; + if ($warnclass == "pagebodywarn") { ?> - -
-
-

-
- -
- - - - - -
action="" class="form-horizontal"> -
- -
- " autocorrect="off" autocapitalize="none" spellcheck="false"> -
-
- -
- -
- "> -
-
- -
-
- -
+
+
+
+
- +
-
-
-
+ +
+
+ +
+
+ +
+
+
class="login"> +

Sign In

+ + + +
+
+
+ +
+
+ + +
+ + + + - + + +addInput(new Form_Select( + 'logincss', + 'Login page color', + $pconfig['logincss'], + ["1e3f75;" => gettext("Blue"), "003300" => gettext("Green"), "770101" => gettext("Red"), + "4b1263" => gettext("Purple"), "424142" => gettext("Gray"), "333333" => gettext("Dark gray"), + "633215" => gettext("Brown" ), "bf7703" => gettext("Orange")] +))->setHelp('Choose a color for the login page'); + $section->addInput(new Form_Checkbox( 'loginshowhost', 'Login hostname', -- cgit v1.1