From 10df2bc950cfe8617d4c8a4aacf291b9a7328e72 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Nov 2013 14:46:38 -0500 Subject: [PATCH 1/6] Bootstrap 3 --- app/views/backend/models/index.blade.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index 3d07be6314..ac6f23c5d2 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -24,7 +24,7 @@ Asset Models :: @lang('admin/models/table.modelnumber') @lang('admin/models/table.numassets') Depreciation - Category + Category @lang('table.actions') @@ -46,9 +46,8 @@ Asset Models :: {{ $model->category->name }} @endif - @lang('button.edit') - @lang('button.delete') - + + @endforeach From b68e39472dd049e74ebf5e7993ac5b0e9e9d79b4 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Nov 2013 15:19:00 -0500 Subject: [PATCH 2/6] Updating to bootstrap 3 --- app/controllers/admin/ModelsController.php | 6 +- app/views/backend/models/edit.blade.php | 102 ++++++++++----------- app/views/backend/models/index.blade.php | 15 +-- 3 files changed, 62 insertions(+), 61 deletions(-) diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index dbc82ce7d5..3e239d7ec7 100644 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -40,7 +40,7 @@ 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); @@ -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')); } diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php index c106733fb3..5fcae473c8 100755 --- a/app/views/backend/models/edit.blade.php +++ b/app/views/backend/models/edit.blade.php @@ -12,80 +12,80 @@ {{-- Page content --}} @section('content') -
-

+
+
+ Back +

@if ($model->id) Update Model @else Create New Model @endif - -
- Back -
-

+

