diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 0c5246cbdf7a..4a105a8c2624 100644 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -148,7 +148,7 @@ public function getCreate() $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id'); // Grab the dropdown list of status - $statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::orderBy('name', 'asc')->lists('name', 'id'); + $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id'); return View::make('backend/hardware/edit')->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('asset',new Asset); @@ -250,7 +250,7 @@ public function getEdit($assetId = null) $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id'); // Grab the dropdown list of status - $statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::orderBy('name', 'asc')->lists('name', 'id'); + $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id'); return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list); } diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php index ce57a3e6fce0..0c245c4b669c 100644 --- a/app/controllers/admin/LicensesController.php +++ b/app/controllers/admin/LicensesController.php @@ -45,7 +45,7 @@ public function getCreate() // Show the page $license_options = array('0' => 'Top Level') + License::lists('name', 'id'); // Show the page - $depreciation_list = array('0' => 'Do Not Depreciate') + Depreciation::lists('name', 'id'); + $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id'); return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('license',new License); } @@ -143,7 +143,7 @@ public function getEdit($licenseId = null) // Show the page $license_options = array('' => 'Top Level') + DB::table('assets')->where('id', '!=', $licenseId)->lists('name', 'id'); - $depreciation_list = array('0' => 'Do Not Depreciate') + Depreciation::lists('name', 'id'); + $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id'); return View::make('backend/licenses/edit', compact('license'))->with('license_options',$license_options)->with('depreciation_list',$depreciation_list); } diff --git a/app/lang/en/admin/hardware/form.php b/app/lang/en/admin/hardware/form.php new file mode 100644 index 000000000000..aacdf633a11b --- /dev/null +++ b/app/lang/en/admin/hardware/form.php @@ -0,0 +1,19 @@ + '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', +) +; diff --git a/app/lang/en/admin/licenses/form.php b/app/lang/en/admin/licenses/form.php new file mode 100644 index 000000000000..04a7c38d3ee3 --- /dev/null +++ b/app/lang/en/admin/licenses/form.php @@ -0,0 +1,20 @@ + 'Create License', + 'update' => 'Update License', + 'name' => 'Software Name', + 'serial' => 'Serial', + 'to_name' => 'Licensed to Name', + 'to_email' => 'Licensed to Email', + 'seats' => 'Seats', + 'order' => 'Order No.', + 'date' => 'Purchase Date', + 'cost' => 'Purchase Cost', + 'depreciation' => 'Depreciation', + 'no_depreciation' => 'Do Not Depreciate', + 'notes' => 'Notes', + +) +; \ No newline at end of file diff --git a/app/lang/en/general.php b/app/lang/en/general.php index eeb0dbd10ff5..5e8ddb254a36 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -8,6 +8,43 @@ 'save' => 'Save', 'checkout' => 'Checkout', 'checkin' => 'Checkin', - 'cancel' => 'Cancel' + 'cancel' => 'Cancel', + 'back' => 'Back', -); + 'total_assets' => 'total assets', + 'assets_available'=> 'assets available', + 'total_licenses'=> 'total licenses', + 'licenses_available'=> 'licenses available', + 'all_assets' => 'All Assets', + 'assets' => 'Assets', + 'asset' => 'Asset', + 'license' => 'License', + 'licenses' => 'Licenses', + 'user' => 'User', + 'people' => 'People', + 'reports' => 'Reports', + 'all' => 'All', + + 'create' => 'Create New', + 'welcome' => 'Welcome, :name', + 'settings' => 'Settings', + 'profile' => 'Your profile', + 'logout' => 'Logout', + 'admin' => 'Admin', + 'groups' => 'Groups', + 'status' => 'Status', + 'status_labels' => 'Status Labels', + 'manufacturers' => 'Manufacturers', + 'categories' => 'Categories', + 'locations' => 'Locations', + 'depreciation' => 'Depreciation', + + 'sign_in' => 'Sign in', + 'deployed' => 'Deployed', + 'ready_to_deploy'=> 'Ready to Deploy', + 'pending' => 'Pending', + 'undeployable' => 'Un-deployable', + 'list_all' => 'List All', + 'asset_models' => 'Asset Models', +) +; diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index be6e770de4bc..e034b3dcbe93 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -3,9 +3,9 @@ {{-- Page title --}} @section('title') @if ($asset->id) - Asset Update :: + @lang('admin/hardware/form.update') :: @else - Create Asset :: + @lang('admin/hardware/form.create') :: @endif @parent @stop @@ -16,12 +16,12 @@
- Back + @lang('general.back')

@if ($asset->id) - Asset Update + @lang('admin/hardware/form.update') @else - Create Asset + @lang('admin/hardware/form.create') @endif

