diff --git a/app/lang/en/admin/groups/message.php b/app/lang/en/admin/groups/message.php index 6a0b9fa5a73c..51f0230f14d1 100755 --- a/app/lang/en/admin/groups/message.php +++ b/app/lang/en/admin/groups/message.php @@ -13,6 +13,7 @@ ), 'delete' => array( + 'confirm' => 'Are you sure you wish to delete this group?', 'create' => 'There was an issue creating the group. Please try again.', 'update' => 'There was an issue updating the group. Please try again.', 'delete' => 'There was an issue deleting the group. Please try again.', diff --git a/app/lang/en/admin/hardware/form.php b/app/lang/en/admin/hardware/form.php index aacdf633a11b..8a802e29aaad 100644 --- a/app/lang/en/admin/hardware/form.php +++ b/app/lang/en/admin/hardware/form.php @@ -2,18 +2,21 @@ return array( - 'create' => 'Create Asset', - 'update' => 'Asset Update', - 'tag' => 'Asset Tag', - 'name' => 'Asset Name', - 'serial' => 'Serial', - 'order' => 'Order Number', - 'model' => 'Model', - 'date' => 'Purchase Date', - 'cost' => 'Purchase Cost', - 'warranty' => 'Warranty', - 'status' => 'Status', - 'notes' => 'Notes', - 'months' => 'months', + 'create' => 'Create Asset', + 'update' => 'Asset Update', + 'tag' => 'Asset Tag', + 'name' => 'Asset Name', + 'serial' => 'Serial', + 'order' => 'Order Number', + 'model' => 'Model', + 'date' => 'Purchase Date', + 'cost' => 'Purchase Cost', + 'warranty' => 'Warranty', + 'status' => 'Status', + 'notes' => 'Notes', + 'months' => 'months', + 'checkout_to' => 'Checkout to', + 'checkin' => 'Checkin', + 'depreciation' => 'Depreciation', ) ; diff --git a/app/lang/en/admin/hardware/general.php b/app/lang/en/admin/hardware/general.php new file mode 100644 index 000000000000..25e4f82875c0 --- /dev/null +++ b/app/lang/en/admin/hardware/general.php @@ -0,0 +1,8 @@ + 'Checkin Asset', + 'checkout' => 'Checkout Asset to User', + 'clone' => 'Clone Asset', + +); diff --git a/app/lang/en/general.php b/app/lang/en/general.php index e257402ed87f..b3e61160ce68 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -45,4 +45,5 @@ 'list_all' => 'List All', 'asset_models' => 'Asset Models', 'currency_symbol' => '$', + 'no_results' => 'No Results.', ); diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php index 2f1a37ba0d45..e720c5cca2a2 100755 --- a/app/views/backend/categories/index.blade.php +++ b/app/views/backend/categories/index.blade.php @@ -33,9 +33,9 @@ {{ $category->name }} - + diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php index b0c887dc5683..84b1436956f1 100755 --- a/app/views/backend/depreciations/index.blade.php +++ b/app/views/backend/depreciations/index.blade.php @@ -35,10 +35,8 @@ {{ $depreciation->months }} @lang('admin/depreciations/table.months') - diff --git a/app/views/backend/groups/create.blade.php b/app/views/backend/groups/create.blade.php index 77290cfe49a3..02639394674b 100755 --- a/app/views/backend/groups/create.blade.php +++ b/app/views/backend/groups/create.blade.php @@ -2,7 +2,7 @@ {{-- Web site Title --}} @section('title') -Create Group :: +@lang('admin/groups/titles.create_group') :: @parent @stop diff --git a/app/views/backend/groups/edit.blade.php b/app/views/backend/groups/edit.blade.php index 428c6f3d165a..e373d76a0375 100755 --- a/app/views/backend/groups/edit.blade.php +++ b/app/views/backend/groups/edit.blade.php @@ -2,7 +2,7 @@ {{-- Web site Title --}} @section('title') -Group Update :: +@lang('admin/groups/titles.edit_group')< :: @parent @stop diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php index a73f111767b0..a7b26575bf5b 100755 --- a/app/views/backend/groups/index.blade.php +++ b/app/views/backend/groups/index.blade.php @@ -2,7 +2,7 @@ {{-- Web site Title --}} @section('title') -Group Management :: +@lang('admin/groups/titles.group_management') :: @parent @stop @@ -38,13 +38,15 @@ {{ $group->created_at->diffForHumans() }} - + name) }}?" onClick="return false;"> @endforeach @else - No results + @lang('general.no_results') @endif diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php index 723866c95eb8..49bd8d2fbe89 100644 --- a/app/views/backend/hardware/checkin.blade.php +++ b/app/views/backend/hardware/checkin.blade.php @@ -2,11 +2,7 @@ {{-- Page title --}} @section('title') - @if ($asset->id) - Checkin Asset :: - @else - Checkin Asset :: - @endif + @lang('admin/hardware/general.checkin') :: @parent @stop @@ -16,7 +12,7 @@
@lang('general.back') -

Checkin Asset

+

@lang('admin/hardware/general.checkin')

@@ -30,7 +26,7 @@
- +

{{ $asset->asset_tag }}

@@ -38,14 +34,14 @@
- +

{{ $asset->name }}

- +
{{ $errors->first('note', ' :message') }} diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php index 33743ff02c4b..44dc59c6a6aa 100644 --- a/app/views/backend/hardware/checkout.blade.php +++ b/app/views/backend/hardware/checkout.blade.php @@ -2,11 +2,7 @@ {{-- Page title --}} @section('title') - @if ($asset->id) - Checkout Asset to User:: - @else - Checkout Asset to User :: - @endif + @lang('admin/hardware/general.checkout') :: @parent @stop @@ -15,14 +11,9 @@
- @lang('general.back') -

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

+ + @lang('general.back') +

@lang('admin/hardware/general.checkout')

@@ -36,7 +27,7 @@
- +

{{ $asset->asset_tag }}

@@ -44,7 +35,7 @@
- +

{{ $asset->name }}

@@ -52,7 +43,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', ' :message') }} @@ -61,7 +52,7 @@
- +
{{ $errors->first('note', ' :message') }} @@ -72,8 +63,8 @@
- Cancel - + @lang('general.cancel') +
diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php index 4eb720f37831..4cac405d89b7 100644 --- a/app/views/backend/hardware/clone.blade.php +++ b/app/views/backend/hardware/clone.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Clone Asset + @lang('admin/hardware/general.clone') :: @parent @stop @@ -14,7 +14,7 @@ @lang('general.back')
-

Clone Asset

+

@lang('admin/hardware/general.clone')

@@ -24,7 +24,7 @@
- +
{{ $errors->first('asset_tag', ' :message') }} @@ -32,7 +32,7 @@
- +
{{ $errors->first('name', ' :message') }} @@ -42,7 +42,7 @@
- +
{{ $errors->first('serial', ' :message') }} @@ -51,7 +51,7 @@
- +
{{ $errors->first('order_number', ' :message') }} @@ -60,7 +60,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', ' :message') }} @@ -69,7 +69,7 @@
- +
{{ $errors->first('purchase_date', ' :message') }} @@ -79,7 +79,7 @@
- +
$ @@ -91,16 +91,17 @@
- +
- months + + @lang('admin/hardware/form.months') {{ $errors->first('warranty_months', ' :message') }}
- +
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $asset->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }} @@ -111,7 +112,7 @@
- +
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:250px')) }} @@ -123,7 +124,7 @@
- +
{{ $errors->first('notes', ' :message') }} @@ -133,8 +134,8 @@
- Cancel - + @lang('general.cancel') +