almost migrated to bootstrap3

4 files changed, 33 insertions, 31 deletions

diff --git a/application/views/file/file_info.php b/application/views/file/file_info.php
index 82a3e4f81..dedc35fea 100644
--- a/application/views/file/file_info.php
+++ b/application/views/file/file_info.php
@@ -1,6 +1,6 @@
 <div class="center">
 	<?php if($filedata): ?>
-		<table style="margin: auto">
+		<table class="table" style="margin: auto">
 			<tr>
 				<td class="title">ID</td>
 				<td class="text"><a href="<?php echo site_url($id); ?>/"><?php echo $id; ?></a></td>
diff --git a/application/views/file/html_header.php b/application/views/file/html_header.php
index c40c35bca..fe9644744 100644
--- a/application/views/file/html_header.php
+++ b/application/views/file/html_header.php
@@ -12,30 +12,32 @@ include(FCPATH."application/views/header.php"); ?>
 	</script>
 
 	<?php if (isset($error_message)) { ?>
-		<div class="alert alert-block alert-error" style="text-align: center">
+	    <div class="container">
+		<div class="alert alert-danger" style="text-align: center">
 			<?php echo $error_message; ?>
 		</div>
+	    </div>
 	<?php } ?>
 
 	<div class="container paste-container">
 		<div style="border:1px solid #ccc;">
-		<div class="navbar navbar-static-top">
+		<div class="navbar navbar-default navbar-static-top navbar-paste">
 			<div class="navbar-inner" style="box-shadow: none;">
-				<ul class="nav">
-					<li><a href="#file-info" class="brand" data-toggle="modal"><?php echo $title ?></a></li>
-					<li class="divider-vertical"></li>
+				<ul class="nav navbar-nav">
+					<li><a href="#file-info" class="navbar-brand" data-toggle="modal"><?php echo $title ?></a></li>
+					<li class="divider"></li>
 					<li class="dropdown">
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="language-toggle">
 							Language: <?php echo htmlspecialchars($current_highlight); ?>
 							<b class="caret"></b>
 						</a>
-						<div class="dropdown-menu" style="padding: 15px; padding-bottom: 0px;">
+						<div class="dropdown-menu" style="padding: 15px;">
 							<form>
-								<input type="text" id="language" placeholder="Language" class="input-medium">
+								<input type="text" id="language" placeholder="Language" class="form-control">
 							</form>
 						</div>
 					</li>
-					<li class="divider-vertical"></li>
+					<li class="divider"></li>
 					<li>
 						<a href="#file-info" role="button" data-toggle="modal">Info</a>
 						<div id="file-info" class="modal hide fade">
@@ -72,21 +74,21 @@ include(FCPATH."application/views/header.php"); ?>
 									<input type="hidden" name="ids[<?php echo $id; ?>]" value="<?php echo $id; ?>">
 									<button class="btn btn-danger pull-left" aria-hidden="true">Delete</button>
 								</form>
-								<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+								<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
 							</div>
 						</div>
 					</li>
-					<li class="divider-vertical"></li>
+					<li class="divider"></li>
 					<li><a href="<?php echo site_url('file/index?repaste='.$id); ?>" role="button">Repaste</a></li>
 				</ul>
-				<div class="btn-group pull-right" style="margin-top: 7px; margin-right:-10px;">
-					<a id="linewrap" class="btn btn-small" rel="tooltip" title="Toggle wrapping of long lines">Linewrap</a>
-					<a href="<?php echo site_url($id."/plain") ?>" class="btn btn-small" rel="tooltip" title="View as plain text">Plain</a>
-					<a href="<?php echo site_url($id) ?>" class="btn btn-small" rel="tooltip" title="View as raw file (org. mime type)">Raw</a>
+				<div class="btn-group pull-right" style="margin-top: 7px; margin-right: 10px;">
+					<a id="linewrap" class="btn btn-default" rel="tooltip" title="Toggle wrapping of long lines">Linewrap</a>
+					<a href="<?php echo site_url($id."/plain") ?>" class="btn btn-default" rel="tooltip" title="View as plain text">Plain</a>
+					<a href="<?php echo site_url($id) ?>" class="btn btn-default" rel="tooltip" title="View as raw file (org. mime type)">Raw</a>
 					<?php if ($current_highlight === 'rmd') { ?>
-						<a href="<?php echo site_url($id)."/" ?>" class="btn btn-small" rel="tooltip" title="Render as Code">Code</a>
+						<a href="<?php echo site_url($id)."/" ?>" class="btn btn-default" rel="tooltip" title="Render as Code">Code</a>
 					<?php } else { ?>
-						<a href="<?php echo site_url($id."/rmd") ?>" class="btn btn-small" rel="tooltip" title="Render as Markdown">Markdown</a>
+						<a href="<?php echo site_url($id."/rmd") ?>" class="btn btn-default" rel="tooltip" title="Render as Markdown">Markdown</a>
 					<?php } ?>
 				</div>
 			</div>
