Merge branch 'working'

1 files changed, 28 insertions, 20 deletions

diff --git a/application/views/header.php b/application/views/header.php
index ba6d6ae9d..75f51664a 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -14,7 +14,7 @@ if (is_cli_client() && !isset($force_full_html)) {
 	<meta name="author" content="">
 
 	<link href="<?php echo link_with_mtime("/data/css/ui-lightness/jquery-ui-1.10.3.custom.min.css"); ?>" rel="stylesheet">
-	<link href="<?php echo link_with_mtime("/data/css/bootstrap-2.3.2.min.css"); ?>" rel="stylesheet">
+	<link href="<?php echo link_with_mtime("/data/css/bootstrap.min.css"); ?>" rel="stylesheet">
 	<link href="<?php echo link_with_mtime("/data/css/style.css"); ?>" rel="stylesheet">
 	<?php
 		if (file_exists(FCPATH."data/local/style.css")) {
@@ -32,10 +32,16 @@ if (is_cli_client() && !isset($force_full_html)) {
 <?php if (file_exists(FCPATH."data/local/header.inc.php")) {
 	include FCPATH."data/local/header.inc.php";
 }?>
-	<div class="navbar navbar-fixed-top navbar-inverse">
-		<div class="navbar-inner">
-			<div class="container">
-				<a class="brand" href="<?php echo site_url(); ?>"><?php
+	<nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+		<div class="container">
+			<div class="navbar-header">
+			    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+				  <span class="sr-only">Toggle navigation</span>
+				  <span class="icon-bar"></span>
+				  <span class="icon-bar"></span>
+				  <span class="icon-bar"></span>
+				</button>
+				<a class="navbar-brand" href="<?php echo site_url(); ?>"><?php
 					if (file_exists(FCPATH."data/local/logo.svg")) {
 						echo '<img src="'.link_with_mtime("/data/local/logo.svg").'" style="height: 20px"> FileBin';
 					} else {
@@ -43,34 +49,36 @@ if (is_cli_client() && !isset($force_full_html)) {
 					}
 					?>
 				</a>
+			</div>
+			<div class="collapse navbar-collapse navbar-ex1-collapse">
 				<?php if(!isset($GLOBALS["is_error_page"])) { ?>
-					<ul class="nav pull-right">
-						<?php if(user_logged_in()) { ?>
-							<li><a href="<?php echo site_url("/user/logout"); ?>">Logout</a></li>
+					<ul class="nav navbar-nav navbar-right">
+						<?php if (isset($user_logged_in) && $user_logged_in) { ?>
+							<li><a class="navbar-link" href="<?php echo site_url("/user/logout"); ?>">Logout</a></li>
 						<?php } else { ?>
 							<li class="dropdown">
 										<a class="dropdown-toggle" href="#" data-toggle="dropdown">Login <b class="caret"></b></a>
-										<div class="dropdown-menu" style="padding: 15px;">
+										<div class="dropdown-menu" style="padding: 5px;">
 										<?php if(auth_driver_function_implemented("can_reset_password")) { ?>
 											<p><?php echo anchor("user/reset_password", "Forgot your password?"); ?></p>
 										<?php } ?>
-										<?php echo form_open("user/login"); ?>
-											<input type="text" name="username" placeholder="Username" class="input-medium">
-											<input type="password" name="password" placeholder="Password" class="input-medium">
-											<button type="submit" name="process" class="btn btn-primary pull-right">Login</button>
+										<?php echo form_open("user/login", array("class" => "form-signin")); ?>
+											<input type="text" name="username" placeholder="Username" class="form-control">
+											<input type="password" name="password" placeholder="Password" class="form-control">
+											<button type="submit" name="process" class="btn btn-default btn-block">Login</button>
 										</form>
 									</div>
 							</li>
 						<?php } ?>
 					</ul>
 					<?php }; ?>
-					<ul class="nav">
-						<?php if(user_logged_in()) { ?>
-							<li><a href="<?php echo site_url("file/index") ?>"><i class="icon-pencil icon-white"></i> New</a></li>
-							<li><a href="<?php echo site_url("file/upload_history") ?>"><i class="icon-book icon-white"></i> History</a></li>
+					<ul class="nav navbar-nav">
+						<?php if (isset($user_logged_in) && $user_logged_in) { ?>
+							<li><a href="<?php echo site_url("file/index") ?>"><span class="glyphicon glyphicon-pencil"></span> New</a></li>
+							<li><a href="<?php echo site_url("file/upload_history") ?>"><span class="glyphicon glyphicon-book"></span> History</a></li>
 							<li class="dropdown">
 								<a href="<?php echo site_url("user/index"); ?>" class="dropdown-toggle" data-toggle="dropdown">
-									<i class="icon-user icon-white"></i> Account <b class="caret"></b>
+									<span class="glyphicon glyphicon-user"></span> Account <b class="caret"></b>
 								</a>
 								<ul class="dropdown-menu">
 									<?php include "user/nav.php"; ?>
@@ -80,14 +88,14 @@ if (is_cli_client() && !isset($force_full_html)) {
 					</ul>
 			</div>
 		</div>
-	</div>
+	</nav>
 	<div id="navbar-height"></div>
 
 	<div class="container">
 	<?php
 	if (isset($alerts)) {
 		foreach ($alerts as $alert) { ?>
-			<div class="alert alert-block alert-<?php echo $alert["type"]; ?>" style="text-align: center">
+			<div class="alert alert-dismissable alert-<?php echo $alert["type"]; ?>" style="text-align: center">
 				<button type="button" class="close" data-dismiss="alert">&times;</button>
 				<?php echo $alert["message"]; ?>
 			</div>