Improved login page graphic

author: Steve Beaver <sbeaver@netgate.com> 2017-06-19 13:15:53 -0400
committer: Steve Beaver <sbeaver@netgate.com> 2017-06-19 13:15:53 -0400
commit: d58a73785cfbd93117c4ac7d15b1e51507c3005c (patch)
tree: 7ed69e73cbafb556f98d8b18766ab3de6cc57f26 /src
parent: f6f1e117710a178cc09409e107057e17e7bd6c7f (diff)
download: pfsense-d58a73785cfbd93117c4ac7d15b1e51507c3005c.zip
pfsense-d58a73785cfbd93117c4ac7d15b1e51507c3005c.tar.gz
9 files changed, 134 insertions, 843 deletions
diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc
index f6b2e12..dd5f0d7 100644
--- a/src/etc/inc/authgui.inc
+++ b/src/etc/inc/authgui.inc
@@ -229,12 +229,11 @@ function display_login_form() {
 		}
 	}
 
-	$logincssfile = "/css/login_blue.css";
+	$logincssfile = "1e3f75";
 
 	if (isset($user_settings['webgui']['logincss'])) {
-		if (file_exists("/usr/local/www/css/" . $user_settings['webgui']['logincss'])) {
-			$logincssfile = "/css/" . $user_settings['webgui']['logincss'];
-		}
+		$logincssfile = "#" . $user_settings['webgui']['logincss'];
+
 	}
 
 	if (isset($config['system']['webgui']['loginshowhost'])) {
@@ -252,7 +251,7 @@ function display_login_form() {
 <head>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css" type="text/css">
-    <link rel="stylesheet" href="<?=$logincssfile?>" type="text/css">
+    <link rel="stylesheet" href="css/login.css" type="text/css">
 	<title><?=gettext("Login"); ?></title>
 	<script type="text/javascript">
 	//<![CDATA{
@@ -262,68 +261,70 @@ function display_login_form() {
 </head>
 
 <body id="login" >
-	<div class="row " style="background-color: #ffffff;">
-		<div class="col-sm-5" >
-			<div style="text-align:center">
-				<svg x="0px" y="0px" viewBox="0 0 282.8 84.2" width="300" height="100">
-				    <style type="text/css">
-				        .st0{fill:#2B40B5;}
-				        .st1{fill:#1475CF;}
-				        .st2{fill:#1C1275;}
-				    </style>
-				    <path class="st0" d="M27.8,57.7c2.9,0,5.4-0.9,7.5-2.6c2.1-1.7,3.6-4,4.4-6.8c0.8-2.8,0.6-5.1-0.5-6.8c-1.1-1.7-3.2-2.6-6.1-2.6 c-2.9,0-5.4,0.9-7.5,2.6c-2.1,1.7-3.5,4-4.3,6.8c-0.8,2.8-0.7,5.1,0.5,6.8C22.8,56.9,24.8,57.7,27.8,57.7"/>
-				    <path class="st0" d="M115.1,46.6c-1.5-0.8-3-1.4-4.7-1.8c-1.7-0.4-3.2-0.7-4.7-1.1c-1.5-0.3-2.7-0.7-3.6-1.1c-0.9-0.4-1.4-1.1-1.4-2 c0-1.1,0.5-1.9,1.4-2.4c0.9-0.5,1.9-0.7,2.8-0.7c2.8,0,5,1,6.7,3.1l7-7c-1.7-1.8-3.9-3.1-6.4-3.8c-2.5-0.7-5-1.1-7.4-1.1 c-1.9,0-3.9,0.2-5.7,0.7c-1.9,0.5-3.6,1.2-5,2.3c-1.5,1-2.6,2.3-3.5,3.9c-0.9,1.6-1.3,3.5-1.3,5.7c0,2.3,0.5,4.2,1.4,5.6 c0.9,1.4,2.1,2.5,3.6,3.3c1.5,0.8,3,1.3,4.7,1.7c1.7,0.4,3.2,0.7,4.7,1.1c1.5,0.3,2.7,0.7,3.6,1.2c0.9,0.5,1.4,1.2,1.4,2.2 c0,1-0.5,1.7-1.6,2.1c-1.1,0.4-2.3,0.6-3.6,0.6c-1.7,0-3.3-0.3-4.6-1c-1.3-0.7-2.5-1.7-3.6-3l-7,7.7c1.8,1.9,4.1,3.2,6.7,3.9 c2.7,0.7,5.3,1.1,7.9,1.1c2,0,4-0.2,6.1-0.6c2-0.4,3.9-1,5.5-2c1.6-0.9,3-2.2,4-3.8c1-1.6,1.6-3.5,1.6-5.9c0-2.3-0.5-4.2-1.4-5.6 C117.7,48.6,116.5,47.4,115.1,46.6"/>
-				    <path class="st0" d="M156.3,34.1c-1.5-1.7-3.3-3-5.5-3.9c-2.2-0.9-4.6-1.4-7.2-1.4c-2.9,0-5.6,0.5-8.1,1.4c-2.5,0.9-4.7,2.2-6.6,3.9 c-1.9,1.7-3.3,3.8-4.4,6.2c-1.1,2.4-1.6,5.1-1.6,8c0,3,0.5,5.6,1.6,8c1.1,2.4,2.5,4.5,4.4,6.2c1.9,1.7,4.1,3,6.6,3.9 c2.5,0.9,5.2,1.4,8.1,1.4c3,0,5.9-0.6,8.7-1.9c2.8-1.3,5.1-3.1,7-5.4l-8-5.9c-1,1.3-2.1,2.4-3.4,3.3c-1.3,0.8-2.9,1.3-4.8,1.3 c-2.2,0-4.1-0.7-5.7-2c-1.5-1.3-2.5-3.1-3-5.2H161v-3.6c0-3-0.4-5.6-1.2-8C159,37.9,157.8,35.8,156.3,34.1 M134.3,44.1 c0.1-0.9,0.3-1.8,0.7-2.6c0.4-0.8,0.9-1.6,1.6-2.2c0.7-0.6,1.5-1.2,2.5-1.6c1-0.4,2.1-0.6,3.4-0.6c2.1,0,3.8,0.7,5.1,2.1 c1.3,1.4,2,3,1.9,5H134.3z"/>
-				    <path class="st0" d="M198.3,33.8c-1-1.6-2.4-2.8-4.2-3.7c-1.8-0.9-4.1-1.3-7-1.3c-1.4,0-2.7,0.2-3.8,0.5c-1.2,0.4-2.2,0.8-3.1,1.4 c-0.9,0.6-1.7,1.2-2.4,1.9c-0.7,0.7-1.2,1.4-1.5,2.1H176v-5.1h-11v37.2h11.5V48.4c0-1.2,0.1-2.4,0.2-3.5c0.2-1.1,0.5-2.1,1-3 c0.5-0.9,1.2-1.6,2.1-2.1c0.9-0.5,2.1-0.8,3.6-0.8c1.5,0,2.6,0.3,3.4,0.9c0.8,0.6,1.4,1.4,1.8,2.4c0.4,1,0.6,2,0.7,3.2 c0.1,1.1,0.1,2.3,0.1,3.3v18.2h11.5V46.4c0-2.5-0.2-4.8-0.5-7C199.9,37.3,199.3,35.4,198.3,33.8"/>
-				    <path class="st0" d="M231.5,46.6c-1.5-0.8-3-1.4-4.7-1.8c-1.7-0.4-3.2-0.7-4.7-1.1c-1.5-0.3-2.7-0.7-3.6-1.1c-0.9-0.4-1.4-1.1-1.4-2 c0-1.1,0.5-1.9,1.4-2.4c0.9-0.5,1.9-0.7,2.8-0.7c2.8,0,5,1,6.7,3.1l7-7c-1.7-1.8-3.9-3.1-6.4-3.8c-2.5-0.7-5-1.1-7.4-1.1 c-1.9,0-3.9,0.2-5.7,0.7c-1.9,0.5-3.6,1.2-5,2.3c-1.5,1-2.6,2.3-3.5,3.9c-0.9,1.6-1.3,3.5-1.3,5.7c0,2.3,0.5,4.2,1.4,5.6 c0.9,1.4,2.1,2.5,3.6,3.3c1.5,0.8,3,1.3,4.7,1.7c1.7,0.4,3.2,0.7,4.7,1.1c1.5,0.3,2.7,0.7,3.6,1.2c0.9,0.5,1.4,1.2,1.4,2.2 c0,1-0.5,1.7-1.6,2.1c-1.1,0.4-2.3,0.6-3.6,0.6c-1.7,0-3.3-0.3-4.6-1c-1.3-0.7-2.5-1.7-3.6-3l-7,7.7c1.8,1.9,4.1,3.2,6.7,3.9 c2.7,0.7,5.3,1.1,7.9,1.1c2,0,4-0.2,6.1-0.6c2-0.4,3.9-1,5.5-2c1.6-0.9,3-2.2,4-3.8c1-1.6,1.6-3.5,1.6-5.9c0-2.3-0.5-4.2-1.4-5.6 C234.1,48.6,232.9,47.4,231.5,46.6"/>
-				    <path class="st0" d="M277.4,51.9v-4.2c-0.1-2.7-0.5-5.2-1.2-7.4c-0.8-2.4-2-4.5-3.5-6.2c-1.5-1.7-3.3-3-5.5-3.9 c-2.2-0.9-4.6-1.4-7.2-1.4c-2.9,0-5.6,0.5-8.1,1.4c-2.5,0.9-4.7,2.2-6.6,3.9c-1.9,1.7-3.3,3.8-4.4,6.2c-1.1,2.4-1.6,5.1-1.6,8 c0,3,0.5,5.6,1.6,8c1.1,2.4,2.5,4.5,4.4,6.2c1.9,1.7,4.1,3,6.6,3.9c2.5,0.9,5.2,1.4,8.1,1.4c3,0,5.9-0.6,8.7-1.9 c2.8-1.3,5.1-3.1,7-5.4l-8-5.9c-1,1.3-2.1,2.4-3.4,3.3c-1.3,0.8-2.9,1.3-4.8,1.3c-2.2,0-4.1-0.7-5.7-2c-1.5-1.3-2.5-3.1-3-5.2H277.4 z M250.7,44.1c0.1-0.9,0.3-1.8,0.7-2.6c0.4-0.8,0.9-1.6,1.6-2.2c0.7-0.6,1.5-1.2,2.5-1.6c1-0.4,2.1-0.6,3.4-0.6 c2.1,0,3.8,0.7,5.1,2.1c1.3,1.4,2,3,1.9,5H250.7z"/>
-				    <path class="st1" d="M52.6,38.9l2.6-9.2h4.6l1.8-6.6c0.6-2,1.3-4,2.2-5.8c0.8-1.8,2-3.4,3.4-4.8c1.4-1.4,3.2-2.5,5.3-3.3 c2.1-0.8,4.8-1.2,7.9-1.2c0.8,0,1.5,0,2.3,0.1c-0.7-2.9-3.3-5-6.3-5.1H11.9c-3.6,0-6.5,3-6.5,6.6V67l10.5-37.3h10.6l-1.4,4.9h0.2 c0.6-0.7,1.4-1.3,2.4-2c1-0.7,2-1.3,3.1-1.9c1.1-0.6,2.3-1,3.6-1.4c1.3-0.4,2.6-0.5,3.9-0.5c2.8,0,5.1,0.5,7.1,1.4 c2,0.9,3.5,2.3,4.7,4c1,1.5,1.6,3.3,1.9,5.4l0.8-0.6H52.6z"/>
-				    <path class="st2" d="M82.1,17.9c-0.5-0.1-1.1-0.2-1.8-0.2c-1.8,0-3.3,0.4-4.5,1.2c-1.1,0.8-2.1,2.4-2.8,4.9l-1.7,5.9h6.5l1.6,5.1 l-4.2,4.1h-6.5l-7.9,28H49.4l7.9-28h-4.4L52,39.5c0,0.2,0.1,0.5,0.1,0.7c0.2,2.3-0.1,4.9-0.9,7.7c-0.7,2.6-1.8,5.1-3.3,7.5 c-1.5,2.4-3.2,4.5-5.1,6.3c-2,1.8-4.2,3.3-6.6,4.4c-2.4,1.1-4.9,1.6-7.6,1.6c-2.4,0-4.5-0.4-6.4-1.1c-1.9-0.7-3.2-2-4-3.8h-0.2 l-5,17.7h63.3c3.6,0,6.6-2.9,6.6-6.6V18.2C82.6,18.1,82.3,18,82.1,17.9"/>
-				    <path class="st0" d="M277.6,68.5h0.8c0.4,0,0.6-0.1,0.7-0.2c0.1-0.1,0.2-0.2,0.2-0.4c0-0.1,0-0.2-0.1-0.3c-0.1-0.1-0.1-0.2-0.3-0.2 c-0.1,0-0.3-0.1-0.6-0.1h-0.7V68.5z M277,70.6v-3.8h1.3c0.5,0,0.8,0,1,0.1c0.2,0.1,0.4,0.2,0.5,0.4c0.1,0.2,0.2,0.4,0.2,0.6 c0,0.3-0.1,0.5-0.3,0.7c-0.2,0.2-0.5,0.3-0.8,0.3c0.1,0.1,0.2,0.1,0.3,0.2c0.2,0.2,0.3,0.4,0.6,0.8l0.5,0.7h-0.8l-0.3-0.6 c-0.3-0.5-0.5-0.8-0.6-0.9c-0.1-0.1-0.3-0.1-0.5-0.1h-0.4v1.6H277z M278.6,65.7c-0.5,0-1,0.1-1.5,0.4c-0.5,0.3-0.8,0.6-1.1,1.1 c-0.3,0.5-0.4,1-0.4,1.5c0,0.5,0.1,1,0.4,1.5c0.3,0.5,0.6,0.8,1.1,1.1c0.5,0.3,1,0.4,1.5,0.4c0.5,0,1-0.1,1.5-0.4 c0.5-0.3,0.8-0.6,1.1-1.1c0.3-0.5,0.4-1,0.4-1.5c0-0.5-0.1-1-0.4-1.5c-0.3-0.5-0.6-0.8-1.1-1.1C279.6,65.8,279.1,65.7,278.6,65.7z M278.6,65.1c0.6,0,1.2,0.2,1.8,0.5c0.6,0.3,1,0.7,1.3,1.3c0.3,0.6,0.5,1.2,0.5,1.8c0,0.6-0.2,1.2-0.5,1.8c-0.3,0.6-0.8,1-1.3,1.3 c-0.6,0.3-1.2,0.5-1.8,0.5c-0.6,0-1.2-0.2-1.8-0.5c-0.6-0.3-1-0.8-1.3-1.3c-0.3-0.6-0.5-1.2-0.5-1.8c0-0.6,0.2-1.2,0.5-1.8 c0.3-0.6,0.8-1,1.3-1.3C277.4,65.2,278,65.1,278.6,65.1z"/>
-				</svg>
-			</div>
-		</div>
-
-		<div class="col-sm-4" style="padding-top: 1%">
-			<div class="alert alert-danger hidden" id="no_cookies"><?= gettext("The browser must support cookies to login."); ?></div>
-<?php
-	if (is_ipaddr($http_host) && !$local_ip && !isset($config['system']['webgui']['nohttpreferercheck'])) {
-		print_info_box(gettext("The IP address being used to access this router is not configured locally, which may be forwarded by NAT or other means.<br />If this forwarding is unexpected, it should be verified that a man-in-the-middle attack is not taking place."), "warning", false);
-	} else {
-		print("<div class=\"alert alert-warning\">This login page is an experiment/work in progress. Change the background color on the \"System->General Setup\" page.</div>");
-	}
-?>
-		</div>
-
-		<div class="col-sm-3 text-center" style="padding-top: 2%">
-			<h4><a href="#">
-				<?=$loginbannerstr?>
-			</a></h4>
-		</div>
-	</div>
-
-    <div class="row logoRow" style="height:90%;">
-        <div class="col-sm-12 col-sm-offset-1 logoCol">
-            <div class="loginCont center-block">
+	<div id="total">
+        <header id="1">
+            <div id="a">
+            	<div class="row ">
+            		<div class="col-sm-4">
+						<div id="logodiv" style="text-align:center" class="bbbb">
+							<img src="pfsense-trans.png" height="100%"/>
+						</div>
+            		</div>
+
+            		<div class="col-sm-8 bbbb msgbox text-center">
+            			<span id="hostspan">
+							<a><h4>pfsense.local.com</h4></a>
+						</span
+            		</div>
+
+<!--
+            		<div class="col-sm-8 bbbb msgbox text-center">
+            			<div class="alert alert-warning">
+							The IP address being used to access this router is not configured locally, which may be forwarded by NAT or other means. If this forwarding is unexpected, it should be verified that a man-in-the-middle attack is not taking place.
+						</div>
+            		</div>
+-->
+<!--
+            		<div class="col-sm-4 text-center bbbb" style="padding-top: 2%">
+            			<a><h4>something.pfsense.com</h4></a>
+            		</div>
+-->
+                </div>
+            </div>
+        </header>
+
+        <div id="bb" style="background: <?=$logincssfile?>;">
+        	<div class="col-sm-4">
+            </div>
+
+        	<div class="col-sm-4 logoCol">
+				<div class="loginCont center-block">
 	                <p class="form-title">
-	                    <?=gettext("Sign In")?></p>
-	                <form method="post" <?= $loginautocomplete ?> action="<?=$_SERVER['SCRIPT_NAME'];?>" class="login">
-		                <input name="usernamefld" id="usernamefld" type="text" placeholder="<?=gettext("Username")?>" />
-		                <input name="passwordfld" id="passwordfld" type="password" placeholder="<?=gettext("Password")?>" />
-		                <input type="submit" name="login" value="<?=gettext("Sign In")?>" class="btn btn-success btn-sm" />
+	                    Sign In
+	                </p>
+
+	                <form method="post" class="login">
+		                <input name="usernamefld" id="usernamefld" type="text" placeholder="Username" />
+		                <input name="passwordfld" id="passwordfld" type="password" placeholder="Password" />
+		                <input type="submit" name="login" value="Sign In" class="btn btn-success btn-sm" />
 	                </form>
-			</div>
+				</div>
+            </div>
+
+        	<div class="col-sm-4">
+            </div>
         </div>
+        <footer id="3">
+            <div id="c">
+				<p class="text-muted">
+					<a target="_blank" href="https://www.pfsense.org/?gui=bootstrap">pfSense</a> is &copy;
+					2004 - 2017 by <a href="https://pfsense.org/license" class="tblnk">Rubicon Communications, LLC (Netgate)</a>. All Rights Reserved.
+					[<a href="/license.php" class="tblnk">view license</a>]
+				</p>
+            </div>
+        </footer>
     </div>
 
-	<footer class="navbar-fixed-bottom footer">
-			<p class="text-muted">
-				<a target="_blank" href="https://www.pfsense.org/?gui=bootstrap">pfSense</a> is &copy;
-				2004 - 2017 by <a href="https://pfsense.org/license" class="tblnk">Rubicon Communications, LLC (Netgate)</a>. All Rights Reserved.
-				[<a href="/license.php" class="tblnk">view license</a>]
-			</p>
-	</footer>
-
 	<script type="text/javascript">
 	//!<[CDATA[
 	events.push(function() {
diff --git a/src/usr/local/www/css/login_blue.css b/src/usr/local/www/css/login.css
index 3bf72b7..8188da9 100644
--- a/src/usr/local/www/css/login_blue.css
+++ b/src/usr/local/www/css/login.css
@@ -1,61 +1,85 @@
-html {
-  height: 100%;
+body, html {
+    height: 100%;
+    padding: 0;
+    margin: 0;
 }
 
 body {
-  margin-bottom: 60px;
-  height: 100%;
+    width: 100%;
 }
 
-.cont {
-    height: 100%;
-    background: #1e3f75;
-    color: white;
+header {
 }
 
-.logoRow {
-    height: 100%;
-    background: #1e3f75;
+#a {
+    position: fixed;
+    height: 90px;
+    top: 0;
+    width: 100%;
+    background-color: white;
 }
 
-.logoCol {
-    height: 100%;
-    background: #1e3f75;
+#bb {
+    position: absolute;
+    top:90px;
+    bottom:25px;
+    width: 100%;
+    color: white;
 }
 
-.loginCont {
-    position: absolute;
-    top: 50%; left: 50%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #1e3f75;
+.bbbb {
+	height: 80px;
+	padding-top: 10px;
 }
 
-.logoCont {
-    position: absolute;
-    top: 40%; left: 60%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #1e3f75;
+#hostspan {
+	text-align: right;
 }
+	.msgbox {
+		padding-right: 30px;
+		padding-top: 25px;
+	}
+
+@media only screen and (max-width : 768px) {
+    /* only size 'xs' and below */
+    #a {
+        height: 100px;
+    }
+
+    #bb {
+    	top: 100px;
+    }
 
-.list-group{
-	    background: #1e3f75 !important;
-	    color: white !important;
+    .bbbb {
+		height: 60px;
+	}
+
+	.msgbox {
+		padding-right: 0px;
+		padding-top: 0px;
+	}
+
+	#hostspan {
+		text-align: center;
+	}
 }
 
-.list-group-item {
-	    background: #1e3f75 !important;
-	    color: white !important;
-	    border: none;
-	    font-weight: 200;
+#c {
+    position: fixed;
+    height: 25px;
+    bottom: 0;
+    width: 100%;
+    background-color: #212121;
+    color: white;
+    text-align: center;
 }
 
-.list-group-item-heading {
-	    color: white !important;
-	    font-weight: 350 !important;
+.loginCont {
+    position: absolute;
+    top: 50%; left: 50%;
+    transform: translate(-50%,-50%);
+    height: 55%;
+    width: 80%;
 }
 
 p.form-title
@@ -70,12 +94,6 @@ p.form-title
     letter-spacing: 4px;
 }
 
-p.rsstitle {
-	font-size: 30px;
-	font-weight: 150;
-	color: #ffffff;
-}
-
 form.login
 {
     width: 300px;
@@ -110,8 +128,8 @@ form.login input[type="submit"]
     outline: 0;
     cursor: pointer;
     letter-spacing: 1px;
-                display: block;
-             margin : 0 auto;
+    display: block;
+    margin : 0 auto;
     margin-top: 36px;
 }
 
@@ -137,9 +155,6 @@ form.login a:hover
     color: #2ecc71;
 }
 
-.footer {
-    height: 60px;
-    background-color: #212121;
-    padding-top: 10px;
-    text-align: center;
+.logoCol {
+    height: 100%;
 }
diff --git a/src/usr/local/www/css/login_brown.css b/src/usr/local/www/css/login_brown.css
deleted file mode 100644
index 5427b78..0000000
--- a/src/usr/local/www/css/login_brown.css
+++ /dev/null
@@ -1,145 +0,0 @@
-html {
-  height: 100%;
-}
-
-body {
-  margin-bottom: 60px;
-  height: 100%;
-}
-
-.cont {
-    height: 100%;
-    background: #633215;
-    color: white;
-}
-
-.logoRow {
-    height: 100%;
-    background: #633215;
-}
-
-.logoCol {
-    height: 100%;
-    background: #633215;
-}
-
-.loginCont {
-    position: absolute;
-    top: 50%; left: 50%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #633215;
-}
-
-.logoCont {
-    position: absolute;
-    top: 40%; left: 60%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #633215;
-}
-
-.list-group{
-	    background: #633215 !important;
-	    color: white !important;
-}
-
-.list-group-item {
-	    background: #633215 !important;
-	    color: white !important;
-	    border: none;
-	    font-weight: 200;
-}
-
-.list-group-item-heading {
-	    color: white !important;
-	    font-weight: 350 !important;
-}
-
-p.form-title
-{
-    font-family: 'Open Sans' , sans-serif;
-    font-size: 20px;
-    font-weight: 500;
-    text-align: center;
-    color: #FFFFFF;
-    margin-top: 5%;
-    text-transform: uppercase;
-    letter-spacing: 4px;
-}
-
-p.rsstitle {
-	font-size: 30px;
-	font-weight: 150;
-	color: #ffffff;
-}
-
-form.login
-{
-    width: 300px;
-    margin: 0 auto;
-}
-
-form.login input[type="text"], form.login input[type="password"]
-{
-    width: 100%;
-    margin: 0;
-    padding: 10px 10px;
-    background: 0;
-    border: 0;
-    border-bottom: 1px solid #FFFFFF;
-    outline: 0;
-    font-style: italic;
-    font-size: 18px;
-    font-weight: 600;
-    letter-spacing: 1px;
-    margin-bottom: 5px;
-    color: #FFFFFF;
-    outline: 0;
-}
-
-form.login input[type="submit"]
-{
-    width: 60%;
-    font-size: 14px;
-    text-transform: uppercase;
-    font-weight: 500;
-    margin-top: 36px;
-    outline: 0;
-    cursor: pointer;
-    letter-spacing: 1px;
-                display: block;
-             margin : 0 auto;
-    margin-top: 36px;
-}
-
-form.login input[type="submit"]:hover
-{
-    transition: background-color 0.5s ease;
-}
-
-form.login label, form.login a
-{
-    font-size: 12px;
-    font-weight: 400;
-    color: #FFFFFF;
-}
-
-form.login a
-{
-    transition: color 0.5s ease;
-}
-
-form.login a:hover
-{
-    color: #2ecc71;
-}
-
-.footer {
-    height: 60px;
-    background-color: #212121;
-    padding-top: 10px;
-    text-align: center;
-}
diff --git a/src/usr/local/www/css/login_gray.css b/src/usr/local/www/css/login_gray.css
deleted file mode 100644
index b25b6bf..0000000
--- a/src/usr/local/www/css/login_gray.css
+++ /dev/null
@@ -1,145 +0,0 @@
-html {
-  height: 100%;
-}
-
-body {
-  margin-bottom: 60px;
-  height: 100%;
-}
-
-.cont {
-    height: 100%;
-    background: #424142;
-    color: white;
-}
-
-.logoRow {
-    height: 100%;
-    background: #424142;
-}
-
-.logoCol {
-    height: 100%;
-    background: #424142;
-}
-
-.loginCont {
-    position: absolute;
-    top: 50%; left: 50%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #424142;
-}
-
-.logoCont {
-    position: absolute;
-    top: 40%; left: 60%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #424142;
-}
-
-.list-group{
-	    background: #424142 !important;
-	    color: white !important;
-}
-
-.list-group-item {
-	    background: #424142 !important;
-	    color: white !important;
-	    border: none;
-	    font-weight: 200;
-}
-
-.list-group-item-heading {
-	    color: white !important;
-	    font-weight: 350 !important;
-}
-
-p.form-title
-{
-    font-family: 'Open Sans' , sans-serif;
-    font-size: 20px;
-    font-weight: 500;
-    text-align: center;
-    color: #FFFFFF;
-    margin-top: 5%;
-    text-transform: uppercase;
-    letter-spacing: 4px;
-}
-
-p.rsstitle {
-	font-size: 30px;
-	font-weight: 150;
-	color: #ffffff;
-}
-
-form.login
-{
-    width: 300px;
-    margin: 0 auto;
-}
-
-form.login input[type="text"], form.login input[type="password"]
-{
-    width: 100%;
-    margin: 0;
-    padding: 10px 10px;
-    background: 0;
-    border: 0;
-    border-bottom: 1px solid #FFFFFF;
-    outline: 0;
-    font-style: italic;
-    font-size: 18px;
-    font-weight: 600;
-    letter-spacing: 1px;
-    margin-bottom: 5px;
-    color: #FFFFFF;
-    outline: 0;
-}
-
-form.login input[type="submit"]
-{
-    width: 60%;
-    font-size: 14px;
-    text-transform: uppercase;
-    font-weight: 500;
-    margin-top: 36px;
-    outline: 0;
-    cursor: pointer;
-    letter-spacing: 1px;
-                display: block;
-             margin : 0 auto;
-    margin-top: 36px;
-}
-
-form.login input[type="submit"]:hover
-{
-    transition: background-color 0.5s ease;
-}
-
-form.login label, form.login a
-{
-    font-size: 12px;
-    font-weight: 400;
-    color: #FFFFFF;
-}
-
-form.login a
-{
-    transition: color 0.5s ease;
-}
-
-form.login a:hover
-{
-    color: #2ecc71;
-}
-
-.footer {
-    height: 60px;
-    background-color: #212121;
-    padding-top: 10px;
-    text-align: center;
-}
diff --git a/src/usr/local/www/css/login_green.css b/src/usr/local/www/css/login_green.css
deleted file mode 100644
index 790c66a..0000000
--- a/src/usr/local/www/css/login_green.css
+++ /dev/null
@@ -1,145 +0,0 @@
-html {
-  height: 100%;
-}
-
-body {
-  margin-bottom: 60px;
-  height: 100%;
-}
-
-.cont {
-    height: 100%;
-    background: #003300;
-    color: white;
-}
-
-.logoRow {
-    height: 100%;
-    background: #003300;
-}
-
-.logoCol {
-    height: 100%;
-    background: #003300;
-}
-
-.loginCont {
-    position: absolute;
-    top: 50%; left: 50%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #003300;
-}
-
-.logoCont {
-    position: absolute;
-    top: 40%; left: 60%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #003300;
-}
-
-.list-group{
-	    background: #003300 !important;
-	    color: white !important;
-}
-
-.list-group-item {
-	    background: #003300 !important;
-	    color: white !important;
-	    border: none;
-	    font-weight: 200;
-}
-
-.list-group-item-heading {
-	    color: white !important;
-	    font-weight: 350 !important;
-}
-
-p.form-title
-{
-    font-family: 'Open Sans' , sans-serif;
-    font-size: 20px;
-    font-weight: 500;
-    text-align: center;
-    color: #FFFFFF;
-    margin-top: 5%;
-    text-transform: uppercase;
-    letter-spacing: 4px;
-}
-
-p.rsstitle {
-	font-size: 30px;
-	font-weight: 150;
-	color: #ffffff;
-}
-
-form.login
-{
-    width: 300px;
-    margin: 0 auto;
-}
-
-form.login input[type="text"], form.login input[type="password"]
-{
-    width: 100%;
-    margin: 0;
-    padding: 10px 10px;
-    background: 0;
-    border: 0;
-    border-bottom: 1px solid #FFFFFF;
-    outline: 0;
-    font-style: italic;
-    font-size: 18px;
-    font-weight: 600;
-    letter-spacing: 1px;
-    margin-bottom: 5px;
-    color: #FFFFFF;
-    outline: 0;
-}
-
-form.login input[type="submit"]
-{
-    width: 60%;
-    font-size: 14px;
-    text-transform: uppercase;
-    font-weight: 500;
-    margin-top: 36px;
-    outline: 0;
-    cursor: pointer;
-    letter-spacing: 1px;
-                display: block;
-             margin : 0 auto;
-    margin-top: 36px;
-}
-
-form.login input[type="submit"]:hover
-{
-    transition: background-color 0.5s ease;
-}
-
-form.login label, form.login a
-{
-    font-size: 12px;
-    font-weight: 400;
-    color: #FFFFFF;
-}
-
-form.login a
-{
-    transition: color 0.5s ease;
-}
-
-form.login a:hover
-{
-    color: #2ecc71;
-}
-
-.footer {
-    height: 60px;
-    background-color: #212121;
-    padding-top: 10px;
-    text-align: center;
-}
diff --git a/src/usr/local/www/css/login_purple.css b/src/usr/local/www/css/login_purple.css
deleted file mode 100644
index f8d9779..0000000
--- a/src/usr/local/www/css/login_purple.css
+++ /dev/null
@@ -1,145 +0,0 @@
-html {
-  height: 100%;
-}
-
-body {
-  margin-bottom: 60px;
-  height: 100%;
-}
-
-.cont {
-    height: 100%;
-    background: #4b1263;
-    color: white;
-}
-
-.logoRow {
-    height: 100%;
-    background: #4b1263;
-}
-
-.logoCol {
-    height: 100%;
-    background: #4b1263;
-}
-
-.loginCont {
-    position: absolute;
-    top: 50%; left: 50%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #4b1263;
-}
-
-.logoCont {
-    position: absolute;
-    top: 40%; left: 60%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #4b1263;
-}
-
-.list-group{
-	    background: #4b1263 !important;
-	    color: white !important;
-}
-
-.list-group-item {
-	    background: #4b1263 !important;
-	    color: white !important;
-	    border: none;
-	    font-weight: 200;
-}
-
-.list-group-item-heading {
-	    color: white !important;
-	    font-weight: 350 !important;
-}
-
-p.form-title
-{
-    font-family: 'Open Sans' , sans-serif;
-    font-size: 20px;
-    font-weight: 500;
-    text-align: center;
-    color: #FFFFFF;
-    margin-top: 5%;
-    text-transform: uppercase;
-    letter-spacing: 4px;
-}
-
-p.rsstitle {
-	font-size: 30px;
-	font-weight: 150;
-	color: #ffffff;
-}
-
-form.login
-{
-    width: 300px;
-    margin: 0 auto;
-}
-
-form.login input[type="text"], form.login input[type="password"]
-{
-    width: 100%;
-    margin: 0;
-    padding: 10px 10px;
-    background: 0;
-    border: 0;
-    border-bottom: 1px solid #FFFFFF;
-    outline: 0;
-    font-style: italic;
-    font-size: 18px;
-    font-weight: 600;
-    letter-spacing: 1px;
-    margin-bottom: 5px;
-    color: #FFFFFF;
-    outline: 0;
-}
-
-form.login input[type="submit"]
-{
-    width: 60%;
-    font-size: 14px;
-    text-transform: uppercase;
-    font-weight: 500;
-    margin-top: 36px;
-    outline: 0;
-    cursor: pointer;
-    letter-spacing: 1px;
-                display: block;
-             margin : 0 auto;
-    margin-top: 36px;
-}
-
-form.login input[type="submit"]:hover
-{
-    transition: background-color 0.5s ease;
-}
-
-form.login label, form.login a
-{
-    font-size: 12px;
-    font-weight: 400;
-    color: #FFFFFF;
-}
-
-form.login a
-{
-    transition: color 0.5s ease;
-}
-
-form.login a:hover
-{
-    color: #2ecc71;
-}
-
-.footer {
-    height: 60px;
-    background-color: #212121;
-    padding-top: 10px;
-    text-align: center;
-}
diff --git a/src/usr/local/www/css/login_red.css b/src/usr/local/www/css/login_red.css
deleted file mode 100644
index 855bf9a..0000000
--- a/src/usr/local/www/css/login_red.css
+++ /dev/null
@@ -1,145 +0,0 @@
-html {
-  height: 100%;
-}
-
-body {
-  margin-bottom: 60px;
-  height: 100%;
-}
-
-.cont {
-    height: 100%;
-    background: #770101;
-    color: white;
-}
-
-.logoRow {
-    height: 100%;
-    background: #770101;
-}
-
-.logoCol {
-    height: 100%;
-    background: #770101;
-}
-
-.loginCont {
-    position: absolute;
-    top: 50%; left: 50%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #770101;
-}
-
-.logoCont {
-    position: absolute;
-    top: 40%; left: 60%;
-    transform: translate(-50%,-50%);
-    height: 55%;
-    width: 80%;
-    background: #770101;
-}
-
-.list-group{
-	    background: #770101 !important;
-	    color: white !important;
-}
-
-.list-group-item {
-	    background: #770101 !important;
-	    color: white !important;
-	    border: none;
-	    font-weight: 200;
-}
-
-.list-group-item-heading {
-	    color: white !important;
-	    font-weight: 350 !important;
-}
-
-p.form-title
-{
-    font-family: 'Open Sans' , sans-serif;
-    font-size: 20px;
-    font-weight: 500;
-    text-align: center;
-    color: #FFFFFF;
-    margin-top: 5%;
-    text-transform: uppercase;
-    letter-spacing: 4px;
-}
-
-p.rsstitle {
-	font-size: 30px;
-	font-weight: 150;
-	color: #ffffff;
-}
-
-form.login
-{
-    width: 300px;
-    margin: 0 auto;
-}
-
-form.login input[type="text"], form.login input[type="password"]
-{
-    width: 100%;
-    margin: 0;
-    padding: 10px 10px;
-    background: 0;
-    border: 0;
-    border-bottom: 1px solid #FFFFFF;
-    outline: 0;
-    font-style: italic;
-    font-size: 18px;
-    font-weight: 600;
-    letter-spacing: 1px;
-    margin-bottom: 5px;
-    color: #FFFFFF;
-    outline: 0;
-}
-
-form.login input[type="submit"]
-{
-    width: 60%;
-    font-size: 14px;
-    text-transform: uppercase;
-    font-weight: 500;
-    margin-top: 36px;
-    outline: 0;
-    cursor: pointer;
-    letter-spacing: 1px;
-                display: block;
-             margin : 0 auto;
-    margin-top: 36px;
-}
-
-form.login input[type="submit"]:hover
-{
-    transition: background-color 0.5s ease;
-}
-
-form.login label, form.login a
-{
-    font-size: 12px;
-    font-weight: 400;
-    color: #FFFFFF;
-}
-
-form.login a
-{
-    transition: color 0.5s ease;
-}
-
-form.login a:hover
-{
-    color: #2ecc71;
-}
-
-.footer {
-    height: 60px;
-    background-color: #212121;
-    padding-top: 10px;
-    text-align: center;
-}
diff --git a/src/usr/local/www/pfsense-trans.png b/src/usr/local/www/pfsense-trans.png
new file mode 100644
index 0000000..5e56c79
--- /dev/null
+++ b/src/usr/local/www/pfsense-trans.png
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index 0291d30..07b5618 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -605,11 +605,11 @@ gen_disablealiaspopupdetail_field($section, $pconfig['disablealiaspopupdetail'])
 
 $section->addInput(new Form_Select(
 	'logincss',
-	'Login page CSS',
+	'Login page color',
 	$pconfig['logincss'],
-	["login_blue.css" => gettext("Blue"), "login_green.css" => gettext("Green"), "login_red.css" => gettext("Red"),
-	 "login_purple.css" => gettext("Purple"), "login_gray.css" => gettext("Gray"), "login_brown.css" => gettext("Brown" )]
-))->setHelp('Choose a CSS file for the login page');
+	["1e3f75;" => gettext("Blue"), "003300" => gettext("Green"), "770101" => gettext("Red"),
+	 "4b1263" => gettext("Purple"), "424142" => gettext("Gray"), "633215" => gettext("Brown" )]
+))->setHelp('Choose a color for the login page');
 
 $section->addInput(new Form_Checkbox(
 	'loginshowhost',
author	Steve Beaver <sbeaver@netgate.com>	2017-06-19 13:15:53 -0400
committer	Steve Beaver <sbeaver@netgate.com>	2017-06-19 13:15:53 -0400
commit	d58a73785cfbd93117c4ac7d15b1e51507c3005c (patch)
tree	7ed69e73cbafb556f98d8b18766ab3de6cc57f26 /src
parent	f6f1e117710a178cc09409e107057e17e7bd6c7f (diff)
download	pfsense-d58a73785cfbd93117c4ac7d15b1e51507c3005c.zip pfsense-d58a73785cfbd93117c4ac7d15b1e51507c3005c.tar.gz