DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Switch to use trans from Lang::get for laravel 5.2

Browse source
This commit is contained in:
snipe 2016-04-07 02:51:57 -07:00
parent 64d36a9e64
commit 0e6b8a8358
32 changed files with 139 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
resources/views/accessories/edit.blade.php
View file

@ -55,7 +55,7 @@
<!-- Company -->
<div class="form-group{{ $errors->has('company_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('company_id', Lang::get('general.company')) }}
{{ Form::label('company_id', trans('general.company')) }}
</div>
<div class="col-md-8">
{{ Form::select('company_id', $company_list , Input::old('company_id', $accessory->company_id), array('class'=>'select2', 'style'=>'width:100%')) }}
@ -67,7 +67,7 @@
<!-- Name -->
<div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/accessories/general.accessory_name')) }}
{{ Form::label('name', trans('admin/accessories/general.accessory_name')) }}
</div>
<div class="col-md-8">
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $accessory->name) }}" />
@ -78,7 +78,7 @@
<!-- Category -->
<div class="form-group{{ $errors->has('category_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('category_id', Lang::get('admin/accessories/general.accessory_category')) }}
{{ Form::label('category_id', trans('admin/accessories/general.accessory_category')) }}
</div>
<div class="col-md-7">
{{ Form::select('category_id', $category_list , Input::old('category_id', $accessory->category_id), array('class'=>'select2', 'style'=>'width:100%')) }}
@ -89,7 +89,7 @@
<!-- Location -->
<div class="form-group{{ $errors->has('location_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('location_id', Lang::get('general.location')) }}
{{ Form::label('location_id', trans('general.location')) }}
</div>
<div class="col-md-7 col-sm-12">
{{ Form::select('location_id', $location_list , Input::old('location_id', $accessory->location_id), array('class'=>'select2', 'style'=>'width:100%')) }}
@ -101,7 +101,7 @@
<!-- Order Number -->
<div class="form-group{{ $errors->has('order_number') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('order_number', Lang::get('admin/accessories/general.order')) }}
{{ Form::label('order_number', trans('admin/accessories/general.order')) }}
</div>
<div class="col-md-3">
<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $accessory->order_number) }}" />
@ -113,7 +113,7 @@
<!-- Purchase Date -->
<div class="form-group{{ $errors->has('purchase_date') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('purchase_date', Lang::get('admin/accessories/general.date')) }}
{{ Form::label('purchase_date', trans('admin/accessories/general.date')) }}
</div>
<div class="input-group col-md-3">
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $accessory->purchase_date) }}">
@ -125,7 +125,7 @@
<!-- Purchase Cost -->
<div class="form-group{{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('purchase_cost', Lang::get('admin/accessories/general.cost')) }}
{{ Form::label('purchase_cost', trans('admin/accessories/general.cost')) }}
</div>
<div class="col-md-3">
<div class="input-group">
@ -141,7 +141,7 @@
<!-- QTY -->
<div class="form-group{{ $errors->has('qty') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('qty', Lang::get('admin/accessories/general.qty')) }}
{{ Form::label('qty', trans('admin/accessories/general.qty')) }}
</div>
<div class="col-md-9" style="margin-left: -15px">
<div class="col-md-3">
@ -157,7 +157,7 @@
<!-- Min QTY -->
<div class="form-group{{ $errors->has('min_amt') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('min_amt', Lang::get('general.min_amt')) }}
{{ Form::label('min_amt', trans('general.min_amt')) }}
</div>
<div class="col-md-9" style="margin-left: -15px">
<div class="col-md-2">

22
resources/views/accessories/index.blade.php
View file