+
+
+ +
- -
- -
- -
- - {{ $errors->first('name', ':message') }} -
+ + +
+ +
+ + {{ $errors->first('name', ' :message') }} +
-
- -
- - {{ $errors->first('modelno', ':message') }} -
+ +
+ +
+ + {{ $errors->first('modelno', ' :message') }} +
- -
- -
- {{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $model->manufacturer_id), array('class'=>'select2', 'style'=>'width:250px')) }} - {{ $errors->first('manufacturer_id', ':message') }} -
+
+ +
+ {{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $model->manufacturer_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {{ $errors->first('manufacturer_id', ' :message') }} +
-
- -
- {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $model->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }} - {{ $errors->first('depreciation_id', ':message') }} -
+
+ +
+ {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $model->depreciation_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {{ $errors->first('depreciation_id', ' :message') }} +
-
- -
- {{ Form::select('category_id', $category_list , Input::old('category_id', $model->category_id), array('class'=>'select2', 'style'=>'width:250px')) }} - {{ $errors->first('category_id', ':message') }} -
+
+ +
+ {{ Form::select('category_id', $category_list , Input::old('category_id', $model->category_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {{ $errors->first('category_id', ' :message') }} +
- -
- - -
-
- @lang('general.cancel') - -
-
+ +
+ +
+ Cancel + +
+
+
@stop diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index ac6f23c5d2..e4f492518e 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -8,15 +8,15 @@ Asset Models :: {{-- Page content --}} @section('content') -
-
- Create New -
- -

Asset Models

+
+
+ Create New +

Asset Models

+
+
@@ -44,7 +44,8 @@ Asset Models :: + @endif +
@if ($model->category) {{ $model->category->name }} - @endif From 02f1977d301cd449aa806e02e8a829516d436ef7 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Nov 2013 15:20:29 -0500 Subject: [PATCH 3/6] Fixed error message --- app/views/backend/hardware/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 0e863ea24f..26e210ba75 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -119,10 +119,10 @@
- +
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:350px')) }} - {{ $errors->first('depreciation_id', ' :message') }} + {{ $errors->first('status_id', ' :message') }}
From 56adc67e67f936c373616a3c09b58d22fc5f9564 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Nov 2013 15:21:11 -0500 Subject: [PATCH 4/6] Require manufacturer ID --- app/models/Model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/Model.php b/app/models/Model.php index 7bf72ebd47..b9fab8c017 100644 --- a/app/models/Model.php +++ b/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() From 80afa7cbc75676370a0ec200b48055bfd90d8d66 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Nov 2013 15:27:44 -0500 Subject: [PATCH 5/6] Disallow checkout of undeployable items --- app/views/backend/hardware/index.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index 3f2038f2b9..b18733d232 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -109,11 +109,13 @@ Assets :: @endif 		+ @if ($asset->status_id < 1 ) @if ($asset->assigned_to != 0) Checkin @else Checkout @endif + @endif From 11c657ffa4c3bdd01cd04b81d01980b2d795107c Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Nov 2013 16:08:18 -0500 Subject: [PATCH 6/6] Fixes #36 --- app/controllers/account/ProfileController.php | 10 +- app/views/backend/users/edit.blade.php | 2 +- .../frontend/account/change-email.blade.php | 41 ++++---- .../account/change-password.blade.php | 56 ++++++----- app/views/frontend/account/profile.blade.php | 95 ++++++++++--------- app/views/frontend/layouts/account.blade.php | 2 +- 6 files changed, 116 insertions(+), 90 deletions(-) diff --git a/app/controllers/account/ProfileController.php b/app/controllers/account/ProfileController.php index eadb0ebcf0..0f2a108c44 100755 --- a/app/controllers/account/ProfileController.php +++ b/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(); diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php index efacdbe52c..16c2947247 100755 --- a/app/views/backend/users/edit.blade.php +++ b/app/views/backend/users/edit.blade.php @@ -189,7 +189,7 @@ Update User {{ $user->fullName() }} :: - + diff --git a/app/views/frontend/account/change-email.blade.php b/app/views/frontend/account/change-email.blade.php index 199273cda5..b7983ec44e 100755 --- a/app/views/frontend/account/change-email.blade.php +++ b/app/views/frontend/account/change-email.blade.php @@ -7,10 +7,15 @@ Change your Email {{-- Account page content --}} @section('account-content') -
-

Change your Email

+
+ +
+

Change Your Email

+
+
+
@@ -19,32 +24,32 @@ Change your Email -
- -
- - {{ $errors->first('email', ':message') }} +
+ +
+ + {{ $errors->first('email', ' :message') }}
- -
- -
- - {{ $errors->first('email_confirm', ':message') }} +
+ +
+ + {{ $errors->first('email_confirm', ' :message') }}
-
- -
- - {{ $errors->first('current_password', ':message') }} +
+ +
+ + {{ $errors->first('current_password', ' :message') }}
+
diff --git a/app/views/frontend/account/change-password.blade.php b/app/views/frontend/account/change-password.blade.php index edf904662d..1d65ee99b9 100755 --- a/app/views/frontend/account/change-password.blade.php +++ b/app/views/frontend/account/change-password.blade.php @@ -7,36 +7,41 @@ Change your Password {{-- Account page content --}} @section('account-content') -
-

Change your Password

+
+ +
+

Change Your Password

+
+
-
- - - {{ $errors->first('old_password', ':message') }} -
- - -
- -
- - {{ $errors->first('password', ':message') }} +
+ +
+ + {{ $errors->first('old_password', ' :message') }}
- -
- -
- - {{ $errors->first('password_confirm', ':message') }} +
+ +
+ + {{ $errors->first('password', ' :message') }} +
+
+ + +
+ +
+ + {{ $errors->first('password_confirm', ' :message') }}
@@ -102,14 +107,15 @@ Change your Password
- +
-
- Cancel - - + +
+ @lang('general.cancel') +
+
diff --git a/app/views/frontend/account/profile.blade.php b/app/views/frontend/account/profile.blade.php index 36ed3527c1..1b9a204218 100755 --- a/app/views/frontend/account/profile.blade.php +++ b/app/views/frontend/account/profile.blade.php @@ -7,71 +7,80 @@ Your Profile {{-- Account page content --}} @section('account-content') -
-

Update your Profile

+
+ +
+

Update Profile

+
-
+
+ + -
- -
- - {{ $errors->first('first_name', ':message') }} +
+ +
+ + {{ $errors->first('first_name', ' :message') }}
-
- -
- - {{ $errors->first('last_name', ':message') }} +
+ +
+ + {{ $errors->first('last_name', ' :message') }}
-
- -
- - {{ $errors->first('website', ':message') }} +
+ +
+ + {{ $errors->first('website', ' :message') }}
- -
- -
- - {{ $errors->first('country', ':message') }} + +
+ +
+
+ {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:300px')) }} + {{ $errors->first('location_id', ' :message') }} +
+
-
-
- -
- - {{ $errors->first('gravatar', ':message') }} -
- -

- - Change your avatar at Gravatar.com. +

+ +
+ + {{ $errors->first('gravatar', ' :message') }} +

+ Change your avatar at Gravatar.com.

-
- -
- - -
-
-
+ + +
+ +
+ @lang('general.cancel') + +
+
+ + + +
@stop diff --git a/app/views/frontend/layouts/account.blade.php b/app/views/frontend/layouts/account.blade.php index 3f4240792d..66521b423a 100755 --- a/app/views/frontend/layouts/account.blade.php +++ b/app/views/frontend/layouts/account.blade.php @@ -5,10 +5,10 @@