diff options
| author | Sander van Leeuwen <sander@react.nl> | 2015-01-19 12:02:41 +0100 |
|---|---|---|
| committer | Sander van Leeuwen <sander@react.nl> | 2015-01-19 12:02:41 +0100 |
| commit | c7d610717d31a42273aa936823381e14d3854f72 (patch) | |
| tree | 90432c7289532e4274d3f7f595ee592c9c0283ba /etc | |
| parent | 2e1cd9d8c79ceec6658cfb9cc91673d9c3bdb3fa (diff) | |
| download | pfsense-c7d610717d31a42273aa936823381e14d3854f72.zip pfsense-c7d610717d31a42273aa936823381e14d3854f72.tar.gz | |
Use bootstrap columns to scale and style jumbotron
pfSense.css - proper positioning for logo, remove with on jumbotron
auth.inc - add bootstrap columns to jumbotron
authgui.inc - idem
index.php - idem
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/auth.inc | 4 | ||||
| -rw-r--r-- | etc/inc/authgui.inc | 66 |
2 files changed, 38 insertions, 32 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() { |