@ -24,23 +24,23 @@
name="accessories"
class="table table-striped"
id="table"
data-url="{{route('api.accessories.list')}}"
data-url="{{route('api.accessories.list') }}"
data-cookie="true"
data-click-to-select="true"
data-cookie-id-table="accessoriesTable-{{ config('version.hash_version') }}">
<thead>
<tr>
<th data-switchable="true" data-searchable="true" data-sortable="true" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-sortable="true" data-searchable="true" data-field="name">{{Lang::get('admin/accessories/table.title')}}</th>
<th data-searchable="true" data-sortable="true" data-field="category">{{Lang::get('admin/accessories/general.accessory_category')}}</th>
<th data-searchable="true" data-sortable="true" data-field="location">{{Lang::get('general.location')}}</th>
<th data-searchable="false" data-sortable="false" data-field="qty">{{Lang::get('admin/accessories/general.total')}}</th>
<th data-searchable="true" data-sortable="true" data-field="purchase_date" data-visible="false">{{Lang::get('admin/accessories/general.date')}}</th>
<th data-searchable="true" data-sortable="true" data-field="purchase_cost">{{Lang::get('admin/accessories/general.cost')}}</th>
<th data-searchable="true" data-sortable="true" data-field="order_number" data-visible="false">{{Lang::get('admin/accessories/general.order')}}</th>
<th data-searchable="false" data-sortable="true" data-field="min_amt">{{Lang::get('general.min_amt')}}</th>
<th data-searchable="false" data-sortable="false" data-field="numRemaining">{{Lang::get('admin/accessories/general.remaining')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{Lang::get('table.actions')}}</th>
<th data-sortable="true" data-searchable="true" data-field="name">{{ trans('admin/accessories/table.title') }}</th>
<th data-searchable="true" data-sortable="true" data-field="category">{{ trans('admin/accessories/general.accessory_category') }}</th>
<th data-searchable="true" data-sortable="true" data-field="location">{{ trans('general.location') }}</th>
<th data-searchable="false" data-sortable="false" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>
<th data-searchable="true" data-sortable="true" data-field="purchase_date" data-visible="false">{{ trans('admin/accessories/general.date') }}</th>
<th data-searchable="true" data-sortable="true" data-field="purchase_cost">{{ trans('admin/accessories/general.cost') }}</th>
<th data-searchable="true" data-sortable="true" data-field="order_number" data-visible="false">{{ trans('admin/accessories/general.order') }}</th>
<th data-searchable="false" data-sortable="true" data-field="min_amt">{{ trans('general.min_amt') }}</th>
<th data-searchable="false" data-sortable="false" data-field="numRemaining">{{ trans('admin/accessories/general.remaining') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

4
resources/views/accessories/view.blade.php
View file

@ -47,8 +47,8 @@
<thead>
<tr>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{Lang::get('general.user')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{Lang::get('table.actions')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.user') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

4
resources/views/asset_maintenances/index.blade.php
View file

@ -27,7 +27,7 @@
name="maintenances"
id="table"
class="table table-striped"
data-url="{{route('api.asset_maintenances.list')}}"
data-url="{{route('api.asset_maintenances.list') }}"
data-cookie="true"
data-click-to-select="true"
data-cookie-id-table="maintenancesTable-{{ config('version.hash_version') }}">
@ -44,7 +44,7 @@
<th data-searchable="true" data-sortable="true" data-field="asset_maintenance_time">{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}</th>
<th data-searchable="true" data-sortable="true" data-field="cost" class="text-right">{{ trans('admin/asset_maintenances/form.cost') }}</th>
<th data-searchable="true" data-sortable="true" data-field="notes" data-visible="false">{{ trans('admin/asset_maintenances/form.notes') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

6
resources/views/asset_maintenances/view.blade.php
View file

@ -69,7 +69,7 @@ use Carbon\Carbon;
<div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
<strong>{{ trans('admin/asset_maintenances/form.completion_date') }}: </strong>
{{ $completionDate = $assetMaintenance->completion_date }}
{{ $completionDate ? $completionDate : Lang::get('admin/asset_maintenances/message.asset_maintenance_incomplete') }}
{{ $completionDate ? $completionDate : trans('admin/asset_maintenances/message.asset_maintenance_incomplete') }}
</div>
<div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
<strong>{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}: </strong>
@ -81,11 +81,11 @@ use Carbon\Carbon;
<div class="row">
<div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
<strong>{{ trans('admin/asset_maintenances/form.cost') }}: </strong>
{{ sprintf( Lang::get( 'general.currency' ) . '%01.2f', $assetMaintenance->cost) }}
{{ sprintf( trans( 'general.currency' ) . '%01.2f', $assetMaintenance->cost) }}
</div>
<div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
<strong>{{ trans('admin/asset_maintenances/form.is_warranty') }}: </strong>
{{ $assetMaintenance->is_warranty ? Lang::get('admin/asset_maintenances/message.warranty') : Lang::get('admin/asset_maintenances/message.not_warranty') }}
{{ $assetMaintenance->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}
</div>
</div>
<!-- 4th Row End -->

6
resources/views/categories/edit.blade.php
View file

@ -39,7 +39,7 @@
<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/categories/general.category_name')) }}
{{ Form::label('name', trans('admin/categories/general.category_name')) }}
<i class='fa fa-asterisk'></i>
</div>
<div class="col-md-9">
@ -51,7 +51,7 @@
<!-- Type -->
<div class="form-group {{ $errors->has('category_type') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('category_type', Lang::get('general.type')) }}
{{ Form::label('category_type', trans('general.type')) }}
<i class='fa fa-asterisk'></i>
</div>
<div class="col-md-7">
@ -63,7 +63,7 @@
<!-- EULA text -->
<div class="form-group {{ $errors->has('eula_text') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('eula_text', Lang::get('admin/categories/general.eula_text')) }}
{{ Form::label('eula_text', trans('admin/categories/general.eula_text')) }}
</div>
<div class="col-md-9">
{{ Form::textarea('eula_text', Input::old('eula_text', $category->eula_text), array('class' => 'form-control')) }}

14
resources/views/categories/index.blade.php
View file

@ -26,19 +26,19 @@
class="table table-striped"
name="categories"
id="table"
data-url="{{route('api.categories.list')}}"
data-url="{{route('api.categories.list') }}"
data-cookie="true"
data-click-to-select="true"
data-cookie-id-table="categoriesTable-{{ config('version.hash_version') }}">
<thead>
<tr>
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-sortable="true" data-field="name">{{Lang::get('admin/categories/table.title')}}</th>
<th data-sortable="true" data-field="category_type">{{Lang::get('general.type')}}</th>
<th data-searchable="false" data-sortable="false" data-field="count">{{Lang::get('general.assets')}}</th>
<th data-searchable="false" data-sortable="true" data-field="acceptance">{{Lang::get('admin/categories/table.require_acceptance')}}</th>
<th data-searchable="false" data-sortable="true" data-field="eula">{{Lang::get('admin/categories/table.eula_text')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
<th data-sortable="true" data-field="name">{{ trans('admin/categories/table.title') }}</th>
<th data-sortable="true" data-field="category_type">{{ trans('general.type') }}</th>
<th data-searchable="false" data-sortable="false" data-field="count">{{ trans('general.assets') }}</th>
<th data-searchable="false" data-sortable="true" data-field="acceptance">{{ trans('admin/categories/table.require_acceptance') }}</th>
<th data-searchable="false" data-sortable="true" data-field="eula">{{ trans('admin/categories/table.eula_text') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

4
resources/views/companies/index.blade.php
View file

@ -37,11 +37,11 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<a href="{{ route('update/company', $company->id) }}" class="btn btn-sm btn-warning"
title="{{ Lang::get('button.edit') }}">
title="{{ trans('button.edit') }}">
<i class="fa fa-pencil icon-white"></i>
</a>
<button type="submit" class="btn btn-sm btn-danger" title="{{ Lang::get('button.delete') }}">
<button type="submit" class="btn btn-sm btn-danger" title="{{ trans('button.delete') }}">
<i class="fa fa-trash icon-white"></i>
</button>

18
resources/views/components/edit.blade.php
View file

@ -46,7 +46,7 @@
@if (\App\Models\Company::isCurrentUserAuthorized())
<div class="form-group {{ $errors->has('company_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('company_id', Lang::get('general.company')) }}
{{ Form::label('company_id', trans('general.company')) }}
</div>
<div class="col-md-7">
{{ Form::select('company_id', $company_list , Input::old('company_id', $component->company_id), array('class'=>'select2', 'style'=>'width:350px')) }}
@ -58,7 +58,7 @@
<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/components/table.title')) }}
{{ Form::label('name', trans('admin/components/table.title')) }}
</div>
<div class="col-md-9">
@ -70,7 +70,7 @@
<!-- Category -->
<div class="form-group {{ $errors->has('category_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('category_id', Lang::get('general.category')) }}
{{ Form::label('category_id', trans('general.category')) }}
</div>
<div class="col-md-7">
@ -82,7 +82,7 @@
<!-- Location -->
<div class="form-group {{ $errors->has('location_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('location_id', Lang::get('general.location')) }}
{{ Form::label('location_id', trans('general.location')) }}
</div>
<div class="col-md-7 col-sm-12">
{{ Form::select('location_id', $location_list , Input::old('location_id', $component->location_id), array('class'=>'select2', 'style'=>'width:350px')) }}
@ -95,7 +95,7 @@
<!-- Order Number -->
<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('order_number', Lang::get('admin/components/general.order')) }}
{{ Form::label('order_number', trans('admin/components/general.order')) }}
</div>
<div class="col-md-3">
<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $component->order_number) }}" />
@ -106,7 +106,7 @@
<!-- Purchase Date -->
<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('purchase_date', Lang::get('admin/components/general.date')) }}
{{ Form::label('purchase_date', trans('admin/components/general.date')) }}
</div>
<div class="input-group col-md-3">
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $component->purchase_date) }}">
@ -118,7 +118,7 @@
<!-- Purchase Cost -->
<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('purchase_cost', Lang::get('admin/components/general.cost')) }}
{{ Form::label('purchase_cost', trans('admin/components/general.cost')) }}
</div>
<div class="col-md-2">
<div class="input-group">
@ -134,7 +134,7 @@
<!-- QTY -->
<div class="form-group {{ $errors->has('total_qty') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('total_qty', Lang::get('general.quantity')) }}
{{ Form::label('total_qty', trans('general.quantity')) }}
</div>
<div class="col-md-9" style="margin-left: -15px">
<div class="col-md-2">
@ -147,7 +147,7 @@
<!-- Min QTY -->
<div class="form-group{{ $errors->has('min_amt') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('min_amt', Lang::get('general.min_amt')) }}
{{ Form::label('min_amt', trans('general.min_amt')) }}
</div>
<div class="col-md-9" style="margin-left: -15px">
<div class="col-md-2">

