From 2e916d024602a01d2ab3b75e036d15087ce8bc7e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 29 Nov 2013 08:39:10 -0500
Subject: [PATCH] MOAR BOOTSTRAP

---
 app/views/backend/categories/edit.blade.php   |   2 +-
 .../backend/depreciations/edit.blade.php      |  67 +++---
 .../backend/depreciations/index.blade.php     |  38 +--
 app/views/backend/licenses/edit.blade.php     | 218 ++++++++++--------
 app/views/backend/licenses/index.blade.php    |  17 +-
 app/views/backend/locations/edit.blade.php    | 154 +++++++------
 app/views/backend/locations/index.blade.php   |  17 +-
 app/views/backend/statuslabels/edit.blade.php |   4 +-
 app/views/backend/users/index.blade.php       |  48 ++--
 9 files changed, 295 insertions(+), 270 deletions(-)

diff --git a/app/views/backend/categories/edit.blade.php b/app/views/backend/categories/edit.blade.php
index b0ee3146f8..63c9ec126d 100755
--- a/app/views/backend/categories/edit.blade.php
+++ b/app/views/backend/categories/edit.blade.php
@@ -30,7 +30,7 @@
 						<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
 						<!-- Name -->
-						<div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
+						<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
 							<label for="name" class="col-md-2 control-label">Category Name</label>
 								<div class="col-md-7">
 									<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $category->name) }}" />
diff --git a/app/views/backend/depreciations/edit.blade.php b/app/views/backend/depreciations/edit.blade.php
index 3b5a43920d..826bb273dd 100755
--- a/app/views/backend/depreciations/edit.blade.php
+++ b/app/views/backend/depreciations/edit.blade.php
@@ -14,57 +14,54 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
-	<h3>
+
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('depreciations') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>
 		@if ($depreciation->id)
 			Update Depreciation
 		@else
 			Create Depreciation
 		@endif
-
-		<div class="pull-right">
-			<a href="{{ route('depreciations') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
-	</h3>
+		</h3>
+	</div>
 </div>
-
+<div class="row form-wrapper">
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-	<!-- Tabs Content -->
-	<div class="tab-content">
+			<!-- Name -->
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<label for="name" class="col-md-4 control-label">Depreciation Name</label>
+					<div class="col-md-6">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $depreciation->name) }}" />
+						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
 