@@ -37,7 +37,7 @@
- +
{{ $errors->first('asset_tag', ' :message') }} @@ -46,7 +46,7 @@
- +
{{ $errors->first('name', ' :message') }} @@ -54,7 +54,7 @@
- +
{{ $errors->first('serial', ' :message') }} @@ -63,7 +63,7 @@
- +
{{ $errors->first('order_number', ' :message') }} @@ -72,7 +72,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') }} @@ -81,7 +81,7 @@
- +
@@ -91,10 +91,10 @@
- +
- $ + @lang('general.currency') {{ $errors->first('purchase_cost', ' :message') }}
@@ -103,10 +103,10 @@
- +
- months + @lang('admin/hardware/form.months') {{ $errors->first('warranty_months', ' :message') }}
@@ -114,7 +114,7 @@
- +
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:350px')) }} {{ $errors->first('status_id', ' :message') }} @@ -123,7 +123,7 @@
- +
{{ $errors->first('notes', ' :message') }} @@ -134,8 +134,8 @@
- Cancel - + @lang('general.cancel') +
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index d6d52cae2d73..3b6c755dde00 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -1,23 +1,26 @@ @extends('backend/layouts/default') +@section('title0') + @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed')) + @if (Input::get('Pending')) + @lang('general.pending') + @elseif (Input::get('RTD')) + @lang('general.ready_to_deploy') + @elseif (Input::get('Undeployable')) + @lang('general.undeployable') + @elseif (Input::get('Deployed')) + @lang('general.deployed') + @endif + @else + @lang('general.all') + @endif + + @lang('general.assets') +@stop + {{-- Page title --}} @section('title') -@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed')) - @if (Input::get('Pending')) - Pending - @elseif (Input::get('RTD')) - Ready to Deploy - @elseif (Input::get('Undeployable')) - Un-deployable - @elseif (Input::get('Deployed')) - Deployed - @endif -@else - All -@endif - -Assets :: -@parent + @yield('title0') :: @parent @stop {{-- Page content --}} @@ -26,23 +29,8 @@
- Create New -

- @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed')) - @if (Input::get('Pending')) - Pending - @elseif (Input::get('RTD')) - Ready to Deploy - @elseif (Input::get('Undeployable')) - Un-deployable - @elseif (Input::get('Deployed')) - Deployed - @endif - @else - All - @endif - Assets -

+ @lang('general.create') +

@yield('title0')

@@ -58,7 +46,7 @@ @lang('admin/hardware/table.title') @lang('admin/hardware/table.serial') @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')) - Status + @lang('general.status') @else @lang('admin/hardware/table.checkoutto') @lang('admin/hardware/table.location') @@ -78,15 +66,14 @@ @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')) @if (Input::get('Pending')) - Pending + @lang('general.pending') @elseif (Input::get('RTD')) - Ready to Deploy + @lang('general.ready_to_deploy') @elseif (Input::get('Undeployable')) @if ($asset->assetstatus) {{ $asset->assetstatus->name }} @endif - - @endif + @endif @else @@ -117,9 +104,9 @@ @if ($asset->status_id < 1 ) @if ($asset->assigned_to != 0) - Checkin + @lang('general.checkin') @else - Checkout + @lang('general.checkout') @endif @endif diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 9a5247f74250..41c562c7e11f 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -86,95 +86,95 @@
  • - Admin + @lang('general.admin')
    • @else -
  • Sign in
    • +
  • @lang('general.sign_in')
    • @endif
    @@ -190,17 +190,17 @@
    ' : '>') }} - Assets + @lang('general.assets') @@ -208,19 +208,19 @@
    ' : '>') }} - Licenses + @lang('general.licenses')
    ' : '>') }} - People + @lang('general.people')
    ' : '>') }} - Reports + @lang('general.reports') @@ -240,7 +240,7 @@
    {{ number_format(Asset::assetcount()) }} - total assets + @lang('general.total_assets')
    @@ -248,7 +248,7 @@
    {{ number_format(Asset::availassetcount()) }} - assets available + @lang('general.assets_available')
    @@ -256,7 +256,7 @@
    {{ number_format(License::assetcount()) }} - total licenses + @lang('general.total_licenses')
    @@ -264,7 +264,7 @@
    {{ number_format(License::availassetcount()) }} - licenses available + @lang('general.licenses_available')
    diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php index cd34810c9242..8daeea78b4ca 100755 --- a/app/views/backend/licenses/edit.blade.php +++ b/app/views/backend/licenses/edit.blade.php @@ -3,9 +3,9 @@ {{-- Page title --}} @section('title') @if ($license->id) - License Update :: + @lang('admin/licenses/form.update') :: @else - Create License :: + @lang('admin/licenses/form.create') :: @endif @parent @stop @@ -15,12 +15,12 @@
    - Back + @lang('general.back')

    @if ($license->id) - Update License + @lang('admin/licenses/form.update') @else - Create License + @lang('admin/licenses/form.create') @endif

    @@ -34,7 +34,7 @@
    - +
    {{ $errors->first('name', ' :message') }} @@ -42,7 +42,7 @@
    - +
    {{ $errors->first('serial', ' :message') }} @@ -50,7 +50,7 @@
    - +
    {{ $errors->first('license_name', ' :message') }} @@ -58,7 +58,7 @@
    - +
    {{ $errors->first('license_email', ' :message') }} @@ -66,7 +66,7 @@
    - +
    {{ $errors->first('seats', ' :message') }} @@ -74,7 +74,7 @@
    - +
    {{ $errors->first('order_number', ' :message') }} @@ -83,7 +83,7 @@
    - +
    @@ -93,10 +93,10 @@
    - +
    - $ + @lang('general.currency') {{ $errors->first('purchase_cost', ' :message') }}
    @@ -105,7 +105,7 @@
    - +
    {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $license->depreciation_id), array('class'=>'select2', 'style'=>'width:350px')) }} {{ $errors->first('depreciation_id', ' :message') }} @@ -114,7 +114,7 @@
    - +
    {{ $errors->first('notes', ' :message') }} @@ -126,8 +126,8 @@
    - Cancel - + @lang('general.cancel') +