6
resources/views/components/view.blade.php
View file

@ -49,9 +49,9 @@
data-cookie-id-table="componentDetailTable-{{ config('version.hash_version') }}">
<thead>
<tr>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{Lang::get('general.asset')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="qty">{{Lang::get('general.qty')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="created_at">{{Lang::get('general.date')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.asset') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="qty">{{ trans('general.qty') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="created_at">{{ trans('general.date') }}</th>
</tr>
</thead>
</table>

18
resources/views/consumables/edit.blade.php
View file

@ -46,7 +46,7 @@
@if (\App\Models\Company::isCurrentUserAuthorized())
<div class="form-group {{ $errors->has('company_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('company_id', Lang::get('general.company')) }}
{{ Form::label('company_id', trans('general.company')) }}
</div>
<div class="col-md-7">
{{ Form::select('company_id', $company_list , Input::old('company_id', $consumable->company_id), array('class'=>'select2', 'style'=>'width:350px')) }}
@ -58,7 +58,7 @@
<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/consumables/table.title')) }}
{{ Form::label('name', trans('admin/consumables/table.title')) }}
</div>
<div class="col-md-9">
@ -70,7 +70,7 @@
<!-- Category -->
<div class="form-group {{ $errors->has('category_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('category_id', Lang::get('general.category')) }}
{{ Form::label('category_id', trans('general.category')) }}
</div>
<div class="col-md-7">
@ -82,7 +82,7 @@
<!-- Location -->
<div class="form-group {{ $errors->has('location_id') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('location_id', Lang::get('general.location')) }}
{{ Form::label('location_id', trans('general.location')) }}
</div>
<div class="col-md-7 col-sm-12">
{{ Form::select('location_id', $location_list , Input::old('location_id', $consumable->location_id), array('class'=>'select2', 'style'=>'width:350px')) }}
@ -95,7 +95,7 @@
<!-- Order Number -->
<div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('order_number', Lang::get('admin/consumables/general.order')) }}
{{ Form::label('order_number', trans('admin/consumables/general.order')) }}
</div>
<div class="col-md-3">
<input class="form-control" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $consumable->order_number) }}" />
@ -106,7 +106,7 @@
<!-- Purchase Date -->
<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('purchase_date', Lang::get('admin/consumables/general.date')) }}
{{ Form::label('purchase_date', trans('admin/consumables/general.date')) }}
</div>
<div class="input-group col-md-3">
<input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $consumable->purchase_date) }}">
@ -118,7 +118,7 @@
<!-- Purchase Cost -->
<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('purchase_cost', Lang::get('admin/consumables/general.cost')) }}
{{ Form::label('purchase_cost', trans('admin/consumables/general.cost')) }}
</div>
<div class="col-md-2">
<div class="input-group">
@ -134,7 +134,7 @@
<!-- QTY -->
<div class="form-group {{ $errors->has('qty') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('qty', Lang::get('general.quantity')) }}
{{ Form::label('qty', trans('general.quantity')) }}
</div>
<div class="col-md-9" style="margin-left: -15px">
<div class="col-md-2">
@ -148,7 +148,7 @@
<!-- Min QTY -->
<div class="form-group{{ $errors->has('min_amt') ? ' has-error' : '' }}">
<div class="col-md-3">
{{ Form::label('min_amt', Lang::get('general.min_amt')) }}
{{ Form::label('min_amt', trans('general.min_amt')) }}
</div>
<div class="col-md-9" style="margin-left: -15px">
<div class="col-md-2">