+			<!-- Name -->
+			<div class="form-group {{ $errors->has('months') ? ' has-error' : '' }}">
+				<label for="months" class="col-md-4 control-label">Number of Months</label>
+					<div class="col-md-1">
+						<input class="form-control" type="text" name="months" id="months" value="{{ Input::old('name', $depreciation->months) }}" />
+						{{ $errors->first('months', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
 
-	<div class="tab-pane active" id="tab-general">
-			<!-- Class Title -->
-			<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Depreciation Class Name</label>
-				<div class="controls">
-					<input class="col-md-6" type="text" name="name" id="name" value="{{ Input::old('name', $depreciation->name) }}" />
-					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
+			<!-- Form actions -->
+			<div class="form-group">
+			<label class="col-md-4 control-label"></label>
+				<div class="col-md-7">
+					<a class="btn btn-link" href="{{ route('depreciations') }}">@lang('general.cancel')</a>
+					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 				</div>
 			</div>
-			<!-- Months -->
-			<div class="form-group {{ $errors->has('months') ? 'error' : '' }}">
-				<label class="control-label" for="name">Number of Months</label>
-				<div class="controls">
-					<input class="col-md-2" type="text" name="months" id="months" value="{{ Input::old('months', $depreciation->months) }}" />
-					{{ $errors->first('months', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-		</div>
 
+		</form>
 
-	<!-- Form actions -->
-	<div class="form-group">
-		<div class="controls">
-			<a class="btn btn-link" href="{{ route('depreciations') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
-		</div>
-	</div>
-</form>
-
+</div>
 
 @stop
diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php
index d7db648bbd..3185270831 100755
--- a/app/views/backend/depreciations/index.blade.php
+++ b/app/views/backend/depreciations/index.blade.php
@@ -8,28 +8,24 @@ Asset Depreciations ::
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-				<h3 class="name">Asset Depreciations
-				<div class="pull-right">
-					<a href="{{ route('create/depreciations') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i>  Create New</a>
-				</div>
-		</h3>
 
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/depreciations') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Asset Depreciations</h3>
+	</div>
+</div>
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="col-md-9 bio">
-                        <div class="profile-box">
-                            <br>
-                            <!-- checked out assets table -->
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
 
-                            <table id="example">
+                    <table id="example">
 						<thead>
 							<tr role="row">
 								<th class="col-md-4">@lang('admin/depreciations/table.title')</th>
 								<th class="col-md-2">@lang('admin/depreciations/table.term')</th>
-								<th class="col-md-3">@lang('table.actions')</th>
+								<th class="col-md-2">@lang('table.actions')</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -38,8 +34,10 @@ Asset Depreciations ::
 								<td>{{ $depreciation->name }}</td>
 								<td>{{ $depreciation->months }} @lang('admin/depreciations/table.months') </td>
 								<td>
-									<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn-flat white">@lang('button.edit')</a>
-									<a data-html="false" class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="Are you sure you wish to delete this depreciation class?" data-title="Delete {{ htmlspecialchars($depreciation->name) }}?" onClick="return false;">@lang('button.delete')</a>
+								<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
+<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="Are you sure you wish to delete this depreciation?" data-title="Delete {{ htmlspecialchars($depreciation->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
+
+
 								</td>
 							</tr>
 							@endforeach
@@ -48,13 +46,15 @@ Asset Depreciations ::
 
 
                         </div>
-                    </div>
+
 
                     <!-- side address column -->
-                    <div class="col-md-3 address pull-right">
+                    <div class="col-md-3 col-xs-12 address pull-right">
 						<br /><br />
 						<h6>About Asset Depreciations</h6>
 						<p>You can set up asset depreciations to depreciate assets based on straight-line depreciation.  </p>
 
                     </div>
+ </div>
+  </div>
 @stop
\ No newline at end of file
diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php
index 88605661e7..fda6c292c7 100755
--- a/app/views/backend/licenses/edit.blade.php
+++ b/app/views/backend/licenses/edit.blade.php
@@ -12,127 +12,143 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		@if ($license->id)
-			<a href="{{ route('view/license',$license->id) }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+<div class="row header">
+    <div class="col-md-12">
+    	@if ($license->id)
+			<a href="{{ route('view/license',$license->id) }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		@else
-			<a href="{{ route('licenses') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('licenses') }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		@endif
+
+		<h3>
+		@if ($license->id)
+			Update License
+		@else
+			Create License
+		@endif
+		</h3>
 	</div>
-
-	<h3>
-		@if ($license->id)
-		Update License
-		@else
-		Create License
-		@endif
-
-
-	</h3>
 </div>
 
+<div class="row form-wrapper">
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-	<!-- Tabs Content -->
-	<div class="tab-content">
+			<!-- Asset Tag -->
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<label for="name" class="col-md-3 control-label">Software Name</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $license->name) }}" />
+						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
 
-		<div class="tab-pane active" id="tab-general">
-			<!-- Category Title -->
-			<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Software Name</label>
-				<div class="controls">
-					<input class="col-md-6" type="text" name="name" id="name" value="{{ Input::old('name', $license->name) }}" />
-					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
+
+			<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
+				<label for="serial" class="col-md-3 control-label">Serial</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $license->serial) }}" />
+						{{ $errors->first('serial', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
+				<label for="serial" class="col-md-3 control-label">Serial</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $license->serial) }}" />
+						{{ $errors->first('serial', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<div class="form-group {{ $errors->has('license_name') ? ' has-error' : '' }}">
+				<label for="license_name" class="col-md-3 control-label">Licensed to Name</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="license_name" id="license_name" value="{{ Input::old('license_name', $license->license_name) }}" />
+						{{ $errors->first('license_name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<div class="form-group {{ $errors->has('license_email') ? ' has-error' : '' }}">
+				<label for="license_email" class="col-md-3 control-label">Licensed to Email</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="license_email" id="license_email" value="{{ Input::old('license_email', $license->license_email) }}" />
+						{{ $errors->first('license_email', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<div class="form-group {{ $errors->has('seats') ? ' has-error' : '' }}">
+				<label for="seats" class="col-md-3 control-label">Seats</label>
+					<div class="col-md-3">
+						<input class="form-control" type="text" name="seats" id="seats" value="{{ Input::old('seats', $license->seats) }}" />
+						{{ $errors->first('seats', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
+				<label for="order_number" class="col-md-3 control-label">Order No.</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $license->order_number) }}" />
+						{{ $errors->first('order_number', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<!-- Purchase Date -->
+			<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
+				<label for="purchase_date" class="col-md-3 control-label">Purchase Date</label>
+				<div class="input-group col-md-2">
+					<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $license->purchase_date) }}">
+					<span class="input-group-addon"><i class="icon-calendar"></i></span>
+				{{ $errors->first('purchase_date', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
-			<div class="form-group {{ $errors->has('serial') ? 'error' : '' }}">
-				<label class="control-label" for="serial">Serial</label>
-				<div class="controls">
-					<input class="col-md-6" type="text" name="serial" id="serial" value="{{ Input::old('serial', $license->serial) }}" />
-					{{ $errors->first('serial', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-			<div class="form-group {{ $errors->has('license_name') ? 'error' : '' }}">
-				<label class="control-label" for="license_name">Licensed to Name</label>
-				<div class="controls">
-					<input class="col-md-6" type="text" name="license_name" id="license_name" value="{{ Input::old('license_name', $license->license_name) }}" />
-					{{ $errors->first('license_name', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-			<div class="form-group {{ $errors->has('license_email') ? 'error' : '' }}">
-				<label class="control-label" for="license_email">Licensed to Email</label>
-				<div class="controls">
-					<input class="col-md-6" type="text" name="license_email" id="license_email" value="{{ Input::old('license_email', $license->license_email) }}" />
-					{{ $errors->first('license_email', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-			<div class="form-group {{ $errors->has('seats') ? 'error' : '' }}">
-				<label class="control-label" for="seats">Seats</label>
-				<div class="controls">
-					<input class="col-md-1" type="text" name="seats" id="seats" value="{{ Input::old('seats', $license->seats) }}" />
-					{{ $errors->first('seats', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-			<div class="form-group {{ $errors->has('order_number') ? 'error' : '' }}">
-				<label class="control-label" for="order_number">Order Number</label>
-				<div class="controls">
-					<input class="col-md-4" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $license->order_number) }}" />
-					{{ $errors->first('order_number', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-			<div class="form-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
-				<label class="control-label" for="purchase_cost">Purchase Cost</label>
-				<div class="controls">
-					$ <input class="col-md-2" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $license->purchase_cost) }}" />
-					{{ $errors->first('purchase_cost', '<span class="help-inline">:message</span>') }}
-				</div>
+
+			<!-- Purchase Cost -->
+			<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
+				<label for="purchase_cost" class="col-md-3 control-label">Purchase Cost</label>
+				<div class="col-md-2">
+					<div class="input-group">
+						<span class="input-group-addon">$</span>
+						<input class="col-md-2 form-control" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $license->purchase_cost) }}" />
+						{{ $errors->first('purchase_cost', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					 </div>
+				 </div>
 			</div>
 
 			<!-- Depreciation -->
-			<div class="form-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
-				<label class="control-label" for="parent">Depreciation</label>
-				<div class="controls">
-					<div class="field-box">
-					{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $license->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }}
-					{{ $errors->first('depreciation_id', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
+			<div class="form-group {{ $errors->has('depreciation_id') ? ' has-error' : '' }}">
+				<label for="parent" class="col-md-3 control-label">Depreciation</label>
+					<div class="col-md-7">
+						{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $license->depreciation_id), array('class'=>'select2', 'style'=>'width:350px')) }}
+						{{ $errors->first('depreciation_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+<!-- Notes -->
+			<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
+				<label for="notes" class="col-md-3 control-label">Notes</label>
+				<div class="col-md-7">
+					<input class="col-md-6 form-control" type="text" name="notes" id="notes" value="{{ Input::old('notes', $license->notes) }}" />
+					{{ $errors->first('notes', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+				</div>
+			</div>
+
+			<!-- Form actions -->
+				<div class="form-group">
+				<label class="col-md-3 control-label"></label>
+					<div class="col-md-7">
+						@if ($license->id)
+						<a class="btn btn-link" href="{{ route('view/license', $license->id) }}">Cancel</a>
+						@else
+						<a class="btn btn-link" href="{{ route('licenses') }}">Cancel</a>
+						@endif
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
 					</div>
 				</div>
-			</div>
 
-			<div class="form-group {{ $errors->has('purchase_date') ? 'error' : '' }}">
-				<label class="control-label" for="purchase_date">Purchase Date</label>
-				<div class="controls">
-					<input type="text" class="datepicker span2" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $license->purchase_date) }}"> <span class="add-on"><i class="icon-calendar"></i></span>
-				{{ $errors->first('purchase_date', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-
-			<div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
-				<label class="control-label" for="notes">Notes</label>
-				<div class="controls">
-					<input class="col-md-6" type="text" name="notes" id="notes" value="{{ Input::old('notes', $license->notes) }}" />
-					{{ $errors->first('notes', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-
-
-	<!-- Form actions -->
-	<div class="form-group">
-		<div class="controls">
-			@if ($license->id)
-			<a class="btn btn-link" href="{{ route('view/license', $license->id) }}">@lang('general.cancel')</a>
-			@else
-			<a class="btn btn-link" href="{{ route('licenses') }}">@lang('general.cancel')</a>
-			@endif
-			<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
-		</div>
-	</div>
 </form>
-
+</div>
 
 @stop
diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
index c8b4f3d156..abc522841d 100755
--- a/app/views/backend/licenses/index.blade.php
+++ b/app/views/backend/licenses/index.blade.php
@@ -7,14 +7,17 @@ Licenses ::
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
-	<div class="pull-right">
-		<a href="{{ route('create/licenses') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-	</div>
 
-	<h3>Software Licenses</h3>
+
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/licenses') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Software Licenses</h3>
+	</div>
 </div>
 
+<div class="row form-wrapper">
+
 <table id="example">
 	<thead>
 		<tr role="row">
@@ -67,9 +70,9 @@ Licenses ::
 					</td>
 					<td>
 					@if ($licensedto->assigned_to)
-						<a href="{{ route('checkin/license', $licensedto->id) }}" class="btn-flat info"> Checkin </a>
+						<a href="{{ route('checkin/license', $licensedto->id) }}" class="btn btn-primary">Checkin</a>
 					@else
-						<a href="{{ route('checkout/license', $licensedto->id) }}" class="btn-flat success">Checkout</a>
+						<a href="{{ route('checkout/license', $licensedto->id) }}" class="btn btn-info">Checkout</a>
 					@endif
 					</td>
 
diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php
index df42cd7e6f..513a98b1fd 100755
--- a/app/views/backend/locations/edit.blade.php
+++ b/app/views/backend/locations/edit.blade.php
@@ -14,92 +14,112 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
-	<h3>
+
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('locations') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>
 		@if ($location->id)
 			Update Location
 		@else
 			Create Location
 		@endif
-
-		<div class="pull-right">
-			<a href="{{ route('locations') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
-	</h3>
+		</h3>
+	</div>
 </div>
 
+<div class="row form-wrapper">
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-	<!-- Tabs Content -->
-	<div class="tab-content">
+			<!-- Location Name -->
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<label for="name" class="col-md-2 control-label">Location Name</label>
+					<div class="col-md-12">
+						<div class="col-xs-8">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $location->name) }}" />
+					</div>
+					{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
 
-	<div class="tab-pane active" id="tab-general">
-			<!-- Class Title -->
-			<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Location Name</label>
-				<div class="controls">
-					<input class="col-md-4" type="text" name="name" id="name" value="{{ Input::old('name', $location->name) }}" />
-					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-				</div>
+			<!-- Address -->
+			<div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
+				<label for="address" class="col-md-2 control-label">Street Address</label>
+					<div class="col-md-12">
+						<div class="col-xs-8">
+						<input class="form-control" type="text" name="address" id="address" value="{{ Input::old('address', $location->address) }}" />
+					</div>
+					{{ $errors->first('address', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
-			<div class="form-group {{ $errors->has('address') ? 'error' : '' }}">
-				<label class="control-label" for="address">Street Address 1</label>
-				<div class="controls">
-					<input class="col-md-4" type="text" name="address" id="address" value="{{ Input::old('address', $location->address) }}" />
-					{{ $errors->first('address', '<span class="help-inline">:message</span>') }}
-				</div>
+
+			<!-- Address -->
+			<div class="form-group {{ $errors->has('address2') ? ' has-error' : '' }}">
+				<label for="address2" class="col-md-2 control-label"></label>
+					<div class="col-md-12">
+						<div class="col-xs-8">
+						<input class="form-control" type="text" name="address2" id="address2" value="{{ Input::old('address2', $location->address2) }}" />
+					</div>
+					{{ $errors->first('address2', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
-			<div class="form-group {{ $errors->has('address2') ? 'error' : '' }}">
-				<label class="control-label" for="address2">Street Address 2</label>
-				<div class="controls">
-					<input class="col-md-4" type="text" name="address2" id="address2" value="{{ Input::old('address2', $location->address2) }}" />
-					{{ $errors->first('address2', '<span class="help-inline">:message</span>') }}
-				</div>
+
+			<!-- City -->
+			<div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
+				<label for="city" class="col-md-2 control-label">City</label>
+					<div class="col-md-12">
+						<div class="col-xs-8">
+						<input class="form-control" type="text" name="city" id="city" value="{{ Input::old('city', $location->city) }}" />
+					</div>
+					{{ $errors->first('city', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
-			<div class="form-group {{ $errors->has('city') ? 'error' : '' }}">
-				<label class="control-label" for="name">City</label>
-				<div class="controls">
-					<input class="col-md-4" type="text" name="city" id="city" value="{{ Input::old('city', $location->city) }}" />
-					{{ $errors->first('city', '<span class="help-inline">:message</span>') }}
+
+			<!-- City -->
+			<div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
+				<label for="state" class="col-md-2 control-label">State Abbrev</label>
+					<div class="col-md-12">
+						<div class="col-xs-2">
+						<input class="form-control" type="text" name="state" id="state" value="{{ Input::old('state', $location->state) }}" />
+					</div>
+					{{ $errors->first('state', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<!-- Zip -->
+			<div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
+				<label for="zip" class="col-md-2 control-label">Zip</label>
+					<div class="col-md-12">
+						<div class="col-xs-3">
+						<input class="form-control" type="text" name="zip" id="zip" value="{{ Input::old('zip', $location->zip) }}" />
+					</div>
+					{{ $errors->first('zip', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<!-- Country -->
+			<div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
+				<label for="country" class="col-md-2 control-label">Country Abbrev</label>
+					<div class="col-md-12">
+						<div class="col-xs-2">
+						<input class="form-control" type="text" name="country" id="country" value="{{ Input::old('country', $location->country) }}" />
+						</div>
+						{{ $errors->first('country', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
+			</div>
+
+			<!-- Form actions -->
+			<div class="form-group">
+			<label class="col-md-2 control-label"></label>
+				<div class="col-md-7">
+					<a class="btn btn-link" href="{{ route('locations') }}">@lang('general.cancel')</a>
+					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 				</div>
 			</div>
 
-			<div class="form-group {{ $errors->has('state') ? 'error' : '' }}">
-				<label class="control-label" for="state">State Abbrev</label>
-				<div class="controls">
-					<input class="col-md-2" type="text" name="state" id="state" value="{{ Input::old('state', $location->state) }}" />
-					{{ $errors->first('state', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-
-			<div class="form-group {{ $errors->has('zip') ? 'error' : '' }}">
-				<label class="control-label" for="zip">Postal Code</label>
-				<div class="controls">
-					<input class="col-md-2" type="text" name="zip" id="zip" value="{{ Input::old('zip', $location->zip) }}" />
-					{{ $errors->first('zip', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-
-			<div class="form-group {{ $errors->has('country') ? 'error' : '' }}">
-				<label class="control-label" for="state">Country Abbrev</label>
-				<div class="controls">
-					<input class="col-md-2" type="text" name="country" id="country" value="{{ Input::old('country', $location->country) }}" />
-					{{ $errors->first('country', '<span class="help-inline">:message</span>') }}
-				</div>
-			</div>
-		</div>
-
-
-	<!-- Form actions -->
-	<div class="form-group">
-		<div class="controls">
-			<a class="btn btn-link" href="{{ route('locations') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
-		</div>
-	</div>
 </form>
 
 
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index d736ce240a..abc1acc33b 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -8,16 +8,16 @@ Locations ::
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		<a href="{{ route('create/location') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/location') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Locations</h3>
 	</div>
-
-	<h3>Locations</h3>
 </div>
 
-<div class="row-fluid table">
+<div class="row form-wrapper">
+
 <table id="example">
 	<thead>
 		<tr role="row">
@@ -36,8 +36,9 @@ Locations ::
 			<td>{{ $location->address }}, {{ $location->address2 }}  </td>
 			<td>{{ $location->city }}, {{ $location->state }}  {{ $location->country }}  </td>
 			<td>
-				<a href="{{ route('update/location', $location->id) }}" class="btn-flat white"> @lang('button.edit')</a>
-				<a data-html="false" class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/location', $location->id) }}" data-content="Are you sure you wish to delete this location?" data-title="Delete {{ htmlspecialchars($location->name) }}?" onClick="return false;">@lang('button.delete')</a>
+				<a href="{{ route('update/location', $location->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
+				<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/location', $location->id) }}" data-content="Are you sure you wish to delete this location?" data-title="Delete {{ htmlspecialchars($location->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
+
 			</td>
 		</tr>
 		@endforeach
diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php
index 2c9a44c8de..b96f5fab7d 100755
--- a/app/views/backend/statuslabels/edit.blade.php
+++ b/app/views/backend/statuslabels/edit.blade.php
@@ -34,8 +34,8 @@
 
 			<!-- Asset Title -->
 			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
-				<label for="name" class="col-md-2 control-label">Asset Name</label>
-					<div class="col-md-7">
+				<label for="name" class="col-md-3 control-label">Status Label Name</label>
+					<div class="col-md-6">
 						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $statuslabel->name) }}" />
 						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index acee33f181..3db54ec1e4 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -8,49 +8,40 @@ User Management ::
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-	@if (Input::get('onlyTrashed'))
-		<a class="btn-flat white" href="{{ URL::to('admin/users') }}">Show Current Users</a>
-	@else
-		<a class="btn-flat white" href="{{ URL::to('admin/users?onlyTrashed=true') }}">Show Deleted Users</a>
-	@endif
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/user') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> New User</a>
+    	@if (Input::get('onlyTrashed'))
+			<a class="btn btn-default pull-right" href="{{ URL::to('admin/users') }}">Show Current Users</a>
+		@else
+			<a class="btn btn-default pull-right" href="{{ URL::to('admin/users?onlyTrashed=true') }}">Show Deleted Users</a>
+		@endif
 
-		<a href="{{ route('create/user') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> New User</a>
-	</div>
-
-	<h3>
+		<h3>
 		@if (Input::get('onlyTrashed'))
 			Deleted
 		@else
 			Current
 		@endif
 
-		 Users
 	</h3>
+	</div>
 </div>
 
-
-
-
-<br><br>
-
-@if ($users->getTotal() > 10)
-{{ $users->links() }}
-@endif
+<div class="row form-wrapper">
 
 @if ($users->getTotal() > 0)
 <div class="row-fluid table users-list">
 <table id="example">
 	<thead>
 		<tr role="row">
-			<th class="col-md-3">@lang('admin/users/table.name')</th>
-			<th class="col-md-2">@lang('admin/users/table.email')</th>
+			<th class="col-md-4">@lang('admin/users/table.name')</th>
+			<th class="col-md-3">@lang('admin/users/table.email')</th>
 			<th class="col-md-1">Assets</th>
 			<th class="col-md-1">Licenses</th>
 			<th class="col-md-1">@lang('admin/users/table.activated')</th>
-			<th class="col-md-3">@lang('table.actions')</th>
+			<th class="col-md-2">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -69,17 +60,18 @@ User Management ::
 			<td>
 			@if ($user->id > 3)
 				@if ( ! is_null($user->deleted_at))
-				<a href="{{ route('restore/user', $user->id) }}" class="btn-flat default"><i class="icon-share-alt icon-white"></i> @lang('button.restore')</a>
+				<a href="{{ route('restore/user', $user->id) }}" class="btn btn-warning"><i class="icon-share-alt icon-white"></i></a>
 				@else
-				<a href="{{ route('update/user', $user->id) }}" class="btn-flat white"><i class="icon-pencil"></i> @lang('button.edit')</a>
+				<a href="{{ route('update/user', $user->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
 				@if (Sentry::getId() !== $user->id)
-				<a  data-html="false" class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/user', $user->id) }}" data-content="Are you sure you wish to delete this user?" data-title="Delete {{ htmlspecialchars($user->first_name) }}?" onClick="return false;"><i class="icon-remove icon-white"></i> @lang('button.delete')</a>
+				<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/user', $user->id) }}" data-content="Are you sure you wish to delete this user?" data-title="Delete {{ htmlspecialchars($user->first_name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 
 				@else
 				<span class="btn-flat danger disabled"><i class="icon-remove icon-white"></i> @lang('button.delete')</span>
 				@endif
 				@endif
 			@endif
+
 			</td>
 		</tr>
 		@endforeach
@@ -96,8 +88,4 @@ User Management ::
 </div>
 @endif
 
-@if ($users->getTotal() > 10)
-{{ $users->links() }}
-@endif
-
 @stop