diff --git a/application/views/file/nav_history.php b/application/views/file/nav_history.php
index 1a3e55c0b..a98d7a4ed 100644
--- a/application/views/file/nav_history.php
+++ b/application/views/file/nav_history.php
@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs">
+<ul class="nav nav-pills nav-history">
 <?php
 $nav = array(
 	"List" => "file/upload_history",
diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index 21a2cc4e6..782ba48c7 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -1,10 +1,10 @@
 <?php if (user_logged_in()) { ?>
 <div class="well">
-	<div class="row-fluid">
-		<div class="span12 text-upload-form">
+	<div class="row">
+		<div class="col-lg-12 text-upload-form">
 			<?php echo form_open_multipart('file/do_paste'); ?>
 				<h2>Text paste</h2>
-				<textarea name="content" class="text-upload span12"><?php
+				<textarea name="content" class="col-lg-12 form-control" rows="15"><?php
 					if (isset($textarea_content)) {
 						echo $textarea_content;
 					}
@@ -13,15 +13,15 @@
 			</form>
 		</div>
 	</div>
-	<div class="row-fluid">
-		<div class="span6">
+	<div class="row">
+		<div class="col-lg-6">
 			<?php echo form_open_multipart('file/do_upload'); ?>
 				<h2>File upload</h2>
 				<input class="file-upload" type="file" name="file[]" multiple="multiple"><br>
 				<button type="submit" id="upload_button" class="btn btn-primary">Upload it!</button>
 			</form>
 		</div>
-		<div class="span6 alert alert-block alert-info">
+		<div class="col-lg-6 alert alert-info">
 			<h4 class="alert-heading">Notice!</h4>
 			<p>
 				Uploads/pastes are <?php if ($upload_max_age > 0) {
@@ -45,17 +45,17 @@
 </script>
 
 <?php } else { ?>
-	<?php echo form_open('user/login'); ?>
-		<input type="text" name="username" placeholder="Username" autofocus />
-		<input type="password" name="password" placeholder="Password" />
-		<input type="submit" class="btn btn-primary" value="Login" name="process" style="margin-bottom: 9px" />
+	<?php echo form_open('user/login', array('class' => 'form-inline')); ?>
+		<input type="text" name="username" placeholder="Username" autofocus class="form-control inline-input"/>
+		<input type="password" name="password" placeholder="Password" class="form-control inline-input"/>
+		<input type="submit" class="btn btn-primary" value="Login" name="process" />
 		<?php if(auth_driver_function_implemented("can_reset_password")) { ?>
-			<p style="display: inline"><?php echo anchor("user/reset_password", "Forgot your password?"); ?></p>
+			<p class="help-block"><?php echo anchor("user/reset_password", "Forgot your password?"); ?></p>
 		<?php } ?>
 	</form>
 <?php } ?>
 <div class="row">
-	<div class="span6">
+	<div class="col-lg-6">
 		<div class="page-header"><h1>Features</h1></div>
 		<p>For shell uploading/pasting and download information for the client go to <a href="<?php echo site_url("file/client"); ?>"><?php echo site_url("file/client"); ?></a></p>
 		<p>You can use the <?php echo anchor("file/upload_history", "history"); ?> to find old uploads.</p>
@@ -72,7 +72,7 @@
 		</dl>
 		<p>If your upload is not detected as text, only <b>/&lt;ID&gt;/qr</b>, <b>/&lt;ID&gt;/plain</b> and <b>/&lt;ID&gt;/info</b> will work as above and all others will simply return the file with the detected MIME type.</p>
 	</div>
-	<div class="span6">
+	<div class="col-lg-6">
 		<div class="page-header"><h1>Information</h1></div>
 		<p>This website's primary goal is aiding developers, power users, students and alike in solving problems, debugging software, sharing their configuration, etc. It is not intended to distribute confidential or harmful information, scripts or software.</p>
 		<?php if(auth_driver_function_implemented("can_register_new_users")) { ?>