diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 0e5a8dd70dd6..2e3f675aa53e 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -77,7 +77,6 @@ class UserController extends BaseController 'user' => $user, 'method' => 'PUT', 'url' => 'users/'.$publicId, - 'title' => trans('texts.edit_user'), ]; return View::make('users.edit', $data); @@ -120,7 +119,6 @@ class UserController extends BaseController 'user' => null, 'method' => 'POST', 'url' => 'users', - 'title' => trans('texts.add_user'), ]; return View::make('users.edit', $data); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 6d0f963d2893..02fe26bece12 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1068,7 +1068,7 @@ $LANG = array( // User Permissions 'owner' => 'Owner', 'administrator' => 'Administrator', - 'administrator_help' => 'Allow user to manage users, change settings, and view and modify all data', + 'administrator_help' => 'Allow user to manage users, change settings and modify all records', 'user_create_all' => 'Create clients, invoices, etc.', 'user_view_all' => 'View all clients, invoices, etc.', 'user_edit_all' => 'Edit all clients, invoices, etc.', @@ -1078,6 +1078,11 @@ $LANG = array( 'restore_vendor' => 'Restore Vendor', 'restored_vendor' => 'Successfully restored vendor', 'restored_expense' => 'Successfully restored expense', + 'permissions' => 'Permissions', + 'create_all_help' => 'Allow user to create and modify records', + 'view_all_help' => 'Allow user to view records they didn\'t create', + 'edit_all_help' => 'Allow user to modify records they didn\'t create', + ); diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 542d40b737a8..5cdbeac2d8e0 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -16,13 +16,24 @@
-

{!! $title !!}

+

{!! trans('texts.user_details') !!}

{!! Former::text('first_name') !!} {!! Former::text('last_name') !!} {!! Former::text('email') !!} + +
+
+ +
+
+

{!! trans('texts.permissions') !!}

+
+
+ + {!! Former::checkbox('is_admin') ->label(' ') ->text(trans('texts.administrator')) @@ -31,17 +42,20 @@ ->value('create_all') ->label(' ') ->id('permissions_create_all') - ->text(trans('texts.user_create_all')) !!} + ->text(trans('texts.user_create_all')) + ->help(trans('texts.create_all_help')) !!} {!! Former::checkbox('permissions[view_all]') ->value('view_all') ->label(' ') ->id('permissions_view_all') - ->text(trans('texts.user_view_all')) !!} + ->text(trans('texts.user_view_all')) + ->help(trans('texts.view_all_help')) !!} {!! Former::checkbox('permissions[edit_all]') ->value('edit_all') ->label(' ') ->id('permissions_edit_all') - ->text(trans('texts.user_edit_all')) !!} + ->text(trans('texts.user_edit_all')) + ->help(trans('texts.edit_all_help')) !!}