6
resources/views/consumables/view.blade.php
View file

@ -44,9 +44,9 @@
data-cookie-id-table="consumableDetailTable-{{ config('version.hash_version') }}">
<thead>
<tr>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{Lang::get('general.user')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="created_at">{{Lang::get('general.date')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="admin">{{Lang::get('general.admin')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.user') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="created_at">{{ trans('general.date') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="admin">{{ trans('general.admin') }}</th>
</tr>
</thead>
</table>

2
resources/views/dashboard.blade.php
View file

@ -122,7 +122,7 @@
</td>
<td>
{{ strtolower(Lang::get('general.'.str_replace(' ','_',$activity->action_type))) }}
{{ strtolower(trans('general.'.str_replace(' ','_',$activity->action_type))) }}
</td>
<td>
@if ($activity->action_type=='requested')

2
resources/views/depreciations/index.blade.php
View file

@ -32,7 +32,7 @@ Asset Depreciations
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-sortable="true" data-field="name">{{ trans('admin/depreciations/table.title') }}</th>
<th data-sortable="false" data-field="months">{{ trans('admin/depreciations/table.term') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

2
resources/views/groups/index.blade.php
View file

@ -36,7 +36,7 @@
<th data-switchable="true" data-sortable="true" data-field="name" data-visible="true">{{ trans('admin/groups/table.name') }}</th>
<th data-switchable="true" data-sortable="false" data-field="users" data-visible="true">{{ trans('admin/groups/table.users') }}</th>
<th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true">{{ trans('general.created_at') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ Lang::get('table.actions') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

10
resources/views/hardware/checkin.blade.php
View file

@ -42,7 +42,7 @@
<!-- Asset name -->
<div class="form-group">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/hardware/form.model')) }}
{{ Form::label('name', trans('admin/hardware/form.model')) }}
</div>
<div class="col-md-9">
<p class="form-control-static">{{ $asset->model->name }}</p>
@ -54,7 +54,7 @@
<!-- Asset name -->
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/hardware/form.name')) }}
{{ Form::label('name', trans('admin/hardware/form.name')) }}
</div>
<div class="col-md-9">
<p class="form-control-static">{{ $asset->name }}</p>
@ -65,7 +65,7 @@
<!-- Status -->
<div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/hardware/form.name')) }}
{{ Form::label('name', trans('admin/hardware/form.name')) }}
</div>
<div class="col-md-9">
{{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:350px','id' =>'modal-statuslabel_types')) }}
@ -77,7 +77,7 @@
<div class="form-group {{ $errors->has('checkin_at') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/hardware/form.checkin_date')) }}
{{ Form::label('name', trans('admin/hardware/form.checkin_date')) }}
</div>
<div class="col-md-9">
<div class="col-md-4 input-group">
@ -92,7 +92,7 @@
<!-- Note -->
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('note', Lang::get('admin/hardware/form.notes')) }}
{{ Form::label('note', trans('admin/hardware/form.notes')) }}
</div>
<div class="col-md-9">
<textarea class="col-md-6 form-control" id="note" name="note">{{ Input::old('note', $asset->note) }}</textarea>

14
resources/views/hardware/checkout.blade.php
View file

@ -31,7 +31,7 @@
<!-- Asset name -->
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/hardware/form.model')) }}
{{ Form::label('name', trans('admin/hardware/form.model')) }}
</div>
<div class="col-md-9">
<p class="form-control-static">{{ $asset->model->name }}</p>
@ -42,7 +42,7 @@
<!-- Asset Name -->
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('name', Lang::get('admin/hardware/form.name')) }}
{{ Form::label('name', trans('admin/hardware/form.name')) }}
</div>
<div class="col-md-9">
<input class="form-control" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
@ -53,7 +53,7 @@
<!-- User -->
<div class="form-group {{ $errors->has('assigned_to') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('assigned_to', Lang::get('admin/hardware/form.checkout_to')) }}
{{ Form::label('assigned_to', trans('admin/hardware/form.checkout_to')) }}
</div>
<div class="col-md-9">
{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $asset->assigned_to), array('id'=>'checkout_to_user','class'=>'select2', 'style'=>'min-width:350px')) }}
@ -65,7 +65,7 @@
<!-- Checkout/Checkin Date -->
<div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('checkout_at', Lang::get('admin/hardware/form.checkout_date')) }}
{{ Form::label('checkout_at', trans('admin/hardware/form.checkout_date')) }}
</div>
<div class="col-md-4">
<div class="right-inner-addon">
@ -80,7 +80,7 @@
<!-- Expected Checkin Date -->
<div class="form-group {{ $errors->has('expected_checkin') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('expected_checkin', Lang::get('admin/hardware/form.expected_checkin')) }}
{{ Form::label('expected_checkin', trans('admin/hardware/form.expected_checkin')) }}
</div>
<div class="col-md-4">
<div class="right-inner-addon">
@ -95,7 +95,7 @@
<!-- Note -->
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('note', Lang::get('admin/hardware/form.notes')) }}
{{ Form::label('note', trans('admin/hardware/form.notes')) }}
</div>
<div class="col-md-9">
<textarea class="col-md-6 form-control" id="note" name="note">
@ -165,7 +165,7 @@ $(function() {
$('#current_assets_content').html("");
} else {
$.get("{{config('app.url')}}/api/users/"+userid+"/assets",{_token: "{{ csrf_token() }}"},function (data) {
$.get("{{config('app.url') }}/api/users/"+userid+"/assets",{_token: "{{ csrf_token() }}"},function (data) {
console.warn("Ajax call came back okay for user " + userid + "! " + data.length + " Data is: "+data);
if (data.length > 0) {
$('#current_assets_box').fadeIn();

8
resources/views/hardware/edit.blade.php
View file

@ -236,7 +236,7 @@
<!-- Company -->
@if (\App\Models\Company::isCurrentUserAuthorized())
<div class="form-group {{ $errors->has('company_id') ? ' has-error' : '' }}">
<div class="col-md-3 control-label">{{ Form::label('company_id', Lang::get('general.company')) }}</div>
<div class="col-md-3 control-label">{{ Form::label('company_id', trans('general.company')) }}</div>
<div class="col-md-7 col-sm-12">
{{ Form::select('company_id', $company_list , Input::old('company_id', $asset->company_id),
['class'=>'select2', 'style'=>'min-width:100%']) }}
@ -401,7 +401,7 @@ $(function() {
$('#custom_fields_content').html("");
} else {
// console.warn("Model ID is: "+modelid);
$.get("{{config('app.url')}}/hardware/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) {
$.get("{{config('app.url') }}/hardware/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) {
// console.warn("Ajax call came back okay! Data is: "+data);
$('#custom_fields_content').html(data);
});
@ -424,7 +424,7 @@ $(function() {
if(status_id!=''){
$(".status_spinner").css("display", "inline");
$.ajax({
url: "{{config('app.url')}}/api/statuslabels/"+status_id+"/deployable",
url: "{{config('app.url') }}/api/statuslabels/"+status_id+"/deployable",
success: function(data) {
console.log(data);
$(".status_spinner").css("display", "none");
@ -512,7 +512,7 @@ $(function () {
data._token = '{{ csrf_token() }}',
//console.dir(data);
$.post("{{config('app.url')}}/api/"+model+"s",data,function (result) {
$.post("{{config('app.url') }}/api/"+model+"s",data,function (result) {
var id=result.id;
var name=result.name || (result.first_name+" "+result.last_name);
$('.modal-body input:visible').val("");

14
resources/views/hardware/view.blade.php
View file

@ -45,20 +45,22 @@
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li class="active">
<a href="#details" data-toggle="tab">Details</a>
<a href="#details" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-info-circle"></i></span> <span class="hidden-xs hidden-sm">Details</span></a>
</li>
<li>
<a href="#software" data-toggle="tab">Software</a>
<a href="#software" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-floppy-o"></i></span> <span class="hidden-xs hidden-sm">Licenses</span></a>
</li>
<li>
<a href="#maintenances" data-toggle="tab">Maintenance</a>
<a href="#maintenances" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-wrench"></i></span> <span class="hidden-xs hidden-sm">Maintenances</span></a>
</li>
<li>
<a href="#history" data-toggle="tab">History</a>
<a href="#history" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-history"></i></span> <span class="hidden-xs hidden-sm">History</span></a>
</li>
<li>
<a href="#files" data-toggle="tab">Files</a>
<a href="#files" data-toggle="tab"><span class="hidden-lg hidden-md"><i class="fa fa-files-o"></i></span> <span class="hidden-xs hidden-sm">Files</span></a>
</li>
<li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal"><i class="fa fa-paperclip"></i> </a></li>
</ul>
<div class="tab-content">
<div class="tab-pane fade in active" id="details">
@ -360,7 +362,7 @@
<td>{{ $assetMaintenance->asset_maintenance_type }}</td>
<td>{{ $assetMaintenance->start_date }}</td>
<td>{{ $assetMaintenance->completion_date }}</td>
<td>{{ $assetMaintenance->is_warranty ? Lang::get('admin/asset_maintenances/message.warranty') : Lang::get('admin/asset_maintenances/message.not_warranty') }}</td>
<td>{{ $assetMaintenance->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}</td>
<td><nobr>{{ $use_currency.$assetMaintenance->cost }}</nobr></td>
<?php $totalCost += $assetMaintenance->cost; ?>
<td><a href="{{ route('update/asset_maintenance', $assetMaintenance->id) }}" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a>

2
resources/views/licenses/edit.blade.php
View file

@ -42,7 +42,7 @@
<!-- Company -->
<div class="form-group{{ $errors->has('company_id') ? ' has-error' : '' }}">
<div class="col-md-3 control-label">
{{ Form::label('company_id', Lang::get('general.company')) }}
{{ Form::label('company_id', trans('general.company')) }}
</div>
<div class="col-md-7">
{{ Form::select('company_id', $company_list , Input::old('company_id', $license->company_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}

26
resources/views/licenses/index.blade.php
View file

@ -25,7 +25,7 @@
<table
name="licenses"
id="table"
data-url="{{route('api.licenses.list')}}"
data-url="{{route('api.licenses.list') }}"
class="table table-striped"
data-cookie="true"
data-click-to-select="true"
@ -34,18 +34,18 @@
<tr>
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-field="companyName" data-sortable="false" data-switchable="true">{{ trans('general.company') }}</th>
<th data-field="name" data-sortable="true">{{Lang::get('admin/licenses/table.title')}}</th>
<th data-field="serial" data-sortable="true" >{{Lang::get('admin/licenses/table.serial')}}</th>
<th data-field="license_name" data-sortable="true" data-visible="false">{{Lang::get('admin/licenses/form.to_name')}}</th>
<th data-field="license_email" data-sortable="true" data-visible="false">{{Lang::get('admin/licenses/form.to_email')}}</th>
<th data-field="totalSeats" data-sortable="false">{{Lang::get('admin/licenses/form.seats')}}</th>
<th data-field="remaining" data-sortable="false">{{Lang::get('admin/licenses/form.remaining_seats')}}</th>
<th data-field="purchase_date" data-sortable="true">{{Lang::get('admin/licenses/table.purchase_date')}}</th>
<th data-field="purchase_cost" data-sortable="true">{{Lang::get('admin/licenses/form.cost')}}</th>
<th data-field="purchase_order" data-sortable="true" data-visible="false">{{Lang::get('admin/licenses/form.purchase_order')}}</th>
<th data-field="expiration_date" data-sortable="true" data-visible="false">{{Lang::get('admin/licenses/form.expiration')}}</th>
<th data-field="notes" data-sortable="true" data-visible="false">{{Lang::get('admin/licenses/form.notes')}}</th>
<th data-field="actions">{{Lang::get('table.actions')}}</th>
<th data-field="name" data-sortable="true">{{ trans('admin/licenses/table.title') }}</th>
<th data-field="serial" data-sortable="true" >{{ trans('admin/licenses/table.serial') }}</th>
<th data-field="license_name" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.to_name') }}</th>
<th data-field="license_email" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.to_email') }}</th>
<th data-field="totalSeats" data-sortable="false">{{ trans('admin/licenses/form.seats') }}</th>
<th data-field="remaining" data-sortable="false">{{ trans('admin/licenses/form.remaining_seats') }}</th>
<th data-field="purchase_date" data-sortable="true">{{ trans('admin/licenses/table.purchase_date') }}</th>
<th data-field="purchase_cost" data-sortable="true">{{ trans('admin/licenses/form.cost') }}</th>
<th data-field="purchase_order" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.purchase_order') }}</th>
<th data-field="expiration_date" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.expiration') }}</th>
<th data-field="notes" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.notes') }}</th>
<th data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

4
resources/views/licenses/view.blade.php
View file

@ -24,8 +24,6 @@
{{-- Page content --}}
@section('content')
<div class="row">
<div class="col-md-12">
@ -36,7 +34,7 @@
<li><a href="#tab_2" data-toggle="tab">{{ trans('general.file_uploads') }}</a></li>
<li><a href="#tab_3" data-toggle="tab">{{ trans('admin/licenses/general.checkout_history') }}</a></li>
<li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal"><i class="fa fa-paperclip"></i></a></li>
<li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal"><i class="fa fa-paperclip"></i> {{ trans('button.upload') }}</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_1">

2
resources/views/locations/edit.blade.php
View file

@ -164,7 +164,7 @@
//start ajax request
$.ajax({
type: 'GET',
url: "{{config('app.url')}}/api/locations/"+id+"/check",
url: "{{config('app.url') }}/api/locations/"+id+"/check",
//force to handle it as text
dataType: "text",
success: function(data) {

2
resources/views/locations/index.blade.php
View file

@ -43,7 +43,7 @@
</th>
<th data-searchable="true" data-sortable="true" data-field="country">
{{ trans('admin/locations/table.country') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

2
resources/views/manufacturers/index.blade.php
View file

@ -25,7 +25,7 @@
name="manufacturers"
class="table table-striped"
id="table"
data-url="{{route('api.manufacturers.list')}}"
data-url="{{route('api.manufacturers.list') }}"
data-cookie="true"
data-click-to-select="true"
data-cookie-id-table="manufacturersTable-{{ config('version.hash_version') }}">

14
resources/views/models/view.blade.php
View file

@ -51,13 +51,13 @@
<thead>
<tr>
<th data-sortable="false" data-field="companyName" data-searchable="false" data-visible="false">{{ Lang::get('admin/companies/table.title') }}</th>
<th data-sortable="true" data-field="id" data-searchable="false" data-visible="false">{{Lang::get('general.id')}}</th>
<th data-sortable="true" data-field="name" data-searchable="true">{{Lang::get('general.name')}}</th>
<th data-sortable="true" data-field="asset_tag">{{Lang::get('general.asset_tag')}}</th>
<th data-sortable="true" data-field="serial">{{Lang::get('admin/hardware/table.serial')}}</th>
<th data-sortable="false" data-field="assigned_to">{{Lang::get('general.user')}}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
<th data-sortable="false" data-field="companyName" data-searchable="false" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-sortable="true" data-field="id" data-searchable="false" data-visible="false">{{ trans('general.id') }}</th>
<th data-sortable="true" data-field="name" data-searchable="true">{{ trans('general.name') }}</th>
<th data-sortable="true" data-field="asset_tag">{{ trans('general.asset_tag') }}</th>
<th data-sortable="true" data-field="serial">{{ trans('admin/hardware/table.serial') }}</th>
<th data-sortable="false" data-field="assigned_to">{{ trans('general.user') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

2
resources/views/reports/asset_maintenances.blade.php
View file

@ -48,7 +48,7 @@
<td>{{ $assetMaintenance->asset_maintenance_type }}</td>
<td>{{ $assetMaintenance->title }}</td>
<td>{{ $assetMaintenance->start_date }}</td>
<td>{{ is_null($assetMaintenance->completion_date) ? Lang::get('admin/asset_maintenances/message.asset_maintenance_incomplete') : $assetMaintenance->completion_date }}</td>
<td>{{ is_null($assetMaintenance->completion_date) ? trans('admin/asset_maintenances/message.asset_maintenance_incomplete') : $assetMaintenance->completion_date }}</td>
@if (is_null($assetMaintenance->asset_maintenance_time))
<?php
$assetMaintenanceTime = intval(Carbon::now()->diffInDays(Carbon::parse($assetMaintenance->start_date)));

2
resources/views/statuslabels/index.blade.php
View file

@ -31,7 +31,7 @@
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-sortable="true" data-field="name">{{ trans('admin/statuslabels/table.name') }}</th>
<th data-sortable="false" data-field="type">{{ trans('admin/statuslabels/table.status_type') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

24
resources/views/suppliers/edit.blade.php
View file

@ -40,7 +40,7 @@
<div class="box-body">
<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
{{ Form::label('name', Lang::get('admin/suppliers/table.name'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('name', trans('admin/suppliers/table.name'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{ Form::text('name', Input::old('name', $supplier->name), array('class' => 'form-control')) }}
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -48,7 +48,7 @@
</div>
<div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
{{ Form::label('address', Lang::get('admin/suppliers/table.address'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('address', trans('admin/suppliers/table.address'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('address', Input::old('address', $supplier->address), array('class' => 'form-control')) }}
{!! $errors->first('address', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -64,7 +64,7 @@
</div>
<div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
{{ Form::label('city', Lang::get('admin/suppliers/table.city'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('city', trans('admin/suppliers/table.city'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('city', Input::old('city', $supplier->city), array('class' => 'form-control')) }}
{!! $errors->first('city', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -72,7 +72,7 @@
</div>
<div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
{{ Form::label('state', Lang::get('admin/suppliers/table.state'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('state', trans('admin/suppliers/table.state'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('state', Input::old('state', $supplier->state), array('class' => 'form-control')) }}
{!! $errors->first('state', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -80,7 +80,7 @@
</div>
<div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
{{ Form::label('country', Lang::get('admin/suppliers/table.country'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('country', trans('admin/suppliers/table.country'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-5">
{!! Form::countries('country', Input::old('country', $supplier->country), 'select2') !!}
{!! $errors->first('country', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -88,7 +88,7 @@
</div>
<div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
{{ Form::label('zip', Lang::get('admin/suppliers/table.zip'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('zip', trans('admin/suppliers/table.zip'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('zip', Input::old('zip', $supplier->zip), array('class' => 'form-control')) }}
{!! $errors->first('zip', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -97,7 +97,7 @@
<div class="form-group {{ $errors->has('contact') ? ' has-error' : '' }}">
{{ Form::label('contact', Lang::get('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('contact', trans('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('contact', Input::old('contact', $supplier->contact), array('class' => 'form-control')) }}
{!! $errors->first('contact', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -106,7 +106,7 @@
<div class="form-group {{ $errors->has('phone') ? ' has-error' : '' }}">
{{ Form::label('phone', Lang::get('admin/suppliers/table.phone'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('phone', trans('admin/suppliers/table.phone'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('phone', Input::old('phone', $supplier->phone), array('class' => 'form-control')) }}
{!! $errors->first('phone', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -114,7 +114,7 @@
</div>
<div class="form-group {{ $errors->has('fax') ? ' has-error' : '' }}">
{{ Form::label('fax', Lang::get('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('fax', trans('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('fax', Input::old('fax', $supplier->fax), array('class' => 'form-control')) }}
{!! $errors->first('fax', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -122,7 +122,7 @@
</div>
<div class="form-group {{ $errors->has('email') ? ' has-error' : '' }}">
{{ Form::label('email', Lang::get('admin/suppliers/table.email'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('email', trans('admin/suppliers/table.email'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('email', Input::old('email', $supplier->email), array('class' => 'form-control')) }}
{!! $errors->first('email', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -130,7 +130,7 @@
</div>
<div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
{{ Form::label('url', Lang::get('admin/suppliers/table.url'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('url', trans('admin/suppliers/table.url'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('url', Input::old('url', $supplier->url), array('class' => 'form-control')) }}
{!! $errors->first('url', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -139,7 +139,7 @@
<div class="form-group {{ $errors->has('notes') ? ' has-error' : '' }}">
{{ Form::label('notes', Lang::get('admin/suppliers/table.notes'), array('class' => 'col-md-3 control-label')) }}
{{ Form::label('notes', trans('admin/suppliers/table.notes'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-6">
{{Form::text('notes', Input::old('notes', $supplier->notes), array('class' => 'form-control')) }}
{!! $errors->first('notes', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}

2
resources/views/suppliers/index.blade.php
View file

@ -40,7 +40,7 @@
<th data-searchable="true" data-sortable="true" data-field="fax" data-visible="false">{{ trans('admin/suppliers/table.fax') }}</th>
<th data-searchable="false" data-sortable="false" data-field="assets">{{ trans('admin/suppliers/table.assets') }}</th>
<th data-searchable="false" data-sortable="false" data-field="licenses">{{ trans('admin/suppliers/table.licenses') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
</table>

2
resources/views/users/edit.blade.php
View file

@ -150,7 +150,7 @@ input[type='text'][disabled], input[disabled], textarea[disabled], input[readonl
<!-- Company -->
<div class="form-group {{ $errors->has('company_id') ? 'has-error' : '' }}">
<div class="col-md-3 control-label">
{{ Form::label('company_id', Lang::get('general.company')) }}
{{ Form::label('company_id', trans('general.company')) }}
</div>
<div class="col-md-9">
{{ Form::select('company_id', $company_list , Input::old('company_id', $user->company_id), array('class'=>'select2', 'style'=>'width:350px')) }}

16
resources/views/users/index.blade.php
View file

@ -66,14 +66,14 @@
<th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-switchable="true" data-sortable="false" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-switchable="true" data-sortable="true" data-field="employee_num" data-visible="false">{{ trans('admin/users/table.employee_num') }}</th>
<th data-sortable="true" data-field="name">{{ Lang::get('admin/users/table.name') }}</th>
<th data-sortable="true" data-field="name">{{ trans('admin/users/table.name') }}</th>
<th data-sortable="true" data-field="email">
<span class="hidden-md hidden-lg">Email</span>
<span class="hidden-xs"><i class="fa fa-envelope fa-lg"></i></span>
</th>
<th data-sortable="true" data-field="username">{{ Lang::get('admin/users/table.username') }}</th>
<th data-searchable="true" data-sortable="true" data-field="manager">{{ Lang::get('admin/users/table.manager') }}</th>
<th data-sortable="true" data-field="location">{{ Lang::get('admin/users/table.location') }}</th>
<th data-sortable="true" data-field="username">{{ trans('admin/users/table.username') }}</th>
<th data-searchable="true" data-sortable="true" data-field="manager">{{ trans('admin/users/table.manager') }}</th>
<th data-sortable="true" data-field="location">{{ trans('admin/users/table.location') }}</th>
<th data-sortable="false" data-field="assets">
<span class="hidden-md hidden-lg">Assets</span>
<span class="hidden-xs"><i class="fa fa-barcode fa-lg"></i></span>
@ -90,10 +90,10 @@
<span class="hidden-md hidden-lg">Consumables</span>
<span class="hidden-xs"><i class="fa fa-tint fa-lg"></i></span>
</th>
<th data-sortable="false" data-field="groups">{{ Lang::get('general.groups') }}</th>
<th data-sortable="true" data-field="notes">{{ Lang::get('general.notes') }}</th>
<th data-sortable="true" data-field="activated">{{ Lang::get('general.activated') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ Lang::get('table.actions') }}</th>
<th data-sortable="false" data-field="groups">{{ trans('general.groups') }}</th>
<th data-sortable="true" data-field="notes">{{ trans('general.notes') }}</th>
<th data-sortable="true" data-field="activated">{{ trans('general.activated') }}</th>
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ trans('table.actions') }}</th>
</tr>
</thead>
{{-- <tfoot>