summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/inc/auth.inc4
-rw-r--r--etc/inc/authgui.inc66
-rw-r--r--usr/local/www/bootstrap/css/pfSense.css9
-rw-r--r--usr/local/www/index.php10
4 files changed, 46 insertions, 43 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index a8eddd1..b8a7c01 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -127,7 +127,9 @@ if(function_exists("display_error_form") && !isset($config['system']['webgui']['
<body id="error" class="no-menu">
<div id="jumbotron">
<div class="container">
- <p><?=gettext("Redirecting to the dashboard...")?></p>
+ <div class="col-sm-offset-3 col-sm-6 col-xs-12">
+ <p><?=gettext("Redirecting to the dashboard...")?></p>
+ </div>
</div>
</div>
</body>
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index 7fb7b36..555429a 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -116,8 +116,10 @@ function display_error_form($http_code, $desc) {
<body id="error" class="no-menu">
<div id="jumbotron">
<div class="container">
- <!-- FIXME: We really need to POST the logout action -->
- <div class="alert alert-danger" role="alert"><a href="index.php?logout"><?=$desc;?></a></div>
+ <div class="col-sm-offset-3 col-sm-6 col-xs-12">
+ <!-- FIXME: We really need to POST the logout action -->
+ <div class="alert alert-danger" role="alert"><a href="index.php?logout"><?=$desc;?></a></div>
+ </div>
</div>
</div>
</body>
@@ -208,6 +210,7 @@ if ($local_ip == false) {
<body id="login" class="no-menu">
<div id="jumbotron">
<div class="container">
+ <div class="col-sm-offset-3 col-sm-6 col-xs-12">
<?php
if(is_ipaddr($http_host) && !$local_ip && !isset($config['system']['webgui']['nohttpreferercheck'])) {
$nifty_background = "#999";
@@ -217,42 +220,43 @@ if ($local_ip == false) {
$loginautocomplete = isset($config['system']['webgui']['loginautocomplete']) ? '' : 'autocomplete="off"';
?>
- <div class="panel panel-default">
- <div class="panel-heading">
- <h2 class="panel-title">Login to pfSense</h2>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h2 class="panel-title">Login to pfSense</h2>
+ </div>
- <div class="panel-body">
+ <div class="panel-body">
<?php if (!empty($_SESSION['Login_Error'])): ?>
- <div class="alert alert-danger" role="alert"><?=$_SESSION['Login_Error'];?></div>
+ <div class="alert alert-danger" role="alert"><?=$_SESSION['Login_Error'];?></div>
<?php endif ?>
- <div class="alert alert-warning" class="hidden" id="no_cookies"><?= gettext("Your browser must support cookies to login."); ?></div>
-
- <form method="post" <?= $loginautocomplete ?> action="<?=$_SERVER['SCRIPT_NAME'];?>" class="form-horizontal">
- <div class="form-group">
- <label for="usernamefld" class="col-sm-3 control-label">Username</label>
- <div class="col-sm-7">
- <input type="text" class="form-control" name="usernamefld" placeholder="Enter your username">
- </div>
- </div>
-
- <div class="form-group">
- <label for="passwordfld" class="col-sm-3 control-label">Password</label>
- <div class="col-sm-7">
- <input type="password" class="form-control" name="passwordfld" placeholder="Enter your password">
- </div>
- </div>
-
- <div class="form-group">
- <div class="col-sm-offset-3 col-sm-7">
- <button type="submit" class="btn btn-primary" name="login">Login</button>
- </div>
+ <div class="alert alert-warning" class="hidden" id="no_cookies"><?= gettext("Your browser must support cookies to login."); ?></div>
+
+ <form method="post" <?= $loginautocomplete ?> action="<?=$_SERVER['SCRIPT_NAME'];?>" class="form-horizontal">
+ <div class="form-group">
+ <label for="usernamefld" class="col-sm-3 control-label">Username</label>
+ <div class="col-sm-7">
+ <input type="text" class="form-control" name="usernamefld" placeholder="Enter your username">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="passwordfld" class="col-sm-3 control-label">Password</label>
+ <div class="col-sm-7">
+ <input type="password" class="form-control" name="passwordfld" placeholder="Enter your password">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-sm-offset-3 col-sm-7">
+ <button type="submit" class="btn btn-primary" name="login">Login</button>
+ </div>
+ </div>
+ </form>
</div>
- </form>
+ </div>
</div>
</div>
</div>
-
<script src="/jquery/jquery-1.11.1.min.js"></script>
<script>
$(function() {
diff --git a/usr/local/www/bootstrap/css/pfSense.css b/usr/local/www/bootstrap/css/pfSense.css
index 0d36a7d..9546506 100644
--- a/usr/local/www/bootstrap/css/pfSense.css
+++ b/usr/local/www/bootstrap/css/pfSense.css
@@ -17,23 +17,18 @@ body {
}
body.no-menu #jumbotron {
- padding: 100px;
+ padding: 100px 0;
background-image: linear-gradient(to bottom,#3c3c3c 0,#222 100%)
}
body.no-menu {
- background: url("/logo-black.png") no-repeat;
- background-position-x: center;
+ background: url("/logo-black.png") no-repeat center 30px;
}
body.no-menu #jumbotron {
margin-top: 75px;
}
-body.no-menu #jumbotron .container {
- width: 450px;
-}
-
body#index .icons {
float: right;
}
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index edb246e..e1dc098 100644
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -156,10 +156,12 @@ if(file_exists('/conf/trigger_initial_wizard')) {
<body id="loading-wizard" class="no-menu">
<div id="jumbotron">
<div class="container">
- <p><?=sprintf(gettext("Welcome to %s!\n"),$g['product_name'])?></p>
- <p><?=gettext("One moment while we start the initial setup wizard.")?></p>
- <p><?=gettext("Embedded platform users: Please be patient, the wizard takes a little longer to run than the normal GUI.")?></p>
- <p><?=sprintf(gettext("To bypass the wizard, click on the %s logo on the initial page."),$g['product_name'])?></p>
+ <div class="col-sm-offset-3 col-sm-6 col-xs-12">
+ <p><?=sprintf(gettext("Welcome to %s!\n"),$g['product_name'])?></p>
+ <p><?=gettext("One moment while we start the initial setup wizard.")?></p>
+ <p><?=gettext("Embedded platform users: Please be patient, the wizard takes a little longer to run than the normal GUI.")?></p>
+ <p><?=sprintf(gettext("To bypass the wizard, click on the %s logo on the initial page."),$g['product_name'])?></p>
+ </div>
</div>
</div>
</body>
OpenPOWER on IntegriCloud