Merge branch 'refs/heads/develop'

Removed post-install-cmd php artisan optimize.

app/controllers/account/ProfileController.php

@@ -5,6 +5,7 @@ use Input;
 use Redirect;
 use Sentry;
 use Validator;
+use Location;
 use View;
 
 class ProfileController extends AuthorizedController {
@@ -20,7 +21,11 @@ class ProfileController extends AuthorizedController {
 		$user = Sentry::getUser();
 
 		// Show the page
-		return View::make('frontend/account/profile', compact('user'));
+
+		$location_list = array('' => 'Select One') + Location::lists('name', 'id');
+
+		// Show the page
+		return View::make('frontend/account/profile', compact('user'))->with('location_list',$location_list);
 	}
 
 	/**
@@ -34,6 +39,7 @@ class ProfileController extends AuthorizedController {
 		$rules = array(
 			'first_name' => 'required|min:3',
 			'last_name'  => 'required|min:3',
+			'location_id'  => 'required',
 			'website'    => 'url',
 			'gravatar'   => 'email',
 		);
@@ -55,7 +61,7 @@ class ProfileController extends AuthorizedController {
 		$user->first_name = Input::get('first_name');
 		$user->last_name  = Input::get('last_name');
 		$user->website    = Input::get('website');
-		$user->country    = Input::get('country');
+		$user->location_id    = Input::get('location_id');
 		$user->gravatar   = Input::get('gravatar');
 		$user->save();
 

app/controllers/admin/AssetsController.php

@@ -273,7 +273,7 @@ class AssetsController extends AdminController {
 
 
 		// Redirect to the asset management page with error
-		return Redirect::to("assets/$assetId/edit")->with('error', Lang::get('admin/hardware/message.update.error'));
+		return Redirect::to("hardware/$assetId/edit")->with('error', Lang::get('admin/hardware/message.update.error'));
 
 	}
 
@@ -320,7 +320,7 @@ class AssetsController extends AdminController {
 		}
 
 		// Get the dropdown of users and then pass it to the checkout view
-		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->lists('full_name', 'id');
+		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
 
 		//print_r($users);
 		return View::make('backend/hardware/checkout', compact('asset'))->with('users_list',$users_list);
@@ -386,7 +386,7 @@ class AssetsController extends AdminController {
 		}
 
 		// Redirect to the asset management page with error
-		return Redirect::to("assets/$assetId/checkout")->with('error', Lang::get('admin/hardware/message.checkout.error'));
+		return Redirect::to("hardware/$assetId/checkout")->with('error', Lang::get('admin/hardware/message.checkout.error'));
 	}
 
 

app/controllers/admin/GroupsController.php

@@ -56,7 +56,7 @@ class GroupsController extends AdminController {
 	{
 		// Declare the rules for the form validation
 		$rules = array(
-			'name' => 'required|alpha_dash|min:2',
+			'name' => 'required|alpha_space|min:2',
 		);
 
 		// Create a new validator instance from our validation rules

app/controllers/admin/LicensesController.php

@@ -239,7 +239,7 @@ class LicensesController extends AdminController {
 		}
 
 		// Get the dropdown of users and then pass it to the checkout view
-		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->lists('full_name', 'id');
+		$users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
 
 		//print_r($users);
 		return View::make('backend/licenses/checkout', compact('licenseseat'))->with('users_list',$users_list);

app/controllers/admin/ModelsController.php

@@ -40,12 +40,12 @@ class ModelsController extends AdminController {
 		// Show the page
 		$depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
 		$manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
-		$category_list = array('' => '') + DB::table('categories')->lists('name', 'id');
+		$category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
 		$view = View::make('backend/models/edit');
 		$view->with('category_list',$category_list);
 		$view->with('depreciation_list',$depreciation_list);
 		$view->with('manufacturer_list',$manufacturer_list);
-		$view->with('model',new Model); 
+		$view->with('model',new Model);
 		return $view;
 	}
 
@@ -81,7 +81,7 @@ class ModelsController extends AdminController {
 			if($model->save())
 			{
 				// Redirect to the new model  page
-				return Redirect::to("assets/models")->with('success', Lang::get('admin/models/message.create.success'));
+				return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.create.success'));
 			}
 		}
 		else
@@ -92,7 +92,7 @@ class ModelsController extends AdminController {
 		}
 
 		// Redirect to the model create page
-		return Redirect::to('assets/models/create')->with('error', Lang::get('admin/models/message.create.error'));
+		return Redirect::to('hardware/models/create')->with('error', Lang::get('admin/models/message.create.error'));
 
 	}
 
@@ -156,7 +156,7 @@ class ModelsController extends AdminController {
 			if($model->save())
 			{
 				// Redirect to the new model  page
-				return Redirect::to("assets/models/$modelId/edit")->with('success', Lang::get('admin/models/message.update.success'));
+				return Redirect::to("hardware/models/$modelId/edit")->with('success', Lang::get('admin/models/message.update.success'));
 			}
 		}
 		else
@@ -167,7 +167,7 @@ class ModelsController extends AdminController {
 		}
 
 		// Redirect to the model create page
-		return Redirect::to("assets/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
+		return Redirect::to("hardware/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
 
 	}
 
@@ -183,19 +183,19 @@ class ModelsController extends AdminController {
 		if (is_null($model = Model::find($modelId)))
 		{
 			// Redirect to the blogs management page
-			return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.not_found'));
+			return Redirect::to('hardware/models')->with('error', Lang::get('admin/models/message.not_found'));
 		}
 
 		if ($model->assets->count() > 0) {
 			// Throw an error that this model is associated with assets
-			return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.assoc_users'));
+			return Redirect::to('hardware/models')->with('error', Lang::get('admin/models/message.assoc_users'));
 
 		} else {
 			// Delete the model
 			$model->delete();
 
 			// Redirect to the models management page
-			return Redirect::to('assets/models')->with('success', Lang::get('admin/models/message.delete.success'));
+			return Redirect::to('hardware/models')->with('success', Lang::get('admin/models/message.delete.success'));
 		}
 	}
 

app/controllers/admin/UsersController.php

@@ -353,6 +353,7 @@ class UsersController extends AdminController {
 				return Redirect::route('users')->with('error', $error);
 			}
 
+
 			// Do we have permission to delete this user?
 			if ($user->isSuperUser() and ! Sentry::getUser()->isSuperUser())
 			{
@@ -360,6 +361,18 @@ class UsersController extends AdminController {
 				return Redirect::route('users')->with('error', 'Insufficient permissions!');
 			}
 
+			if (count($user->assets) > 0) {
+
+				// Redirect to the user management page
+				return Redirect::route('users')->with('error', 'This user still has '.count($user->assets).' assets associated with them.');
+			}
+
+			if (count($user->licenses) > 0) {
+
+				// Redirect to the user management page
+				return Redirect::route('users')->with('error', 'This user still has '.count($user->licenses).' licenses associated with them.');
+			}
+
 			// Delete the user
 			$user->delete();
 

app/models/Asset.php

@@ -83,7 +83,6 @@ class Asset extends Elegant {
 	 public static function assetcount()
 	{
 		return DB::table('assets')
-
                     ->where('physical', '=', '1')
                     ->whereNull('deleted_at','and')
                     ->count();

app/models/LicenseSeat.php

@@ -11,7 +11,7 @@ class LicenseSeat extends Elegant {
 
 	public function user()
 	{
-		return $this->belongsTo('User','assigned_to');
+		return $this->belongsTo('User','assigned_to')->withTrashed();
 	}
 
 }

app/models/Model.php

@@ -7,6 +7,7 @@ class Model extends Elegant {
 		'name'   => 'required|alpha_space|min:3',
 		'modelno'   => 'alpha_space|min:1',
 		'category_id'   => 'required|integer',
+		'manufacturer_id'   => 'required|integer',
 	);
 
 	public function assets()

app/models/Setting.php

@@ -5,7 +5,13 @@ class Setting extends Elegant {
 
 	public static function getSettings()
 	{
-		return Setting::find(1);
+		static $static_cache = NULL;
+
+		if (!$static_cache) {
+			$static_cache = Setting::find(1);
+		}
+		return $static_cache;
+
 	}
 
 }

app/storage/logs/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

app/storage/views/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

app/views/backend/categories/edit.blade.php

@@ -12,48 +12,46 @@
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-				<h3 class="name">Asset Categories
-				<div class="pull-right">
-					<a href="{{ route('categories') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-				</div>
-		</h3>
 
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-                            <br>
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('categories') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>Asset Categories</h3>
+	</div>
+</div>
+
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
                         <form class="form-horizontal" method="post" action="" autocomplete="off">
 						<!-- CSRF Token -->
 						<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-						<!-- Category Title -->
-						<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
-							<label class="control-label" for="name">Category Name</label>
-							<div class="controls">
-								<input type="text" name="name" id="name" value="{{ Input::old('name', $category->name) }}" />
-								{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-							</div>
+						<!-- Name -->
+						<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) }}" />
+									{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+								</div>
 						</div>
 
 						<!-- Form actions -->
-						<div class="control-group">
-							<div class="controls">
+						<div class="form-group">
+						<label class="col-md-2 control-label"></label>
+							<div class="col-md-7">
 								<a class="btn btn-link" href="{{ route('categories') }}">@lang('general.cancel')</a>
-								<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+								<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 							</div>
 						</div>
 					</form>
-
-
-                        </div>
-                    </div>
+					<br><br><br><br><br>
+					</div>
 
                     <!-- side address column -->
-                    <div class="span3 address pull-right">
+                    <div class="col-md-3 col-xs-12 address pull-right">
 						<br /><br />
 						<h6>About Asset Categories</h6>
 						<p>Asset categories help you organize your assets. Some
@@ -61,4 +59,6 @@
 						and so on, but you can use asset categories any way that makes sense for you.  </p>
 
                     </div>
+</div>
+</div>
 @stop

app/views/backend/categories/index.blade.php

@@ -8,53 +8,53 @@ Asset Categories ::
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-				<h3 class="name">Asset Categories
-				<div class="pull-right">
-					<a href="{{ route('create/category') }}" 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/category') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Asset Categories</h3>
+	</div>
+</div>
+
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
+		<table id="example">
+		<thead>
+			<tr role="row">
+				<th class="col-md-7">@lang('admin/categories/table.title')</th>
+				<th class="col-md-2">@lang('table.actions')</th>
+			</tr>
+		</thead>
+		<tbody>
+			@foreach ($categories as $category)
+			<tr>
+				<td>{{ $category->name }}</td>
+				<td>
+				<a href="{{ route('update/category', $category->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/category', $category->id) }}" data-content="Are you sure you wish to delete this category?" data-title="Delete {{ htmlspecialchars($category->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-                            <br>
-                            <!-- checked out assets table -->
-
-                        <table id="example">
-						<thead>
-							<tr role="row">
-								<th class="span6">@lang('admin/categories/table.title')</th>
-								<th class="span3">@lang('table.actions')</th>
-							</tr>
-						</thead>
-						<tbody>
-							@foreach ($categories as $category)
-							<tr>
-								<td>{{ $category->name }}</td>
-								<td>
-									<a href="{{ route('update/category', $category->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/category', $category->id) }}" data-content="Are you sure you wish to delete this category?" data-title="Delete the  {{ htmlspecialchars($category->name) }} category?" onClick="return false;">@lang('button.delete')</a>
-								</td>
-							</tr>
-							@endforeach
-						</tbody>
-						</table>
+				</td>
+			</tr>
+			@endforeach
+		</tbody>
+		</table>
 
 
-                        </div>
-                    </div>
+	</div>
 
-                    <!-- side address column -->
-                    <div class="span3 address pull-right">
-						<br /><br />
-						<h6>About Asset Categories</h6>
-						<p>Asset categories help you organize your assets. Some
-						example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;,
-						and so on, but you can use asset categories any way that makes sense for you.  </p>
 
-                    </div>
+<!-- side address column -->
+<div class="col-md-3 col-xs-12 address pull-right">
+	<br /><br />
+	<h6>About Asset Categories</h6>
+	<p>Asset categories help you organize your assets. Some
+	example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;,
+	and so on, but you can use asset categories any way that makes sense for you.  </p>
+
+</div>
+</div>
+</div>
 @stop

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="control-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Depreciation Class Name</label>
-				<div class="controls">
-					<input class="span6" 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="control-group {{ $errors->has('months') ? 'error' : '' }}">
-				<label class="control-label" for="name">Number of Months</label>
-				<div class="controls">
-					<input class="span2" 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="control-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

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="span9 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="span4">@lang('admin/depreciations/table.title')</th>
-								<th class="span2">@lang('admin/depreciations/table.term')</th>
-								<th class="span3">@lang('table.actions')</th>
+								<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-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="span3 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

app/views/backend/groups/create.blade.php

@@ -2,89 +2,79 @@
 
 {{-- Web site Title --}}
 @section('title')
-Create a Group ::
+Create Group ::
 @parent
 @stop
 
 {{-- Content --}}
 @section('content')
-<div class="page-header">
-	<h3>
-		Create a New Group
 
-		<div class="pull-right">
-			<a href="{{ route('groups') }}" class="btn btn-small btn-inverse"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
-	</h3>
+
+<div class="row header">
+    <div class="col-md-12">
+			<a href="{{ route('groups') }}" class="btn btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>Group Update</h3>
+	</div>
 </div>
 
-<!-- Tabs -->
-<ul class="nav nav-tabs">
-	<li class="active"><a href="#tab-general" data-toggle="tab">General</a></li>
-	<li><a href="#tab-permissions" data-toggle="tab">Permissions</a></li>
-</ul>
+<div class="row form-wrapper">
+<div class="col-md-10 column">
 
 <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">
-		<!-- General tab -->
-		<div class="tab-pane active" id="tab-general">
 			<!-- Name -->
-			<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Name</label>
-				<div class="controls">
-					<input type="text" name="name" id="name" value="{{ Input::old('name') }}" />
-					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-				</div>
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<label for="name" class="col-md-2 control-label">Group Name</label>
+					<div class="col-md-6">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name') }}" />
+						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
-		</div>
+			<br><br>
+			<br><br>
 
-		<!-- Tab Permissions -->
-		<div class="tab-pane" id="tab-permissions">
-			<div class="control-group">
-				<div class="controls">
 
 					@foreach ($permissions as $area => $permissions)
 					<fieldset>
 						<legend>{{ $area }}</legend>
 
 						@foreach ($permissions as $permission)
-						<div class="control-group">
-							<label class="control-group">{{ $permission['label'] }}</label>
 
-							<div class="radio inline">
-								<label for="{{ $permission['permission'] }}_allow" onclick="">
-									<input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($selectedPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}>
-									Allow
-								</label>
-							</div>
+						<div class="field-box">
+                            <label for="name" class="col-md-2 control-label">{{ $permission['label'] }}</label>
+                            <div class="col-md-8">
+                                <label class="radio-inline">
+                                    <input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($selectedPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}> Allow
+                                </label>
 
-							<div class="radio inline">
-								<label for="{{ $permission['permission'] }}_deny" onclick="">
-									<input type="radio" value="0" id="{{ $permission['permission'] }}_deny" name="permissions[{{ $permission['permission'] }}]"{{ ( ! array_get($selectedPermissions, $permission['permission']) ? ' checked="checked"' : '') }}>
-									Deny
-								</label>
-							</div>
-						</div>
+                                <label class="radio-inline">
+                                    <input type="radio" value="0" id="{{ $permission['permission'] }}_deny" name="permissions[{{ $permission['permission'] }}]"{{ ( ! array_get($selectedPermissions, $permission['permission']) ? ' checked="checked"' : '') }}> Deny
+                                </label>
+                            </div>
+                        </div>
 						@endforeach
 
 					</fieldset>
 					@endforeach
 
-				</div>
-			</div>
-		</div>
-	</div>
+				<br><br><br><br>
+
+
+				<!-- 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('groups') }}">@lang('general.cancel')</a>
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+					</div>
+				</div>
+
 
-	<!-- Form Actions -->
-	<div class="control-group">
-		<div class="controls">
-			<a class="btn btn-link" href="{{ route('groups') }}">Cancel</a>
-			<button type="submit" class="btn btn-success">Create Group</button>
-		</div>
-	</div>
 </form>
+
+</div>
+				</div>
 @stop
+

app/views/backend/groups/edit.blade.php

@@ -8,83 +8,69 @@ Group Update ::
 
 {{-- Content --}}
 @section('content')
-<div class="page-header">
-	<h3>
-		Group Update
 
-		<div class="pull-right">
-			<a href="{{ route('groups') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
-	</h3>
+
+<div class="row header">
+    <div class="col-md-12">
+			<a href="{{ route('groups') }}" class="btn btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>Group Update</h3>
+	</div>
 </div>
 
-<!-- Tabs -->
-<ul class="nav nav-tabs">
-	<li class="active"><a href="#tab-general" data-toggle="tab">General</a></li>
-	<li><a href="#tab-permissions" data-toggle="tab">Permissions</a></li>
-</ul>
+<div class="row form-wrapper">
+<div class="col-md-10 column">
 
 <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">
-		<!-- General tab -->
-		<div class="tab-pane active" id="tab-general">
 			<!-- Name -->
-			<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Name</label>
-				<div class="controls">
-					<input type="text" name="name" id="name" value="{{ Input::old('name', $group->name) }}" />
-					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-				</div>
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<label for="name" class="col-md-2 control-label">Group Name</label>
+					<div class="col-md-6">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $group->name) }}" />
+						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
-		</div>
+			<br><br>
 
-		<!-- Permissions tab -->
-		<div class="tab-pane" id="tab-permissions">
-			<div class="controls">
-				<div class="control-group">
 
 					@foreach ($permissions as $area => $permissions)
-					<fieldset>
-						<legend>{{ $area }}</legend>
+						<h4>{{ $area }}</h4>
 
 						@foreach ($permissions as $permission)
-						<div class="control-group">
-							<label class="control-group">{{ $permission['label'] }}</label>
+						<div class="field-box">
+                            <label for="name" class="col-md-2 control-label">{{ $permission['label'] }}</label>
+                            <div class="col-md-8">
+                                <label class="radio-inline">
+                                    <input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($groupPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}> Allow
+                                </label>
+
+                                <label class="radio-inline">
+                                    <input type="radio" value="0" id="{{ $permission['permission'] }}_deny" name="permissions[{{ $permission['permission'] }}]"{{ ( ! array_get($groupPermissions, $permission['permission']) ? ' checked="checked"' : '') }}> Deny
+                                </label>
+                            </div>
+                        </div>
 
-							<div class="radio inline">
-								<label for="{{ $permission['permission'] }}_allow" onclick="">
-									<input type="radio" value="1" id="{{ $permission['permission'] }}_allow" name="permissions[{{ $permission['permission'] }}]"{{ (array_get($groupPermissions, $permission['permission']) === 1 ? ' checked="checked"' : '') }}>
-									Allow
-								</label>
-							</div>
 
-							<div class="radio inline">
-								<label for="{{ $permission['permission'] }}_deny" onclick="">
-									<input type="radio" value="0" id="{{ $permission['permission'] }}_deny" name="permissions[{{ $permission['permission'] }}]"{{ ( ! array_get($groupPermissions, $permission['permission']) ? ' checked="checked"' : '') }}>
-									Deny
-								</label>
-							</div>
-						</div>
 						@endforeach
-
-					</fieldset>
 					@endforeach
 
-				</div>
-			</div>
-		</div>
-	</div>
+				<br><br><br><br>
+
+
+				<!-- 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('groups') }}">@lang('general.cancel')</a>
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+					</div>
+				</div>
+
 
-	<!-- Form Actions -->
-	<div class="control-group">
-		<div class="controls">
-			<a class="btn btn-link" href="{{ route('groups') }}">@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>
+				</div>
 @stop

app/views/backend/groups/index.blade.php

@@ -8,39 +8,37 @@ Group Management ::
 
 {{-- Content --}}
 @section('content')
-<div class="page-header">
-	<h3>
-		Group Management
 
-		<div class="pull-right">
-			<a href="{{ route('create/group') }}" 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/group') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Group Management</h3>
+	</div>
 </div>
 
 
-<div class="row-fluid table">
+
+<div class="row form-wrapper">
 <table id="example">
 	<thead>
 		<tr role="row">
-			<th class="span1">@lang('admin/groups/table.id')</th>
-			<th class="span6">@lang('admin/groups/table.name')</th>
-			<th class="span2">@lang('admin/groups/table.users')</th>
-			<th class="span2">@lang('admin/groups/table.created_at')</th>
-			<th class="span2">@lang('table.actions')</th>
+			<th class="col-md-6">@lang('admin/groups/table.name')</th>
+			<th class="col-md-1">@lang('admin/groups/table.users')</th>
+			<th class="col-md-2">@lang('admin/groups/table.created_at')</th>
+			<th class="col-md-3">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
 		@if ($groups->count() >= 1)
 		@foreach ($groups as $group)
 		<tr>
-			<td>{{ $group->id }}</td>
 			<td>{{ $group->name }}</td>
 			<td>{{ $group->users()->count() }}</td>
 			<td>{{ $group->created_at->diffForHumans() }}</td>
 			<td>
-				<a href="{{ route('update/group', $group->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/group', $group->id) }}" data-content="Are you sure you wish to delete this group?" data-title="Delete {{ htmlspecialchars($group->name) }}?" onClick="return false;">@lang('button.delete')</a>
+				<a href="{{ route('update/group', $group->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/group', $group->id) }}" data-content="Are you sure you wish to delete this group?" data-title="Delete {{ htmlspecialchars($group->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 			</td>
 		</tr>
 		@endforeach

app/views/backend/hardware/checkin.blade.php

@@ -12,52 +12,60 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
-		<div class="pull-right">
-			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-		</div>
+
+<div class="row header">
+    <div class="col-md-12">
+		<a href="{{ route('hardware') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		<h3> Checkin Asset </h3>
+	</div>
 </div>
 
+<div class="row form-wrapper">
+<!-- left column -->
+<div class="col-md-10 column">
+
 <form class="form-horizontal" method="post" action="" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
+			<!-- Asset tag -->
+			<div class="form-group">
+			<label class="col-sm-2 control-label">Asset Tag</label>
+				<div class="col-md-6">
+				  <p class="form-control-static">{{ $asset->asset_tag }}</p>
+				</div>
+		  	</div>
 
-			<!-- Asset Tag -->
-			<div class="control-group">
-				<label class="control-label" for="asset_tag">Asset Tag</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="asset_tag" id="asset_tag" value="{{ $asset->asset_tag }}" />
+			<!-- Asset name -->
+		  	<div class="form-group">
+			<label class="col-sm-2 control-label">Asset Name</label>
+				<div class="col-md-6">
+				  <p class="form-control-static">{{ $asset->name }}</p>
+				</div>
+		  	</div>
+			<!-- Note -->
+			<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+				<label for="note" class="col-md-2 control-label">Note</label>
+				<div class="col-md-7">
+					<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{ Input::old('note', $asset->note) }}" />
+					{{ $errors->first('note', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
-
-			<!-- Asset Name -->
-			<div class="control-group">
-				<label class="control-label" for="name">Asset Name</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="name" id="asset_name" value="{{ $asset->name }}" />
-				</div>
-			</div>
-
-			<!-- Notes -->
-			<div class="control-group {{ $errors->has('note') ? 'error' : '' }}">
-				<label class="control-label" for="note">Notes</label>
-				<div class="controls">
-					<input class="span6" type="text" name="note" id="note" value="{{ Input::old('note', $asset->note) }}" />
-					{{ $errors->first('note', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
-				</div>
-			</div>
-
 			<!-- Form actions -->
-			<div class="control-group">
-				<div class="controls">
-					<a class="btn btn-link" href="{{ route('hardware') }}">@lang('general.cancel')</a>
-					<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i>@lang('general.checkin')</button>
+				<div class="form-group">
+				<label class="col-md-2 control-label"></label>
+					<div class="col-md-7">
+						@if ($asset->id)
+						<a class="btn btn-link" href="{{ route('view/hardware', $asset->id) }}">@lang('general.cancel')</a>
+						@else
+						<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
+						@endif
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i>@lang('general.checkin')</button>
+					</div>
 				</div>
-			</div>
 
 </form>
-
+</div>
+</div>
 
 @stop

app/views/backend/hardware/checkout.blade.php

@@ -12,76 +12,79 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+<div class="row header">
+    <div class="col-md-12">
+		<a href="{{ route('hardware') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>
+		@if ($asset->id)
+			Checkout Asset to User
+		@else
+			Create Asset
+		@endif
+		</h3>
 	</div>
-
-	<h3>
-	@if ($asset->id)
-		Checkout Asset to User
-	@else
-		Create Asset
-	@endif
-	</h3>
 </div>
 
+<div class="row form-wrapper">
+<!-- left column -->
+<div class="col-md-10 column">
 
 <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">
-
-		<div class="tab-pane active" id="tab-general">
-
-			<!-- Asset Tag -->
-			<div class="control-group">
-				<label class="control-label" for="asset_tag">Asset Tag</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="asset_tag" id="asset_tag" value="{{ $asset->asset_tag }}" />
+			<!-- Asset tag -->
+			<div class="form-group">
+			<label class="col-sm-2 control-label">Asset Tag</label>
+				<div class="col-md-6">
+				  <p class="form-control-static">{{ $asset->asset_tag }}</p>
 				</div>
-			</div>
+		  	</div>
 
-			<!-- Asset Name -->
-			<div class="control-group">
-				<label class="control-label" for="name">Asset Name</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="name" id="asset_name" value="{{ $asset->name }}" />
+			<!-- Asset name -->
+		  	<div class="form-group">
+			<label class="col-sm-2 control-label">Asset Name</label>
+				<div class="col-md-6">
+				  <p class="form-control-static">{{ $asset->name }}</p>
 				</div>
-			</div>
-
+		  	</div>
 			<!-- User -->
-			<div class="control-group {{ $errors->has('assigned_to') ? 'error' : '' }}">
-				<label class="control-label" for="parent">Checkout to</label>
-				<div class="controls">
 
+			<div class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">
+				<label for="assigned_to" class="col-md-2 control-label">Checkout to</label>
+				<div class="col-md-7">
 					{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'style'=>'min-width:350px')) }}
-					{{ $errors->first('assigned_to', '<span class="help-inline">:message</span>') }}
+					{{ $errors->first('assigned_to', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
-			<!-- Notes -->
-			<div class="control-group {{ $errors->has('note') ? 'error' : '' }}">
-				<label class="control-label" for="note">Notes</label>
-				<div class="controls">
-					<input class="span6" type="text" name="note" id="note" value="{{ Input::old('notes', $asset->note) }}" />
-					{{ $errors->first('note', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
+			<!-- Note -->
+			<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+				<label for="note" class="col-md-2 control-label">Note</label>
+				<div class="col-md-7">
+					<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{ Input::old('note', $asset->note) }}" />
+					{{ $errors->first('note', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
-		</div>
+			<!-- Form actions -->
+			<div class="form-group">
+			<label class="col-md-2 control-label"></label>
+				<div class="col-md-7">
+					@if ($asset->id)
+					<a class="btn btn-link" href="{{ route('view/hardware', $asset->id) }}">Cancel</a>
+					@else
+					<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
+					@endif
+					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
+				</div>
+			</div>
+
+
 
-	<!-- Form actions -->
-	<div class="control-group">
-		<div class="controls">
-			<a class="btn btn-link" href="{{ route('hardware') }}">@lang('general.cancel')</a>
-			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i>@lang('general.checkout')</button>
-		</div>
-	</div>
 </form>
 
-
+</div>
+</div>
 @stop

app/views/backend/hardware/clone.blade.php

@@ -23,43 +23,43 @@
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
 			<!-- Asset Tag -->
-			<div class="control-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
 				<label class="control-label" for="asset_tag">Asset Tag</label>
 				<div class="controls">
-					<input class="span4" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag') }}" />
+					<input class="col-md-4" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag') }}" />
 					{{ $errors->first('asset_tag', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 			<!-- Asset Title -->
-			<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
 				<label class="control-label" for="name">Asset Name</label>
 				<div class="controls">
-					<input class="span4" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
+					<input class="col-md-4" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
 					{{ $errors->first('name', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
 
 			<!-- Serial -->
-			<div class="control-group {{ $errors->has('serial') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('serial') ? 'error' : '' }}">
 				<label class="control-label" for="serial">Serial</label>
 				<div class="controls">
-					<input class="span4" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
+					<input class="col-md-4" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
 					{{ $errors->first('serial', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
 			<!-- Order Number -->
-			<div class="control-group {{ $errors->has('order_number') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('order_number') ? 'error' : '' }}">
 				<label class="control-label" for="order_number">Order Number</label>
 				<div class="controls">
-					<input class="span4" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
+					<input class="col-md-4" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
 					{{ $errors->first('order_number', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
 				<!-- Model -->
-			<div class="control-group {{ $errors->has('model_id') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('model_id') ? 'error' : '' }}">
 				<label class="control-label" for="parent">Model</label>
 				<div class="controls">
 					{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}
@@ -68,7 +68,7 @@
 			</div>
 
 			<!-- Purchase Date -->
-			<div class="control-group input-append {{ $errors->has('purchase_date') ? 'error' : '' }}" >
+			<div class="form-group input-append {{ $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', $asset->purchase_date) }}">
@@ -78,28 +78,28 @@
 			</div>
 
 			<!-- Purchase Cost -->
-			<div class="control-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
 				<label class="control-label" for="purchase_cost">Purchase Cost</label>
 				<div class="controls">
 				<div class="input-prepend">
 					<span class="add-on">$</span>
-					<input class="span2" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $asset->purchase_cost) }}" />
+					<input class="col-md-2" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $asset->purchase_cost) }}" />
 					{{ $errors->first('purchase_cost', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 				 </div>
 			</div>
 
 			<!-- Warrantee -->
-			<div class="control-group {{ $errors->has('warranty_months') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('warranty_months') ? 'error' : '' }}">
 				<label class="control-label" for="serial">Warranty</label>
 				<div class="controls">
-					<input class="span1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" />  months
+					<input class="col-md-1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" />  months
 					{{ $errors->first('warranty_months', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
 			<!-- Depreciation -->
-			<div class="control-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
 				<label class="control-label" for="parent">Depreciation</label>
 				<div class="controls">
 					<div class="field-box">
@@ -110,7 +110,7 @@
 			</div>
 
 			<!-- Status -->
-			<div class="control-group {{ $errors->has('status_id') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
 				<label class="control-label" for="parent">Status</label>
 				<div class="controls">
 					<div class="field-box">
@@ -122,16 +122,16 @@
 
 
 			<!-- Notes -->
-			<div class="control-group {{ $errors->has('notes') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
 				<label class="control-label" for="notes">Notes</label>
 				<div class="controls">
-					<input class="span6" type="text" name="notes" id="notes" value="{{ Input::old('notes', $asset->notes) }}" />
+					<input class="col-md-6" type="text" name="notes" id="notes" value="{{ Input::old('notes', $asset->notes) }}" />
 					{{ $errors->first('notes', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
 	<!-- Form actions -->
-	<div class="control-group">
+	<div class="form-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
 			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Save</button>

app/views/backend/hardware/edit.blade.php

@@ -11,166 +11,144 @@
 @stop
 
 {{-- Page content --}}
+
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		@if ($asset->id)
-			<a href="{{ route('view/hardware',$asset->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 ($asset->id)
+			<a href="{{ route('view/hardware',$asset->id) }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		@else
-			<a href="{{ route('hardware') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+			<a href="{{ route('hardware') }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
 		@endif
-	</div>
 
-	<h3>
-	@if ($asset->id)
+		<h3>
+		@if ($asset->id)
 		Asset Update
-	@else
-		Create Asset
-	@endif
-
-
-	</h3>
+			@else
+				Create Asset
+			@endif
+		</h3>
+	</div>
 </div>
 
+<div class="row form-wrapper">
+            <!-- left column -->
+            <div class="col-md-10 column">
 
-<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">
-
-		<div class="tab-pane active" id="tab-general">
-
-
+			<form class="form-horizontal" method="post" action="" autocomplete="off" role="form">
+			<!-- CSRF Token -->
+			<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
 			<!-- Asset Tag -->
-			<div class="control-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
-				<label class="control-label" for="asset_tag">Asset Tag</label>
-				<div class="controls">
-					<input class="span4" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $asset->asset_tag) }}" />
-					{{ $errors->first('asset_tag', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
-				</div>
+			<div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
+				<label for="asset_tag" class="col-md-2 control-label">Asset Tag</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $asset->asset_tag) }}" />
+						{{ $errors->first('asset_tag', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
+
 			<!-- Asset Title -->
-			<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Asset Name</label>
-				<div class="controls">
-					<input class="span4" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
-					{{ $errors->first('name', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
-				</div>
+			<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">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
+						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
-
-
 			<!-- Serial -->
-			<div class="control-group {{ $errors->has('serial') ? 'error' : '' }}">
-				<label class="control-label" for="serial">Serial</label>
-				<div class="controls">
-					<input class="span4" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
-					{{ $errors->first('serial', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
+			<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
+				<label for="serial" class="col-md-2 control-label">Serial</label>
+				<div class="col-md-7">
+					<input class="form-control" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
+					{{ $errors->first('serial', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
 			<!-- Order Number -->
-			<div class="control-group {{ $errors->has('order_number') ? 'error' : '' }}">
-				<label class="control-label" for="order_number">Order Number</label>
-				<div class="controls">
-					<input class="span4" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
-					{{ $errors->first('order_number', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
+			<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
+				<label for="order_number" class="col-md-2 control-label">Order Number</label>
+				<div class="col-md-7">
+					<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
+					{{ $errors->first('order_number', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
-				<!-- Model -->
-			<div class="control-group {{ $errors->has('model_id') ? 'error' : '' }}">
-				<label class="control-label" for="parent">Model</label>
-				<div class="controls">
+			<!-- Model -->
+			<div class="form-group {{ $errors->has('model_id') ? ' has-error' : '' }}">
+				<label for="parent" class="col-md-2 control-label">Model</label>
+				<div class="col-md-7">
 					{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}
-					{{ $errors->first('model_id', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
+					{{ $errors->first('model_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
 			<!-- Purchase Date -->
-			<div class="control-group input-append {{ $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', $asset->purchase_date) }}">
-				{{ $errors->first('purchase_date', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
-
+			<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
+				<label for="purchase_date" class="col-md-2 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', $asset->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>
 
 			<!-- Purchase Cost -->
-			<div class="control-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
-				<label class="control-label" for="purchase_cost">Purchase Cost</label>
-				<div class="controls">
-				<div class="input-prepend">
-					<span class="add-on">$</span>
-					<input class="span2" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', $asset->purchase_cost) }}" />
-					{{ $errors->first('purchase_cost', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
-				</div>
+			<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
+				<label for="purchase_cost" class="col-md-2 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', $asset->purchase_cost) }}" />
+						{{ $errors->first('purchase_cost', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					 </div>
 				 </div>
 			</div>
 
 			<!-- Warrantee -->
-			<div class="control-group {{ $errors->has('warranty_months') ? 'error' : '' }}">
-				<label class="control-label" for="serial">Warranty</label>
-				<div class="controls">
-					<input class="span1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" />  months
-					{{ $errors->first('warranty_months', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
-				</div>
-			</div>
-
-			<!-- Depreciation -->
-			<div class="control-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', $asset->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('warranty_months') ? ' has-error' : '' }}">
+				<label for="warranty_months" class="col-md-2 control-label">Warranty</label>
+				<div class="col-md-2">
+					<div class="input-group">
+					<input class="col-md-2 form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" />   <span class="input-group-addon">months</span>
+					{{ $errors->first('warranty_months', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
 				</div>
 			</div>
 
 			<!-- Status -->
-			<div class="control-group {{ $errors->has('status_id') ? 'error' : '' }}">
-				<label class="control-label" for="parent">Status</label>
-				<div class="controls">
-					<div class="field-box">
-					{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_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('status_id') ? ' has-error' : '' }}">
+				<label for="status_id" class="col-md-2 control-label">Status</label>
+					<div class="col-md-7">
+						{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:350px')) }}
+						{{ $errors->first('status_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 					</div>
-				</div>
 			</div>
 
-
 			<!-- Notes -->
-			<div class="control-group {{ $errors->has('notes') ? 'error' : '' }}">
-				<label class="control-label" for="notes">Notes</label>
-				<div class="controls">
-					<input class="span6" type="text" name="notes" id="notes" value="{{ Input::old('notes', $asset->notes) }}" />
-					{{ $errors->first('notes', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
+			<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
+				<label for="notes" class="col-md-2 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', $asset->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-2 control-label"></label>
+					<div class="col-md-7">
+						@if ($asset->id)
+						<a class="btn btn-link" href="{{ route('view/hardware', $asset->id) }}">Cancel</a>
+						@else
+						<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
+						@endif
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
+					</div>
+				</div>
 
-
-
-		</div>
-
-	<!-- Form actions -->
-	<div class="control-group">
-		<div class="controls">
-			@if ($asset->id)
-			<a class="btn btn-link" href="{{ route('view/hardware', $asset->id) }}">Cancel</a>
-			@else
-			<a class="btn btn-link" href="{{ route('hardware') }}">Cancel</a>
-			@endif
-
-			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Save</button>
-		</div>
+		</form>
 	</div>
-</form>
-
-
+</div>
 @stop

app/views/backend/hardware/index.blade.php

@@ -22,11 +22,11 @@ Assets ::
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
-		<div class="pull-right">
-			<a href="{{ route('create/hardware') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-		</div>
 
+
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/hardware') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
 		<h3>
 		@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')  || Input::get('Deployed'))
 			@if (Input::get('Pending'))
@@ -43,27 +43,29 @@ Assets ::
 		@endif
 				Assets
 		</h3>
-
+	</div>
 </div>
 
+<div class="row form-wrapper">
+
 @if ($assets->count() > 0)
 
 
 <table id="example">
 	<thead>
 		<tr role="row">
-			<th class="span2" bSortable="true">@lang('admin/hardware/table.asset_tag')</th>
-			<th class="span2" bSortable="true"><span class="line"></span>@lang('admin/hardware/table.title')</th>
-			<th class="span2" bSortable="true"><span class="line"></span>@lang('admin/hardware/table.serial')</th>
+			<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.asset_tag')</th>
+			<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.title')</th>
+			<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.serial')</th>
 			@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))
-			<th class="span2" bSortable="true">Status</th>
+			<th class="col-md-2" bSortable="true">Status</th>
 			@else
-			<th class="span2" bSortable="true">@lang('admin/hardware/table.checkoutto')</th>
-			<th class="span2" bSortable="true">@lang('admin/hardware/table.location')</th>
+			<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.checkoutto')</th>
+			<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.location')</th>
 			@endif
 
-			<th class="span1">@lang('admin/hardware/table.change')</th>
-			<th class="span2" bSortable="false">@lang('table.actions')</th>
+			<th class="col-md-1">@lang('admin/hardware/table.change')</th>
+			<th class="col-md-2" bSortable="false">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -107,15 +109,17 @@ Assets ::
 			@endif
 
 			<td>
+			@if ($asset->status_id < 1 )
 			@if ($asset->assigned_to != 0)
-				<a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a>
+				<a href="{{ route('checkin/hardware', $asset->id) }}" class="btn btn-primary">Checkin</a>
 			@else
-				<a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat success">Checkout</a>
+				<a href="{{ route('checkout/hardware', $asset->id) }}" class="btn btn-info">Checkout</a>
+			@endif
 			@endif
 			</td>
 			<td nowrap="nowrap">
-				<a href="{{ route('update/hardware', $asset->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/hardware', $asset->id) }}" data-content="Are you sure you wish to delete this asset?" data-title="Delete {{ htmlspecialchars($asset->asset_tag) }}?" onClick="return false;">@lang('button.delete')</a>
+				<a href="{{ route('update/hardware', $asset->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/hardware', $asset->id) }}" data-content="Are you sure you wish to delete this asset?" data-title="Delete {{ htmlspecialchars($asset->asset_tag) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 			</td>
 		</tr>
 		@endforeach
@@ -130,6 +134,7 @@ Assets ::
 	</div>
 </div>
 
+</div>
 @endif
 
 

app/views/backend/hardware/view.blade.php

@@ -8,204 +8,203 @@ View Asset {{ $asset->asset_tag }} ::
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
 
-				<div class="btn-group pull-right">
-					<button class="btn glow">Actions</button>
-					<button class="btn glow dropdown-toggle" data-toggle="dropdown">
-						<span class="caret"></span>
-					</button>
-					<ul class="dropdown-menu">
+<div class="row header">
+    <div class="col-md-12">
+    	<div class="btn-group pull-right">
+			<button class="btn glow">Actions</button>
+			<button class="btn glow dropdown-toggle" data-toggle="dropdown">
+				<span class="caret"></span>
+			</button>
+			<ul class="dropdown-menu">
 
-						@if ($asset->status_id == 1)
-							@if ($asset->assigned_to != 0)
-								<li><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a></li>
-							@endif
-						@elseif ($asset->status_id == 0)
-								<li><a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat success">Checkout</a></li>
+				@if ($asset->status_id == 1)
+					@if ($asset->assigned_to != 0)
+						<li><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat info">Checkin</a></li>
+					@endif
+				@elseif ($asset->status_id == 0)
+						<li><a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat success">Checkout</a></li>
+				@endif
+				<li><a href="{{ route('update/hardware', $asset->id) }}">Edit Asset</a></li>
+				<li><a href="{{ route('clone/hardware', $asset->id) }}">Clone Asset</a></li>
+			</ul>
+		</div>
+		<h3>
+		<h3 class="name">History for {{ $asset->asset_tag }} ({{ $asset->name }})
+	</h3>
+	</div>
+</div>
+
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
+	<div class="col-md-12" style="min-height: 130px;">
+
+		@if ($asset->model->manufacturer)
+			<div class="col-md-6"><strong>Manufacturer: </strong> {{ $asset->model->manufacturer->name }} </div>
+			<div class="col-md-6"><strong>Model:</strong> {{ $asset->model->name }} / {{ $asset->model->modelno }}</div>
+		@endif
+
+		@if ($asset->purchase_date)
+			<div class="col-md-6"><strong>Purchased On: </strong>{{ $asset->purchase_date }} </div>
+		@endif
+
+		@if ($asset->purchase_cost)
+			<div class="col-md-6"><strong>Purchase Cost:</strong> ${{ number_format($asset->purchase_cost,2) }} </div>
+		@endif
+
+		@if ($asset->order_number)
+			<div class="col-md-6"><strong>Order #:</strong> {{ $asset->order_number }} </div>
+		@endif
+
+		@if ($asset->warranty_months)
+			<div class="col-md-6"><strong>Warranty:</strong> {{ $asset->warranty_months }} months</div>
+			<div class="col-md-6"><strong>Expires:</strong> {{ $asset->warrantee_expires() }}</div>
+		@endif
+
+		@if ($asset->depreciation)
+			<div class="col-md-6"><strong>Depreciation: </strong>{{ $asset->depreciation->name }}
+				({{ $asset->depreciation->months }} months)</div>
+			<div class="col-md-6"><strong>Depreciates On: </strong>{{ $asset->depreciated_date() }} </div>
+			<div class="col-md-6"><strong>Fully Depreciated: </strong>{{ $asset->months_until_depreciated()->m }} months,
+			{{ $asset->months_until_depreciated()->y }} years</div>
+		@endif
+
+
+	</div>
+
+
+		<!-- checked out assets table -->
+
+		<table class="table table-hover">
+			<thead>
+				<tr>
+					<th class="col-md-1"></th>
+					<th class="col-md-3"><span class="line"></span>Date</th>
+					<th class="col-md-2"><span class="line"></span>Admin</th>
+					<th class="col-md-2"><span class="line"></span>Action</th>
+					<th class="col-md-2"><span class="line"></span>User</th>
+					<th class="col-md-3"><span class="line"></span>Note</th>
+				</tr>
+			</thead>
+			<tbody>
+			@if (count($asset->assetlog) > 0)
+				@foreach ($asset->assetlog as $log)
+				<tr>
+					<td>
+					@if ((isset($log->checkedout_to)) && ($log->checkedout_to == $asset->assigned_to))
+					<i class="icon-star"></i>
+					@endif
+					</td>
+					<td>{{ $log->added_on }}</td>
+					<td>
+						@if (isset($log->user_id))
+						{{ $log->adminlog->fullName() }}
 						@endif
-						<li><a href="{{ route('update/hardware', $asset->id) }}">Edit Asset</a></li>
-						<li><a href="{{ route('clone/hardware', $asset->id) }}">Clone Asset</a></li>
+					</td>
+					<td>{{ $log->action_type }}</td>
+					<td>
+						@if (isset($log->checkedout_to))
+						<a href="{{ route('view/user', $log->checkedout_to) }}">
+						{{ $log->userlog->fullName() }}
+						</a>
+						@endif
+					</td>
+					<td>
+						@if ($log->note)
+						{{ $log->note }}
+						@endif
+					</td>
+				</tr>
+				@endforeach
+				@endif
+				<tr>
+					<td></td>
+					<td>{{ $asset->created_at }}</td>
+					<td>
+					@if ($asset->adminuser->id)
+					{{ $asset->adminuser->fullName() }}
+					@else
+					Unknown Admin
+					@endif
+					</td>
+					<td>created asset</td>
+					<td></td>
+					<td></td>
+				</tr>
+			</tbody>
+		</table>
+
+
+    	</div>
+
+		<!-- side address column -->
+		<div class="col-md-3 col-xs-12 address pull-right">
+
+			@if ((isset($asset->assigned_to ) && ($asset->assigned_to > 0)))
+				<h6><br>Checked Out To:</h6>
+				<ul>
+
+					<li><img src="{{ $asset->assigneduser->gravatar() }}" class="img-circle" style="width: 100px; margin-right: 20px;" /><br /><br /></li>
+					<li><a href="{{ route('view/user', $asset->assigned_to) }}">{{ $asset->assigneduser->fullName() }}</a></li>
+
+
+					@if (isset($asset->assetloc->address))
+						<li>{{ $asset->assetloc->address }}
+						@if (isset($asset->assetloc->address2))
+							{{ $asset->assetloc->address2 }}
+						@endif
+						</li>
+						@if (isset($asset->assetloc->city))
+							<li>{{ $asset->assetloc->city }}, {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li>
+						@endif
+
+					@endif
+
+					@if (isset($asset->assigneduser->email))
+						<li><br /><i class="icon-envelope-alt"></i> <a href="mailto:{{ $asset->assigneduser->email }}">{{ $asset->assigneduser->email }}</a></li>
+					@endif
+
+					@if (isset($asset->assigneduser->phone))
+						<li><i class="icon-phone"></i> {{ $asset->assigneduser->phone }}</li>
+					@endif
+
+					<li><br /><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat large info ">Checkin Asset</a></li>
 					</ul>
+
+			@elseif (($asset->status_id ) && ($asset->status_id > 1))
+
+				@if ($asset->assetstatus)
+					<h6><br>{{ $asset->assetstatus->name }} Asset</h6>
+
+					<div class="col-md-6">
+					<div class="alert alert-warning alert-block">
+						<i class="icon-warning-sign"></i>
+						<strong>Warning: </strong> This asset has been marked <strong>{{ $asset->assetstatus->name }}</strong> and is currently undeployable.
+						If this status has changed, please update the asset status.
+					</div>
+				</div>
+				@endif
+
+			@elseif ($asset->status_id == NULL)
+					<h6><br>Pending Asset</h6>
+					<div class="col-md-12">
+					<div class="alert alert-info alert-block">
+						<i class="icon-info-sign"></i>
+						<strong>Warning: </strong> This asset has been marked as pending and is currently undeployable.
+						If this status has changed, please update the asset status.
+					</div>
 				</div>
 
-				<h3 class="name">History for {{ $asset->asset_tag }} ({{ $asset->name }})
-
-
-				</h3>
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-
-						<!-- details snapshot box -->
-                        <div class="row-fluid show-grid">
-								<div class="span9"></div>
-
-
-								@if ($asset->model->manufacturer)
-									<div class="span4"><strong>Manufacturer: </strong> {{ $asset->model->manufacturer->name }} </div>
-									<div class="span6"><strong>Model:</strong> {{ $asset->model->name }} / {{ $asset->model->modelno }}</div>
-								@endif
-
-								@if ($asset->purchase_date)
-									<div class="span4"><strong>Purchased On: </strong>{{ $asset->purchase_date }} </div>
-								@endif
-
-								@if ($asset->purchase_cost)
-									<div class="span4"><strong>Purchase Cost:</strong> ${{ number_format($asset->purchase_cost,2) }} </div>
-								@endif
-
-								@if ($asset->order_number)
-									<div class="span4"><strong>Order #:</strong> {{ $asset->order_number }} </div>
-								@endif
-
-								@if ($asset->warranty_months)
-									<div class="span4"><strong>Warranty:</strong> {{ $asset->warranty_months }} months</div>
-									<div class="span4"><strong>Expires:</strong> {{ $asset->warrantee_expires() }}</div>
-								@endif
-
-								@if ($asset->depreciation)
-									<div class="span4"><strong>Depreciation: </strong>{{ $asset->depreciation->name }}
-										({{ $asset->depreciation->months }} months)</div>
-									<div class="span4"><strong>Depreciates On: </strong>{{ $asset->depreciated_date() }} </div>
-									<div class="span4"><strong>Fully Depreciated: </strong>{{ $asset->months_until_depreciated()->m }} months,
-									{{ $asset->months_until_depreciated()->y }} years</div>
-								@endif
-						</div>
-
-
-
-                            <br>
-                            <!-- checked out assets table -->
-
-                            <table class="table table-hover">
-                                <thead>
-                                    <tr>
-                                    	<th class="span1"></th>
-                                        <th class="span3"><span class="line"></span>Date</th>
-                                        <th class="span2"><span class="line"></span>Admin</th>
-                                        <th class="span2"><span class="line"></span>Action</th>
-                                        <th class="span2"><span class="line"></span>User</th>
-                                        <th class="span3"><span class="line"></span>Note</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                @if (count($asset->assetlog) > 0)
-									@foreach ($asset->assetlog as $log)
-									<tr>
-										<td>
-										@if ((isset($log->checkedout_to)) && ($log->checkedout_to == $asset->assigned_to))
-										<i class="icon-star"></i>
-										@endif
-										</td>
-										<td>{{ $log->added_on }}</td>
-										<td>
-											@if (isset($log->user_id))
-											{{ $log->adminlog->fullName() }}
-											@endif
-										</td>
-										<td>{{ $log->action_type }}</td>
-										<td>
-											@if (isset($log->checkedout_to))
-											<a href="{{ route('view/user', $log->checkedout_to) }}">
-											{{ $log->userlog->fullName() }}
-											</a>
-											@endif
-										</td>
-										<td>
-											@if ($log->note)
-											{{ $log->note }}
-											@endif
-										</td>
-									</tr>
-									@endforeach
-									@endif
-									<tr>
-										<td></td>
-										<td>{{ $asset->created_at }}</td>
-										<td>
-										@if ($asset->adminuser->id)
-										{{ $asset->adminuser->fullName() }}
-										@else
-										Unknown Admin
-										@endif
-										</td>
-										<td>created asset</td>
-										<td></td>
-										<td></td>
-									</tr>
-                                </tbody>
-                            </table>
-
-                        </div>
-                    </div>
-
-                    <!-- side address column -->
-                    <div class="span3 address pull-right">
-
-						@if ((isset($asset->assigned_to ) && ($asset->assigned_to > 0)))
-                       		<h6><br>Checked Out To:</h6>
-                       		<ul>
-
-								<li><img src="{{ $asset->assigneduser->gravatar() }}" class="img-circle" style="width: 100px; margin-right: 20px;" /><br /><br /></li>
-								<li><a href="{{ route('view/user', $asset->assigned_to) }}">{{ $asset->assigneduser->fullName() }}</a></li>
-
-
-								@if (isset($asset->assetloc->address))
-									<li>{{ $asset->assetloc->address }}
-									@if (isset($asset->assetloc->address2))
-										{{ $asset->assetloc->address2 }}
-									@endif
-									</li>
-									@if (isset($asset->assetloc->city))
-										<li>{{ $asset->assetloc->city }}, {{ $asset->assetloc->state }} {{ $asset->assetloc->zip }}</li>
-									@endif
-
-								@endif
-
-								@if (isset($asset->assigneduser->email))
-									<li><br /><i class="icon-envelope-alt"></i> <a href="mailto:{{ $asset->assigneduser->email }}">{{ $asset->assigneduser->email }}</a></li>
-								@endif
-
-								@if (isset($asset->assigneduser->phone))
-									<li><i class="icon-phone"></i> {{ $asset->assigneduser->phone }}</li>
-								@endif
-
-								<li><br /><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat large info ">Checkin Asset</a></li>
-								</ul>
-
-						@elseif (($asset->status_id ) && ($asset->status_id > 1))
-
-							@if ($asset->assetstatus)
-								<h6><br>{{ $asset->assetstatus->name }} Asset</h6>
-
-								<div class="col-md-6">
-								<div class="alert alert-warning alert-block">
-									<i class="icon-warning-sign"></i>
-									<strong>Warning: </strong> This asset has been marked <strong>{{ $asset->assetstatus->name }}</strong> and is currently undeployable.
-									If this status has changed, please update the asset status.
-								</div>
-							</div>
-							@endif
-
-						@elseif ($asset->status_id == NULL)
-								<h6><br>Pending Asset</h6>
-								<div class="col-md-6">
-								<div class="alert alert-info alert-block">
-									<i class="icon-info-sign"></i>
-									<strong>Warning: </strong> This asset has been marked as pending and is currently undeployable.
-									If this status has changed, please update the asset status.
-								</div>
-							</div>
-
-						@else
-						<h6><br>Checkout Asset</h6>
-							<ul>
-								<li>This asset is not checked out to anyone yet. Use the button below to check it out now.</li>
-								<li><br><br /><a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat large success">Checkout Asset</a></li>
-							</ul>
-                        @endif
-                    </div>
+			@else
+			<h6><br>Checkout Asset</h6>
+				<ul>
+					<li>This asset is not checked out to anyone yet. Use the button below to check it out now.</li>
+					<li><br><br /><a href="{{ route('checkout/hardware', $asset->id) }}" class="btn-flat large success">Checkout Asset</a></li>
+				</ul>
+			@endif
+		</div>
+	</div>
+</div>
 @stop

app/views/backend/layouts/default.blade.php

@@ -11,41 +11,40 @@
 		</title>
 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<!-- Mobile Specific Metas
-		================================================== -->
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+
+
 		<!-- bootstrap -->
 		<link href="{{ asset('assets/css/bootstrap/bootstrap.css') }}" rel="stylesheet" />
-		<link href="{{ asset('assets/css/bootstrap/bootstrap-responsive.css') }}" rel="stylesheet" />
 		<link href="{{ asset('assets/css/bootstrap/bootstrap-overrides.css') }}" type="text/css" rel="stylesheet" />
-		<link href="{{ asset('assets/css/lib/bootstrap.datepicker.css') }}" type="text/css" rel="stylesheet">
 
 
 
 		<!-- libraries -->
-		<link href="{{ asset('assets/css/lib/jquery-ui-1.10.2.custom.css') }}" rel="stylesheet" type="text/css" />
+		<link href="{{ asset('assets/css/lib/uniform.default.css') }}" rel="stylesheet" type="text/css" />
+		<link href="{{ asset('assets/css/lib/select2.css') }}" type="text/css" rel="stylesheet">
+		<link href="{{ asset('assets/css/lib/bootstrap.datepicker.css') }}" type="text/css" rel="stylesheet">
 		<link href="{{ asset('assets/css/lib/font-awesome.css') }}" type="text/css" rel="stylesheet" />
 
 		<!-- global styles -->
 		<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/compiled/layout.css') }}">
 		<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/compiled/elements.css') }}">
 		<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/compiled/icons.css') }}">
-		<link href="{{ asset('assets/css/lib/select2.css') }}" type="text/css" rel="stylesheet">
+
 
 		<!-- this page specific styles -->
 		<link rel="stylesheet" href="{{ asset('assets/css/compiled/index.css') }}" type="text/css" media="screen" />
 		<link rel="stylesheet" href="{{ asset('assets/css/compiled/user-list.css') }}" type="text/css" media="screen" />
 		<link rel="stylesheet" href="{{ asset('assets/css/compiled/user-profile.css') }}" type="text/css" media="screen" />
+		<link rel="stylesheet" href="{{ asset('assets/css/compiled/form-showcase.css') }}" type="text/css" media="screen" />
 		<link rel="stylesheet" href="{{ asset('assets/css/lib/jquery.dataTables.css') }}" type="text/css" media="screen" />
 
 
+
 		<!-- open sans font -->
 		<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
 
-		<!-- lato font -->
-		<link href='//fonts.googleapis.com/css?family=Lato:300,400,700,900,300italic,400italic,700italic,900italic' rel='stylesheet' type='text/css'>
-
 		<!--[if lt IE 9]>
 		  <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
 		<![endif]-->
@@ -66,60 +65,25 @@
 	<!-- navbar -->
 
 
+	<!-- navbar -->
+	<header class="navbar navbar-inverse" role="banner">
 
-
-	 <!-- navbar -->
     <div class="navbar navbar-inverse">
         <div class="navbar-inner navbar-inverse">
-            <button type="button" class="btn btn-navbar visible-phone" id="menu-toggler">
+        <div class="navbar-header">
+            <button class="navbar-toggle" type="button" data-toggle="collapse" id="menu-toggler">
+                <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="brand" href="/">{{ Setting::getSettings()->site_name }}</a>
-			</ul>
-
-
-            <ul class="nav pull-right">
+            <a class="navbar-brand" href="/">{{ Setting::getSettings()->site_name }}</a>
+        </div>
+        <ul class="nav navbar-nav pull-right hidden-xs">
             @if (Sentry::check())
-                <!-- <li class="hidden-phone">
-                    <input class="search" type="text" />
-                </li> -->
-				<!--
-				<li class="notification-dropdown hidden-phone">
-                    <a href="#" class="trigger">
-                        <i class="icon-warning-sign"></i>
-                        <span class="count">8</span>
-                    </a>
-                    <div class="pop-dialog">
-                        <div class="pointer right">
-                            <div class="arrow"></div>
-                            <div class="arrow_border"></div>
-                        </div>
-                        <div class="body">
-                            <a href="#" class="close-icon"><i class="icon-remove-sign"></i></a>
-                            <div class="notifications">
-                                <h3>You have 2 new notifications</h3>
-                                <a href="#" class="item">
-                                    <i class="icon-signin"></i> (these are placeholder)
-                                    <span class="time"><i class="icon-time"></i> 13 min.</span>
-                                </a>
-                                <a href="#" class="item">
-                                    <i class="icon-signin"></i> Warranty expiring!
-                                    <span class="time"><i class="icon-time"></i> 18 min.</span>
-                                </a>
-                                <div class="footer">
-                                    <a href="#" class="logout">View all notifications</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </li> -->
-
 
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle hidden-phone" data-toggle="dropdown">
+                    <a href="#" class="dropdown-toggle hidden-xs hidden-sm" data-toggle="dropdown">
                         Welcome, {{ Sentry::getUser()->first_name }}
                         <b class="caret"></b>
                     </a>
@@ -189,14 +153,15 @@
             </ul>
         </div>
     </div>
+    </header>
     <!-- end navbar -->
 
 	@if (Sentry::check())
-	 <!-- sidebar -->
+	<!-- sidebar -->
     <div id="sidebar-nav">
         <ul id="dashboard-menu">
 
-            <li{{ (Request::is('hardware') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
+            <li{{ (Request::is('hardware*') ? ' class="active"><div class="pointer"><div class="arrow"></div><div class="arrow_border"></div></div>' : '>') }}
                 <a href="#" class="dropdown-toggle">
                     <i class="icon-barcode"></i>
                     <span>Assets</span>
@@ -241,22 +206,19 @@
 <!-- main container -->
     <div class="content">
 
-
-        <div class="container-fluid">
-
 		@if ((Sentry::check()) && (Sentry::getUser()->hasAccess('admin')))
         <!-- upper main stats -->
             <div id="main-stats">
-                <div class="row-fluid stats-row">
-                    <div class="span3 stat">
-                        <div class="data">
+            <div class="row stats-row">
+                <div class="col-md-3 col-sm-3 stat">
+                    <div class="data">
                             <a href="{{ URL::to('hardware') }}">
                             	<span class="number">{{ number_format(Asset::assetcount()) }}</span>
                            	 	<span style="color:black">total assets</span>
                             </a>
                         </div>
                     </div>
-                    <div class="span3 stat">
+                    <div class="col-md-3 col-sm-3 stat">
                         <div class="data">
                             <a href="{{ URL::to('hardware?RTD=true') }}">
                             	<span class="number">{{ number_format(Asset::availassetcount()) }}</span>
@@ -264,7 +226,7 @@
                             </a>
                         </div>
                     </div>
-                    <div class="span3 stat">
+                    <div class="col-md-3 col-sm-3 stat">
                         <div class="data">
                             <a href="{{ URL::to('admin/licenses') }}">
                             	<span class="number">{{ number_format(License::assetcount()) }}</span>
@@ -272,8 +234,7 @@
                             </a>
                         </div>
                     </div>
-
-                    <div class="span3 stat last">
+                    <div class="col-md-3 col-sm-3 stat last">
                         <div class="data">
                         	<a href="{{ URL::to('admin/licenses') }}">
                             	<span class="number">{{ number_format(License::availassetcount()) }}</span>
@@ -292,7 +253,7 @@
 
 
                  <!-- Notifications -->
-			@include('frontend/notifications')
+				@include('frontend/notifications')
 
 			<!-- Content -->
 			@yield('content')
@@ -301,7 +262,7 @@
                 </div>
 		  </div>
        </div>
-    </div>
+
 
 	<footer>
     <div id="footer">
@@ -314,16 +275,10 @@
 
     <!-- end main container -->
 
-
-
 	<!-- scripts -->
     <script src="//code.jquery.com/jquery-latest.js"></script>
     <script src="{{ asset('assets/js/bootstrap.min.js') }}"></script>
-    <script src="{{ asset('assets/js/jquery-ui-1.10.2.custom.min.js') }}"></script>
-    <!-- knob -->
     <script src="{{ asset('assets/js/jquery.knob.js') }}"></script>
-
-
     <script src="{{ asset('assets/js/select2.min.js') }}"></script>
     <script src="{{ asset('assets/js/jquery.uniform.min.js') }}"></script>
     <script src="{{ asset('assets/js/bootstrap.datepicker.js') }}"></script>
@@ -387,9 +342,11 @@
             var title = $(this).attr('data-title');
 
 			if (!$('#dataConfirmModal').length) {
-				$('body').append('<div id="dataConfirmModal" class="modal" role="dialog" aria-labelledby="dataConfirmLabel" aria-hidden="true"><div class="modal-header"><button type="button" class="close " data-dismiss="modal" aria-hidden="true">×</button><h3 id="dataConfirmLabel">'+title+'</h3></div><div class="modal-body">'+message+'</div><div class="modal-footer"><button class="btn-flat white" data-dismiss="modal" aria-hidden="true">No</button> <a class="btn-flat danger" id="dataConfirmOK">Yes</a></div></div>');
+				$('body').append('<div class="modal fade" id="dataConfirmModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button><h4 class="modal-title" id="myModalLabel">'+title+'</h4></div><div class="modal-body">'+message+'</div><div class="modal-footer"><button type="button" class="btn btn-default" data-dismiss="modal">Close</button><a class="btn btn-danger" id="dataConfirmOK">Yes</a></div></div></div></div>');
 			}
 
+
+
 			$('#dataConfirmModal').find('.modal-body').text(message);
 			$('#dataConfirmOK').attr('href', href);
 			$('#dataConfirmModal').modal({show:true});

app/views/backend/licenses/checkin.blade.php

@@ -8,62 +8,59 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		<a href="{{ route('licenses') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+<div class="row header">
+    <div class="col-md-12">
+		<a href="{{ route('licenses') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3> Checkin License </h3>
 	</div>
-
-	<h3>Checkin License</h3>
 </div>
 
+<div class="row form-wrapper">
+<!-- left column -->
+<div class="col-md-10 column">
 
 <form class="form-horizontal" method="post" action="" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-			<!-- Asset Tag -->
-			<div class="control-group">
-				<label class="control-label" for="asset_tag">Asset Tag</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="asset_tag" id="asset_tag" value="{{ $licenseseat->license->asset_tag }}" />
+
+			<!-- Asset name -->
+		  	<div class="form-group">
+			<label class="col-sm-2 control-label">Asset Name</label>
+				<div class="col-md-6">
+				  <p class="form-control-static">{{ $licenseseat->license->name }}</p>
+				</div>
+		  	</div>
+
+		  	<!-- Serial -->
+		  	<div class="form-group">
+			<label class="col-sm-2 control-label">Serial</label>
+				<div class="col-md-6">
+				  <p class="form-control-static">{{ $licenseseat->license->serial }}</p>
+				</div>
+		  	</div>
+
+			<!-- Note -->
+			<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+				<label for="note" class="col-md-2 control-label">Note</label>
+				<div class="col-md-7">
+					<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{ Input::old('note', $licenseseat->note) }}" />
+					{{ $errors->first('note', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
-
-			<!-- Asset Name -->
-			<div class="control-group">
-				<label class="control-label" for="name">Asset Name</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="name" id="asset_name" value="{{ $licenseseat->license->name }}" />
-				</div>
-			</div>
-			<!-- Serial -->
-			<div class="control-group">
-				<label class="control-label" for="serial">Serial</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="serial" id="serial" value="{{ $licenseseat->license->serial }}" />
-				</div>
-			</div>
-
-			<!-- Notes -->
-			<div class="control-group {{ $errors->has('note') ? 'error' : '' }}">
-				<label class="control-label" for="note">Notes</label>
-				<div class="controls">
-					<input class="span6" type="text" name="note" id="note" value="{{ Input::old('note', $licenseseat->note) }}" />
-					{{ $errors->first('note', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
-				</div>
-			</div>
-
-
-
 			<!-- Form actions -->
-			<div class="control-group">
-				<div class="controls">
-					<a class="btn btn-link" href="{{ route('licenses') }}">@lang('general.cancel')</a>
-					<button type="submit" class="btn-flat success">@lang('general.checkin')</button>
+				<div class="form-group">
+				<label class="col-md-2 control-label"></label>
+					<div class="col-md-7">
+						<a class="btn btn-link" href="{{ route('licenses') }}">@lang('general.cancel')</a>
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.checkin')</button>
+					</div>
 				</div>
-			</div>
+
+
 </form>
+</div>
+</div>
 
-
-@stop
+@stop

app/views/backend/licenses/checkout.blade.php

@@ -8,69 +8,72 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		<a href="{{ route('licenses') }}"  class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+<div class="row header">
+    <div class="col-md-12">
+		<a href="{{ route('hardware') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>
+			Checkout License to User
+		</h3>
 	</div>
-
-	<h3>Checkout License to User</h3>
-
 </div>
 
+<div class="row form-wrapper">
+<!-- left column -->
+<div class="col-md-10 column">
+
 <form class="form-horizontal" method="post" action="" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-			<!-- Asset Tag -->
-			<div class="control-group">
-				<label class="control-label" for="asset_tag">Asset Tag</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="asset_tag" id="asset_tag" value="{{ $licenseseat->license->asset_tag }}" />
+			<!-- Asset name -->
+		  	<div class="form-group">
+			<label class="col-sm-2 control-label">Asset Name</label>
+				<div class="col-md-6">
+				  <p class="form-control-static">{{ $licenseseat->license->name }}</p>
 				</div>
-			</div>
+		  	</div>
 
-			<!-- Asset Name -->
-			<div class="control-group">
-				<label class="control-label" for="name">Asset Name</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="name" id="asset_name" value="{{ $licenseseat->license->name }}" />
-				</div>
-			</div>
 			<!-- Serial -->
-			<div class="control-group">
-				<label class="control-label" for="serial">Serial</label>
-				<div class="controls">
-					<input class="span4" readonly="readonly" type="text" name="serial" id="serial" value="{{ $licenseseat->license->serial }}" />
+		  	<div class="form-group">
+			<label class="col-sm-2 control-label">Serial</label>
+				<div class="col-md-6">
+				  <p class="form-control-static">{{ $licenseseat->license->serial }}</p>
 				</div>
-			</div>
+		  	</div>
 
 			<!-- User -->
-			<div class="control-group {{ $errors->has('assigned_to') ? 'error' : '' }}">
-				<label class="control-label" for="parent">Checkout to</label>
-				<div class="controls">
-					{{ Form::select('assigned_to', $users_list , Input::old('assigned_to'), array('class'=>'select2', 'style'=>'min-width:350px')) }}
-					{{ $errors->first('user_id', '<span class="help-inline">:message</span>') }}
+			<div class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">
+				<label for="assigned_to" class="col-md-2 control-label">Checkout to</label>
+				<div class="col-md-7">
+					{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $licenseseat->assigned_to), array('class'=>'select2', 'style'=>'min-width:350px')) }}
+					{{ $errors->first('assigned_to', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
-			<!-- Notes -->
-			<div class="control-group {{ $errors->has('note') ? 'error' : '' }}">
-				<label class="control-label" for="note">Notes</label>
-				<div class="controls">
-					<input class="span6" type="text" name="note" id="note" value="{{ Input::old('notes', $licenseseat->note) }}" />
-					{{ $errors->first('note', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
+			<!-- Note -->
+			<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+				<label for="note" class="col-md-2 control-label">Note</label>
+				<div class="col-md-7">
+					<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{ Input::old('note', $licenseseat->note) }}" />
+					{{ $errors->first('note', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 				</div>
 			</div>
 
+
 			<!-- Form actions -->
-			<div class="control-group">
-				<div class="controls">
+			<div class="form-group">
+			<label class="col-md-2 control-label"></label>
+				<div class="col-md-7">
 					<a class="btn btn-link" href="{{ route('licenses') }}">@lang('general.cancel')</a>
-					<button type="submit" class="btn-flat success">@lang('general.checkout')</button>
+					<button type="submit"  class="btn btn-success"><i class="icon-ok icon-white"></i>  @lang('general.checkout')</button>
 				</div>
 			</div>
+
+
 </form>
 
+</div>
+</div>
 
 @stop

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="control-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Software Name</label>
-				<div class="controls">
-					<input class="span6" 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="control-group {{ $errors->has('serial') ? 'error' : '' }}">
-				<label class="control-label" for="serial">Serial</label>
-				<div class="controls">
-					<input class="span6" 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="control-group {{ $errors->has('license_name') ? 'error' : '' }}">
-				<label class="control-label" for="license_name">Licensed to Name</label>
-				<div class="controls">
-					<input class="span6" 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="control-group {{ $errors->has('license_email') ? 'error' : '' }}">
-				<label class="control-label" for="license_email">Licensed to Email</label>
-				<div class="controls">
-					<input class="span6" 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="control-group {{ $errors->has('seats') ? 'error' : '' }}">
-				<label class="control-label" for="seats">Seats</label>
-				<div class="controls">
-					<input class="span1" 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="control-group {{ $errors->has('order_number') ? 'error' : '' }}">
-				<label class="control-label" for="order_number">Order Number</label>
-				<div class="controls">
-					<input class="span4" 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="control-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
-				<label class="control-label" for="purchase_cost">Purchase Cost</label>
-				<div class="controls">
-					$ <input class="span2" 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="control-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="control-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="control-group {{ $errors->has('notes') ? 'error' : '' }}">
-				<label class="control-label" for="notes">Notes</label>
-				<div class="controls">
-					<input class="span6" 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="control-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-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
-		</div>
-	</div>
 </form>
-
+</div>
 
 @stop

app/views/backend/licenses/index.blade.php

@@ -7,21 +7,24 @@ 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">
-			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.title')</th>
-			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.serial')</th>
-			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.assigned_to')</th>
-			<th class="span2" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
+			<th class="col-md-3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.title')</th>
+			<th class="col-md-3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.serial')</th>
+			<th class="col-md-3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.assigned_to')</th>
+			<th class="col-md-2" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -32,7 +35,7 @@ Licenses ::
 			<tr>
 
 					<td><a href="{{ route('view/license', $license->id) }}">{{ $license->name }}</a>
-					@if ($license->seats ==1)
+					@if ($license->seats == 1)
 						({{ $license->seats }} seat)
 					@else
 						({{ $license->seats }} seats)
@@ -42,8 +45,8 @@ Licenses ::
 					<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
 					<td></td>
 					<td>
-					<a href="{{ route('update/license', $license->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/license', $license->id) }}" data-content="Are you sure you wish to delete this license?" data-title="Delete {{ htmlspecialchars($license->name) }}?" onClick="return false;">@lang('button.delete')</a>
+					<a href="{{ route('update/license', $license->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/license', $license->id) }}" data-content="Are you sure you wish to delete this license?" data-title="Delete {{ htmlspecialchars($license->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 
 
 					</td>
@@ -59,17 +62,19 @@ Licenses ::
 					 </td>
 					<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
 					<td>
-					@if ($licensedto->assigned_to)
-						<a href="{{ route('view/user', $licensedto->id) }}">
+					@if (($licensedto->assigned_to) && ($licensedto->deleted_at == NULL))
+						<a href="{{ route('view/user', $licensedto->assigned_to) }}">
 					{{ $licensedto->user->fullName() }}
 					</a>
+					@elseif (($licensedto->assigned_to) && ($licensedto->deleted_at != NULL))
+						<del>{{ $licensedto->user->fullName() }}</del>
 					@endif
 					</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>
 

app/views/backend/licenses/view.blade.php

@@ -8,10 +8,10 @@ View License {{ $license->name }} ::
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
 
-                <div class="btn-group pull-right">
+<div class="row header">
+    <div class="col-md-12">
+    	<div class="btn-group pull-right">
 					<button class="btn glow">Actions</button>
 					<button class="btn glow dropdown-toggle" data-toggle="dropdown">
 						<span class="caret"></span>
@@ -26,23 +26,24 @@ View License {{ $license->name }} ::
 						<li><a href="{{ route('update/license', $license->id) }}">Edit License</a></li>
 					</ul>
 				</div>
+			<h3 class="name">History for ({{ $license->name }})</h3>
+
+	</div>
+</div>
+
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
 
-				<h3 class="name">History for ({{ $license->name }})</h3>
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-                            <br>
                             <!-- checked out assets table -->
-
 							<h6>{{ $license->seats }} License Seats</h6>
                             <table class="table table-hover">
                                 <thead>
                                     <tr>
-                                    	<th class="span2">Seat</th>
-                                         <th class="span6">User</th>
-                                         <th class="span2"></th>
+                                    	<th class="col-md-2">Seat</th>
+                                         <th class="col-md-6">User</th>
+                                         <th class="col-md-2"></th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -82,12 +83,12 @@ View License {{ $license->name }} ::
                             <table class="table table-hover">
                                 <thead>
                                     <tr>
-                                    	<th class="span1"></th>
-                                        <th class="span3"><span class="line"></span>Date</th>
-                                        <th class="span3"><span class="line"></span>Admin</th>
-                                        <th class="span3"><span class="line"></span>Action</th>
-                                        <th class="span3"><span class="line"></span>User</th>
-                                        <th class="span3"><span class="line"></span>Note</th>
+                                    	<th class="col-md-1"></th>
+                                        <th class="col-md-3"><span class="line"></span>Date</th>
+                                        <th class="col-md-3"><span class="line"></span>Admin</th>
+                                        <th class="col-md-3"><span class="line"></span>Action</th>
+                                        <th class="col-md-3"><span class="line"></span>User</th>
+                                        <th class="col-md-3"><span class="line"></span>Note</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -108,9 +109,10 @@ View License {{ $license->name }} ::
 										<td>{{ $log->action_type }}</td>
 
 										<td>
-											@if (($log->checkedout_to) && ($log->checkedout_to > 0 ))
+											@if (isset($log->checkedout_to))
 											<a href="{{ route('view/user', $log->checkedout_to) }}">
-												{{ $log->userlog->fullName() }}
+											{{ $log->userlog->fullName() }}
+
 											</a>
 											@endif
 										</td>
@@ -139,13 +141,10 @@ View License {{ $license->name }} ::
                                 </tbody>
                             </table>
 
-
-
-                        </div>
                     </div>
 
                     <!-- side address column -->
-                    <div class="span3 address pull-right">
+                    <div class="col-md-3 col-xs-12 address pull-right">
                     <h6><br>License Info:</h6>
                        		<ul>
 								@if ($license->serial)

app/views/backend/locations/edit.blade.php

@@ -14,95 +14,112 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<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>
+<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
-
-
-	</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="control-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Location Name</label>
-				<div class="controls">
-					<input class="span4" 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="control-group {{ $errors->has('address') ? 'error' : '' }}">
-				<label class="control-label" for="address">Street Address 1</label>
-				<div class="controls">
-					<input class="span4" 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="control-group {{ $errors->has('address2') ? 'error' : '' }}">
-				<label class="control-label" for="address2">Street Address 2</label>
-				<div class="controls">
-					<input class="span4" 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="control-group {{ $errors->has('city') ? 'error' : '' }}">
-				<label class="control-label" for="name">City</label>
-				<div class="controls">
-					<input class="span4" 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="control-group {{ $errors->has('state') ? 'error' : '' }}">
-				<label class="control-label" for="state">State Abbrev</label>
-				<div class="controls">
-					<input class="span2" 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="control-group {{ $errors->has('zip') ? 'error' : '' }}">
-				<label class="control-label" for="zip">Postal Code</label>
-				<div class="controls">
-					<input class="span2" 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="control-group {{ $errors->has('country') ? 'error' : '' }}">
-				<label class="control-label" for="state">Country Abbrev</label>
-				<div class="controls">
-					<input class="span2" 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="control-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>
 
 

app/views/backend/locations/index.blade.php

@@ -8,25 +8,25 @@ 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">
-			<th class="span3">@lang('admin/locations/table.name')</th>
-			<th class="span3">Address</th>
-			<th class="span2">@lang('admin/locations/table.city'),
+			<th class="col-md-3">@lang('admin/locations/table.name')</th>
+			<th class="col-md-3">Address</th>
+			<th class="col-md-2">@lang('admin/locations/table.city'),
 			 @lang('admin/locations/table.state')
 			@lang('admin/locations/table.country')</th>
-			<th class="span2">@lang('table.actions')</th>
+			<th class="col-md-2">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -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

app/views/backend/manufacturers/edit.blade.php

@@ -12,50 +12,70 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		<a href="{{ route('manufacturers') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-	</div>
-
-	<h3>
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('manufacturers') }}" class="btn-flat gray pull-right"><i class="icon-plus-sign icon-white"></i> Back</a>
+		<h3>
 		@if ($manufacturer->id)
 		Update Manufacturer
 		@else
 			Create manufacturer
 		@endif
-
 	</h3>
+	</div>
 </div>
 
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
+
+
 
 <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">
-
-		<div class="tab-pane active" id="tab-general">
-			<!-- Category Title -->
-			<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Manufacturer Name</label>
-				<div class="controls">
-					<input type="text" name="name" id="name" value="{{ Input::old('name', $manufacturer->name) }}" />
-					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-				</div>
+			<!-- Name -->
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<label for="name" class="col-md-2 control-label">Manufacturer Name</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $manufacturer->name) }}" />
+						{{ $errors->first('name', '<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">
+				@if ($manufacturer->id)
+				<a class="btn btn-link" href="{{ route('view/manufacturer', $manufacturer->id) }}">@lang('general.cancel')</a>
+				@else
+				<a class="btn btn-link" href="{{ route('manufacturers') }}">@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 actions -->
-	<div class="control-group">
-		<div class="controls">
-			<a class="btn btn-link" href="{{ route('manufacturers') }}">@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>
+<br><br><br><br>
 
+</div>
+
+	<!-- side address column -->
+   <div class="col-md-3 col-xs-12 address pull-right">
+		<br /><br />
+		<h6>Have Some Haiku</h6>
+		<p>Serious error.<br>
+		All shortcuts have disappeared.<br>
+		Screen. Mind. Both are blank.</p>
+
+
+	</div>
+
+</div>
 
 @stop

app/views/backend/manufacturers/index.blade.php

@@ -8,22 +8,24 @@ Asset Manufacturers ::
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-		<a href="{{ route('create/manufacturer') }}" 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/manufacturer') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Asset Manufacturers</h3>
 	</div>
-
-	<h3>Asset Manufacturers</h3>
 </div>
 
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
 
-<div class="row-fluid table">
 <table id="example">
 	<thead>
 		<tr role="row">
-			<th class="span6">@lang('admin/manufacturers/table.title')</th>
-			<th class="span3">@lang('table.actions')</th>
+			<th class="col-md-7">@lang('admin/manufacturers/table.title')</th>
+			<th class="col-md-2">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -31,8 +33,11 @@ Asset Manufacturers ::
 		<tr>
 			<td>{{ $manufacturer->name }}</td>
 			<td>
-				<a href="{{ route('update/manufacturer', $manufacturer->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/manufacturer', $manufacturer->id) }}" data-content="Are you sure you wish to delete this manufacturer?" data-title="Delete {{ htmlspecialchars($manufacturer->name) }}?" onClick="return false;">@lang('button.delete')</a>
+
+				<a href="{{ route('update/manufacturer', $manufacturer->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/manufacturer', $manufacturer->id) }}" data-content="Are you sure you wish to delete this manufacturer?" data-title="Delete {{ htmlspecialchars($manufacturer->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
+
+
 			</td>
 		</tr>
 		@endforeach
@@ -40,4 +45,23 @@ Asset Manufacturers ::
 </table>
 </div>
 
+	<!-- side address column -->
+   <div class="col-md-3 col-xs-12 address pull-right">
+		<br /><br />
+		<h6>Have Some Haiku</h6>
+		<p>The Staples truck came.<br>
+		Left thirteen cardboard boxes.<br>
+		Honey stained maple.</p>
+
+		<p>----------</p>
+
+		<p>I'm sorry, there's – um -<br>
+		insufficient – what's-it-called?<br>
+		The term eludes me...</p>
+
+	</div>
+
+</div>
+
+
 @stop

app/views/backend/models/edit.blade.php

@@ -12,80 +12,80 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
-	<div class="pull-right">
-		<a href="{{ route('models') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
-	</div>
-
-	<h3>
+<div class="row header">
+    <div class="col-md-12">
+    		<a href="{{ route('models') }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>
 		@if ($model->id)
 		Update Model
 		@else
 			Create New Model
 		@endif
-	</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() }}" />
 
 
-		<!-- General tab -->
-		<div class="tab-pane active" id="tab-general">
-			<!-- Model Title -->
-			<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
-				<label class="control-label" for="name">Model Name</label>
-				<div class="controls">
-					<input type="text" name="name" id="name" value="{{ Input::old('name', $model->name) }}" />
-					{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-				</div>
+
+			<!-- Model name -->
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<label for="name" class="col-md-2 control-label">Model Name</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $model->name) }}" />
+						{{ $errors->first('name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
 
-			<div class="control-group {{ $errors->has('modelno') ? 'error' : '' }}">
-				<label class="control-label" for="modelno">Model No.</label>
-				<div class="controls">
-					<input type="text" name="modelno" id="modelno" value="{{ Input::old('modelno', $model->modelno) }}" />
-					{{ $errors->first('modelno', '<span class="help-inline">:message</span>') }}
-				</div>
+			<!-- Model No. -->
+			<div class="form-group {{ $errors->has('modelno') ? ' has-error' : '' }}">
+				<label for="modelno" class="col-md-2 control-label">Model No.</label>
+					<div class="col-md-7">
+						<input class="form-control" type="text" name="modelno" id="modelno" value="{{ Input::old('modelno', $model->modelno) }}" />
+						{{ $errors->first('modelno', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
 
-			<!-- Manufacturer -->
-			<div class="control-group {{ $errors->has('manufacturer_id') ? 'error' : '' }}">
-				<label class="control-label" for="parent">Manufacturer</label>
-				<div class="controls">
-					{{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $model->manufacturer_id), array('class'=>'select2', 'style'=>'width:250px')) }}
-					{{ $errors->first('manufacturer_id', '<span class="help-inline">:message</span>') }}
-				</div>
+			<div class="form-group {{ $errors->has('manufacturer_id') ? ' has-error' : '' }}">
+				<label for="manufacturer_id" class="col-md-2 control-label">Manufacturer</label>
+					<div class="col-md-7">
+						{{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $model->manufacturer_id), array('class'=>'select2', 'style'=>'width:350px')) }}
+						{{ $errors->first('manufacturer_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
 
 			<!-- Depreciation -->
-			<div class="control-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
-				<label class="control-label" for="parent">Depreciation</label>
-				<div class="controls">
-					{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $model->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }}
-					{{ $errors->first('depreciation_id', '<span class="help-inline">:message</span>') }}
-				</div>
+			<div class="form-group {{ $errors->has('depreciation_id') ? ' has-error' : '' }}">
+				<label for="depreciation_id" class="col-md-2 control-label">Depreciation</label>
+					<div class="col-md-7">
+						{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $model->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>
 
 			<!-- Category -->
-			<div class="control-group {{ $errors->has('category_id') ? 'error' : '' }}">
-				<label class="control-label" for="parent">Category</label>
-				<div class="controls">
-					{{ Form::select('category_id', $category_list , Input::old('category_id', $model->category_id), array('class'=>'select2', 'style'=>'width:250px')) }}
-					{{ $errors->first('category_id', '<span class="help-inline">:message</span>') }}
-				</div>
+			<div class="form-group {{ $errors->has('category_id') ? ' has-error' : '' }}">
+				<label for="category_id" class="col-md-2 control-label">Category</label>
+					<div class="col-md-7">
+						{{ Form::select('category_id', $category_list , Input::old('category_id', $model->category_id), array('class'=>'select2', 'style'=>'width:350px')) }}
+						{{ $errors->first('category_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
 
-
-	</div>
-
-	<!-- Form Actions -->
-	<div class="control-group">
-		<div class="controls">
-			<a class="btn btn-link" href="{{ route('models') }}">@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 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('models') }}">Cancel</a>
+					<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+				</div>
+			</div>
 </form>
+</div>
 @stop

app/views/backend/models/index.blade.php

@@ -8,24 +8,24 @@ Asset Models ::
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
 
-	<div class="pull-right">
-			<a href="{{ route('create/model') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i> Create New</a>
-		</div>
-
-	<h3>Asset Models</h3>
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/model') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Asset Models</h3>
+	</div>
 </div>
 
+<div class="row form-wrapper">
 <table id="example">
 	<thead>
 		<tr role="row">
-			<th class="span3">@lang('admin/models/table.title')</th>
-			<th class="span2">@lang('admin/models/table.modelnumber')</th>
-			<th class="span1">@lang('admin/models/table.numassets')</th>
-			<th class="span2">Depreciation</th>
-			<th class="span1">Category</th>
-			<th class="span2">@lang('table.actions')</th>
+			<th class="col-md-3">@lang('admin/models/table.title')</th>
+			<th class="col-md-2">@lang('admin/models/table.modelnumber')</th>
+			<th class="col-md-1">@lang('admin/models/table.numassets')</th>
+			<th class="col-md-2">Depreciation</th>
+			<th class="col-md-2">Category</th>
+			<th class="col-md-2">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -44,11 +44,11 @@ Asset Models ::
 			<td>
 			@if ($model->category)
 			{{ $model->category->name }}
-			@endif</td>
+			@endif
+			</td>
 			<td>
-				<a href="{{ route('update/model', $model->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/model', $model->id) }}" data-content="Are you sure you wish to delete this model?" data-title="Delete {{ htmlspecialchars($model->name) }}?" onClick="return false;">@lang('button.delete')</a>
-
+				<a href="{{ route('update/model', $model->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/model', $model->id) }}" data-content="Are you sure you wish to delete this model?" data-title="Delete {{ htmlspecialchars($model->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 			</td>
 		</tr>
 		@endforeach

app/views/backend/models/view.blade.php

@@ -8,43 +8,36 @@ View Model {{ $model->model_tag }} ::
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-                <div class="btn-group pull-right">
-					<button class="btn glow">Actions</button>
-					<button class="btn glow dropdown-toggle" data-toggle="dropdown">
-						<span class="caret"></span>
-					</button>
-					<ul class="dropdown-menu">
-						<li><a href="{{ route('update/model', $model->id) }}">Edit Asset</a></li>
-					</ul>
-				</div>
 
-				<h3 class="name">History for {{ $model->name }} </h3>
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('update/model', $model->id) }}" class="btn btn-default pull-right"><i class="icon-plus-sign icon-white"></i> Update Model</a>
+		<h3 class="name">History for {{ $model->name }} </h3>
+	</div>
+</div>
+
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
 
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-                            <br>
                             <!-- checked out models table -->
 							@if (count($model->assets) > 0)
                            <table id="example">
 							<thead>
 								<tr role="row">
-                                        <th class="span3">Name</th>
-                                        <th class="span3">Asset Tag</th>
-                                        <th class="span3">User</th>
-                                        <th class="span2">Actions</th>
+                                        <th class="col-md-3">Name</th>
+                                        <th class="col-md-3">Asset Tag</th>
+                                        <th class="col-md-3">User</th>
+                                        <th class="col-md-2">Actions</th>
                                     </tr>
                                 </thead>
                                 <tbody>
 
 									@foreach ($model->assets as $modelassets)
 									<tr>
-										<td><a href="{{ route('view/asset', $modelassets->id) }}">{{ $modelassets->name }}</a></td>
-										<td><a href="{{ route('view/asset', $modelassets->id) }}">{{ $modelassets->asset_tag }}</a></td>
+										<td><a href="{{ route('view/hardware', $modelassets->id) }}">{{ $modelassets->name }}</a></td>
+										<td><a href="{{ route('view/hardware', $modelassets->id) }}">{{ $modelassets->asset_tag }}</a></td>
 										<td>
 										@if ($modelassets->assigneduser)
 										<a href="{{ route('view/user', $modelassets->assigned_to) }}">
@@ -54,9 +47,9 @@ View Model {{ $model->model_tag }} ::
 										</td>
 										<td>
 										@if ($modelassets->assigned_to != 0)
-											<a href="{{ route('checkin/asset', $modelassets->id) }}" class="btn-flat info">Checkin</a>
+											<a href="{{ route('checkin/hardware', $modelassets->id) }}" class="btn-flat info">Checkin</a>
 										@else
-											<a href="{{ route('checkout/asset', $modelassets->id) }}" class="btn-flat success">Checkout</a>
+											<a href="{{ route('checkout/hardware', $modelassets->id) }}" class="btn-flat success">Checkout</a>
 										@endif
 										</td>
 
@@ -77,12 +70,11 @@ View Model {{ $model->model_tag }} ::
                             @endif
 
                         </div>
-                    </div>
+
 
                     <!-- side address column -->
-                    <div class="span3 address pull-right">
-
-                    <h6><br>More Info:</h6>
+                    <div class="col-md-3 col-xs-12 address pull-right">
+                    <h6>More Info:</h6>
                        		<ul>
 
 

app/views/backend/reports/index.blade.php

@@ -28,20 +28,20 @@ Depreciation Report
 	<h3>Depreciation Report</h3>
 </div>
 
-
-<div class="row-fluid table">
+<div class="row table">
+<div class="col-md-12">
 <table id="example">
 		<thead>
 			<tr role="row">
-			<th class="span2">@lang('admin/hardware/table.asset_tag')</th>
-			<th class="span2">@lang('admin/hardware/table.title')</th>
-			<th class="span2">@lang('admin/hardware/table.serial')</th>
-			<th class="span3">@lang('admin/hardware/table.checkoutto')</th>
-			<th class="span2">@lang('admin/hardware/table.location')</th>
-			<th class="span2">@lang('admin/hardware/table.purchase_date')</th>
-			<th class="span1">@lang('admin/hardware/table.purchase_cost')</th>
-			<th class="span1">@lang('admin/hardware/table.book_value')</th>
-			<th class="span1">Diff</th>
+			<th class="col-sm-2">@lang('admin/hardware/table.asset_tag')</th>
+			<th class="col-sm-2">@lang('admin/hardware/table.title')</th>
+			<th class="col-sm-2">@lang('admin/hardware/table.serial')</th>
+			<th class="col-sm-3">@lang('admin/hardware/table.checkoutto')</th>
+			<th class="col-sm-2">@lang('admin/hardware/table.location')</th>
+			<th class="col-sm-2">@lang('admin/hardware/table.purchase_date')</th>
+			<th class="col-sm-1">@lang('admin/hardware/table.purchase_cost')</th>
+			<th class="col-sm-1">@lang('admin/hardware/table.book_value')</th>
+			<th class="col-sm-1">Diff</th>
 		</tr>
 	</thead>
 	<tbody>

app/views/backend/settings/edit.blade.php

@@ -20,7 +20,7 @@
 
                 <div class="row-fluid profile">
                     <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
+                    <div class="col-md-9 bio">
                         <div class="profile-box">
                             <br>
                             <!-- checked out assets table -->
@@ -31,17 +31,17 @@
 
 								@foreach ($settings as $setting)
 
-									<div class="control-group {{ $errors->has('site_name') ? 'error' : '' }}">
+									<div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
 										<label class="control-label" for="site_name">Site Name</label>
 										<div class="controls">
-											<input class="span9" type="text" name="site_name" id="site_name" value="{{ Input::old('site_name', $setting->site_name) }}" />
+											<input class="col-md-9" type="text" name="site_name" id="site_name" value="{{ Input::old('site_name', $setting->site_name) }}" />
 											{{ $errors->first('site_name', '<span class="help-inline">:message</span>') }}
 										</div>
 									</div>
-									<div class="control-group {{ $errors->has('per_page') ? 'error' : '' }}">
+									<div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}">
 										<label class="control-label" for="per_page">Results Per Page</label>
 										<div class="controls">
-											<input class="span1" type="text" name="per_page" id="per_page" value="{{ Input::old('per_page', $setting->per_page) }}" />
+											<input class="col-md-1" type="text" name="per_page" id="per_page" value="{{ Input::old('per_page', $setting->per_page) }}" />
 											{{ $errors->first('per_page', '<span class="help-inline">:message</span>') }}
 										</div>
 									</div>
@@ -51,7 +51,7 @@
 								@endforeach
 
 								<!-- Form actions -->
-									<div class="control-group">
+									<div class="form-group">
 										<div class="controls">
 											<a class="btn btn-link" href="{{ route('app') }}">@lang('general.cancel')</a>
 											<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
@@ -63,7 +63,7 @@
 </div>
 
                     <!-- side address column -->
-                    <div class="span3 address pull-right">
+                    <div class="col-md-3 address pull-right">
 					<br /><br />
 						<p>These settings let you customize certain aspects of your installation. </p>
 

app/views/backend/settings/index.blade.php

@@ -21,7 +21,7 @@ Settings ::
 
                 <div class="row-fluid profile">
                     <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
+                    <div class="col-md-9 bio">
                         <div class="profile-box">
                             <br>
                             <!-- checked out assets table -->
@@ -29,8 +29,8 @@ Settings ::
                             <table class="table table-hover">
 							<thead>
 								<tr>
-									<th class="span3">Setting</th>
-									<th class="span3"><span class="line"></span>Value</th>
+									<th class="col-md-3">Setting</th>
+									<th class="col-md-3"><span class="line"></span>Value</th>
 								</tr>
 							</thead>
 							<tbody>
@@ -51,7 +51,7 @@ Settings ::
                     </div>
 
                     <!-- side address column -->
-                    <div class="span3 address pull-right">
+                    <div class="col-md-3 address pull-right">
 						<br /><br />
 
 						<p>These settings let you customize certain aspects of your installation. </p>

app/views/backend/statuslabels/edit.blade.php

@@ -12,54 +12,51 @@
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-                <div class="pull-right">
-					<a href="{{ route('statuslabels') }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('statuslabels') }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> Back</a>
+		<h3>Status Labels</h3>
+	</div>
+</div>
+
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
+
+		<!-- checked out assets table -->
+
+		<form class="form-horizontal" method="post" action="" autocomplete="off">
+			<!-- CSRF Token -->
+			<input type="hidden" name="_token" value="{{ csrf_token() }}" />
+
+
+
+			<!-- Asset Title -->
+			<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+				<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>
+			</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('statuslabels') }}">Cancel</a>
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+					</div>
 				</div>
-
-				<h3 class="name">
-					@if ($statuslabel->id)
-						Update Status Label
-					@else
-						Create New Status Label
-					@endif
-				</h3>
+		</form>
+		<br><br><br><br>
 
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-                            <br>
-                            <!-- checked out assets table -->
-
-                            <form class="form-horizontal" method="post" action="" autocomplete="off">
-								<!-- CSRF Token -->
-								<input type="hidden" name="_token" value="{{ csrf_token() }}" />
-
-									<div class="control-group {{ $errors->has('name') ? 'error' : '' }}">
-										<label class="control-label" for="name">Status Label</label>
-										<div class="controls">
-											<input class="span9" type="text" name="name" id="name" value="{{ Input::old('name', $statuslabel->name) }}" />
-											{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
-										</div>
-									</div>
-
-									<!-- Form actions -->
-									<div class="control-group">
-										<div class="controls">
-											<a class="btn btn-link" href="{{ route('statuslabels') }}">@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>
 </div>
 
                     <!-- side address column -->
-                    <div class="span3 address pull-right">
+                    <div class="col-md-3 address pull-right">
 					<br /><br />
 						<h6>About Status Labels</h6>
 						<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>

app/views/backend/statuslabels/index.blade.php

@@ -8,55 +8,57 @@ Status Labels
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-                <div class="pull-right">
-					<a href="{{ route('create/statuslabel') }}" class="btn-flat success"><i class="icon-plus-sign icon-white"></i>  Create New</a>
-				</div>
-
-				<h3 class="name">Status Labels</h3>
 
 
-                <div class="row-fluid profile">
-                    <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
-                        <div class="profile-box">
-                            <br>
-                            <!-- checked out assets table -->
+<div class="row header">
+    <div class="col-md-12">
+    	<a href="{{ route('create/statuslabel') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> Create New</a>
+		<h3>Status Labels</h3>
+	</div>
+</div>
 
-                            <table id="example">
-							<thead>
-								<tr role="row">
-									<th class="span4">@lang('admin/statuslabels/table.name')</th>
-									<th class="span2"><span class="line"></span>@lang('table.actions')</th>
-								</tr>
-							</thead>
-							<tbody>
-								@foreach ($statuslabels as $statuslabel)
-								<tr>
-									<td>{{ $statuslabel->name }}</td>
-									<td>
-										<a href="{{ route('update/statuslabel', $statuslabel->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/statuslabel', $statuslabel->id) }}" data-content="Are you sure you wish to delete this status label?" data-title="Delete {{ htmlspecialchars($statuslabel->name) }}?" onClick="return false;">@lang('button.delete')</a>
-									</td>
-								</tr>
-								@endforeach
-							</tbody>
-						</table>
+<div class="user-profile">
+<div class="row profile">
+<div class="col-md-9 bio">
 
-                        </div>
-                    </div>
+			<br>
+			<!-- checked out assets table -->
 
-                    <!-- side address column -->
-                    <div class="span3 address pull-right">
-						<br /><br />
-						<h6>About Status Labels</h6>
-						<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>
+			<table id="example">
+			<thead>
+				<tr role="row">
+					<th class="col-md-4">@lang('admin/statuslabels/table.name')</th>
+					<th class="col-md-2">@lang('table.actions')</th>
+				</tr>
+			</thead>
+			<tbody>
+				@foreach ($statuslabels as $statuslabel)
+				<tr>
+					<td>{{ $statuslabel->name }}</td>
+					<td>
+						<a href="{{ route('update/statuslabel', $statuslabel->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/statuslabel', $statuslabel->id) }}" data-content="Are you sure you wish to delete this status label?" data-title="Delete {{ htmlspecialchars($statuslabel->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
+					</td>
+				</tr>
+				@endforeach
+			</tbody>
+		</table>
 
-						<p>It could be broken, out for diagnostics, out for
-						repair, lost or stolen, etc. Status labels allow your team to show the progression.</p>
+		</div>
+
+	<!-- side address column -->
+   <div class="col-md-3 col-xs-12 address pull-right">
+		<br /><br />
+		<h6>About Status Labels</h6>
+		<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>
+
+		<p>It could be broken, out for diagnostics, out for
+		repair, lost or stolen, etc. Status labels allow your team to show the progression.</p>
+
+	</div>
+
+</div>
 
-                    </div>
 @stop
 
 

app/views/backend/users/create.blade.php

@@ -34,7 +34,7 @@ Create a User ::
 		<!-- General tab -->
 		<div class="tab-pane active" id="tab-general">
 			<!-- First Name -->
-			<div class="control-group {{ $errors->has('first_name') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('first_name') ? 'error' : '' }}">
 				<label class="control-label" for="first_name">First Name</label>
 				<div class="controls">
 					<input type="text" name="first_name" id="first_name" value="{{ Input::old('first_name') }}" />
@@ -43,7 +43,7 @@ Create a User ::
 			</div>
 
 			<!-- Last Name -->
-			<div class="control-group {{ $errors->has('last_name') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('last_name') ? 'error' : '' }}">
 				<label class="control-label" for="last_name">Last Name</label>
 				<div class="controls">
 					<input type="text" name="last_name" id="last_name" value="{{ Input::old('last_name') }}" />
@@ -52,7 +52,7 @@ Create a User ::
 			</div>
 
 			<!-- Jobtitle -->
-			<div class="control-group {{ $errors->has('jobtitle') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('jobtitle') ? 'error' : '' }}">
 				<label class="control-label" for="jobtitle">Job Title</label>
 				<div class="controls">
 					<input type="text" name="jobtitle" id="jobtitle" value="{{ Input::old('jobtitle') }}" />
@@ -61,7 +61,7 @@ Create a User ::
 			</div>
 
 			<!-- Location -->
-			<div class="control-group {{ $errors->has('phone') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('phone') ? 'error' : '' }}">
 				<label class="control-label" for="location_id">Location</label>
 				<div class="controls">
 					<div class="field-box">
@@ -72,7 +72,7 @@ Create a User ::
 			</div>
 
 			<!-- Phone -->
-			<div class="control-group {{ $errors->has('phone') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('phone') ? 'error' : '' }}">
 				<label class="control-label" for="jobtitle">Phone</label>
 				<div class="controls">
 					<input type="text" name="phone" id="phone" value="{{ Input::old('phone') }}" />
@@ -81,7 +81,7 @@ Create a User ::
 			</div>
 
 			<!-- Email -->
-			<div class="control-group {{ $errors->has('email') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('email') ? 'error' : '' }}">
 				<label class="control-label" for="email">Email</label>
 				<div class="controls">
 					<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
@@ -90,7 +90,7 @@ Create a User ::
 			</div>
 
 			<!-- Password -->
-			<div class="control-group {{ $errors->has('password') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('password') ? 'error' : '' }}">
 				<label class="control-label" for="password">Password</label>
 				<div class="controls">
 					<input type="password" name="password" id="password" value="" />
@@ -99,7 +99,7 @@ Create a User ::
 			</div>
 
 			<!-- Password Confirm -->
-			<div class="control-group {{ $errors->has('password_confirm') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('password_confirm') ? 'error' : '' }}">
 				<label class="control-label" for="password_confirm">Confirm Password</label>
 				<div class="controls">
 					<input type="password" name="password_confirm" id="password_confirm" value="" />
@@ -108,7 +108,7 @@ Create a User ::
 			</div>
 
 			<!-- Activation Status -->
-			<div class="control-group {{ $errors->has('activated') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('activated') ? 'error' : '' }}">
 				<label class="control-label" for="activated">User Activated</label>
 				<div class="controls">
 					<select name="activated" id="activated">
@@ -120,7 +120,7 @@ Create a User ::
 			</div>
 
 			<!-- Groups -->
-			<div class="control-group {{ $errors->has('groups') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('groups') ? 'error' : '' }}">
 				<label class="control-label" for="groups">Groups</label>
 				<div class="controls">
 					<select name="groups[]" id="groups[]" multiple="multiple">
@@ -138,7 +138,7 @@ Create a User ::
 
 		<!-- Permissions tab -->
 		<div class="tab-pane" id="tab-permissions">
-			<div class="control-group">
+			<div class="form-group">
 				<div class="controls">
 
 					@foreach ($permissions as $area => $permissions)
@@ -146,8 +146,8 @@ Create a User ::
 						<legend>{{ $area }}</legend>
 
 						@foreach ($permissions as $permission)
-						<div class="control-group">
-							<label class="control-group">{{ $permission['label'] }}</label>
+						<div class="form-group">
+							<label class="form-group">{{ $permission['label'] }}</label>
 
 							<div class="radio inline">
 								<label for="{{ $permission['permission'] }}_allow" onclick="">
@@ -183,7 +183,7 @@ Create a User ::
 	</div>
 
 	<!-- Form Actions -->
-	<div class="control-group">
+	<div class="form-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('users') }}">Cancel</a>
 			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Create User</button>

app/views/backend/users/edit.blade.php

@@ -33,7 +33,7 @@ Update User {{ $user->fullName() }} ::
 		<!-- General tab -->
 		<div class="tab-pane active" id="tab-general">
 			<!-- First Name -->
-			<div class="control-group {{ $errors->has('first_name') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('first_name') ? 'error' : '' }}">
 				<label class="control-label" for="first_name">First Name</label>
 				<div class="controls">
 					<input type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" />
@@ -42,7 +42,7 @@ Update User {{ $user->fullName() }} ::
 			</div>
 
 			<!-- Last Name -->
-			<div class="control-group {{ $errors->has('last_name') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('last_name') ? 'error' : '' }}">
 				<label class="control-label" for="last_name">Last Name</label>
 				<div class="controls">
 					<input type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" />
@@ -51,7 +51,7 @@ Update User {{ $user->fullName() }} ::
 			</div>
 
 			<!-- Jobtitle -->
-			<div class="control-group {{ $errors->has('jobtitle') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('jobtitle') ? 'error' : '' }}">
 				<label class="control-label" for="jobtitle">Job Title</label>
 				<div class="controls">
 					<input type="text" name="jobtitle" id="jobtitle" value="{{ Input::old('jobtitle', $user->jobtitle) }}" />
@@ -60,7 +60,7 @@ Update User {{ $user->fullName() }} ::
 			</div>
 
 			<!-- Location -->
-			<div class="control-group {{ $errors->has('phone') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('phone') ? 'error' : '' }}">
 				<label class="control-label" for="location_id">Location</label>
 				<div class="controls">
 					<div class="field-box">
@@ -71,7 +71,7 @@ Update User {{ $user->fullName() }} ::
 			</div>
 
 			<!-- Phone -->
-			<div class="control-group {{ $errors->has('phone') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('phone') ? 'error' : '' }}">
 				<label class="control-label" for="jobtitle">Phone</label>
 				<div class="controls">
 					<input type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" />
@@ -81,7 +81,7 @@ Update User {{ $user->fullName() }} ::
 
 
 			<!-- Email -->
-			<div class="control-group {{ $errors->has('email') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('email') ? 'error' : '' }}">
 				<label class="control-label" for="email">Email</label>
 				<div class="controls">
 					<input type="email" name="email" id="email" value="{{ Input::old('email', $user->email) }}" />
@@ -90,7 +90,7 @@ Update User {{ $user->fullName() }} ::
 			</div>
 
 			<!-- Password -->
-			<div class="control-group {{ $errors->has('password') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('password') ? 'error' : '' }}">
 				<label class="control-label" for="password">Password</label>
 				<div class="controls">
 					<input type="password" name="password" id="password" value="" />
@@ -99,7 +99,7 @@ Update User {{ $user->fullName() }} ::
 			</div>
 
 			<!-- Password Confirm -->
-			<div class="control-group {{ $errors->has('password_confirm') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('password_confirm') ? 'error' : '' }}">
 				<label class="control-label" for="password_confirm">Confirm Password</label>
 				<div class="controls">
 					<input type="password" name="password_confirm" id="password_confirm" value="" />
@@ -108,7 +108,7 @@ Update User {{ $user->fullName() }} ::
 			</div>
 
 			<!-- Activation Status -->
-			<div class="control-group {{ $errors->has('activated') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('activated') ? 'error' : '' }}">
 				<label class="control-label" for="activated">User Activated</label>
 				<div class="controls">
 					<select{{ ($user->id === Sentry::getId() ? ' disabled="disabled"' : '') }} name="activated" id="activated">
@@ -120,7 +120,7 @@ Update User {{ $user->fullName() }} ::
 			</div>
 
 			<!-- Groups -->
-			<div class="control-group {{ $errors->has('groups') ? 'error' : '' }}">
+			<div class="form-group {{ $errors->has('groups') ? 'error' : '' }}">
 				<label class="control-label" for="groups">Groups</label>
 				<div class="controls">
 					<select name="groups[]" id="groups[]" multiple>
@@ -139,15 +139,15 @@ Update User {{ $user->fullName() }} ::
 		<!-- Permissions tab -->
 		<div class="tab-pane" id="tab-permissions">
 			<div class="controls">
-				<div class="control-group">
+				<div class="form-group">
 
 					@foreach ($permissions as $area => $permissions)
 					<fieldset>
 						<legend>{{ $area }}</legend>
 
 						@foreach ($permissions as $permission)
-						<div class="control-group">
-							<label class="control-group">{{ $permission['label'] }}</label>
+						<div class="form-group">
+							<label class="form-group">{{ $permission['label'] }}</label>
 
 							<div class="radio inline">
 								<label for="{{ $permission['permission'] }}_allow" onclick="">
@@ -183,13 +183,13 @@ Update User {{ $user->fullName() }} ::
 	</div>
 
 	<!-- Form Actions -->
-	<div class="control-group">
+	<div class="form-group">
 		<div class="controls">
 			<a class="btn btn-link" href="{{ route('users') }}">@lang('general.cancel')</a>
 
 			<button type="reset" class="btn">Reset</button>
 
-			<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+			<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 </form>

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="span3">@lang('admin/users/table.name')</th>
-			<th class="span2">@lang('admin/users/table.email')</th>
-			<th class="span1">Assets</th>
-			<th class="span1">Licenses</th>
-			<th class="span1">@lang('admin/users/table.activated')</th>
-			<th class="span3">@lang('table.actions')</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-2">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -67,19 +58,20 @@ User Management ::
 			<td>{{ $user->licenses->count() }}</td>
 			<td>{{ $user->isActivated() ? '<i class="icon-ok"></i>' : ''}}</td>
 			<td>
-			@if ($user->id > 3)
+			@if ($user->id > 2)
 				@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>
+				<span class="btn-flat danger disabled"><i class="icon-trash icon-white"></i></span>
 				@endif
 				@endif
 			@endif
+
 			</td>
 		</tr>
 		@endforeach
@@ -96,8 +88,4 @@ User Management ::
 </div>
 @endif
 
-@if ($users->getTotal() > 10)
-{{ $users->links() }}
-@endif
-
 @stop

app/views/backend/users/view.blade.php

@@ -8,23 +8,41 @@ View User {{ $user->fullName() }} ::
 
 {{-- Page content --}}
 @section('content')
-<div id="pad-wrapper" class="user-profile">
-                <!-- header -->
-                <div class="row-fluid header">
-                    <div class="span8">
-                        <img src="{{ $user->gravatar() }}" class="avatar img-circle">
-                        <h3 class="name">{{ $user->fullName() }}</h3>
-                        <span class="area">{{ $user->jobtitle }}</span>
-                    </div>
 
-                    <a href="{{ route('update/user', $user->id) }}" class="btn-flat white large pull-right edit"><i class="icon-pencil"></i> @lang('button.edit') This User</a>
+<div class="user-profile">
+            <!-- header -->
+            <div class="row header">
+                <div class="col-md-8">
+                    <img src="{{ $user->gravatar() }}" class="avatar img-circle">
+                    <h3 class="name">{{ $user->fullName() }}</h3>
+                    <span class="area">{{ $user->jobtitle }}</span>
                 </div>
+                @if ($user->deleted_at != NULL)
+                		    <a href="{{ route('restore/user', $user->id) }}" class="btn btn-warning pull-right edit"><i class="icon-pencil"></i> Restore This User</a>
+
+                @else
+                	    <a href="{{ route('update/user', $user->id) }}" class="btn-flat white large pull-right edit"><i class="icon-pencil"></i> @lang('button.edit') This User</a>
+
+                @endif
+            </div>
+
+            <div class="row profile">
 
-                <div class="row-fluid profile">
                     <!-- bio, new note & orders column -->
-                    <div class="span9 bio">
+                    <div class="col-md-9 bio">
                         <div class="profile-box">
 
+						@if ($user->deleted_at != NULL)
+
+							<div class="col-md-12">
+								<div class="alert alert-danger">
+									<i class="icon-exclamation-sign"></i>
+									<strong>Warning: </strong>
+									 This user has been deleted. You will have to restore this user to edit them or assign them new assets.
+								</div>
+							</div>
+
+						@endif
 
                             <h6>Assets Checked Out to {{ $user->first_name }}</h6>
                             <br>
@@ -33,10 +51,10 @@ View User {{ $user->fullName() }} ::
                             <table class="table table-hover">
                                 <thead>
                                     <tr>
-                                    	<th class="span3">Asset Type</th>
-                                        <th class="span3"><span class="line"></span>Asset Tag</th>
-                                        <th class="span3"><span class="line"></span>Name</th>
-                                        <th class="span3"><span class="line"></span>Actions</th>
+                                    	<th class="col-md-3">Asset Type</th>
+                                        <th class="col-md-3"><span class="line"></span>Asset Tag</th>
+                                        <th class="col-md-3"><span class="line"></span>Name</th>
+                                        <th class="col-md-3"><span class="line"></span>Actions</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -59,7 +77,7 @@ View User {{ $user->fullName() }} ::
                             </table>
                             @else
 
-                            <div class="col-md-6">
+                            <div class="col-md-12">
 								<div class="alert alert-warning alert-block">
 									<i class="icon-warning-sign"></i>
 									@lang('admin/users/table.noresults')
@@ -74,10 +92,10 @@ View User {{ $user->fullName() }} ::
                             <table class="table table-hover">
                                 <thead>
                                     <tr>
-                                    	<th class="span3">Asset Type</th>
-                                    	<th class="span3">Serial</th>
-                                        <th class="span3"><span class="line"></span>Name</th>
-                                        <th class="span3"><span class="line"></span>Actions</th>
+                                    	<th class="col-md-3">Asset Type</th>
+                                    	<th class="col-md-3">Serial</th>
+                                        <th class="col-md-3"><span class="line"></span>Name</th>
+                                        <th class="col-md-3"><span class="line"></span>Actions</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -100,7 +118,7 @@ View User {{ $user->fullName() }} ::
                             </table>
                             @else
 
-                            <div class="col-md-6">
+                            <div class="col-md-12">
 								<div class="alert alert-warning alert-block">
 									<i class="icon-warning-sign"></i>
 									@lang('admin/users/table.noresults')
@@ -117,10 +135,10 @@ View User {{ $user->fullName() }} ::
                             <table class="table table-hover">
                                 <thead>
                                     <tr>
-                                        <th class="span3">Date</th>
-                                        <th class="span3"><span class="line"></span>Action</th>
-                                        <th class="span3"><span class="line"></span>Asset</th>
-                                        <th class="span3"><span class="line"></span>By</th>
+                                        <th class="col-md-3">Date</th>
+                                        <th class="col-md-3"><span class="line"></span>Action</th>
+                                        <th class="col-md-3"><span class="line"></span>Asset</th>
+                                        <th class="col-md-3"><span class="line"></span>By</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -144,7 +162,8 @@ View User {{ $user->fullName() }} ::
                             </table>
                             @else
 
-                            <div class="col-md-6">
+
+                            <div class="col-md-12">
 								<div class="alert alert-warning alert-block">
 									<i class="icon-warning-sign"></i>
 									@lang('admin/users/table.noresults')
@@ -156,7 +175,7 @@ View User {{ $user->fullName() }} ::
                     </div>
 
                     <!-- side address column -->
-                    <div class="span3 address pull-right">
+                    <div class="col-md-3 address pull-right">
 
 
                         <h6>Contact  {{ $user->first_name }}</h6>

app/views/frontend/account/change-email.blade.php

@@ -7,10 +7,15 @@ Change your Email
 
 {{-- Account page content --}}
 @section('account-content')
-<div class="page-header">
-	<h4>Change your Email</h4>
+<div class="row header">
+
+    <div class="col-md-12">
+		<h3>Change Your Email</h3>
+	</div>
 </div>
 
+<div class="row form-wrapper">
+
 <form method="post" action="" class="form-horizontal" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
@@ -19,36 +24,36 @@ Change your Email
 	<input type="hidden" name="formType" value="change-email" />
 
 	<!-- New Email -->
-	<div class="control-group{{ $errors->first('email', ' error') }}">
-		<label class="control-label" for="email">New Email</label>
-		<div class="controls">
-			<input type="email" name="email" id="email" value="" />
-			{{ $errors->first('email', '<span class="help-block">:message</span>') }}
+	<div class="form-group {{ $errors->has('email') ? ' has-error' : '' }}">
+		<label for="email" class="col-md-2 control-label">New Email</label>
+		<div class="col-md-5">
+			<input class="form-control" type="email" name="email" id="email" value="{{ Input::old('email', $user->email) }}" />
+			{{ $errors->first('email', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
-
 	<!-- Confirm New Email -->
-	<div class="control-group{{ $errors->first('email_confirm', ' error') }}">
-		<label class="control-label" for="email_confirm">Confirm New Email</label>
-		<div class="controls">
-			<input type="email" name="email_confirm" id="email_confirm" value="" />
-			{{ $errors->first('email_confirm', '<span class="help-block">:message</span>') }}
+	<div class="form-group {{ $errors->has('email_confirm') ? ' has-error' : '' }}">
+		<label for="email_confirm" class="col-md-2 control-label">New Email</label>
+		<div class="col-md-5">
+			<input class="form-control" type="email" name="email_confirm" id="email_confirm" />
+			{{ $errors->first('email_confirm', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
 
 	<!-- Current Password -->
-	<div class="control-group{{ $errors->first('current_password', ' error') }}">
-		<label class="control-label" for="current_password">Current Password</label>
-		<div class="controls">
-			<input type="password" name="current_password" id="current_password" value="" />
-			{{ $errors->first('current_password', '<span class="help-block">:message</span>') }}
+	<div class="form-group {{ $errors->has('current_password') ? ' has-error' : '' }}">
+		<label for="current_password" class="col-md-2 control-label">Current Password</label>
+		<div class="col-md-5">
+			<input class="form-control" type="password" name="current_password" id="current_password" />
+			{{ $errors->first('current_password', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
 
+
 	<hr>
 
 	<!-- Form actions -->
-	<div class="control-group">
+	<div class="form-group">
 		<div class="controls">
 			<button type="submit" class="btn">Update Email</button>
 

app/views/frontend/account/change-password.blade.php

@@ -7,45 +7,48 @@ Change your Password
 
 {{-- Account page content --}}
 @section('account-content')
-<div class="page-header">
-	<h4>Change your Password</h4>
+<div class="row header">
+
+    <div class="col-md-12">
+		<h3>Change Your Password</h3>
+	</div>
 </div>
 
+<div class="row form-wrapper">
 <form method="post" action="" class="form-horizontal" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
 	<!-- Old Password -->
-	<div class="control-group{{ $errors->first('old_password', ' error') }}">
-		<label class="control-label" for="old_password">Old Password</label>
-		<div class="controls">
-			<input type="password" name="old_password" id="old_password" value="" />
-			{{ $errors->first('old_password', '<span class="help-block">:message</span>') }}
+	<div class="form-group {{ $errors->has('old_password') ? ' has-error' : '' }}">
+		<label for="old_password" class="col-md-2 control-label">Old Password</label>
+		<div class="col-md-5">
+			<input class="form-control" type="text" name="old_password" id="old_password" />
+			{{ $errors->first('old_password', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
 
-	<!-- New Password -->
-	<div class="control-group{{ $errors->first('password', ' error') }}">
-		<label class="control-label" for="password">New Password</label>
-		<div class="controls">
-			<input type="password" name="password" id="password" value="" />
-			{{ $errors->first('password', '<span class="help-block">:message</span>') }}
+	<div class="form-group {{ $errors->has('password') ? ' has-error' : '' }}">
+		<label for="password" class="col-md-2 control-label">New Password</label>
+		<div class="col-md-5">
+			<input class="form-control" type="password" name="password" id="password" />
+			{{ $errors->first('password', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
 
-	<!-- Confirm New Password  -->
-	<div class="control-group{{ $errors->first('password_confirm', ' error') }}">
-		<label class="control-label" for="password_confirm">Confirm New Password</label>
-		<div class="controls">
-			<input type="password" name="password_confirm" id="password_confirm" value="" />
-			{{ $errors->first('password_confirm', '<span class="help-block">:message</span>') }}
+
+	<div class="form-group {{ $errors->has('password_confirm') ? ' has-error' : '' }}">
+		<label for="password_confirm" class="col-md-2 control-label">New Password</label>
+		<div class="col-md-5">
+			<input class="form-control" type="password" name="password_confirm" id="password_confirm" />
+			{{ $errors->first('password_confirm', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
 
 	<hr>
 
 	<!-- Form actions -->
-	<div class="control-group">
+	<div class="form-group">
 		<div class="controls">
 			<button type="submit" class="btn">Update Password</button>
 
@@ -78,7 +81,7 @@ Change your Password
 				<input type="hidden" name="formType" value="change-email" />
 
 				<!-- Old Password -->
-				<div class="control-group{{ $errors->first('old_password', ' error') }}">
+				<div class="form-group{{ $errors->first('old_password', ' error') }}">
 					<label class="control-label" for="old_password">Old Password</label>
 					<div class="controls">
 						<input type="password" name="old_password" id="old_password" value="" />
@@ -87,7 +90,7 @@ Change your Password
 				</div>
 
 				<!-- New Email -->
-				<div class="control-group{{ $errors->first('email', ' error') }}">
+				<div class="form-group{{ $errors->first('email', ' error') }}">
 					<label class="control-label" for="email">New Email</label>
 					<div class="controls">
 						<input type="email" name="email" id="email" value="" />
@@ -96,7 +99,7 @@ Change your Password
 				</div>
 
 				<!-- Confirm New Email -->
-				<div class="control-group{{ $errors->first('email_confirm', ' error') }}">
+				<div class="form-group{{ $errors->first('email_confirm', ' error') }}">
 					<label class="control-label" for="email_confirm">Confirm New Email</label>
 					<div class="controls">
 						<input type="email" name="email_confirm" id="email_confirm" value="" />
@@ -104,14 +107,15 @@ Change your Password
 					</div>
 				</div>
 
-				<!-- Form actions -->
-				<div class="control-group">
-					<div class="controls">
-						<a class="btn" href="{{ route('home') }}">Cancel</a>
-
-						<button type="submit" class="btn btn-info">Update</button>
+				<!-- 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('home') }}">@lang('general.cancel')</a>
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
 					</div>
 				</div>
+
 			</form>
 		</div>
 	</div>

app/views/frontend/account/profile.blade.php

@@ -7,71 +7,80 @@ Your Profile
 
 {{-- Account page content --}}
 @section('account-content')
-<div class="page-header">
-	<h4>Update your Profile</h4>
+<div class="row header">
+
+    <div class="col-md-12">
+		<h3>Update Profile</h3>
+	</div>
 </div>
 
-<form method="post" action="" class="form-vertical" autocomplete="off">
+<div class="row form-wrapper">
+
+<form method="post"  class="form-horizontal" action="" class="form-vertical" autocomplete="off">
 	<!-- CSRF Token -->
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
 	<!-- First Name -->
-	<div class="control-group{{ $errors->first('first_name', ' error') }}">
-		<label class="control-label" for="first_name">First Name</label>
-		<div class="controls">
-			<input class="span4" type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" />
-			{{ $errors->first('first_name', '<span class="help-block">:message</span>') }}
+	<div class="form-group {{ $errors->has('first_name') ? ' has-error' : '' }}">
+		<label for="first_name" class="col-md-2 control-label">First Name</label>
+		<div class="col-md-5">
+			<input class="form-control" type="text" name="first_name" id="first_name" value="{{ Input::old('first_name', $user->first_name) }}" />
+			{{ $errors->first('first_name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
 
 	<!-- Last Name -->
-	<div class="control-group{{ $errors->first('last_name', ' error') }}">
-		<label class="control-label" for="last_name">Last Name</label>
-		<div class="controls">
-			<input class="span4" type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" />
-			{{ $errors->first('last_name', '<span class="help-block">:message</span>') }}
+	<div class="form-group {{ $errors->has('last_name') ? ' has-error' : '' }}">
+		<label for="last_name" class="col-md-2 control-label">Last Name</label>
+		<div class="col-md-5">
+			<input class="form-control" type="text" name="last_name" id="last_name" value="{{ Input::old('last_name', $user->last_name) }}" />
+			{{ $errors->first('last_name', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
 
 	<!-- Website URL -->
-	<div class="control-group{{ $errors->first('website', ' error') }}">
-		<label class="control-label" for="website">Website URL</label>
-		<div class="controls">
-			<input class="span4" type="text" name="website" id="website" value="{{ Input::old('website', $user->website) }}" />
-			{{ $errors->first('website', '<span class="help-block">:message</span>') }}
+	<div class="form-group {{ $errors->has('website') ? ' has-error' : '' }}">
+		<label for="website" class="col-md-2 control-label">Website</label>
+		<div class="col-md-5">
+			<input class="form-control" type="text" name="website" id="website" value="{{ Input::old('website', $user->website) }}" />
+			{{ $errors->first('website', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
 		</div>
 	</div>
 
-	<!-- Country -->
-	<div class="control-group{{ $errors->first('country', ' error') }}">
-		<label class="control-label" for="country">Country</label>
-		<div class="controls">
-			<input class="span4" type="text" name="country" id="country" value="{{ Input::old('country', $user->country) }}" />
-			{{ $errors->first('country', '<span class="help-block">:message</span>') }}
+	<!-- Location -->
+		<div class="form-group {{ $errors->has('phone') ? 'error' : '' }}">
+			<label class="col-md-2 control-label" for="location_id">Location</label>
+			<div class="col-md-5">
+				<div class="field-box">
+				{{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:300px')) }}
+				{{ $errors->first('location_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+				</div>
+			</div>
 		</div>
-	</div>
 
 	<!-- Gravatar Email -->
-	<div class="control-group{{ $errors->first('gravatar', ' error') }}">
-		<label class="control-label" for="gravatar">Gravatar Email <small>(Private)</small></label>
-		<div class="controls">
-			<input class="span4" type="text" name="gravatar" id="gravatar" value="{{ Input::old('gravatar', $user->gravatar) }}" />
-			{{ $errors->first('gravatar', '<span class="help-block">:message</span>') }}
-		</div>
-
-		<p>
-			<img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" />
-			<a href="http://gravatar.com">Change your avatar at Gravatar.com</a>.
+	<div class="form-group {{ $errors->has('gravatar') ? ' has-error' : '' }}">
+		<label for="gravatar" class="col-md-2 control-label">Gravatar Email <small>(Private)</small></label>
+		<div class="col-md-5">
+			<input class="form-control" type="text" name="gravatar" id="gravatar" value="{{ Input::old('gravatar', $user->gravatar) }}" />
+			{{ $errors->first('gravatar', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+			<p><img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" />
+			<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.
 		</p>
-	</div>
-
-	<hr>
-
-	<!-- Form actions -->
-	<div class="control-group">
-		<div class="controls">
-			<button type="submit" class="btn">Update your Profile</button>
 		</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('home') }}">@lang('general.cancel')</a>
+			<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
+		</div>
+	</div>
+
+
+
 </form>
+</div>
 @stop

app/views/frontend/auth/forgot-password-confirm.blade.php

@@ -16,7 +16,7 @@ Forgot Password ::
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
 	<!-- New Password -->
-	<div class="control-group{{ $errors->first('password', ' error') }}">
+	<div class="form-group{{ $errors->first('password', ' error') }}">
 		<label class="control-label" for="password">New Password</label>
 		<div class="controls">
 			<input type="password" name="password" id="password" value="{{ Input::old('password') }}" />
@@ -25,7 +25,7 @@ Forgot Password ::
 	</div>
 
 	<!-- Password Confirm -->
-	<div class="control-group{{ $errors->first('password_confirm', ' error') }}">
+	<div class="form-group{{ $errors->first('password_confirm', ' error') }}">
 		<label class="control-label" for="password_confirm">Password Confirmation</label>
 		<div class="controls">
 			<input type="password" name="password_confirm" id="password_confirm" value="{{ Input::old('password_confirm') }}" />
@@ -34,7 +34,7 @@ Forgot Password ::
 	</div>
 
 	<!-- Form actions -->
-	<div class="control-group">
+	<div class="form-group">
 		<div class="controls">
 			<a class="btn" href="{{ route('home') }}">Cancel</a>
 

app/views/frontend/auth/forgot-password.blade.php

@@ -16,7 +16,7 @@ Forgot Password ::
 	<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
 	<!-- Email -->
-	<div class="control-group{{ $errors->first('email', ' error') }}">
+	<div class="form-group{{ $errors->first('email', ' error') }}">
 		<label class="control-label" for="email">Email</label>
 		<div class="controls">
 			<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
@@ -25,7 +25,7 @@ Forgot Password ::
 	</div>
 
 	<!-- Form actions -->
-	<div class="control-group">
+	<div class="form-group">
 		<div class="controls">
 			<a class="btn" href="{{ route('home') }}">Cancel</a>
 

app/views/frontend/auth/signin.blade.php

@@ -8,53 +8,63 @@ Account Sign in ::
 
 {{-- Page content --}}
 @section('content')
-<div class="page-header">
-	<h3>Sign in into your account</h3>
+
+<div class="row header">
+    <div class="col-md-12">
+		<h3>Sign in into your account</h3>
+	</div>
 </div>
-<div class="row">
+
+<div class="row form-wrapper">
+
 	<form method="post" action="{{ route('signin') }}" class="form-horizontal">
 		<!-- CSRF Token -->
 		<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
-		<!-- Email -->
-		<div class="control-group{{ $errors->first('email', ' error') }}">
-			<label class="control-label" for="email">Email</label>
-			<div class="controls">
-				<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
-				{{ $errors->first('email', '<span class="help-block">:message</span>') }}
+			<div class="form-group">
+				<label class="col-md-6 control-label"></label>
+					<div class="col-md-5">
+						<br><a href="{{ route('forgot-password') }}" class="btn btn-link">I forgot my password</a>
+					</div>
+				</div>
+
+			<!-- Email -->
+			<div class="form-group{{ $errors->first('email', ' error') }}">
+				<label for="email" class="col-md-3 control-label">Email</label>
+					<div class="col-md-5">
+						<input class="form-control" type="email" name="email" id="email" value="{{ Input::old('email') }}" />
+						{{ $errors->first('email', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
-		</div>
 
-		<!-- Password -->
-		<div class="control-group{{ $errors->first('password', ' error') }}">
-			<label class="control-label" for="password">Password</label>
-			<div class="controls">
-				<input type="password" name="password" id="password" value="" />
-				{{ $errors->first('password', '<span class="help-block">:message</span>') }}
+			<!-- Password -->
+			<div class="form-group{{ $errors->first('password', ' error') }}">
+				<label for="password" class="col-md-3 control-label">Password</label>
+					<div class="col-md-5">
+						<input class="form-control" type="password" name="password" id="password" value="{{ Input::old('password') }}" />
+						{{ $errors->first('password', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
+					</div>
 			</div>
-		</div>
 
-		<!-- Remember me -->
-		<div class="control-group">
-			<div class="controls">
-			<label class="checkbox">
-				<input type="checkbox" name="remember-me" id="remember-me" value="1" /> Remember me
-			</label>
+			 <div class="field-box">
+				<label class="col-md-3 control-label checkbox-inline"></label>
+				  <input type="checkbox" name="remember-me" id="remember-me" value="1" /> Remember me
+				</label>
 			</div>
-		</div>
 
-		<hr>
+			<!-- Form actions -->
+				<div class="form-group">
+				<label class="col-md-6 control-label"></label>
+					<div class="col-md-5">
+						<a class="btn btn-link" href="{{ route('home') }}">Cancel</a>
+						<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Sign in</button>
+					</div>
+				</div>
+
+
 
-		<!-- Form actions -->
-		<div class="control-group">
-			<div class="controls">
-				<a class="btn" href="{{ route('home') }}">Cancel</a>
 
-				<button type="submit" class="btn">Sign in</button>
 
-				<a href="{{ route('forgot-password') }}" class="btn btn-link">I forgot my password</a>
-			</div>
-		</div>
 	</form>
 </div>
 @stop

app/views/frontend/auth/signup.blade.php

@@ -17,7 +17,7 @@ Account Sign up ::
 		<input type="hidden" name="_token" value="{{ csrf_token() }}" />
 
 		<!-- First Name -->
-		<div class="control-group{{ $errors->first('first_name', ' error') }}">
+		<div class="form-group{{ $errors->first('first_name', ' error') }}">
 		<label class="control-label" for="first_name">First Name</label>
 			<div class="controls">
 				<input type="text" name="first_name" id="first_name" value="{{ Input::old('first_name') }}" />
@@ -26,7 +26,7 @@ Account Sign up ::
 		</div>
 
 		<!-- Last Name -->
-		<div class="control-group{{ $errors->first('last_name', ' error') }}">
+		<div class="form-group{{ $errors->first('last_name', ' error') }}">
 			<label class="control-label" for="last_name">Last Name</label>
 			<div class="controls">
 				<input type="text" name="last_name" id="last_name" value="{{ Input::old('last_name') }}" />
@@ -35,7 +35,7 @@ Account Sign up ::
 		</div>
 
 		<!-- Email -->
-		<div class="control-group{{ $errors->first('email', ' error') }}">
+		<div class="form-group{{ $errors->first('email', ' error') }}">
 			<label class="control-label" for="email">Email</label>
 			<div class="controls">
 				<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
@@ -44,7 +44,7 @@ Account Sign up ::
 		</div>
 
 		<!-- Email Confirm -->
-		<div class="control-group{{ $errors->first('email_confirm', ' error') }}">
+		<div class="form-group{{ $errors->first('email_confirm', ' error') }}">
 			<label class="control-label" for="email_confirm">Confirm Email</label>
 			<div class="controls">
 				<input type="email" name="email_confirm" id="email_confirm" value="{{ Input::old('email_confirm') }}" />
@@ -53,7 +53,7 @@ Account Sign up ::
 		</div>
 
 		<!-- Password -->
-		<div class="control-group{{ $errors->first('password', ' error') }}">
+		<div class="form-group{{ $errors->first('password', ' error') }}">
 			<label class="control-label" for="password">Password</label>
 			<div class="controls">
 				<input type="password" name="password" id="password" value="" />
@@ -62,7 +62,7 @@ Account Sign up ::
 		</div>
 
 		<!-- Password Confirm -->
-		<div class="control-group{{ $errors->first('password_confirm', ' error') }}">
+		<div class="form-group{{ $errors->first('password_confirm', ' error') }}">
 			<label class="control-label" for="password_confirm">Confirm Password</label>
 			<div class="controls">
 				<input type="password" name="password_confirm" id="password_confirm" value="" />
@@ -73,7 +73,7 @@ Account Sign up ::
 		<hr>
 
 		<!-- Form actions -->
-		<div class="control-group">
+		<div class="form-group">
 			<div class="controls">
 				<a class="btn" href="{{ route('home') }}">Cancel</a>
 

app/views/frontend/layouts/account.blade.php

@@ -3,15 +3,15 @@
 {{-- Page content --}}
 @section('content')
 <div class="row">
-	<div class="span3">
+	<div class="col-md-3">
 		<ul class="nav nav-list">
-			<li class="nav-header">Main Menu</li>
 			<li{{ Request::is('account/profile') ? ' class="active"' : '' }}><a href="{{ URL::route('profile') }}">Profile</a></li>
 			<li{{ Request::is('account/change-password') ? ' class="active"' : '' }}><a href="{{ URL::route('change-password') }}">Change Password</a></li>
 			<li{{ Request::is('account/change-email') ? ' class="active"' : '' }}><a href="{{ URL::route('change-email') }}">Change Email</a></li>
+
 		</ul>
 	</div>
-	<div class="span9">
+	<div class="col-md-9">
 		@yield('account-content')
 	</div>
 </div>

app/views/frontend/notifications.blade.php

@@ -1,6 +1,6 @@
 @if ($errors->any())
-<div class="col-md-6">
-	<div class="alert alert-error alert-block">
+<div class="col-md-12">
+	<div class="alert alert-danger">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<i class="icon-exclamation-sign"></i>
 		<strong>Error: </strong>
@@ -11,8 +11,8 @@
 @endif
 
 @if ($message = Session::get('success'))
-<div class="col-md-6">
-	<div class="alert alert-success alert-block">
+<div class="col-md-12">
+	<div class="alert alert-success">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<i class="icon-ok"></i>
 		<strong>Success: </strong>
@@ -22,8 +22,8 @@
 @endif
 
 @if ($message = Session::get('error'))
-<div class="col-md-6">
-	<div class="alert alert-error alert-block">
+<div class="col-md-12">
+	<div class="alert alert alert-danger">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<i class="icon-exclamation-sign"></i>
 		<strong>Error: </strong>
@@ -33,8 +33,8 @@
 @endif
 
 @if ($message = Session::get('warning'))
-<div class="col-md-6">
-	<div class="alert alert-warning alert-block">
+<div class="col-md-12">
+	<div class="alert alert-warning">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<i class="icon-warning-sign"></i>
 		<strong>Warning: </strong>
@@ -44,8 +44,8 @@
 @endif
 
 @if ($message = Session::get('info'))
-<div class="col-md-6">
-	<div class="alert alert-info alert-block">
+<div class="col-md-12">
+	<div class="alert alert-info">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<i class="icon-info-sign"></i>
 		<strong>Info: </strong>

composer.json

@@ -20,9 +20,6 @@
 		]
 	},
 	"scripts": {
-		"post-install-cmd": [
-			"php artisan optimize"
-		],
 		"pre-update-cmd": [
 			"php artisan clear-compiled"
 		],

public/assets/css/bootstrap/bootstrap-overrides.css

@@ -2,13 +2,17 @@
 
 h1,h2,h3,h4,h5,h6{
 	font-weight: normal;
+	font-family: 'Open Sans', sans-serif;
 }
 
 /* COMPONENTS */
 
 
 /* labels */
-.label, .badge {font-weight: lighter;}
+.label, .badge {
+	font-weight: lighter;
+	font-size: 90%;
+}
 .label-success, .badge-success {
 	background-color: rgb(129, 189, 130);
 }
@@ -35,8 +39,8 @@ h1,h2,h3,h4,h5,h6{
 .alert-info [class*=" icon-"] {
 	color: #4993c6;
 }
-.alert-error [class^="icon-"], 
-.alert-error [class*=" icon-"] {
+.alert-danger [class^="icon-"], 
+.alert-danger [class*=" icon-"] {
 	color: #d5393e;
 }
 
@@ -136,6 +140,7 @@ select{
 input[type="file"] {
 	font-size: 12px;
 	line-height: 12px;
+	display: inline-block;
 }
 
 input[disabled], textarea[disabled], input[readonly], textarea[readonly] {
@@ -165,14 +170,13 @@ textarea::-webkit-input-placeholder {
 
 
 /* PREPEND & APPEND INPUT */
-.input-append input, 
-.input-prepend input, 
-.input-append .uneditable-input, 
-.input-prepend .uneditable-input {
+.input-group input, 
+.input-group input, 
+.input-group .uneditable-input, 
+.input-group .uneditable-input {
 	border: 1px solid #d6e2eb;
 }
-.input-append .add-on, 
-.input-prepend .add-on {
+.input-group .input-group-addon {
 	background-color: #f2f5f9;
 	border: 1px solid #d6e2eb;
 	padding: 4px 8px;
@@ -180,11 +184,9 @@ textarea::-webkit-input-placeholder {
 }
 
 /* NAVBAR */
-
 .navbar-inverse {
+	min-height: 48px;
 	margin-bottom: 0px;
-}
-.navbar-inverse .navbar-inner {
 	border-radius: 0px;
 	border-bottom: 1px solid #191e23;
 
@@ -197,25 +199,33 @@ textarea::-webkit-input-placeholder {
 	background: linear-gradient(to bottom,  #2c3742 0%,#28303a 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2c3742', endColorstr='#28303a',GradientType=0 ); /* IE6-9 */
 }
-.navbar-inverse .btn-navbar {
+/* navbar-nav*/
+.navbar-inverse .navbar-nav {
+	padding-right: 20px;
+}
+/* menu toggler */
+.navbar-inverse .navbar-toggle {
 	float: left;
 	margin-top: 10px;
+	margin-left: 15px;
 }
-.navbar-inverse .brand {
+/* navbar brand*/
+.navbar-inverse .navbar-brand {
 	color: #ffffff;
 	text-transform: uppercase;
 	font-weight: lighter;
-	padding: 12px 20px 12px;
+	padding: 11px 20px;
 }
-.navbar-inverse .brand strong {
+.navbar-inverse .navbar-brand strong {
 	font-weight: normal;
 }
+/* navbar links */
 .navbar-inverse .nav > li > a {
 	padding: 13px 15px 8px;
 	border-left: 1px solid #101417;
 	color: rgb(214, 214, 214);
 	outline: 0px;
-	height: 25px;
+	height: 46px;
 	transition: background .1s linear;
 	-moz-transition: background .1s linear; /* Firefox 4 */
 	-webkit-transition: background .1s linear; /* Safari and Chrome */
@@ -224,10 +234,21 @@ textarea::-webkit-input-placeholder {
 .navbar-inverse .nav > li > a:hover {
 	background: rgba(25, 31, 36,0.6);
 }
-/* TODO: deprecated mobile-menu, ya no se usa, remover despues de migrar todos los htmls al nuevo diseno */
-.navbar-inverse .mobile-menu .nav > li > a {
-	color: #fff;
-	border-left: 0px;
+/* dropdown caret */
+.dropdown .caret {
+	position: relative;
+	top: -1px;	
+}
+/* dropdown active */
+.dropdown.open > a, 
+.dropdown.open > a:hover, 
+.dropdown.open > a:focus {
+	border-color: #101417;
+}
+/* dropdown menu */
+.dropdown-menu > li > a {
+	font-size: 13px;
+	outline: none;
 }
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus,
@@ -238,88 +259,28 @@ textarea::-webkit-input-placeholder {
 
 
 /* PAGINATION */
-
-.pagination {
-	margin: 8px 0;
-}
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span,
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span{
-	font-size: 23px;
-	color: #bcc6d3;
-	padding: 1px 9px 3px 9px;
-}
-.pagination ul > li:last-child > a:hover,
-.pagination ul > li:last-child > span:hover,
-.pagination ul > li:first-child > a:hover,
-.pagination ul > li:first-child > span:hover{
-	color: #4f4f4f;
-}
-.pagination ul > li > a, .pagination ul > li > span{
-	border-color: #d0dde9;
-	color: #4f4f4f;
+.pagination > li > a, .pagination > li > span {
 	font-weight: 600;
-	padding: 2px 12px;
-	box-shadow: 0px 1px 0px 0px #efefef;
-	transition: background-color .1s linear;
-	-moz-transition: background-color .1s linear; /* Firefox 4 */
-	-webkit-transition: background-color .1s linear; /* Safari and Chrome */
-	-o-transition: background-color .1s linear;  /* Opera */
 }
-.pagination ul > li > a.active{
-	color: #3b9ff3;
-}
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-	background-color: #f5f5f5;
-}
-
-/* pagination inverse */
-
-.pagination.inverse ul > li:last-child > a,
-.pagination.inverse ul > li:last-child > span,
-.pagination.inverse ul > li:first-child > a,
-.pagination.inverse ul > li:first-child > span{
-	font-size: 23px;
+.pagination.inverse a,
+.pagination.inverse span {
+	background-color: #333e4a;
 	color: #fff;
-	padding: 1px 9px 3px 9px;
-}
-.pagination.inverse ul > li:last-child > a:hover,
-.pagination.inverse ul > li:last-child > span:hover,
-.pagination.inverse ul > li:first-child > a:hover,
-.pagination.inverse ul > li:first-child > span:hover{
-	color: #fff;
-}
-.pagination.inverse ul > li > a, .pagination.inverse ul > li > span{
 	border-top-color: #333e4a;
 	border-bottom-color: #333e4a;
 	border-right-color: #566676;
-	border-left: 0px;
-	color: rgb(241, 241, 241);
-	font-weight: 600;
-	padding: 2px 12px;
-	background: #333e4a;
-	transition: background-color .1s linear;
-	-moz-transition: background-color .1s linear; /* Firefox 4 */
-	-webkit-transition: background-color .1s linear; /* Safari and Chrome */
-	-o-transition: background-color .1s linear;  /* Opera */
+	border-left-color: #566676;
+} 
+.pagination.inverse a:hover,
+.pagination.inverse span:hover {
+	background-color: #000;
 }
-.pagination.inverse ul > li > a.active{
+.pagination.inverse > li.active > a {
 	color: #3b9ff3;
 	background-color: #212b36;
 	border-right-color: #212b36;
-	margin-left: -1px;
+	border-left-color: #212b36;
 }
-.pagination.inverse ul > li > a:hover,
-.pagination.inverse ul > li > a:focus,
-.pagination.inverse ul > .active > a,
-.pagination.inverse ul > .active > span {
-	background-color: #212b36;
-}
-
 
 /* TABLES*/
 
@@ -339,16 +300,17 @@ textarea::-webkit-input-placeholder {
 .table thead th{
 	font-weight: bold;
 	position: relative;
-	padding-bottom: 20px;
-	padding-top: 5px;
+	padding-bottom: 20px !important;
+	padding-top: 5px !important;
 	text-transform: uppercase;
 	font-size: 11px;
-	vertical-align: top;
+	vertical-align: top !important;
+	border-bottom: 0px !important;
 }
 .table td{
 	color: #526273;
-	border-top-color: #edf2f7;
-	vertical-align: middle;
+	border-top-color: #edf2f7 !important;
+	vertical-align: middle !important;
 }
 .table th.align-right,
 .table td.align-right {
@@ -366,4 +328,17 @@ table th span.line{
 	height: 10px;
 }
 
+/* modals */
+.modal-backdrop.in {
+	opacity: 0.5 !important;
+}
+
+
+/* override navbar toggle */
+@media (max-width: 768px) {
+  .navbar-toggle {
+    display: block !important;
+  }
+}
+
 

public/assets/css/compiled/calendar.css

@@ -12,7 +12,7 @@
   position: absolute;
   background: #fff;
   text-align: left;
-  width: 260px;
+  width: 300px;
   border: 1px solid #b2b4b6;
   box-shadow: 0px 0px 7px -1px rgba(0, 0, 0, 0.35);
   border-radius: 4px;
@@ -38,11 +38,13 @@
   position: relative;
   top: 5px;
   margin-left: 10px;
-  width: 70%;
+  width: 75%;
+  display: inline-block;
 }
 .calendar-wrapper .popup input[type="submit"] {
   float: right;
   margin-right: 15px;
+  margin-top: 15px;
 }
 .calendar-wrapper .popup i.close-pop {
   position: absolute;

public/assets/css/compiled/elements.css

@@ -11,6 +11,7 @@
   font-size: 12px;
 }
 .btn-group button.glow {
+  float: left;
   font-size: 11px;
   font-family: "Open sans", Helvetica, Arial;
   color: #313d4c;
@@ -66,6 +67,7 @@
 }
 .btn-group > .btn.glow {
   font-size: 12px;
+  float: left;
   font-weight: 500;
   padding: 6px 14px;
   color: #313d4c;
@@ -85,15 +87,12 @@
 .btn-group > .btn.glow.dropdown-toggle {
   padding: 6px 9px;
 }
-.btn-group > .btn.glow .caret {
-  margin-top: 6px;
-}
 
 /* FLAT BUTTONS */
 .btn-flat {
   display: inline-block;
   margin: 0;
-  line-height: 11px;
+  line-height: 15px;
   vertical-align: middle;
   font-size: 12px;
   text-shadow: none;
@@ -359,7 +358,7 @@
 .slider-button {
   display: block;
   width: 37px;
-  height: 21px;
+  height: 23px;
   line-height: 23px;
   background: #fff;
   border: 1px solid #d0dde9;
@@ -410,7 +409,7 @@
   font-size: 12px;
   border: none;
   padding: 1px 30px 0px 7px;
-  height: 25px;
+  height: 21px;
   -webkit-appearance: none;
   color: #737f8d;
   text-shadow: 1px 1px 1px #fff;
@@ -420,7 +419,7 @@
 /* jQuery UI Slider overrides */
 .ui-slider {
   border: 1px solid #cfdde8;
-  height: 4px;
+  height: 7px;
   background: #edeeef;
   box-shadow: inset 0px -3px 7px 0px #fff;
 }

public/assets/css/compiled/form-showcase.css

@@ -48,7 +48,6 @@
 }
 .form-page .form-wrapper label.checkbox,
 .form-page .form-wrapper label.radio {
-  padding-left: 0px;
   font-weight: lighter;
 }
 .form-page .form-wrapper label.checkbox input[type="checkbox"],
@@ -69,6 +68,13 @@
 .form-page .form-wrapper .column.pull-right .ui-select {
   width: 250px;
 }
+.form-page .form-wrapper .column.pull-right .input-group {
+  margin-bottom: 10px;
+  width: 250px;
+}
+.form-page .form-wrapper .column.pull-right .input-datepicker {
+  width: 250px;
+}
 .form-page .form-wrapper .select2-container {
   margin-left: 0px;
 }

public/assets/css/compiled/form-wizard.css

@@ -109,15 +109,17 @@
   position: relative;
   top: 2px;
 }
+.form-wrapper input[type="text"] {
+  width: 400px;
+}
 .form-wrapper.payment-info label {
   width: 150px;
 }
 .form-wrapper .alert-msg {
   display: block;
   margin-left: 120px;
-  position: relative;
-  top: -2px;
   margin-bottom: -4px;
+  margin-top: 10px;
 }
 .form-wrapper .alert-msg i {
   font-size: 14px;
@@ -167,4 +169,8 @@
   .wizard-steps {
     left: 0px;
   }
+
+  .form-wrapper input[type="text"] {
+    width: 200px;
+  }
 }

public/assets/css/compiled/gallery.css

@@ -1,9 +1,5 @@
-.gallery {
-  /* gallery popup */
-}
 .gallery .gallery-wrapper {
   text-align: center;
-  padding-left: 45px;
   position: relative;
 }
 .gallery .img-container {
@@ -46,6 +42,9 @@
 .gallery .img-container span.trash {
   top: 48%;
 }
+.gallery .new-img {
+  display: inline-block;
+}
 .gallery .new-img img {
   border: 2px dashed #dee3e8;
   cursor: pointer;
@@ -55,117 +54,6 @@
   opacity: 0.8;
   border-color: #ccc;
 }
-.gallery .popup {
-  position: absolute;
-  background: #fff;
-  text-align: left;
-  width: 260px;
-  border: 1px solid #2b3b48;
-  box-shadow: 0px 0px 12px -1px rgba(0, 0, 0, 0.45);
-  border-radius: 4px;
-  padding: 14px 20px 14px 20px;
-  z-index: 5;
-  left: 240px;
-  top: 285px;
-}
-.gallery .popup h5 {
-  text-transform: uppercase;
-  font-weight: 600;
-  margin: 0 0 21px 0;
-  font-size: 14px;
-  color: #7e91aa;
-}
-.gallery .popup .thumb {
-  float: left;
-}
-.gallery .popup img {
-  cursor: pointer;
-  border: 2px solid #dff0fd;
-  border-radius: 3px;
-}
-.gallery .popup .title {
-  float: right;
-  width: 58%;
-}
-.gallery .popup .title input {
-  display: inline-block;
-  width: 90%;
-  margin: 7px 0 18px;
-}
-.gallery .popup .title .ui-select {
-  width: 96%;
-}
-.gallery .popup .title input:-moz-placeholder {
-  font-style: italic;
-}
-.gallery .popup .title input:-ms-input-placeholder {
-  font-style: italic;
-}
-.gallery .popup .title input::-webkit-input-placeholder {
-  font-style: italic;
-}
-.gallery .popup .description {
-  width: 100%;
-  margin-top: 22px;
-  display: inline-block;
-}
-.gallery .popup .description h6 {
-  margin: 0 0 5px 0;
-  color: #364453;
-  font-weight: 600;
-  font-size: 13px;
-}
-.gallery .popup .description textarea {
-  width: 95%;
-  margin-bottom: 13px;
-  height: 60px;
-}
-.gallery .popup .description input[type="submit"] {
-  float: right;
-}
-.gallery .popup i.close-pop {
-  position: absolute;
-  right: 11px;
-  cursor: pointer;
-  top: 12px;
-  opacity: 0.6;
-  transition: opacity .1s linear;
-  -moz-transition: opacity .1s linear;
-  -webkit-transition: opacity .1s linear;
-  -o-transition: opacity .1s linear;
-}
-.gallery .popup i.close-pop:hover {
-  opacity: 1;
-}
-.gallery .popup .pointer {
-  position: absolute;
-  top: 35%;
-  left: -22px;
-}
-.gallery .popup .pointer .arrow,
-.gallery .popup .pointer .arrow_border {
-  border-color: transparent #fff transparent transparent;
-  border-width: 11px;
-  border-style: solid;
-  font-size: 0;
-  left: 50%;
-  line-height: 0;
-  margin: 0 auto;
-  position: absolute;
-  top: 0;
-  width: 0;
-  z-index: 1002;
-  left: 0;
-  margin-left: 45%;
-}
-.gallery .popup .pointer .arrow_border {
-  border-color: transparent #000 transparent transparent;
-  border-width: 11px;
-  margin-left: -1px;
-  border-style: solid;
-  z-index: 1001;
-  top: 0px;
-}
 
 /* gallery blank state */
 .no-gallery {

public/assets/css/compiled/grids.css

@@ -9,7 +9,7 @@
   margin-top: 10px;
   margin-bottom: 20px;
 }
-.show-grid [class*="span"] {
+.show-grid [class*="col-"] {
   background-color: #eee;
   text-align: center;
   -webkit-border-radius: 3px;
@@ -17,4 +17,5 @@
   border-radius: 3px;
   min-height: 40px;
   line-height: 40px;
+  border: 1px solid rgba(86, 61, 124, 0.2);
 }

public/assets/css/compiled/index.css

@@ -1,16 +1,15 @@
 /* Main stats up of screen */
 #main-stats {
-  margin-left: -20px;
-  margin-right: -20px;
   background-color: #fdfdfd;
   border-bottom: 1px solid #efeef3;
 }
 #main-stats .stats-row {
   box-shadow: inset -1px 0px 5px 2px #f9f9f9;
+  margin: 0;
 }
 #main-stats .stat {
   text-align: right;
-  padding: 30px 0px 35px 0px;
+  padding: 25px 0px 30px 0px;
   border-right: 1px solid #e8e9ee;
   position: relative;
   box-shadow: 1px 0px 0px 0px white;
@@ -40,15 +39,6 @@
   right: 50px;
 }
 
-#main-stats a:hover {
-text-decoration: none;
-}
-
-#helpicon a:hover {
-text-decoration: none;
-}
-
-
 .section {
   border-top: 1px solid #edeff1;
   margin-top: 100px;
@@ -58,7 +48,6 @@ text-decoration: none;
 
 /* Stats chart */
 #statsChart {
-  width: 97%;
   height: 250px;
   margin-top: 35px;
 }
@@ -87,9 +76,6 @@ text-decoration: none;
   margin-top: 10px;
   margin-bottom: 50px;
 }
-#pad-wrapper .ui-elements .ui-sliders .ui-slider {
-  width: 95%;
-}
 #pad-wrapper .ui-elements .ui-sliders .ui-slider.slider-sample2, #pad-wrapper .ui-elements .ui-sliders .ui-slider.slider-sample3 {
   margin-top: 20px;
 }
@@ -213,10 +199,10 @@ text-decoration: none;
 }
 
 /* responsive */
-@media (max-width: 767px) {
+@media (max-width: 768px) {
   #main-stats {
-    margin-left: 0px;
-    margin-right: 0px;
+    margin-left: -15px;
+    margin-right: -15px;
   }
 
   #pad-wrapper .ui-elements .knobs {
@@ -242,6 +228,9 @@ text-decoration: none;
   #main-stats .stat .data {
     padding-right: 17px;
   }
+  #main-stats .stat .data .number {
+    font-size: 18px;
+  }
 
   #pad-wrapper .knob-wrapper .info {
     display: none;
@@ -250,6 +239,10 @@ text-decoration: none;
   .pointer {
     top: 5%;
   }
+
+  .table-products .head {
+    margin-bottom: 20px;
+  }
 }
 @media (min-width: 980px) {
   #pad-wrapper .ui-elements .knob-wrapper + .knob-wrapper {

public/assets/css/compiled/layout.css

@@ -8,8 +8,9 @@ body {
   /*-webkit-font-smoothing: antialiased;*/
 }
 
-div.popover-content {
-font-size: 12px;
+
+#main-stats a:hover {
+text-decoration: none;
 }
 
 h1, h2, h3, h4, h5 {
@@ -22,10 +23,27 @@ h1 small, h2 small, h3 small, h4 small, h5 small {
   font-style: italic;
 }
 
+body.menu {
+  overflow-x: hidden;
+}
+body.menu .content {
+  margin-left: 165px;
+  position: fixed;
+  width: 850px;
+}
+body.menu #sidebar-nav {
+  position: absolute;
+  left: 0;
+  /*height: 100%;*/
+  border-right: 0px;
+  box-shadow: none;
+}
+
 input.search {
   background: url("../../img/lens.png") #fcfcfc no-repeat 95%;
   box-shadow: none;
-  height: 19px;
+  height: 25px;
+  width: 220px;
   font-size: 13px;
   padding: 2px 6px;
   border: 1px solid #d0dde9;
@@ -34,8 +52,12 @@ input.search {
   top: 11px;
 }
 
+.alert-msg {
+color: #b94a48;
+}
 .header {
-  margin-bottom: 60px;
+  margin-bottom: 30px;
+  /* border-bottom: 1px #e8e9ee solid; */
 }
 .header h1, .header h2, .header h3, .header h4, .header h5 {
   float: left;
@@ -50,12 +72,14 @@ input.search {
   /* navbar popup dialog */
 }
 .navbar-inverse input.search {
+  height: 27px;
+  width: 220px;
+  padding: 3px 6px;
   background: url("../../img/lens.png") #0f1217 no-repeat 95%;
   border: 1px solid #0f1217;
   position: relative;
   border-radius: 4px;
   top: 9px;
-  padding: 3px 6px;
   color: #000;
   font-size: 13px;
   margin-right: 40px;
@@ -65,6 +89,7 @@ input.search {
 }
 .navbar-inverse input.search:focus {
   background-color: #fff;
+  border: 0;
 }
 .navbar-inverse .settings i {
   color: #9ba3ad;
@@ -182,13 +207,13 @@ input.search {
   margin-right: 1px;
 }
 .navbar-inverse .pop-dialog .messages {
-  width: 330px;
+  width: 325px;
   margin: 10px -10px 0px -10px;
 }
 .navbar-inverse .pop-dialog .messages .item {
   display: block;
   padding: 10px 20px 15px 20px;
-  height: 54px;
+  height: 80px;
   border-bottom: 1px solid #e7e8ea;
   color: #363636;
   text-decoration: none;
@@ -216,11 +241,10 @@ input.search {
 }
 .navbar-inverse .pop-dialog .messages .item .msg {
   font-size: 11px;
-  color: #757677;
-  font-weight: 600;
+  color: #636363;
   line-height: 13px;
   position: relative;
-  top: -1px;
+  top: 2px;
 }
 .navbar-inverse .pop-dialog .messages .item .time {
   position: absolute;
@@ -260,15 +284,14 @@ input.search {
 }
 #sidebar-nav #dashboard-menu > li > a {
   display: block;
-  margin-right: -15px;
-  margin-left: -15px;
   padding: 19px 14px 15px 14px;
+  margin-left: -15px;
   margin-bottom: 5px;
   border-bottom: 1px solid #dae1e8;
   box-shadow: 0 2px 1px -1px #FFFFFF;
   color: #6e829b;
   outline: 0px;
-  width: 88%;
+  line-height: 21px;
 }
 #sidebar-nav #dashboard-menu > li {
   position: relative;
@@ -391,11 +414,10 @@ input.search {
 }
 
 #pad-wrapper {
-  padding: 0px 25px;
-  margin-top: 55px;
+  padding: 0px 50px;
+  margin-top: 15px;
 }
 #pad-wrapper h4 {
-  margin: 0 0 0 20px;
   color: #696d73;
   font-style: italic;
 }
@@ -413,6 +435,11 @@ input.search {
   border-bottom: 1px solid #dae3e9;
   box-shadow: -3px 3px 3px -2px #f1f1f3;
   border-radius: 0px 0px 0px 5px;
+  -webkit-transition: margin-left .3s ease;
+  -moz-transition: margin-left .3s ease;
+  -o-transition: margin-left .3s ease;
+  -ms-transition: margin-left .3s ease;
+  transition: margin-left .3s ease;
   /* starts skins changer */
   /* end skin changer*/
 }
@@ -428,7 +455,7 @@ input.search {
   -o-transition: right .3s;
   transition: right .3s;
   position: fixed;
-  right: -85px;
+  right: -88px;
   top: 135px;
   font-size: 13px;
   z-index: 9999;
@@ -478,7 +505,7 @@ input.search {
   padding-right: 12px;
   white-space: nowrap;
   display: block;
-  width: 100px;
+  width: 115px;
   position: relative;
   top: 9px;
   -webkit-transition: width .2s;
@@ -489,35 +516,9 @@ input.search {
 }
 
 /* responsive */
-@media (max-width: 1020px) {
-  .content {
-    margin-left: 65px;
-  }
-
-  #dashboard-menu {
-    margin-left: 5px;
-  }
-  #dashboard-menu .pointer {
-    display: none;
-  }
-  #dashboard-menu li a span {
-    visibility: hidden;
-  }
-}
-@media (max-width: 600px) {
-  .content {
-    margin-left: 0em;
-    border-left-width: 0px;
-  }
-}
-@media (max-width: 822px) {
-  .navbar-inverse input.search {
-    display: none;
-  }
-}
-@media (max-width: 767px) {
+@media (max-width: 768px) {
   #pad-wrapper {
-    padding: 0px 10px;
+    padding: 0px 15px;
   }
 
   .content {
@@ -525,9 +526,8 @@ input.search {
     margin: 0;
   }
 
-  #main-stats .stat {
-    width: 50%;
-    float: left;
+  #dashboard-menu .pointer {
+    display: none;
   }
 
   #sidebar-nav {
@@ -539,25 +539,34 @@ input.search {
     border-right: 1px solid #ccc;
     width: 165px;
     box-shadow: 1px 1px 4px 1px #e9e9e9;
-    -webkit-transition: left .25s ease;
-    -moz-transition: left .25s ease;
-    -o-transition: left .25s ease;
-    -ms-transition: left .25s ease;
-    transition: left .25s ease;
-  }
-  #sidebar-nav.display {
-    position: absolute;
-    left: 0;
-    height: 100%;
+    -webkit-transition: left .3s ease;
+    -moz-transition: left .3s ease;
+    -o-transition: left .3s ease;
+    -ms-transition: left .3s ease;
+    transition: left .3s ease;
   }
+
   #sidebar-nav #dashboard-menu {
     margin-left: 10px;
   }
+
   #sidebar-nav #dashboard-menu li a span {
     visibility: visible;
   }
+
   #sidebar-nav #dashboard-menu li:last-child a {
     border-bottom: 0px;
     box-shadow: none;
   }
 }
+@media (max-width: 822px) {
+  .navbar-inverse input.search {
+    display: none;
+  }
+}
+@media (max-width: 767px) {
+  #main-stats .stat {
+    width: 50%;
+    float: left;
+  }
+}

public/assets/css/compiled/new-user.css

@@ -26,14 +26,19 @@
 .new-user .form-wrapper input[type="text"] {
   margin: 0;
   padding: 3px 6px;
+  width: 75%;
+  display: inline-block;
 }
 .new-user .form-wrapper .address-fields {
   margin-left: 0px;
   float: left;
   width: 75%;
 }
+.new-user .form-wrapper .address-fields input[type="text"]:first-child {
+  width: 100%;
+}
 .new-user .form-wrapper input.small {
-  width: 30%;
+  width: 27%;
   margin-top: 20px;
   margin-right: 20px;
 }
@@ -56,10 +61,11 @@
   margin-top: 27px;
 }
 .new-user .textarea span.charactersleft {
-  display: block;
   color: #9ba0a5;
+  display: inline-block;
   text-align: left;
-  margin-left: 18%;
+  margin-left: 20%;
+  margin-top: 8px;
   font-size: 13px;
   font-style: italic;
 }

public/assets/css/compiled/personal-info.css

@@ -33,9 +33,6 @@
 .settings-wrapper .personal-info form {
   margin-left: 50px;
 }
-.settings-wrapper .personal-info .field-box {
-  margin-bottom: 20px;
-}
 .settings-wrapper .personal-info label {
   display: inline-block;
   float: left;
@@ -44,18 +41,20 @@
   cursor: auto;
   width: 20%;
   margin-right: 10px;
+  text-align: left;
 }
 .settings-wrapper .personal-info .input[type="text"] {
   font-weight: 600;
 }
 .settings-wrapper .personal-info .ui-select {
-  width: 50%;
+  width: 100%;
   margin-bottom: 10px;
 }
 .settings-wrapper .personal-info .actions {
   margin-bottom: 25px;
-  margin-left: 0;
   margin-top: 30px;
+  width: 100%;
+  padding-right: 70px;
   float: left;
   text-align: right;
 }
@@ -73,7 +72,7 @@
 }
 
 /* responsive */
-@media (max-width: 767px) {
+@media (max-width: 768px) {
   .settings-wrapper #pad-wrapper {
     padding: 0px 20px;
   }
@@ -88,9 +87,6 @@
   .settings-wrapper .personal-info h5.personal-title {
     margin-left: 0;
   }
-  .settings-wrapper .personal-info .field-box {
-    margin-left: 0;
-  }
   .settings-wrapper .personal-info .ui-select {
     width: 90%;
   }
@@ -109,14 +105,19 @@
   .settings-wrapper .personal-info .ui-select {
     width: 77%;
   }
+
+  .avatar-box {
+    text-align: center;
+    margin-bottom: 20px;
+  }
+
+  .settings-wrapper .personal-info {
+    border-left: 0px;
+    box-shadow: none;
+  }
 }
 @media (min-width: 768px) {
   .settings-wrapper .personal-info .alert {
     margin-left: 50px;
   }
 }
-@media (min-width: 980px) {
-  .settings-wrapper .personal-info .ui-select {
-    width: 60%;
-  }
-}

public/assets/css/compiled/signin.css

@@ -11,6 +11,8 @@
 .login-wrapper {
   position: absolute;
   top: 90px;
+  left: 0;
+  right: 0;
   text-align: center;
 }
 .login-wrapper .logo {
@@ -88,6 +90,7 @@
   float: left;
   color: #4a576a;
   font-size: 13px;
+  font-weight: 600;
 }
 .login-wrapper .box .login {
   text-transform: uppercase;

public/assets/css/compiled/signup.css

@@ -18,13 +18,15 @@ body {
   background: #2c3742;
   box-shadow: inset rgba(255, 255, 255, 0.3) 0 1px 0, inset rgba(0, 0, 0, 0.22) 0 -1px 0, rgba(0, 0, 0, 0.14) 0 1px 2px;
   width: 100%;
-  height: 45px;
+  height: 75px;
   text-align: center;
   padding-top: 28px;
 }
 
 .login-wrapper {
   position: absolute;
+  left: 0;
+  right: 0;
   text-align: center;
 }
 .login-wrapper .logo {

public/assets/css/compiled/skins/dark.css

@@ -1,61 +0,0 @@
-html {
-  background: transparent url(../../../img/bgs/back-orange.png) repeat-x 0 0;
-  min-height: 100%;
-  background-size: 100% 100%;
-  /*-webkit-background-size: cover;*/
-}
-
-body {
-  background: none;
-}
-
-.navbar-inverse .navbar-inner {
-  background: none;
-  border: 1px solid transparent;
-  box-shadow: none;
-}
-
-.navbar-inverse .notification-dropdown .count {
-  background: #fc827b;
-}
-
-/* sidebar */
-#sidebar-nav.display {
-  background: transparent url(../../../img/bgs/back-orange.png) repeat-x 0 0;
-  background-size: 100% 100%;
-  box-shadow: none;
-}
-
-#dashboard-menu > li.active > a,
-#dashboard-menu > li > a:hover {
-  color: #fff;
-  text-shadow: none;
-}
-
-#dashboard-menu > li > a {
-  color: #bebebe;
-  box-shadow: none;
-  border: 0px;
-}
-
-#dashboard-menu a i {
-  opacity: 0.6;
-}
-
-#dashboard-menu a i.icon-chevron-down {
-  color: #fff;
-}
-
-#dashboard-menu ul.submenu {
-  border-bottom: 0px;
-  box-shadow: 0 2px 1px -1px #4b6588;
-}
-
-#dashboard-menu ul.submenu a {
-  text-shadow: none;
-  color: lightgrey;
-}
-
-.content {
-  box-shadow: none;
-}

public/assets/css/compiled/tables.css

@@ -121,8 +121,12 @@
     top: 26.8%;
   }
 }
-@media (max-width: 767px) {
-  .table-wrapper .table .img {
+@media (max-width: 768px) {
+  .table-wrapper {
+    padding: 0px 15px;
+  }
+  .table-wrapper .table .img,
+  .table-wrapper .table .avatar {
     display: none;
   }
   .table-wrapper .table input[type="checkbox"] {

public/assets/css/compiled/ui-elements.css

@@ -54,6 +54,18 @@
 #pad-wrapper .ctrls h4 {
   margin: 20px 0px 20px 0px;
 }
+#pad-wrapper .ctrls .dropdown .dropdown-menu {
+  margin-right: 10px;
+  position: static;
+  display: block;
+}
+#pad-wrapper .ctrls .nav-tabs {
+  margin-bottom: 15px;
+}
+#pad-wrapper .ctrls .tab-content {
+  padding: 0px 10px;
+  margin-bottom: 20px;
+}
 #pad-wrapper .sliders .slider {
   margin-bottom: 20px;
 }

public/assets/css/compiled/user-list.css

@@ -1,7 +1,10 @@
+.users-list .header h3 {
+  margin-top: 0px;
+}
 .users-list .header input.search {
   padding: 5px 6px;
   position: relative;
-  top: -1px;
+  top: 0px;
 }
 .users-list .header input.search:focus {
   box-shadow: none;
@@ -13,6 +16,12 @@
 .users-list .header .ui-dropdown {
   margin-left: 20px;
 }
+.users-list .header .ui-dropdown input.form-control {
+  width: 60px;
+  display: inline-block;
+  height: 28px;
+  margin: 0px 8px;
+}
 .users-list .header a.btn-flat span {
   font-size: 17px;
   position: relative;
@@ -62,6 +71,9 @@
   .users-list .table td {
     font-size: 12px;
   }
+  .users-list .table .avatar {
+    display: none;
+  }
   .users-list h3 {
     display: block;
     float: none;

public/assets/css/compiled/user-profile.css

@@ -3,7 +3,7 @@
   margin-right: 25px;
   border: 2px solid #e9ecee;
   position: relative;
-  top: 20px;
+  top: 3px;
 }
 .user-profile .header .name {
   font-weight: 600;
@@ -25,6 +25,7 @@
   font-size: 14px;
 }
 .user-profile .profile .profile-box {
+  border-top: 1px solid #dde2e9;
   padding-top: 23px;
   width: 90%;
 }
@@ -120,7 +121,7 @@
     font-weight: normal;
   }
 }
-@media (max-width: 767px) {
+@media (max-width: 768px) {
   .user-profile .profile .bio {
     border-right: 0 none;
     border-bottom: 1px solid #edeef1;

public/assets/css/lib/bootstrap.datepicker.css

@@ -8,12 +8,13 @@
  *
  */
 .datepicker {
-  padding: 4px;
+  padding: 8px 12px;
   margin-top: 1px;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
   direction: ltr;
+  font-size: 13px;
   /*.dow {
 		border-top: 1px solid #ddd !important;
 	}*/

public/assets/css/lib/font-awesome.css

@@ -1,33 +1,34 @@
 /*!
- *  Font Awesome 3.1.0
+ *  Font Awesome 3.2.1
  *  the iconic font designed for Bootstrap
- *  -------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation
- *  can be found at: http://fontawesome.io
+ *  ------------------------------------------------------------------------------
+ *  The full suite of pictographic icons, examples, and documentation can be
+ *  found at http://fontawesome.io.  Stay up to date on Twitter at
+ *  http://twitter.com/fontawesome.
  *
  *  License
- *  -------------------------------------------------------
- *  - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
+ *  ------------------------------------------------------------------------------
+ *  - The Font Awesome font is licensed under SIL OFL 1.1 -
  *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
+ *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
  *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 License -
+ *  - Font Awesome documentation licensed under CC BY 3.0 -
  *    http://creativecommons.org/licenses/by/3.0/
  *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
  *    "Font Awesome by Dave Gandy - http://fontawesome.io"
-
- *  Contact
- *  -------------------------------------------------------
+ *
+ *  Author - Dave Gandy
+ *  ------------------------------------------------------------------------------
  *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/fortaweso_me
- *  Work: Lead Product Designer @ http://kyruus.com
+ *  Twitter: http://twitter.com/davegandy
+ *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../../font/fontawesome-webfont.eot?v=3.1.0');
-  src: url('../../font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../../font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../../font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../../font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg');
+  src: url('../../font/fontawesome-webfont.eot?v=3.2.1');
+  src: url('../../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -55,31 +56,34 @@
 }
 /* makes sure icons active on rollover in links */
 a [class^="icon-"],
-a [class*=" icon-"],
-a [class^="icon-"]:before,
-a [class*=" icon-"]:before {
+a [class*=" icon-"] {
   display: inline;
 }
 /* increased font size for icon-large */
 [class^="icon-"].icon-fixed-width,
 [class*=" icon-"].icon-fixed-width {
   display: inline-block;
-  width: 1.2857142857142858em;
-  text-align: center;
+  width: 1.1428571428571428em;
+  text-align: right;
+  padding-right: 0.2857142857142857em;
 }
 [class^="icon-"].icon-fixed-width.icon-large,
 [class*=" icon-"].icon-fixed-width.icon-large {
-  width: 1.5714285714285714em;
+  width: 1.4285714285714286em;
 }
-ul.icons-ul {
-  list-style-type: none;
-  text-indent: -0.7142857142857143em;
+.icons-ul {
   margin-left: 2.142857142857143em;
+  list-style-type: none;
 }
-ul.icons-ul > li .icon-li {
-  width: 0.7142857142857143em;
-  display: inline-block;
+.icons-ul > li {
+  position: relative;
+}
+.icons-ul .icon-li {
+  position: absolute;
+  left: -2.142857142857143em;
+  width: 2.142857142857143em;
   text-align: center;
+  line-height: inherit;
 }
 [class^="icon-"].hide,
 [class*=" icon-"].hide {
@@ -239,6 +243,11 @@ ul.icons-ul > li .icon-li {
 .btn.btn-large [class*=" icon-"].pull-right.icon-2x {
   margin-left: .2em;
 }
+/* Fixes alignment in nav lists */
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  line-height: inherit;
+}
 /* EXTRAS
  * -------------------------- */
 /* Stacked and layered icon */
@@ -273,6 +282,12 @@ ul.icons-ul > li .icon-li {
   -webkit-animation: spin 2s infinite linear;
   animation: spin 2s infinite linear;
 }
+/* Prevent stack and spinners from being taken inline when inside a link */
+a .icon-stack,
+a .icon-spin {
+  display: inline-block;
+  text-decoration: none;
+}
 @-moz-keyframes spin {
   0% {
     -moz-transform: rotate(0deg);
@@ -352,6 +367,14 @@ ul.icons-ul > li .icon-li {
   -o-transform: scale(1, -1);
   transform: scale(1, -1);
 }
+/* ensure rotation occurs inside anchor tags */
+a .icon-rotate-90:before,
+a .icon-rotate-180:before,
+a .icon-rotate-270:before,
+a .icon-flip-horizontal:before,
+a .icon-flip-vertical:before {
+  display: inline-block;
+}
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
 .icon-glass:before {
@@ -363,7 +386,7 @@ ul.icons-ul > li .icon-li {
 .icon-search:before {
   content: "\f002";
 }
-.icon-envelope:before {
+.icon-envelope-alt:before {
   content: "\f003";
 }
 .icon-heart:before {
@@ -402,12 +425,14 @@ ul.icons-ul > li .icon-li {
 .icon-zoom-out:before {
   content: "\f010";
 }
+.icon-power-off:before,
 .icon-off:before {
   content: "\f011";
 }
 .icon-signal:before {
   content: "\f012";
 }
+.icon-gear:before,
 .icon-cog:before {
   content: "\f013";
 }
@@ -417,7 +442,7 @@ ul.icons-ul > li .icon-li {
 .icon-home:before {
   content: "\f015";
 }
-.icon-file:before {
+.icon-file-alt:before {
   content: "\f016";
 }
 .icon-time:before {
@@ -441,11 +466,10 @@ ul.icons-ul > li .icon-li {
 .icon-play-circle:before {
   content: "\f01d";
 }
-.icon-repeat:before,
-.icon-rotate-right:before {
+.icon-rotate-right:before,
+.icon-repeat:before {
   content: "\f01e";
 }
-/* F020 doesn't work in Safari. all shifted one down */
 .icon-refresh:before {
   content: "\f021";
 }
@@ -638,8 +662,8 @@ ul.icons-ul > li .icon-li {
 .icon-arrow-down:before {
   content: "\f063";
 }
-.icon-share-alt:before,
-.icon-mail-forward:before {
+.icon-mail-forward:before,
+.icon-share-alt:before {
   content: "\f064";
 }
 .icon-resize-full:before {
@@ -732,16 +756,17 @@ ul.icons-ul > li .icon-li {
 .icon-key:before {
   content: "\f084";
 }
+.icon-gears:before,
 .icon-cogs:before {
   content: "\f085";
 }
 .icon-comments:before {
   content: "\f086";
 }
-.icon-thumbs-up:before {
+.icon-thumbs-up-alt:before {
   content: "\f087";
 }
-.icon-thumbs-down:before {
+.icon-thumbs-down-alt:before {
   content: "\f088";
 }
 .icon-star-half:before {
@@ -780,6 +805,7 @@ ul.icons-ul > li .icon-li {
 .icon-phone:before {
   content: "\f095";
 }
+.icon-unchecked:before,
 .icon-check-empty:before {
   content: "\f096";
 }
@@ -879,6 +905,7 @@ ul.icons-ul > li .icon-li {
 .icon-copy:before {
   content: "\f0c5";
 }
+.icon-paperclip:before,
 .icon-paper-clip:before {
   content: "\f0c6";
 }
@@ -951,14 +978,14 @@ ul.icons-ul > li .icon-li {
 .icon-sort-up:before {
   content: "\f0de";
 }
-.icon-envelope-alt:before {
+.icon-envelope:before {
   content: "\f0e0";
 }
 .icon-linkedin:before {
   content: "\f0e1";
 }
-.icon-undo:before,
-.icon-rotate-left:before {
+.icon-rotate-left:before,
+.icon-undo:before {
   content: "\f0e2";
 }
 .icon-legal:before {
@@ -1015,7 +1042,7 @@ ul.icons-ul > li .icon-li {
 .icon-food:before {
   content: "\f0f5";
 }
-.icon-file-alt:before {
+.icon-file-text-alt:before {
   content: "\f0f6";
 }
 .icon-building:before {
@@ -1093,10 +1120,13 @@ ul.icons-ul > li .icon-li {
 .icon-circle:before {
   content: "\f111";
 }
-.icon-reply:before,
-.icon-mail-reply:before {
+.icon-mail-reply:before,
+.icon-reply:before {
   content: "\f112";
 }
+.icon-github-alt:before {
+  content: "\f113";
+}
 .icon-folder-close-alt:before {
   content: "\f114";
 }
@@ -1266,3 +1296,184 @@ ul.icons-ul > li .icon-li {
 .icon-share-sign:before {
   content: "\f14d";
 }
+.icon-compass:before {
+  content: "\f14e";
+}
+.icon-collapse:before {
+  content: "\f150";
+}
+.icon-collapse-top:before {
+  content: "\f151";
+}
+.icon-expand:before {
+  content: "\f152";
+}
+.icon-euro:before,
+.icon-eur:before {
+  content: "\f153";
+}
+.icon-gbp:before {
+  content: "\f154";
+}
+.icon-dollar:before,
+.icon-usd:before {
+  content: "\f155";
+}
+.icon-rupee:before,
+.icon-inr:before {
+  content: "\f156";
+}
+.icon-yen:before,
+.icon-jpy:before {
+  content: "\f157";
+}
+.icon-renminbi:before,
+.icon-cny:before {
+  content: "\f158";
+}
+.icon-won:before,
+.icon-krw:before {
+  content: "\f159";
+}
+.icon-bitcoin:before,
+.icon-btc:before {
+  content: "\f15a";
+}
+.icon-file:before {
+  content: "\f15b";
+}
+.icon-file-text:before {
+  content: "\f15c";
+}
+.icon-sort-by-alphabet:before {
+  content: "\f15d";
+}
+.icon-sort-by-alphabet-alt:before {
+  content: "\f15e";
+}
+.icon-sort-by-attributes:before {
+  content: "\f160";
+}
+.icon-sort-by-attributes-alt:before {
+  content: "\f161";
+}
+.icon-sort-by-order:before {
+  content: "\f162";
+}
+.icon-sort-by-order-alt:before {
+  content: "\f163";
+}
+.icon-thumbs-up:before {
+  content: "\f164";
+}
+.icon-thumbs-down:before {
+  content: "\f165";
+}
+.icon-youtube-sign:before {
+  content: "\f166";
+}
+.icon-youtube:before {
+  content: "\f167";
+}
+.icon-xing:before {
+  content: "\f168";
+}
+.icon-xing-sign:before {
+  content: "\f169";
+}
+.icon-youtube-play:before {
+  content: "\f16a";
+}
+.icon-dropbox:before {
+  content: "\f16b";
+}
+.icon-stackexchange:before {
+  content: "\f16c";
+}
+.icon-instagram:before {
+  content: "\f16d";
+}
+.icon-flickr:before {
+  content: "\f16e";
+}
+.icon-adn:before {
+  content: "\f170";
+}
+.icon-bitbucket:before {
+  content: "\f171";
+}
+.icon-bitbucket-sign:before {
+  content: "\f172";
+}
+.icon-tumblr:before {
+  content: "\f173";
+}
+.icon-tumblr-sign:before {
+  content: "\f174";
+}
+.icon-long-arrow-down:before {
+  content: "\f175";
+}
+.icon-long-arrow-up:before {
+  content: "\f176";
+}
+.icon-long-arrow-left:before {
+  content: "\f177";
+}
+.icon-long-arrow-right:before {
+  content: "\f178";
+}
+.icon-apple:before {
+  content: "\f179";
+}
+.icon-windows:before {
+  content: "\f17a";
+}
+.icon-android:before {
+  content: "\f17b";
+}
+.icon-linux:before {
+  content: "\f17c";
+}
+.icon-dribbble:before {
+  content: "\f17d";
+}
+.icon-skype:before {
+  content: "\f17e";
+}
+.icon-foursquare:before {
+  content: "\f180";
+}
+.icon-trello:before {
+  content: "\f181";
+}
+.icon-female:before {
+  content: "\f182";
+}
+.icon-male:before {
+  content: "\f183";
+}
+.icon-gittip:before {
+  content: "\f184";
+}
+.icon-sun:before {
+  content: "\f185";
+}
+.icon-moon:before {
+  content: "\f186";
+}
+.icon-archive:before {
+  content: "\f187";
+}
+.icon-bug:before {
+  content: "\f188";
+}
+.icon-vk:before {
+  content: "\f189";
+}
+.icon-weibo:before {
+  content: "\f18a";
+}
+.icon-renren:before {
+  content: "\f18b";
+}

public/assets/css/lib/fullcalendar.css

@@ -70,6 +70,7 @@ html .fc,
 .fc-header .fc-button {
 	margin-bottom: 1em;
 	vertical-align: top;
+	height: 29px;
 	}
 	
 /* buttons edges butting together */

public/assets/css/lib/jquery.dataTables.css

@@ -143,13 +143,13 @@ table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
 	margin-left: 25px;
 }
 
-.paginate_enabled_previous { background: url('/assets/img/datatables/back_enabled.png') no-repeat top left; }
-.paginate_enabled_previous:hover { background: url('/assets/img/datatables/back_enabled_hover.png') no-repeat top left; }
-.paginate_disabled_previous { background: url('/assets/img/datatables/back_disabled.png') no-repeat top left; }
+.paginate_enabled_previous { background: url('../../img/datatables/back_enabled.png') no-repeat top left; }
+.paginate_enabled_previous:hover { background: url('../../img/datatables/back_enabled_hover.png') no-repeat top left; }
+.paginate_disabled_previous { background: url('../../img/datatables/back_disabled.png') no-repeat top left; }
 
-.paginate_enabled_next { background: url('/assets/img/datatables/forward_enabled.png') no-repeat top right; }
-.paginate_enabled_next:hover { background: url('/assets/img/datatables/forward_enabled_hover.png') no-repeat top right; }
-.paginate_disabled_next { background: url('/assets/img/datatables/forward_disabled.png') no-repeat top right; }
+.paginate_enabled_next { background: url('../../img/datatables/forward_enabled.png') no-repeat top right; }
+.paginate_enabled_next:hover { background: url('../../img/datatables/forward_enabled_hover.png') no-repeat top right; }
+.paginate_disabled_next { background: url('../../img/datatables/forward_disabled.png') no-repeat top right; }
 
 /* Full number pagination */
 .paging_full_numbers {
@@ -228,13 +228,13 @@ table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
 /*
  * Sorting
  */
-.sorting { background: url('/assets/img/datatables/sort_both.png') no-repeat center right; }
-.sorting_asc { background: url('/assets/img/datatables/sort_asc.png') no-repeat center right; }
-.sorting_desc { background: url('/assets/img/datatables/sort_desc.png') no-repeat center right; }
-
-.sorting_asc_disabled { background: url('/assets/img/datatables/sort_asc_disabled.png') no-repeat center right; }
-.sorting_desc_disabled { background: url('/assets/img/datatables/sort_desc_disabled.png') no-repeat center right; }
+.sorting { background: url('../../img/datatables/sort_both.png') no-repeat center right; }
+.sorting_asc { background: url('../../img/datatables/sort_asc.png') no-repeat center right; }
+.sorting_desc { background: url('../../img/datatables/sort_desc.png') no-repeat center right; }
 
+.sorting_asc_disabled { background: url('../../img/datatables/sort_asc_disabled.png') no-repeat center right; }
+.sorting_desc_disabled { background: url('../../img/datatables/sort_desc_disabled.png') no-repeat center right; }
+ 
 table.dataTable thead th:active,
 table.dataTable thead td:active {
 	outline: none;

public/assets/css/lib/uniform.default.css

@@ -49,8 +49,7 @@ textarea.uniform {
 div.checker input,
 input[type="search"],
 input[type="search"]:active {
-  -moz-appearance: none;
-  -webkit-appearance: none; }
+}
 
 /* Select */
 div.selector {
@@ -120,9 +119,7 @@ div.checker {
     div.checker span.checked {
       background-position: -76px -260px; }
   div.checker input {
-    opacity: 0;
-    filter: alpha(opacity=0);
-    -moz-opacity: 0;
+
     border: none;
     background: none;
     display: -moz-inline-box;
@@ -162,9 +159,8 @@ div.radio {
     div.radio span.checked {
       background-position: -72px -279px; }
   div.radio input {
-    opacity: 0;
-    filter: alpha(opacity=0);
-    -moz-opacity: 0;
+
+
     border: none;
     background: none;
     display: -moz-inline-box;

public/assets/css/scss/calendar.scss

@@ -11,7 +11,7 @@
 		position: absolute;
 		background: #fff;
 		text-align: left;
-		width: 260px;
+		width: 300px;
 		border: 1px solid rgb(178, 180, 182);
 		box-shadow: 0px 0px 7px -1px rgba(0, 0, 0, 0.35);
 		border-radius: 4px;
@@ -35,12 +35,14 @@
 				position: relative;
 				top: 5px;
 				margin-left: 10px;
-				width: 70%;
+				width: 75%;
+				display: inline-block;
 			}
 		}
 		input[type="submit"]{
 			float: right;
 			margin-right: 15px;
+			margin-top: 15px;
 		}
 		i.close-pop{
 			position: absolute;

public/assets/css/scss/elements.scss

@@ -32,6 +32,7 @@
 		&.middle{ border-right: 0; }
 		&.right{ border-radius: 0 4px 4px 0; }
 
+		float: left;
 		font-size: 11px;
 		font-family: "Open sans", Helvetica, Arial;
 		color: #313d4c;
@@ -55,6 +56,7 @@
 	}
 	> .btn.glow {
 		font-size: 12px;
+		float: left;
 		font-weight: 500;
 		padding: 6px 14px;
 		color: #313d4c;
@@ -73,9 +75,6 @@
 		&.dropdown-toggle {
 			padding: 6px 9px;
 		}
-		.caret {
-			margin-top: 6px;
-		}
 	}
 }
 
@@ -345,7 +344,7 @@
 .slider-button {
 	display: block;
 	width: 37px;
-	height: 21px;
+	height: 23px;
 	line-height: 23px;
 	background: #fff;
 	border: 1px solid #d0dde9;
@@ -404,7 +403,7 @@
 		font-size: 12px;
 		border: none;
 		padding: 1px 30px 0px 7px;
-		height: 25px;
+		height: 21px;
 		-webkit-appearance: none;
 		color: #737f8d;
 		text-shadow: 1px 1px 1px #fff;
@@ -417,7 +416,7 @@
 /* jQuery UI Slider overrides */
 .ui-slider {
 	border: 1px solid #cfdde8;
-	height: 4px;
+	height: 7px;
 	background: #edeeef;
 	box-shadow: inset 0px -3px 7px 0px #fff;
 }

public/assets/css/scss/form-showcase.scss

@@ -44,7 +44,6 @@
 		}
 		label.checkbox,
 		label.radio {
-			padding-left: 0px;
 			font-weight: lighter;
 			input[type="checkbox"],
 			input[type="radio"] {
@@ -66,6 +65,13 @@
 			.ui-select {
 				width: 250px;
 			}
+			.input-group {
+				margin-bottom: 10px;
+				width: 250px;
+			}
+			.input-datepicker {
+				width: 250px;
+			}
 		}
 		.select2-container {
 			margin-left: 0px;

public/assets/css/scss/form-wizard.scss

@@ -120,15 +120,17 @@
 		position: relative;
 		top: 2px;
 	}
+	input[type="text"] {
+		width: 400px;
+	}
 	&.payment-info label {
 		width: 150px;
 	}
 	.alert-msg {
 		display: block;
 		margin-left: 120px;
-		position: relative;
-		top: -2px;
 		margin-bottom: -4px;
+		margin-top: 10px;
 		i {
 			font-size: 14px;
 		}
@@ -187,4 +189,7 @@
 	.wizard-steps {
 		left: 0px;
 	}	
+	.form-wrapper input[type="text"] {
+		width: 200px;
+	}
 }

public/assets/css/scss/gallery.scss

@@ -1,7 +1,6 @@
 .gallery {
 	.gallery-wrapper {
 		text-align: center;
-		padding-left: 45px;
 		position: relative;
 	}
 	.img-container {
@@ -46,128 +45,15 @@
 			top: 48%;
 		}
 	}
-	.new-img img {
-		border: 2px dashed #dee3e8;
-		cursor: pointer;
-		margin-bottom: 50px;
-		&:hover {
-			opacity: 0.8;
-			border-color: #ccc;
-		}
-	}
-
-	/* gallery popup */
-	.popup {
-		position: absolute;
-		background: #fff;
-		text-align: left;
-		width: 260px;
-		border: 1px solid #2b3b48;
-		box-shadow: 0px 0px 12px -1px rgba(0, 0, 0, 0.45);
-		border-radius: 4px;
-		padding: 14px 20px 14px 20px;
-		z-index: 5;
-		left: 240px;
-		top: 285px;
-
-		h5 {
-			text-transform: uppercase;
-			font-weight: 600;
-			margin: 0 0 21px 0;
-			font-size: 14px;
-			color: #7e91aa;
-		}
-		.thumb{
-			float: left;
-		}
+	.new-img {
+		display: inline-block;
 		img {
+			border: 2px dashed #dee3e8;
 			cursor: pointer;
-			border:2px solid #dff0fd;
-			border-radius: 3px;
-		}
-		.title {
-			float: right;
-			width: 58%;
-			input {
-				display: inline-block;
-				width: 90%;
-				margin: 7px 0 18px 
-			}
-			.ui-select{
-				width: 96%;
-			}
-			input:-moz-placeholder{
-				font-style: italic;
-			}
-			input:-ms-input-placeholder{
-				font-style: italic;
-			}
-			input::-webkit-input-placeholder{
-				font-style: italic;
-			}
-		}
-		.description {
-			width: 100%;
-			margin-top: 22px;
-			display: inline-block;
-			h6 {
-				margin: 0 0 5px 0;
-				color: #364453;
-				font-weight:600;
-				font-size: 13px;
-			}
-			textarea {
-				width: 95%;
-				margin-bottom: 13px;
-				height: 60px;
-			}
-			input[type="submit"]{
-				float: right;
-			}
-		}
-		i.close-pop {
-			position: absolute;
-			right: 11px;
-			cursor: pointer;
-			top: 12px;
-			opacity: 0.6;
-
-			transition: opacity .1s linear;
-			-moz-transition: opacity .1s linear;
-			-webkit-transition: opacity .1s linear;
-			-o-transition: opacity .1s linear;
-
-			&:hover{
-				opacity: 1;
-			}
-		}
-		.pointer {
-			position: absolute;
-			top: 35%;
-			left: -22px;
-			.arrow,
-			.arrow_border {
-				border-color: transparent #fff transparent transparent;
-				border-width: 11px;
-				border-style: solid;
-				font-size: 0;
-				left: 50%;
-				line-height: 0;
-				margin: 0 auto;
-				position: absolute;
-				top: 0;
-				width: 0;
-				z-index: 1002;
-				left: 0;
-				margin-left: 45%;
-			}
-			.arrow_border {
-				border-color: transparent #000 transparent transparent;
-				border-width: 11px;
-				margin-left: -1px;
-				border-style: solid;
-				z-index: 1001;
-				top: 0px;
+			margin-bottom: 50px;
+			&:hover {
+				opacity: 0.8;
+				border-color: #ccc;
 			}
 		}
 	}

public/assets/css/scss/grids.scss

@@ -8,7 +8,7 @@
 	margin-top: 10px;
 	margin-bottom: 20px;
 
-	[class*="span"] {
+	[class*="col-"] {
 		background-color: #eee;
 		text-align: center;
 		-webkit-border-radius: 3px;
@@ -16,5 +16,6 @@
 		border-radius: 3px;
 		min-height: 40px;
 		line-height: 40px;
+		border: 1px solid rgba(86,61,124,.2);
 	}
 }

public/assets/css/scss/index.scss

@@ -1,15 +1,14 @@
 /* Main stats up of screen */
 #main-stats {
-	margin-left: -20px;
-	margin-right: -20px;
 	background-color: #fdfdfd;
 	border-bottom: 1px solid #efeef3;
 	.stats-row {
 		box-shadow: inset -1px 0px 5px 2px #f9f9f9;
+		margin: 0;
 	}
 	.stat {
 		text-align: right;
-		padding: 30px 0px 35px 0px;
+		padding: 25px 0px 30px 0px;
 		border-right: 1px solid #e8e9ee;
 		position: relative;
 		box-shadow: 1px 0px 0px 0px white;
@@ -51,7 +50,6 @@
 
 /* Stats chart */
 #statsChart {
-	width: 97%;
 	height: 250px;
 	margin-top: 35px;
 }
@@ -82,7 +80,6 @@
 		margin-top: 10px;
 		margin-bottom: 50px;
 		.ui-slider {
-			width: 95%;
 			&.slider-sample2,
 			&.slider-sample3 {
 				margin-top: 20px;
@@ -221,10 +218,10 @@
 @media (max-width: 480px) {
 	
 }
-@media (max-width: 767px) {
+@media (max-width: 768px) {
 	#main-stats {
-		margin-left: 0px;
-		margin-right: 0px;
+		margin-left: -15px;
+		margin-right: -15px;
 	}
 	#pad-wrapper {
 		.ui-elements {
@@ -257,6 +254,9 @@
 @media (max-width: 979px) {
 	#main-stats .stat .data {
 		padding-right: 17px;
+		.number {
+			font-size: 18px;
+		}
 	}
 	#pad-wrapper .knob-wrapper .info {
 		display: none;
@@ -264,6 +264,9 @@
 	.pointer {
 		top: 5%;
 	}
+	.table-products .head {
+		margin-bottom: 20px;
+	}
 }
 @media (min-width: 980px) {
 	#pad-wrapper .ui-elements .knob-wrapper + .knob-wrapper {

public/assets/css/scss/layout.scss

@@ -18,10 +18,27 @@ h1,h2,h3,h4,h5 {
 	}
 }
 
+body.menu {
+	overflow-x: hidden;
+	.content {
+		margin-left: 165px;
+		position: fixed;
+		width: 850px;
+	}
+	#sidebar-nav {
+		position: absolute;
+		left: 0;
+		/*height: 100%;*/
+		border-right: 0px;
+		box-shadow: none;
+	}
+}
+
 input.search{
 	background: url("../../img/lens.png") #fcfcfc no-repeat 95%;
 	box-shadow: none;
-	height: 19px;
+	height: 25px;
+	width: 220px;
 	font-size: 13px;
 	padding: 2px 6px;
 	border:1px solid #d0dde9;
@@ -43,12 +60,14 @@ input.search{
 /* search input */
 .navbar-inverse {
 	input.search {
+		height: 27px;
+		width: 220px;
+		padding: 3px 6px;
 		background: url("../../img/lens.png") #0f1217 no-repeat 95%;
 		border: 1px solid #0f1217;
 		position: relative;
 		border-radius: 4px;
-		top: 9px;
-		padding: 3px 6px;
+		top: 9px;	
 		color: #000;
 		font-size: 13px;
 		margin-right: 40px;
@@ -57,6 +76,7 @@ input.search{
 	    transition: all .3s linear;
 	    &:focus {
 			background-color: #fff;
+			border: 0;
 		}
 	}
 	/* navbar settings and logout icons */
@@ -183,12 +203,12 @@ input.search{
 
 		/* navbar popup dialog for messages */
 		.messages {
-			width: 330px;
+			width: 325px;
 			margin: 10px -10px 0px -10px;
 			.item {
 				display: block;
 				padding: 10px 20px 15px 20px;
-				height: 54px;
+				height: 80px;
 				border-bottom: 1px solid #e7e8ea;
 				color: rgb(54, 54, 54);
 				text-decoration: none;
@@ -216,11 +236,10 @@ input.search{
 				}
 				.msg {
 					font-size: 11px;
-					color: rgb(117, 118, 119);
-					font-weight: 600;
+					color: rgb(99, 99, 99);
 					line-height: 13px;
 					position: relative;
-					top: -1px;
+					top: 2px;
 				}
 				.time {
 					position: absolute;
@@ -265,15 +284,14 @@ input.search{
 
 		> li > a {
 			display: block;
-			margin-right: -15px;
-			margin-left: -15px;
 			padding: 19px 14px 15px 14px;
+			margin-left: -15px;
 			margin-bottom: 5px;
 			border-bottom: 1px solid #dae1e8;
 			box-shadow: 0 2px 1px -1px #FFFFFF;
 			color: rgb(110, 130, 155);
 			outline: 0px;
-			width: 88%;
+			line-height: 21px;
 		}
 		> li {
 			position: relative;
@@ -407,10 +425,9 @@ input.search{
 
 
 #pad-wrapper {
-	padding: 0px 25px;
+	padding: 0px 50px;
 	margin-top: 55px;
 	h4 {
-		margin: 0 0 0 20px;
 		color: #696d73;
 		font-style: italic;
 	}
@@ -430,6 +447,12 @@ input.search{
 	box-shadow: -3px 3px 3px -2px #f1f1f3;
 	border-radius: 0px 0px 0px 5px;
 
+	-webkit-transition: margin-left .3s ease;
+	-moz-transition: margin-left .3s ease;
+	-o-transition: margin-left .3s ease;
+	-ms-transition: margin-left .3s ease;
+	transition: margin-left .3s ease;
+
 	&.wide-content {
 		margin-left: 0;
 		border-radius: 0;
@@ -444,7 +467,7 @@ input.search{
 		-o-transition: right .3s;
 		transition: right .3s;
 		position: fixed;
-		right: -85px;
+		right: -88px;
 		top: 135px;
 		font-size: 13px;
 		z-index: 9999;
@@ -495,7 +518,7 @@ input.search{
 				padding-right: 12px;
 				white-space: nowrap;
 				display: block;
-				width: 100px;
+				width: 115px;
 				position: relative;
 				top: 9px;
 				-webkit-transition: width .2s;
@@ -513,41 +536,18 @@ input.search{
 
 /* responsive */
 @media (max-width: 1020px) {
-	.content {
-		margin-left: 65px;
-	}
-	#dashboard-menu {
-		margin-left: 5px;
-		.pointer {
-			display: none;
-		}
-		li a span {
-			visibility: hidden;
-		}
-	}
 }
-@media (max-width: 600px) {
-	.content {
-		margin-left: 0em;
-		border-left-width: 0px;
-	}
-}
-@media (max-width: 822px) {
-	.navbar-inverse input.search {display: none;}
-}
-@media (max-width: 767px) {
+@media (max-width: 768px) {
 	#pad-wrapper {  
-		padding: 0px 10px;
+		padding: 0px 15px;
 	}
 	.content {
 		min-width: 0px;
 		margin:0;
 	}
-	#main-stats .stat{
-		width: 50%;
-		float: left;
+	#dashboard-menu .pointer {
+		display: none;
 	}
-
 	#sidebar-nav {
 		left: -200px;
 		position: fixed;
@@ -558,28 +558,29 @@ input.search{
 		width: 165px;
 		box-shadow: 1px 1px 4px 1px rgb(233, 233, 233);
 
-		-webkit-transition: left .25s ease;
-		-moz-transition: left .25s ease;
-		-o-transition: left .25s ease;
-		-ms-transition: left .25s ease;
-		transition: left .25s ease;
-
-		&.display {
-			position: absolute;
-			left: 0;
-			height: 100%;
-		}
-
-		#dashboard-menu {
-			margin-left: 10px;
-
-			li a span {
-				visibility: visible;
-			}
-			li:last-child a {
-				border-bottom: 0px;
-				box-shadow: none;
-			}
-		}		
+		-webkit-transition: left .3s ease;
+		-moz-transition: left .3s ease;
+		-o-transition: left .3s ease;
+		-ms-transition: left .3s ease;
+		transition: left .3s ease;
+	}	
+	#sidebar-nav #dashboard-menu {
+		margin-left: 10px;
+	}
+	#sidebar-nav #dashboard-menu li a span {
+		visibility: visible;
+	}
+	#sidebar-nav #dashboard-menu li:last-child a {
+		border-bottom: 0px;
+		box-shadow: none;
+	}
+}
+@media (max-width: 822px) {
+	.navbar-inverse input.search {display: none;}
+}
+@media (max-width: 767px) {
+	#main-stats .stat{
+		width: 50%;
+		float: left;
 	}
 }

public/assets/css/scss/new-user.scss

@@ -25,14 +25,19 @@
 		input[type="text"] {
 			margin: 0;
 			padding: 3px 6px;
+			width: 75%;
+			display: inline-block;
 		}
 		.address-fields {
 			margin-left: 0px;
 			float: left;
 			width: 75%;
+			input[type="text"]:first-child {
+				width: 100%;
+			}
 		}
 		input.small {
-			width: 30%;
+			width: 27%;
 			margin-top: 20px;
 			margin-right: 20px;
 		}
@@ -50,10 +55,11 @@
 	.textarea {
 		margin-top: 27px;
 		span.charactersleft {
-			display: block;
 			color: #9ba0a5;
+			display: inline-block;
 			text-align: left;
-			margin-left: 18%;
+			margin-left: 20%;
+			margin-top: 8px;
 			font-size: 13px;
 			font-style: italic;
 		}

public/assets/css/scss/personal-info.scss

@@ -34,10 +34,7 @@
 		}
 		form {
 			margin-left: 50px;
-		}
-		.field-box {	
-			margin-bottom: 20px;
-		}
+		}		
 		label {
 			display: inline-block;
 			float: left;
@@ -46,18 +43,20 @@
 			cursor: auto;
 			width:20%;
 			margin-right: 10px;
+			text-align: left;
 		}
 		.input[type="text"] {
 			font-weight: 600;
 		}
 		.ui-select {
-			width: 50%;
+			width: 100%;
 			margin-bottom: 10px;
 		}
 		.actions {
 			margin-bottom: 25px;
-			margin-left: 0;
 			margin-top: 30px;
+			width: 100%;
+			padding-right: 70px;
 			float: left;
 			text-align: right;
 			span {
@@ -81,7 +80,7 @@
 @media (max-width: 480px) {
 }
 
-@media (max-width: 767px) {
+@media (max-width: 768px) {
 	.settings-wrapper {
 		#pad-wrapper{
 			padding: 0px 20px;
@@ -95,10 +94,7 @@
 			margin-top: 40px;
 			h5.personal-title {
 				margin-left: 0;
-			}
-			.field-box {
-				margin-left: 0;
-			}
+			}			
 			.ui-select {
 				width: 90%;
 			}
@@ -120,16 +116,22 @@
 	.settings-wrapper .personal-info .ui-select{
 		width: 77%;
 	}
+	.avatar-box {
+		text-align: center;
+		margin-bottom: 20px;
+	}
+	.settings-wrapper .personal-info {
+		border-left: 0px;
+		box-shadow: none;
+	}
 }
 @media (min-width: 768px){ 
 	.settings-wrapper .personal-info .alert {
 		margin-left: 50px;
-	}
+	}	
 }
 @media (min-width: 980px) {
-	.settings-wrapper .personal-info .ui-select{
-		width: 60%;
-	}
+
 }
 
 @media (max-width: 979px) {

public/assets/css/scss/signin.scss

@@ -10,6 +10,8 @@
 .login-wrapper {
 	position: absolute;
 	top: 90px;
+	left: 0;
+	right: 0;
 	text-align: center;
 	.logo {
 		margin-bottom: 45px;
@@ -85,6 +87,7 @@
 				float: left;
 				color: #4a576a;
 				font-size: 13px;
+				font-weight: 600;
 			}
 		}
 		.login {

public/assets/css/scss/signup.scss

@@ -16,12 +16,14 @@ body {
 	background: #2c3742;
 	box-shadow: inset rgba(255,255,255,0.3) 0 1px 0,inset rgba(0,0,0,0.22) 0 -1px 0,rgba(0,0,0,0.14) 0 1px 2px;
 	width: 100%;
-	height: 45px;
+	height: 75px;
 	text-align: center;
 	padding-top: 28px;
 }
 .login-wrapper{
 	position: absolute;
+	left: 0;
+	right: 0;
 	text-align: center;
 
 	.logo {

public/assets/css/scss/skins/dark.scss

@@ -1,55 +0,0 @@
-html {
-	background: transparent url(../../../img/bgs/back-orange.png) repeat-x 0 0;
-	min-height: 100%;
-	background-size: 100% 100%;
-	/*-webkit-background-size: cover;*/
-}
-body {
-	background: none;
-}
-.navbar-inverse .navbar-inner {
-	background: none;
-	border: 1px solid transparent;
-	box-shadow: none;
-}
-.navbar-inverse .notification-dropdown .count {
-	background: rgb(252, 130, 123);
-}
-
-
-/* sidebar */
-#sidebar-nav.display { 
-	background: transparent url(../../../img/bgs/back-orange.png) repeat-x 0 0;
-	background-size: 100% 100%;
-	box-shadow: none;
-}
-#dashboard-menu > li.active > a, 
-#dashboard-menu > li > a:hover {
-	color: #fff;
-	text-shadow: none;
-}
-#dashboard-menu > li > a {
-	color: rgb(190, 190, 190);
-	box-shadow: none;
-	border: 0px;
-}
-#dashboard-menu a i {
-	opacity: 0.6;
-}
-#dashboard-menu a i.icon-chevron-down {
-	color: #fff;
-}
-#dashboard-menu ul.submenu {
-	border-bottom: 0px;
-	box-shadow: 0 2px 1px -1px rgb(75, 101, 136);
-}
-#dashboard-menu ul.submenu a {
-	text-shadow: none;
-	color: rgb(211, 211, 211);
-}
-
-.content {
-	box-shadow: none;
-}
-
-

public/assets/css/scss/tables.scss

@@ -126,10 +126,12 @@
 	}
 }
 
-@media (max-width: 767px) {
+@media (max-width: 768px) {
 	.table-wrapper {
+		padding: 0px 15px;
 		.table {
-			.img {
+			.img,
+			.avatar {
 				display: none;
 			}
 			input[type="checkbox"] {

public/assets/css/scss/ui-elements.scss

@@ -53,6 +53,21 @@
 		h4 {
 			margin: 20px 0px 20px 0px;
 		}
+
+		.dropdown {			
+			.dropdown-menu {
+				margin-right: 10px;
+				position: static;
+				display: block;
+			}			
+		}
+		.nav-tabs {
+			margin-bottom: 15px;
+		}
+		.tab-content {
+			padding: 0px 10px;
+			margin-bottom: 20px;
+		}
 	}
 	.sliders .slider {
 		margin-bottom: 20px;

public/assets/css/scss/user-list.scss

@@ -1,9 +1,12 @@
 .users-list {
 	.header {
+		h3 {
+			margin-top: 0px;
+		}
 		input.search {
 			padding: 5px 6px;
 			position: relative;
-			top: -1px;
+			top: 0px;
 			&:focus {
 				box-shadow: none;
 				border: 1px solid #888;
@@ -14,6 +17,12 @@
 		}
 		.ui-dropdown {
 			margin-left: 20px;
+			input.form-control {
+				width: 60px;
+				display: inline-block;
+				height: 28px;
+				margin: 0px 8px;
+			}
 		}
 		a.btn-flat span {
 			font-size: 17px;
@@ -72,6 +81,9 @@
 			td {
 				font-size: 12px;
 			}
+			.avatar {
+				display: none;
+			}
 		}
 		h3 {
 			display: block;

public/assets/css/scss/user-profile.scss

@@ -133,7 +133,7 @@
 	}
 }
 
-@media (max-width: 767px) {
+@media (max-width: 768px) {
 	.user-profile {
 		.profile {
 			.bio{