diff --git a/app/controllers/admin/GroupsController.php b/app/controllers/admin/GroupsController.php index e182128e43..79977e298c 100755 --- a/app/controllers/admin/GroupsController.php +++ b/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 diff --git a/app/views/backend/groups/create.blade.php b/app/views/backend/groups/create.blade.php index 8b61fab30c..1db2dddfda 100755 --- a/app/views/backend/groups/create.blade.php +++ b/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') -
-

- Create a New Group -
- Back -
-

+ +
+
+ Back +

Group Update

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

+

- -
-
-
@foreach ($permissions as $area => $permissions)
{{ $area }} @foreach ($permissions as $permission) -
- -
- -
+
+ +
+ -
- -
-
+ +
+
@endforeach
@endforeach -
-
-
-
+



+ + + +
+ +
+ @lang('general.cancel') + +
+
+ - -
-
- Cancel - -
-
+ +
+
@stop + diff --git a/app/views/backend/groups/edit.blade.php b/app/views/backend/groups/edit.blade.php index ed49fbd71e..bc89d6c746 100755 --- a/app/views/backend/groups/edit.blade.php +++ b/app/views/backend/groups/edit.blade.php @@ -8,83 +8,69 @@ Group Update :: {{-- Content --}} @section('content') -
-

- Group Update -
- Back -
-

+ +
+
+ Back +

Group Update

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

- -
-
-
@foreach ($permissions as $area => $permissions) -
- {{ $area }} +

{{ $area }}

@foreach ($permissions as $permission) -
- +
+ +
+ + + +
+
-
- -
-
- -
-
@endforeach - -
@endforeach -
-
-
-
+



+ + + +
+ +
+ @lang('general.cancel') + +
+
+ - -
-
- @lang('general.cancel') - -
-
+ +
+
@stop diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php index 9985ddd4bd..555a67fdd5 100755 --- a/app/views/backend/groups/index.blade.php +++ b/app/views/backend/groups/index.blade.php @@ -8,39 +8,37 @@ Group Management :: {{-- Content --}} @section('content') -
-

- Group Management -
- Create New -
-

+ +
+
+ Create New +

Group Management

+
-
+ +
- - + - + @if ($groups->count() >= 1) @foreach ($groups as $group) - @endforeach diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php index 35e7bbeda1..712888feea 100644 --- a/app/views/backend/hardware/checkout.blade.php +++ b/app/views/backend/hardware/checkout.blade.php @@ -12,76 +12,77 @@ {{-- Page content --}} @section('content') -
-
- Back +
+
+ Back +

+ @if ($asset->id) + Checkout Asset to User + @else + Create Asset + @endif +

- -

- @if ($asset->id) - Checkout Asset to User - @else - Create Asset - @endif -

+
+ +
- -
- -
- - +
- -
- + +
+

{{ $asset->asset_tag }}

-
+
- -
- -
- + +
+ +
+

{{ $asset->name }}

-
- +
-
- -
+
+ +
{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'style'=>'min-width:350px')) }} - {{ $errors->first('assigned_to', ':message') }} + {{ $errors->first('assigned_to', ' :message') }}
- +
- -
- - {{ $errors->first('note', ' :message') }} + +
+ + {{ $errors->first('note', ' :message') }}
-
+ +
+ +
+ @if ($asset->id) + Cancel + @else + Cancel + @endif + +
+
- -
-
- @lang('general.cancel') - -
-
- +
+
@stop diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 2d4f8427af..2a1dbe4a23 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -14,8 +14,6 @@ @section('content') - -
@if ($asset->id) @@ -156,7 +154,7 @@ @else Cancel @endif - +
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index f0f6efe088..a6c0524fb5 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -342,7 +342,7 @@ var title = $(this).attr('data-title'); if (!$('#dataConfirmModal').length) { - $('body').append(''); + $('body').append(''); } diff --git a/app/views/backend/licenses/checkin.blade.php b/app/views/backend/licenses/checkin.blade.php index fa07892196..f781f48afe 100644 --- a/app/views/backend/licenses/checkin.blade.php +++ b/app/views/backend/licenses/checkin.blade.php @@ -8,62 +8,59 @@ {{-- Page content --}} @section('content') -
-
- Back +
+
+ Back +

Checkin License

- -

Checkin License

+
+ +
- -
- -
- -
-
- -
- -
- + +
+ +
+

{{ $licenseseat->license->name }}

-
- -
- -
- -
-
+
- + +
+ +
+

{{ $licenseseat->license->serial }}

+
+
+ +
- -
- - {{ $errors->first('note', ' :message') }} + +
+ + {{ $errors->first('note', ' :message') }}
- - - -
-
- @lang('general.cancel') - +
+ +
+ @lang('general.cancel') + +
-
+ + +
+
- -@stop +@stop \ No newline at end of file diff --git a/app/views/backend/licenses/checkout.blade.php b/app/views/backend/licenses/checkout.blade.php index 853a261351..2f656fce93 100644 --- a/app/views/backend/licenses/checkout.blade.php +++ b/app/views/backend/licenses/checkout.blade.php @@ -8,69 +8,72 @@ {{-- Page content --}} @section('content') -
-
- Back +
+
+ Back +

+ Checkout License to User +

- -

Checkout License to User

-
+
+ +
+
- -
- -
- + +
+ +
+

{{ $licenseseat->license->name }}

-
+
- -
- -
- -
-
-
- -
- +
+ +
+

{{ $licenseseat->license->serial }}

-
+
-
- -
- {{ Form::select('assigned_to', $users_list , Input::old('assigned_to'), array('class'=>'select2', 'style'=>'min-width:350px')) }} - {{ $errors->first('user_id', ':message') }} +
+ +
+ {{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $licenseseat->assigned_to), array('class'=>'select2', 'style'=>'min-width:350px')) }} + {{ $errors->first('assigned_to', ' :message') }}
- +
- -
- - {{ $errors->first('note', ' :message') }} + +
+ + {{ $errors->first('note', ' :message') }}
+
-
+ +
@lang('general.cancel') - +
+ + +
+
@stop diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php index d02b6fc76a..88605661e7 100755 --- a/app/views/backend/licenses/edit.blade.php +++ b/app/views/backend/licenses/edit.blade.php @@ -129,7 +129,7 @@ @else @lang('general.cancel') @endif - +
diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php index 1d3c898e81..c8b4f3d156 100755 --- a/app/views/backend/licenses/index.blade.php +++ b/app/views/backend/licenses/index.blade.php @@ -32,7 +32,7 @@ Licenses ::
@@ -60,7 +60,7 @@ Licenses ::
@lang('admin/groups/table.id') @lang('admin/groups/table.name')@lang('admin/groups/table.users')@lang('admin/groups/table.users') @lang('admin/groups/table.created_at')@lang('table.actions')@lang('table.actions')
{{ $group->id }} {{ $group->name }} {{ $group->users()->count() }} {{ $group->created_at->diffForHumans() }} - @lang('button.edit') - @lang('button.delete') + +
{{ $license->name }} - @if ($license->seats ==1) + @if ($license->seats == 1) ({{ $license->seats }} seat) @else ({{ $license->seats }} seats) @@ -42,8 +42,8 @@ Licenses :: {{ $license->serial }} - @lang('button.edit') - @lang('button.delete') + + {{ $license->serial }} @if ($licensedto->assigned_to) - + {{ $licensedto->user->fullName() }} @endif diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php index c4ee736603..2c9a44c8de 100755 --- a/app/views/backend/statuslabels/edit.blade.php +++ b/app/views/backend/statuslabels/edit.blade.php @@ -12,50 +12,47 @@ {{-- Page content --}} @section('content') -