diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php index 9f122dff4e..5599dd5e42 100755 --- a/app/Http/Controllers/CategoriesController.php +++ b/app/Http/Controllers/CategoriesController.php @@ -55,7 +55,7 @@ class CategoriesController extends Controller // Show the page $category_types= Helper::categoryTypeList(); return View::make('categories/edit')->with('item', new Category) - ->with('category_types', $category_types); + ->with('category_types', $category_types); } diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 4aca40fb53..995f4085fb 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -116,7 +116,7 @@ class Asset extends Depreciable if ($this->save()) { - $this->logCheckout($note); + $log = $this->logCheckout($note); if ((($this->requireAcceptance()=='1') || ($this->getEula())) && ($user->email!='')) { $this->checkOutNotifyMail($log->id, $user, $checkout_at, $expected_checkin, $note); } diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index 9d3760ef54..8fb9e76a9e 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -193,14 +193,13 @@ class AssetPresenter extends Presenter **/ public function name() { - if (empty($this->name)) { if (isset($this->model)) { return $this->model->name.' ('.$this->asset_tag.')'; } return $this->asset_tag; } else { - return $this->name; + return $this->name.' ('.$this->asset_tag.')'; } } diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php index cd91ce9d2c..aa31cd2eff 100644 --- a/app/Presenters/ConsumablePresenter.php +++ b/app/Presenters/ConsumablePresenter.php @@ -62,7 +62,7 @@ class ConsumablePresenter extends Presenter * Link to this consumables name * @return string */ - private function nameUrl() + public function nameUrl() { return (string)link_to_route('consumables.show', $this->name, $this->id); } diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index 6806de68c8..0bcc9ef1de 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -65,7 +65,7 @@ class UserPresenter extends Presenter $result = [ 'id' => $this->id, 'checkbox' => ($status!='deleted') ? '' : '', - 'name' => $this->fullName(), + 'name' => $this->nameUrl(), 'jobtitle' => $this->jobtitle, 'email' => $this->emailLink(), 'username' => $this->username, diff --git a/resources/views/accessories/checkin.blade.php b/resources/views/accessories/checkin.blade.php index 5dcc762cf8..5749be8f59 100755 --- a/resources/views/accessories/checkin.blade.php +++ b/resources/views/accessories/checkin.blade.php @@ -24,12 +24,10 @@ - - @if ($accessory->name)
- +

{{ $accessory->name }}

@@ -40,13 +38,15 @@
- + {!! $errors->first('note', ' :message') !!}
- +
{{ trans('button.cancel') }} @@ -54,7 +54,7 @@
-
-
+ + @stop diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php index 0b36cfe5e3..bf02673ede 100755 --- a/resources/views/accessories/checkout.blade.php +++ b/resources/views/accessories/checkout.blade.php @@ -32,28 +32,30 @@ @if ($accessory->name)
- -
-

{{ $accessory->name }}

-
+ +
+

{{ $accessory->name }}

+
@endif @if ($accessory->category->name)
- -
-

{{ $accessory->category->name }}

-
+ +
+

{{ $accessory->category->name }}

+
@endif
- +
{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $accessory->assigned_to), array('class'=>'select2', 'style'=>'min-width:350px')) }} {!! $errors->first('assigned_to', ' :message') !!} @@ -70,7 +72,6 @@ @if ($accessory->getEula())
-

{{ trans('admin/categories/general.required_eula') }}

@@ -81,10 +82,10 @@
-
-
+
- + + @stop diff --git a/resources/views/accessories/index.blade.php b/resources/views/accessories/index.blade.php index 1f9f04f944..63871a6b97 100755 --- a/resources/views/accessories/index.blade.php +++ b/resources/views/accessories/index.blade.php @@ -15,7 +15,6 @@ {{-- Page content --}} @section('content') -
@@ -33,9 +32,11 @@
+ +@stop @section('moar_scripts') @include ('partials.bootstrap-table', [ @@ -44,6 +45,3 @@ 'columns' => \App\Presenters\AccessoryPresenter::dataTableLayout() ]) @stop - - -@stop diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 947047c539..d6d9795412 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -20,19 +20,24 @@ @endcan @@ -46,46 +51,45 @@
-
-
- - - - - - - - -
{{ trans('general.user') }}{{ trans('table.actions') }}
-
+
+
+ + + + + + + +
{{ trans('general.user') }}{{ trans('table.actions') }}
+
- -
+ +

{{ trans('admin/accessories/general.about_accessories_title') }}

{{ trans('admin/accessories/general.about_accessories_text') }}

- @can('checkout', \App\Models\Accessory::class) + @can('checkout', \App\Models\Accessory::class) numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }} - @endcan + @endcan
+
-
+@stop @section('moar_scripts') @include ('partials.bootstrap-table', ['exportFile' => 'accessory' . $accessory->name . '-export', 'search' => false]) @stop - -@stop diff --git a/resources/views/account/accept-asset.blade.php b/resources/views/account/accept-asset.blade.php index d249015024..73d1dd0baa 100644 --- a/resources/views/account/accept-asset.blade.php +++ b/resources/views/account/accept-asset.blade.php @@ -29,73 +29,68 @@
- - - + + + -
+
+
+
+
+
+ +
-
+
+ +
-
-
+ @if ($item->getEula()) +
+
+ {!! $item->getEula() !!} +
+
+ @endif + @if ($snipeSettings->require_accept_signature=='1') +
-
- +

Sign below to indicate that you agree to the terms of service:

+ +
+
+ +
-
- +
+
+
+
+ @endif - @if ($item->getEula()) -
-
- {!! $item->getEula() !!} -
-
- @endif +
- @if ($snipeSettings->require_accept_signature=='1') -
- -

Sign below to indicate that you agree to the terms of service:

- -
-
- - -
-
- -
-
-
- @endif - - - - -
- -
-
- -
-
+
+
+ +
+
-
- +
+@stop + @section('moar_scripts') @@ -138,6 +133,4 @@ }); -@stop - -@stop +@stop \ No newline at end of file diff --git a/resources/views/account/change-password.blade.php b/resources/views/account/change-password.blade.php index 3de365041c..af17444d49 100755 --- a/resources/views/account/change-password.blade.php +++ b/resources/views/account/change-password.blade.php @@ -8,7 +8,6 @@ Change your Password {{-- Account page content --}} @section('content')
-

{{ trans('general.changepassword') }}

@@ -22,7 +21,7 @@ Change your Password
@@ -42,7 +41,7 @@ Change your Password
@@ -57,12 +56,13 @@ Change your Password
- -
- {{ trans('button.cancel') }} - + +
+ {{ trans('button.cancel') }} +
+
@stop diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index 08c471635a..7c74a8c184 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -18,131 +18,123 @@
- -
- - {!! $errors->first('first_name', ' :message') !!} -
+ +
+ + {!! $errors->first('first_name', ' :message') !!} +
- -
- - {!! $errors->first('last_name', ' :message') !!} -
+ +
+ + {!! $errors->first('last_name', ' :message') !!} +
-
- -
-
- {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:300px')) }} - {!! $errors->first('location_id', ' :message') !!} -
-
+
+ +
+
+ {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:300px')) }} + {!! $errors->first('location_id', ' :message') !!}
+
+
-
- -
- {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} - {!! $errors->first('locale', ':message') !!} -
+
+ +
+ {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} + {!! $errors->first('locale', ':message') !!}
+
- +
- -
- - {!! $errors->first('website', ' :message') !!} -
+ +
+ + {!! $errors->first('website', ' :message') !!} +
- -
- - {!! $errors->first('gravatar', ' :message') !!} -

- Change your avatar at Gravatar.com. + +

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

+ + Change your avatar at Gravatar.com.

-
+
- + @if ($user->avatar) -
- -
- {{ Form::checkbox('avatar_delete') }} - - {!! $errors->first('avatar_delete', ':message') !!} -
+
+ +
+ {{ Form::checkbox('avatar_delete') }} + + {!! $errors->first('avatar_delete', ':message') !!}
+
@endif -
- -
- {{ Form::file('avatar') }} - {!! $errors->first('avatar', ':message') !!} +
+ +
+ {{ Form::file('avatar') }} + {!! $errors->first('avatar', ':message') !!} +
-
- - @if ($snipeSettings->two_factor_enabled=='1') + + @if ($snipeSettings->two_factor_enabled=='1') +
+
+ @can('self.two_factor') +
+ @endif -
- - @can('self.two_factor') -
-
- - @endif - - - - -
+ {{ Form::close() }} +
-
-
-
-
- - - - - +
+
+
+
@stop diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php index 6236b21c32..68718d72a7 100644 --- a/resources/views/account/requestable-assets.blade.php +++ b/resources/views/account/requestable-assets.blade.php @@ -66,15 +66,13 @@ {{ $asset->defaultLoc->name }} @endif - @if ($asset->assigned_to != '' && $asset->assigned_to > 0) + @if ($asset->assigned_to != '' && $asset->assigned_to > 0) Checked out @else - {{ trans('admin/hardware/general.requestable') }} + {{ trans('admin/hardware/general.requestable') }} @endif {{ $asset->expected_checkin }} - - @if ($asset->isRequestedBy(Auth::user())) {{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}} @@ -89,7 +87,6 @@
- @else
@@ -97,8 +94,6 @@ {{ trans('general.no_results') }}
- - @endif
@@ -114,13 +109,12 @@ {{ trans('general.quantity') }} {{ trans('table.actions') }} - + @foreach($models as $requestableModel) - -
@@ -155,10 +149,9 @@ - - - @stop + + @section('moar_scripts') -@stop - + // Checkbox handling + $('div.icheckbox_minimal-blue').on('ifChecked', function(event){ + $("#encrypt_warning").show(); + }); + $('div.icheckbox_minimal-blue').on('ifUnchecked', function(event){ + $("#encrypt_warning").hide(); + }); + + @stop diff --git a/resources/views/custom_fields/fieldset.blade.php b/resources/views/custom_fields/fieldset.blade.php index ed13db8e15..483423ef13 100644 --- a/resources/views/custom_fields/fieldset.blade.php +++ b/resources/views/custom_fields/fieldset.blade.php @@ -7,90 +7,81 @@ @stop @section('header_right') - + {{ trans('general.back') }} @stop - - @section('content') +
+
+
+
+

{{ $custom_fieldset->name }} {{ trans('admin/custom_fields/general.fieldset') }}

+
+
+
+
+ + + + + + + + + + + + + + + @foreach($custom_fieldset->fields as $field) + + + + + + + + + + + @endforeach + + + + + + +
{{ trans('admin/custom_fields/general.order') }}{{ trans('admin/custom_fields/general.field_name') }}{{ trans('admin/custom_fields/general.field_format') }}{{ trans('admin/custom_fields/general.field_element') }}{{ trans('admin/custom_fields/general.encrypted') }}{{ trans('admin/custom_fields/general.required') }}
+ + + + + + {{$field->pivot->order}}{{$field->name}}{{$field->format}}{{$field->element}}{{ $field->field_encrypted=='1' ? trans('general.yes') : trans('general.no') }}{{$field->pivot->required ? "REQUIRED" : "OPTIONAL"}} + Remove +
+ {{ Form::open(['route' => + ["fieldsets.associate",$custom_fieldset->id], + 'class'=>'form-horizontal', + 'id' => 'ordering']) }} + {{ Form::checkbox("required","on") }} + {{ trans('admin/custom_fields/general.required') }} + {{ Form::text("order",$maxid)}} + {{ Form::select("field_id",$custom_fields_list,"",["onchange" => "$('#ordering').submit()"]) }} + first('field_id'); ?> + {{ Form::close() }} +
+
+
+
+
- - -
-
- -
- -
-

{{ $custom_fieldset->name }} {{ trans('admin/custom_fields/general.fieldset') }}

-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - @foreach($custom_fieldset->fields as $field) - - - - - - - - - - - @endforeach - -
{{ trans('admin/custom_fields/general.order') }}{{ trans('admin/custom_fields/general.field_name') }}{{ trans('admin/custom_fields/general.field_format') }}{{ trans('admin/custom_fields/general.field_element') }}{{ trans('admin/custom_fields/general.encrypted') }}{{ trans('admin/custom_fields/general.required') }}
- {{ Form::open(['route' => - ["fieldsets.associate",$custom_fieldset->id], - 'class'=>'form-horizontal', - 'id' => 'ordering']) }} - {{ Form::checkbox("required","on") }} - {{ trans('admin/custom_fields/general.required') }} - {{ Form::text("order",$maxid)}} - {{ Form::select("field_id",$custom_fields_list,"",["onchange" => "$('#ordering').submit()"]) }} - first('field_id'); ?> - -
- - - - - - {{$field->pivot->order}}{{$field->name}}{{$field->format}}{{$field->element}}{{ $field->field_encrypted=='1' ? trans('general.yes') : trans('general.no') }}{{$field->pivot->required ? "REQUIRED" : "OPTIONAL"}}Remove
- -
-
-
-
- - - - +@stop @section('moar_scripts') - -@stop @stop diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php index 300f38ff69..055716bbd9 100644 --- a/resources/views/custom_fields/index.blade.php +++ b/resources/views/custom_fields/index.blade.php @@ -8,142 +8,116 @@ @section('content') +
+
+
-
-
+
+

{{ trans('admin/custom_fields/general.fieldsets') }}

+
+ {{ trans('admin/custom_fields/general.create_fieldset') }} +
+
-
+
+ + + + + + + + + -
-

{{ trans('admin/custom_fields/general.fieldsets') }}

-
- {{ trans('admin/custom_fields/general.create_fieldset') }} -
-
-
-
{{ trans('general.name') }}{{ trans('admin/custom_fields/general.qty_fields') }}{{ trans('admin/custom_fields/general.used_by_models') }}
- - - - - - - - + @if(isset($custom_fieldsets)) + + @foreach($custom_fieldsets AS $fieldset) + + + + + + + @endforeach + + @endif +
{{ trans('general.name') }}{{ trans('admin/custom_fields/general.qty_fields') }}{{ trans('admin/custom_fields/general.used_by_models') }}
+ {{ link_to_route("fieldsets.show",$fieldset->name,['id' => $fieldset->id]) }} + + {{ $fieldset->fields->count() }} + + @foreach($fieldset->models as $model) + {{ link_to_route("models.show",$model->name,[$model->id]) }} + @endforeach + + {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete']) }} + @if($fieldset->models->count() > 0) + + @else + + @endif + {{ Form::close() }} +
+
+
- - @if(isset($custom_fieldsets)) - - @foreach($custom_fieldsets AS $fieldset) - - - {{ link_to_route("fieldsets.show",$fieldset->name,['id' => $fieldset->id]) }} - - - {{ $fieldset->fields->count() }} - - - @foreach($fieldset->models as $model) - {{ link_to_route("models.show",$model->name,[$model->id]) }} - @endforeach - - - {{ Form::open(array('route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete')) }} - - @if($fieldset->models->count() > 0) - - @else - - @endif - {{ Form::close() }} - - - @endforeach - @endif - - - - -
-
- -
- -
-

{{ trans('admin/custom_fields/general.about_fieldsets_title') }}

-

{{ trans('admin/custom_fields/general.about_fieldsets_text') }}

- -
-
+
+ +
+

{{ trans('admin/custom_fields/general.about_fieldsets_title') }}

+

{{ trans('admin/custom_fields/general.about_fieldsets_text') }}

+
+
-
+
+

{{ trans('admin/custom_fields/general.custom_fields') }}

+
+ {{ trans('admin/custom_fields/general.create_field') }} +
+
+
+ + + + + + + + + + + + @foreach($custom_fields AS $field) + + + + + + + + @endforeach + +
{{ trans('general.name') }}{{ trans('admin/custom_fields/general.field_format') }}{{ trans('admin/custom_fields/general.field_element_short') }}{{ trans('admin/custom_fields/general.fieldsets') }}
{{ $field->name }}{{ $field->format }}{{ $field->element }} + @foreach($field->fieldset as $fieldset) + {{ link_to_route("fieldsets.show",$fieldset->name,[$fieldset->id])}} + @endforeach + + {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete')) }} -
-

{{ trans('admin/custom_fields/general.custom_fields') }}

-
- {{ trans('admin/custom_fields/general.create_field') }} -
-
-
- - - - - - - - - - - - - - @foreach($custom_fields AS $field) - - - - - - - - - @endforeach - - - - - -
{{ trans('general.name') }}{{ trans('admin/custom_fields/general.field_format') }}{{ trans('admin/custom_fields/general.field_element_short') }}{{ trans('admin/custom_fields/general.fieldsets') }}
{{ $field->name }}{{ $field->format }}{{ $field->element }} - @foreach($field->fieldset as $fieldset) - {{ link_to_route("fieldsets.show",$fieldset->name,[$fieldset->id])}} - @endforeach - - {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete')) }} - - @if($field->fieldset->count()>0) - - @else - - @endif - {{ Form::close() }} -
- - + @if($field->fieldset->count()>0) + + @else + + @endif + {{ Form::close() }} +
- -
- - - -
+ @stop diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index d855ebf879..11b040117c 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -12,152 +12,141 @@
+ +
+ +
+
+

{{ number_format(\App\Models\Asset::assetcount()) }}

+

{{ trans('general.total_assets') }}

+
+
+ +
+ @can('index', \App\Models\Asset::class) + {{ trans('general.moreinfo') }} + @endcan +
+
- -
- -
-
-

{{ number_format(\App\Models\Asset::assetcount()) }}

-

{{ trans('general.total_assets') }}

-
-
- -
- @can('index', \App\Models\Asset::class) - {{ trans('general.moreinfo') }} - @endcan -
-
+
+ +
+
+

{{ number_format(\App\Models\License::assetcount()) }}

+

{{ trans('general.total_licenses') }}

+
+
+ +
+ @can('view', \App\Models\License::class) + {{ trans('general.moreinfo') }} + @endcan +
+
-
- -
-
-

{{ number_format(\App\Models\License::assetcount()) }}

-

{{ trans('general.total_licenses') }}

-
-
- -
- @can('view', \App\Models\License::class) - {{ trans('general.moreinfo') }} - @endcan -
-
- -
- -
-
-

{{ number_format(\App\Models\Accessory::count()) }}

-

{{ trans('general.total_accessories') }}

-
-
- -
- @can('index', \App\Models\Accessory::class) - {{ trans('general.moreinfo') }} - @endcan -
-
- -
- -
-
-

{{ number_format(\App\Models\Consumable::count()) }}

-

{{ trans('general.total_consumables') }}

-
-
- -
- @can('index', \App\Models\Consumable::class) - {{ trans('general.moreinfo') }} - @endcan -
-
+
+ +
+
+

{{ number_format(\App\Models\Accessory::count()) }}

+

{{ trans('general.total_accessories') }}

+
+
+ +
+ @can('index', \App\Models\Accessory::class) + {{ trans('general.moreinfo') }} + @endcan +
+
+
+ +
+
+

{{ number_format(\App\Models\Consumable::count()) }}

+

{{ trans('general.total_consumables') }}

+
+
+ +
+ @can('index', \App\Models\Consumable::class) + {{ trans('general.moreinfo') }} + @endcan +
+
- -
-
-
-
-

{{ trans('general.recent_activity') }}

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

{{ trans('general.recent_activity') }}

+
+ +
+
+
+
+
+
+
- - - - - - - - + + + + + + + + - -
{{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.item') }}To
{{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.item') }}To
-
-
-
-
-
-
-
-
-
-

{{ trans('general.assets') }}

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

{{ trans('general.assets') }}

+
+ +
-
+ +
+
+
+
+ +
+
+
+
+
+ + + +@stop @section('moar_scripts') - - - -@stop - + + + @stop diff --git a/resources/views/depreciations/edit.blade.php b/resources/views/depreciations/edit.blade.php index 23d5065f58..7c3180be36 100755 --- a/resources/views/depreciations/edit.blade.php +++ b/resources/views/depreciations/edit.blade.php @@ -12,7 +12,8 @@ @include ('partials.forms.edit.name', ['translated_name' => trans('admin/depreciations/general.depreciation_name')])
-
- +
-

{{ trans('admin/depreciations/general.about_asset_depreciations') }}

-

{{ trans('admin/depreciations/general.about_depreciations') }}

+

{{ trans('admin/depreciations/general.about_asset_depreciations') }}

+

{{ trans('admin/depreciations/general.about_depreciations') }}

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php index f9840fd3b4..ecf91e8ff4 100755 --- a/resources/views/groups/edit.blade.php +++ b/resources/views/groups/edit.blade.php @@ -18,40 +18,40 @@
-
- - {!! $errors->first('name', ' :message') !!} -
+ + +
+ + {!! $errors->first('name', ' :message') !!}
+
-
+
- @foreach ($permissions as $area => $permission) - @for ($i = 0; $i < count($permission); $i++) + @foreach ($permissions as $area => $permission) + @for ($i = 0; $i < count($permission); $i++) - @if ($permission[$i]['display']) -

{{ $area }}: {{ $permission[$i]['label'] }}

-

{{ $permission[$i]['note'] }}

+ @if ($permission[$i]['display']) +

{{ $area }}: {{ $permission[$i]['label'] }}

+

{{ $permission[$i]['note'] }}

- -
- - - - -
-
- @endif - @endfor - @endforeach + +
+ + +
+
+ @endif + @endfor + @endforeach +
@stop diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php index 3c1b3dfc82..c3e8ffabef 100755 --- a/resources/views/groups/index.blade.php +++ b/resources/views/groups/index.blade.php @@ -13,14 +13,11 @@ {{-- Content --}} @section('content') - -
-
-
-
- +
+
+
+
- - - + + - - -
{{ trans('general.id') }} {{ trans('admin/groups/table.name') }} {{ trans('admin/groups/table.users') }} {{ trans('general.created_at') }} {{ trans('table.actions') }}
-
-
- -
+ + + +
+
+
+
@stop @section('moar_scripts') diff --git a/resources/views/groups/view.blade.php b/resources/views/groups/view.blade.php index d42c622fce..875d818aef 100644 --- a/resources/views/groups/view.blade.php +++ b/resources/views/groups/view.blade.php @@ -13,8 +13,11 @@
- {{ trans('admin/groups/table.update') }} - {{ trans('general.back') }} + {{ trans('admin/groups/table.update') }} + + + {{ trans('general.back') }} +

{{ trans('admin/groups/titles.group_management') }} - {{ $group->name }}

@@ -23,21 +26,20 @@
@if (count($users) > 0) - - - +
+ + - @foreach ($users as $user) - + @endforeach - -
{{ trans('admin/groups/table.name') }}
{{ $user->first_name }} {{ $user->last_name }} + {{ $user->first_name }} {{ $user->last_name }} +
@@ -50,4 +52,6 @@
@endif
+
+
@stop diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php index a5839e027c..6d2839ff14 100644 --- a/resources/views/hardware/bulk-checkout.blade.php +++ b/resources/views/hardware/bulk-checkout.blade.php @@ -6,125 +6,105 @@ @parent @stop - {{-- Page content --}} @section('content')
+ +
+
+
+

{{ trans('admin/hardware/form.tag') }}

+
+
+ + {{ csrf_field() }} - -
+ +
-
-
-

{{ trans('admin/hardware/form.tag') }}

-
-
- - - + {{ Form::label('assigned_to', trans('admin/hardware/form.checkout_to'), array('class' => 'col-md-3 control-label')) }} +
+ {{ Form::select('assigned_to', $users_list , Input::old('assigned_to'), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'width:100%')) }} - - -
- - {{ Form::label('assigned_to', trans('admin/hardware/form.checkout_to'), array('class' => 'col-md-3 control-label')) }} - -
- {{ Form::select('assigned_to', $users_list , Input::old('assigned_to'), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'width:100%')) }} - - {!! $errors->first('assigned_to', ' :message') !!} -
-
- New -
-
- - -
- - {{ Form::label('name', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }} - -
-
- - -
- {!! $errors->first('checkout_at', ' :message') !!} -
-
- - -
- - {{ Form::label('name', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }} - -
-
- - -
- {!! $errors->first('expected_checkin', ' :message') !!} -
-
- - - -
- - {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} - -
- - {!! $errors->first('note', ' :message') !!} -
-
- -
- - {{ Form::label('selected_asset', trans('general.assets'), array('class' => 'col-md-3 control-label')) }} - -
- {{ Form::select('selected_assets[]', $assets_list , Input::old('selected_asset'), array('class'=>'select2', 'id'=>'selected_asset', 'style'=>'width:100%', 'multiple'=>'multiple')) }} - - {!! $errors->first('selected_asset', ' :message') !!} -
-
- - - -
-
- {{ trans('button.cancel') }} - -
+ {!! $errors->first('assigned_to', ' :message') !!} +
+
+ New +
- -
- - - +@stop @section('moar_scripts') @@ -275,6 +255,5 @@ $(function() { }); }); -@stop @stop \ No newline at end of file diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php index 665d31dcc1..d60b67e429 100644 --- a/resources/views/hardware/bulk-delete.blade.php +++ b/resources/views/hardware/bulk-delete.blade.php @@ -2,81 +2,67 @@ {{-- Page title --}} @section('title') - {{ trans('admin/hardware/form.bulk_delete') }} - +{{ trans('admin/hardware/form.bulk_delete') }} @parent @stop @section('header_right') - - {{ trans('general.back') }} + + {{ trans('general.back') }} @stop - - {{-- Page content --}} - @section('content') +
+ +
+

{{ trans('admin/hardware/form.bulk_delete_help') }}

+
+ {{csrf_field()}} +
+
+

{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}

+
-
- - - -
- -

{{ trans('admin/hardware/form.bulk_delete_help') }}

- - -
-
-

{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}

-
-
- - - - - - - - - - - - - - @foreach ($assets as $asset) - - - - - - - - @endforeach - - - -
IDNameLocationAssigned To
{{ $asset->id }}{{ $asset->present()->name() }} - @if ($asset->assetloc) - {{ $asset->assetloc->name }} - @endif - - @if ($asset->assigneduser) - {{ $asset->assigneduser->present()->fullName() }} ({{ $asset->assigneduser->username }}) - @endif -
- - +
+ + + + + + + + + + + + @foreach ($assets as $asset) + + + + + + + + @endforeach + +
IDNameLocationAssigned To
{{ $asset->id }}{{ $asset->present()->name() }} + @if ($asset->assetloc) + {{ $asset->assetloc->name }} + @endif + + @if ($asset->assigneduser) + {{ $asset->assigneduser->present()->fullName() }} ({{ $asset->assigneduser->username }}) + @endif +
+
- {{ trans('button.cancel') }} - + {{ trans('button.cancel') }} +
-
- - - -
-
+
+ +
+
@stop diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index d57a564692..17f6645fe2 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -12,13 +12,8 @@ {{ trans('general.back') }} @stop - {{-- Page content --}} - @section('content') - - -
@@ -28,143 +23,141 @@ {{ trans('admin/hardware/form.bulk_update_warn', ['asset_count' => count($assets)]) }}
- -
+ {{ csrf_field() }} - - - -
- -
- -
+
+
+ +
- - - {!! $errors->first('purchase_date', ' :message') !!} + + + {!! $errors->first('purchase_date', ' :message') !!}
-
+
- -
+ +
-
- {{ Form::select('status_id', $statuslabel_list , Input::old('status_id'), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('status_id', ' :message') !!} -
-
+
+ {{ Form::select('status_id', $statuslabel_list , Input::old('status_id'), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('status_id', ' :message') !!} +
+
- -
+ +
-
- {{ Form::select('model_id', $models_list , Input::old('model_id'), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('model_id', ' :message') !!} -
-
+
+ {{ Form::select('model_id', $models_list , Input::old('model_id'), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('model_id', ' :message') !!} +
+
+ +
+ +
+ {{ Form::select('rtd_location_id', $location_list , Input::old('rtd_location_id'), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('status_id', ' :message') !!} +
+
- -
- -
- {{ Form::select('rtd_location_id', $location_list , Input::old('rtd_location_id'), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('status_id', ' :message') !!} -
-
- - -
+ +
{{ $snipeSettings->default_currency }} - - {!! $errors->first('purchase_cost', ' :message') !!} + {!! $errors->first('purchase_cost', ' :message') !!}
-
+
- -
- + +
+
- {{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id'), array('class'=>'select2', 'style'=>'min-width:350px')) }} - {!! $errors->first('supplier_id', ' :message') !!} + {{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id'), array('class'=>'select2', 'style'=>'min-width:350px')) }} + {!! $errors->first('supplier_id', ' :message') !!}
-
+
- -
+ +
-
- {{ Form::select('company_id', $companies_list , Input::old('company_id'), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('company_id', ' :message') !!} -
-
- - -
-
- - {!! $errors->first('order_number', ' :message') !!} + {{ Form::select('company_id', $companies_list , Input::old('company_id'), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('company_id', ' :message') !!}
-
+
- -
- + +
+ +
+ + {!! $errors->first('order_number', ' :message') !!} +
+
+ + +
+
-
- {{ trans('admin/hardware/form.months') }} +
+ + {{ trans('admin/hardware/form.months') }} {!! $errors->first('warranty_months', ' :message') !!} -
+
-
+
- - -
- + +
+
- - - + + +
-
+
+ @foreach ($assets as $key => $value) + + @endforeach +
- @foreach ($assets as $key => $value) - - @endforeach - - -
- -
+
-
-
- - - -
+
+
+ +
@stop diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index c79ec9869d..351be85643 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -2,120 +2,107 @@ {{-- Page title --}} @section('title') - {{ trans('admin/hardware/general.checkin') }} - @parent +{{ trans('admin/hardware/general.checkin') }} +@parent @stop {{-- Page content --}} @section('content') + - - - -
- - -
- -
-
-

{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}

-
- -
-
- - @if ($backto=='user') -
- @else - - @endif - - - - @if ($asset->model->name) - -
- - {{ Form::label('name', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }} - -
-

{{ $asset->model->name }}

-
-
- @endif - - -
- {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }} -
- - {!! $errors->first('name', ' :message') !!} -
-
- - -
- - {{ Form::label('name', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }} - -
- {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types')) }} - {!! $errors->first('status_id', ' :message') !!} -
-
- - -
- - {{ Form::label('name', trans('admin/hardware/form.checkin_date'), array('class' => 'col-md-3 control-label')) }} - -
-
- - -
- {!! $errors->first('checkin_at', ' :message') !!} -
-
- - -
- - {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} - -
- - {!! $errors->first('note', ' :message') !!} -
-
- -
-
-
-
- {{ trans('button.cancel') }} - -
-
+
+ +
+
+
+

{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}

+
+
+
+ @if ($backto=='user') +
+ @else + + @endif + {{csrf_field()}} + @if ($asset->model->name) + +
+ {{ Form::label('name', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }} +
+

{{ $asset->model->name }}

+
-
+ @endif + + +
+ {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }} +
+ + {!! $errors->first('name', ' :message') !!} +
+
+ + +
+ {{ Form::label('name', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }} +
+ {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types')) }} + {!! $errors->first('status_id', ' :message') !!} +
+
+ + +
+ {{ Form::label('name', trans('admin/hardware/form.checkin_date'), array('class' => 'col-md-3 control-label')) }} +
+
+ + +
+ {!! $errors->first('checkin_at', ' :message') !!} +
+
+ + +
+ + {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} + +
+ + {!! $errors->first('note', ' :message') !!} +
+
+ + +
+ +
+
+
+ {{ trans('button.cancel') }} +
+
+
+
@stop diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index f107951c2f..e666b353bc 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -6,7 +6,6 @@ @parent @stop - {{-- Page content --}} @section('content') @@ -17,148 +16,122 @@ } -
- - -
- -
-
-

{{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}

-
-
-
- - - - - - @if ($asset->model->name) - -
- - {{ Form::label('name', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }} - -
-

{{ $asset->model->name }}

-
-
- @endif - - -
- - {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }} - -
- - {!! $errors->first('name', ' :message') !!} -
-
- - -
- - {{ Form::label('assigned_to', trans('admin/hardware/form.checkout_to'), array('class' => 'col-md-3 control-label')) }} - -
- {{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'width:100%')) }} - - {!! $errors->first('assigned_to', ' :message') !!} -
-
- New -
-
- - - - -
- - {{ Form::label('name', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }} - -
-
- - -
- {!! $errors->first('checkout_at', ' :message') !!} -
-
- - - -
- - {{ Form::label('name', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }} - -
-
- - -
- {!! $errors->first('expected_checkin', ' :message') !!} -
-
- - -
- - {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} - -
- - {!! $errors->first('note', ' :message') !!} -
-
- - - - @if ($asset->requireAcceptance()) - -
-
-

{{ trans('admin/categories/general.required_acceptance') }}

-
-
- @endif - - - @if ($asset->getEula()) -
-
-

{{ trans('admin/categories/general.required_eula') }}

-
-
- @endif - -
-
- {{ trans('button.cancel') }} - -
-
- -
- - - @stop - {{-- Page content --}} @section('content') -
-
@@ -35,97 +32,87 @@
  • Details
  • {{ trans('general.file_uploads') }}
  • {{ trans('admin/licenses/general.checkout_history') }}
    • -
  • {{ trans('button.upload') }}
    • +
    -
    - - - - - - - + + + + + + - - @if ($license->licenseseats) - @foreach ($license->licenseseats as $licensedto) - - - - - - - - - - @endforeach + + @if ($license->licenseseats) + @foreach ($license->licenseseats as $licensedto) + + + + + + + + @endforeach @endif - - -
    {{ trans('admin/licenses/general.seat') }}{{ trans('admin/licenses/general.user') }}{{ trans('admin/licenses/form.asset') }}
    {{ trans('admin/licenses/general.seat') }}{{ trans('admin/licenses/general.user') }}{{ trans('admin/licenses/form.asset') }}
    Seat {{ $count }} - - @if (($licensedto->user) && ($licensedto->deleted_at == NULL)) - @can('users.view') - - {{ $licensedto->user->present()->fullName() }} - - @else - {{ $licensedto->user->present()->fullName() }} - @endcan - - @elseif (($licensedto->user) && ($licensedto->deleted_at != NULL)) - {{ $licensedto->user->present()->fullName() }} - @elseif ($licensedto->asset) - @if ($licensedto->asset->assigned_to != 0) - @can('users.view') - - {{ $licensedto->asset->assigneduser->present()->fullName() }} - - @else - {{ $licensedto->asset->assigneduser->present()->fullName() }} - @endcan - - @endif - @endif - - @if ($licensedto->asset_id) - @can('view', $licensedto->asset) - - {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }} - - @else - {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }} - @endcan - - @endif - - @can('checkout', $licensedto) - @if (($licensedto->assigned_to) || ($licensedto->asset_id)) - - @if ($license->reassignable) - - {{ trans('general.checkin') }} - - @else - Assigned - @endif - @else - - {{ trans('general.checkout') }} - @endif - @endcan -
    Seat {{ $count }} + @if (($licensedto->user) && ($licensedto->deleted_at == NULL)) + @can('users.view') + + {{ $licensedto->user->present()->fullName() }} + + @else + {{ $licensedto->user->present()->fullName() }} + @endcan + @elseif (($licensedto->user) && ($licensedto->deleted_at != NULL)) + {{ $licensedto->user->present()->fullName() }} + @elseif ($licensedto->asset) + @if ($licensedto->asset->assigned_to != 0) + @can('users.view') + + {{ $licensedto->asset->assigneduser->present()->fullName() }} + + @else + {{ $licensedto->asset->assigneduser->present()->fullName() }} + @endcan + @endif + @endif + + @if ($licensedto->asset_id) + @can('view', $licensedto->asset) + + {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }} + + @else + {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }} + @endcan + @endif + + @can('checkout', $licensedto) + @if (($licensedto->assigned_to) || ($licensedto->asset_id)) + @if ($license->reassignable) + + {{ trans('general.checkin') }} + + @else + Assigned + @endif + @else + + {{ trans('general.checkout') }} + + @endif + @endcan +
    - +
    +
    @@ -145,12 +132,14 @@ @endif @can('viewKeys', $license) - @if (!is_null($license->serial)) - - - - - @endif + @if (!is_null($license->serial)) + + + + + @endif @endcan @if (!is_null($license->license_name)) @@ -167,63 +156,59 @@ @endif - @if ($license->supplier_id) - - - + + @endif @if ($license->expiration_date > 0) - - - + + + @endif - @if ($license->depreciation) - - - - + @if ($license->depreciation) - - - - + {{ trans('admin/hardware/form.depreciation') }}: + + + + + + + + + + - - + + @endif @if ($license->purchase_order) @@ -239,19 +224,14 @@ @if ($license->purchase_date > 0) - - + + @endif @if ($license->purchase_cost > 0) - + - - + + @endif @if (($license->seats) && ($license->seats) > 0) - - + + @endif - - + + @if ($license->notes) - + + + + @endif - -
    {{ trans('admin/licenses/form.license_key') }}{!! nl2br(e($license->serial)) !!}
    {{ trans('admin/licenses/form.license_key') }} + {!! nl2br(e($license->serial)) !!} +
    {{ trans('general.supplier') }}: - +
    {{ trans('general.supplier') }}: + - {{ $license->supplier->name }} + {{ $license->supplier->name }}
    {{ trans('admin/licenses/form.expiration') }}: - {{ $license->expiration_date }} -
    {{ trans('admin/licenses/form.expiration') }}:{{ $license->expiration_date }}
    - {{ trans('admin/hardware/form.depreciation') }}: - - {{ $license->depreciation->name }} - ({{ $license->depreciation->months }} - {{ trans('admin/hardware/form.months') }} - ) -
    - {{ trans('admin/hardware/form.depreciates_on') }}: - - {{ $license->depreciated_date()->format("Y-m-d") }} -
    + {{ $license->depreciation->name }} + ({{ $license->depreciation->months }} + {{ trans('admin/hardware/form.months') }} + ) +
    + {{ trans('admin/hardware/form.depreciates_on') }}: + + {{ $license->depreciated_date()->format("Y-m-d") }} +
    + {{ trans('admin/hardware/form.fully_depreciated') }}: + - {{ trans('admin/hardware/form.fully_depreciated') }}: - @if ($license->time_until_depreciated()->y > 0) {{ $license->time_until_depreciated()->y }} {{ trans('admin/hardware/form.years') }}, @endif {{ $license->time_until_depreciated()->m }} {{ trans('admin/hardware/form.months') }} - -
    - {{ trans('general.purchase_date') }}: - - {{ $license->purchase_date }} - {{ trans('general.purchase_date') }}:{{ $license->purchase_date }}
    {{ trans('general.purchase_cost') }}: - {{ trans('general.purchase_cost') }}: {{ $snipeSettings->default_currency }} {{ \App\Helpers\Helper::formatCurrencyOutput($license->purchase_cost) }} @@ -261,61 +241,49 @@ @if ($license->order_number)
    {{ trans('general.order_number') }}: - - {{ $license->order_number }} - {{ trans('general.order_number') }}:{{ $license->order_number }}
    {{ trans('admin/licenses/form.seats') }}: - - {{ $license->seats }}{{ trans('admin/licenses/form.seats') }}:{{ $license->seats }}
    - {{ trans('admin/licenses/form.reassignable') }}: - - {{ $license->reassignable ? 'Yes' : 'No' }} - {{ trans('admin/licenses/form.reassignable') }}:{{ $license->reassignable ? 'Yes' : 'No' }}
    - {{ trans('general.notes') }}: - - {!! nl2br(e($license->notes)) !!}
    {{ trans('general.notes') }}: + {!! nl2br(e($license->notes)) !!} +
    -
    +
    +
    +
    +
    -
    -
    - -
    -
    - - - + + - - - + + + @if (count($license->uploads) > 0) @foreach ($license->uploads as $file) @@ -324,12 +292,12 @@ {{ $file->note }} @endif - + @endforeach @else - - - - + + + @endif -
    {{ trans('general.notes') }} {{ trans('general.file_name') }}
    - {{ $file->filename }} - {{ $file->filename }} @if ($file->filename) - Download + + Download + @endif @@ -338,105 +306,89 @@
    - {{ trans('general.no_results') }} -
    {{ trans('general.no_results') }}
    +
    -
    -
    - - - - - - - - - - - @if (count($license->assetlog) > 0) - @foreach ($license->assetlog as $log) - - - - - - - - - @endforeach + + + + + + + + + + + @if (count($license->assetlog) > 0) + @foreach ($license->assetlog as $log) + + + - - - - - - - + + + + + + + + @endforeach + @endif + + + + + + + +
    {{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('button.actions') }}{{ trans('admin/licenses/general.user') }}{{ trans('general.notes') }}
    {{ $log->created_at }} - @if (isset($log->user_id)) - {{ $log->user->present()->fullName() }} - @endif - {{ $log->action_type }} - @if (($log->target) && ($log->target->id!='0')) - - @if ($log->target_type == 'App\Models\User') - - {{ $log->userlog->present()->fullName() }} - - @elseif ($log->target_type == 'App\Models\Asset') - - {{ $log->userlog->present()->name() }} - - @endif - - - @elseif ($log->action_type=='uploaded') - - {{ $log->filename }} - - @endif - - - @if ($log->note) {{ $log->note }} - @endif -
    {{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('button.actions') }}{{ trans('admin/licenses/general.user') }}{{ trans('general.notes') }}
    {{ $log->created_at }} + @if (isset($log->user_id)) + {{ $log->user->present()->fullName() }} @endif -
    {{ $license->created_at }} - @if ($license->adminuser) {{ $license->adminuser->present()->fullName() }} - @else - {{ trans('general.unknown_admin') }} - @endif - {{ trans('general.created_asset') }} - @if ($license->notes) - {{ $license->notes }} - @endif -
    {{ $log->action_type }} + @if (($log->target) && ($log->target->id!='0')) + @if ($log->target_type == 'App\Models\User') + + {{ $log->userlog->present()->fullName() }} + + @elseif ($log->target_type == 'App\Models\Asset') + + {{ $log->userlog->present()->name() }} + + @endif + @elseif ($log->action_type=='uploaded') + {{ $log->filename }} + @endif + + @if ($log->note) + {{ $log->note }} + @endif +
    {{ $license->created_at }} + @if ($license->adminuser) + {{ $license->adminuser->present()->fullName() }} + @else + {{ trans('general.unknown_admin') }} + @endif + {{ trans('general.created_asset') }} + @if ($license->notes) + {{ $license->notes }} + @endif +
    -
    -
    - -
    - -
    - -
    - -
    - - - -
    - + + + + + + + @@ -451,27 +403,23 @@ 'method' => 'POST', 'route' => ['upload/license', $license->id], 'files' => true, 'class' => 'form-horizontal' ]) }} -
    - -

    {{ trans('admin/licenses/general.filetype_info') }}

    - -
    -
    - -
    -
    -
    -
    - {{ Form::file('licensefile[]', ['multiple' => 'multiple']) }} -
    -
    - - -
    -
    - - -
    +
    +

    {{ trans('admin/licenses/general.filetype_info') }}

    +
    +
    + +
    +
    +
    +
    + {{ Form::file('licensefile[]', ['multiple' => 'multiple']) }} +
    +
    +
    +
    + + +
    {{ Form::close() }} diff --git a/resources/views/locations/index.blade.php b/resources/views/locations/index.blade.php index 2f226f5701..23d83f1670 100755 --- a/resources/views/locations/index.blade.php +++ b/resources/views/locations/index.blade.php @@ -12,13 +12,11 @@ @stop {{-- Page content --}} @section('content') -
    - + + @stop @section('moar_scripts') @include ('partials.bootstrap-table', ['exportFile' => 'locations-export', 'search' => true]) - - @stop diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php index c8694340d9..e4f92fe44d 100644 --- a/resources/views/locations/view.blade.php +++ b/resources/views/locations/view.blade.php @@ -15,74 +15,69 @@ {{-- Page content --}} @section('content') -
    -
    -
    - -
    -
    -
    -
    -
    - - - - - -
    {{ trans('general.user') }}
    -
    +
    +
    +
    +
    +
    +
    +
    + + + + + + +
    {{ trans('general.user') }}
    +
    -
    -
    -
    - -
    -
    -
    -
    - - - - - - - - - -
    {{ trans('general.name') }}{{ trans('admin/hardware/form.model') }}{{ trans('admin/hardware/form.tag') }}{{ trans('admin/hardware/form.serial') }}
    -
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + +
    {{ trans('general.name') }}{{ trans('admin/hardware/form.model') }}{{ trans('admin/hardware/form.tag') }}{{ trans('admin/hardware/form.serial') }}
    -> - +
    @stop - @section('moar_scripts') @include ('partials.bootstrap-table', ['exportFile' => 'locations-export', 'search' => true]) diff --git a/resources/views/manufacturers/index.blade.php b/resources/views/manufacturers/index.blade.php index 97f6c94240..128aba934a 100755 --- a/resources/views/manufacturers/index.blade.php +++ b/resources/views/manufacturers/index.blade.php @@ -20,33 +20,29 @@
    - - +
    - - - - - - - - - + + + + + + + + + -
    {{ trans('general.id') }}{{ trans('admin/manufacturers/table.name') }}{{ trans('general.assets') }}{{ trans('general.licenses') }}{{ trans('general.accessories') }}{{ trans('general.consumables') }}{{ trans('table.actions') }}
    {{ trans('general.id') }}{{ trans('admin/manufacturers/table.name') }}{{ trans('general.assets') }}{{ trans('general.licenses') }}{{ trans('general.accessories') }}{{ trans('general.consumables') }}{{ trans('table.actions') }}
    - -
    + +
    - -
    diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php index 6148abebaa..e857ab170a 100644 --- a/resources/views/manufacturers/view.blade.php +++ b/resources/views/manufacturers/view.blade.php @@ -23,148 +23,151 @@ {{-- Page content --}} @section('content') -
    -
    +
    +
    +
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - {{ trans('admin/companies/table.title') }} - {{ trans('general.id') }}{{ trans('general.name') }}{{ trans('admin/hardware/form.model') }}{{ trans('general.asset_tag') }}{{ trans('admin/hardware/form.serial') }}{{ trans('general.user') }}{{ trans('admin/hardware/table.change') }}{{ trans('table.actions') }}
    -
    + -
    - - - - - - - - - - - - - - - - - - - - -
    {{ trans('general.id') }}{{ trans('general.company') }}{{ trans('admin/licenses/table.title') }}{{ trans('general.manufacturer') }}{{ trans('admin/licenses/table.serial') }}{{ trans('admin/licenses/form.to_name') }}{{ trans('admin/licenses/form.to_email') }}{{ trans('admin/licenses/form.seats') }}{{ trans('admin/licenses/form.remaining_seats') }}{{ trans('admin/licenses/table.purchase_date') }}{{ trans('general.purchase_cost') }}{{ trans('admin/licenses/form.purchase_order') }}{{ trans('admin/licenses/form.expiration') }}{{ trans('admin/licenses/form.notes') }}{{ trans('table.actions') }}
    -
    +
    +
    + + + + + + + + + + + + + + +
    + {{ trans('admin/companies/table.title') }} + {{ trans('general.id') }}{{ trans('general.name') }}{{ trans('admin/hardware/form.model') }}{{ trans('general.asset_tag') }}{{ trans('admin/hardware/form.serial') }}{{ trans('general.user') }}{{ trans('admin/hardware/table.change') }}{{ trans('table.actions') }}
    +
    -
    - - - - - - - - - - - - - - - - - -
    {{ trans('admin/companies/table.title') }}{{ trans('admin/accessories/table.title') }}{{ trans('admin/accessories/general.accessory_category') }}{{ trans('general.manufacturer') }}{{ trans('general.location') }}{{ trans('admin/accessories/general.total') }}{{ trans('admin/accessories/general.date') }}{{ trans('general.purchase_cost') }}{{ trans('admin/accessories/general.order') }}{{ trans('general.min_amt') }}{{ trans('admin/accessories/general.remaining') }}{{ trans('table.actions') }}
    -
    -
    - - - - - - - - - - - - - - - - - - - - -
    {{ trans('general.id') }}{{ trans('admin/companies/table.title') }}{{ trans('admin/consumables/table.title') }}{{ trans('general.location') }}{{ trans('general.category') }} {{ trans('admin/consumables/general.total') }} {{ trans('admin/consumables/general.remaining') }} {{ trans('general.min_amt') }}{{ trans('general.manufacturer') }}{{ trans('general.model_no') }}{{ trans('admin/consumables/general.item_no') }}{{ trans('admin/consumables/general.order') }}{{ trans('admin/consumables/general.date') }}{{ trans('general.purchase_cost') }} {{ trans('table.actions') }}
    -
    -
    -
    -
    -
    +
    + + + + + + + + + + + + + + + + + + + + +
    {{ trans('general.id') }}{{ trans('general.company') }}{{ trans('admin/licenses/table.title') }}{{ trans('general.manufacturer') }}{{ trans('admin/licenses/table.serial') }}{{ trans('admin/licenses/form.to_name') }}{{ trans('admin/licenses/form.to_email') }}{{ trans('admin/licenses/form.seats') }}{{ trans('admin/licenses/form.remaining_seats') }}{{ trans('admin/licenses/table.purchase_date') }}{{ trans('general.purchase_cost') }}{{ trans('admin/licenses/form.purchase_order') }}{{ trans('admin/licenses/form.expiration') }}{{ trans('admin/licenses/form.notes') }}{{ trans('table.actions') }}
    +
    + +
    + + + + + + + + + + + + + + + + + +
    {{ trans('admin/companies/table.title') }}{{ trans('admin/accessories/table.title') }}{{ trans('admin/accessories/general.accessory_category') }}{{ trans('general.manufacturer') }}{{ trans('general.location') }}{{ trans('admin/accessories/general.total') }}{{ trans('admin/accessories/general.date') }}{{ trans('general.purchase_cost') }}{{ trans('admin/accessories/general.order') }}{{ trans('general.min_amt') }}{{ trans('admin/accessories/general.remaining') }}{{ trans('table.actions') }}
    +
    + +
    + + + + + + + + + + + + + + + + + + + + +
    {{ trans('general.id') }}{{ trans('admin/companies/table.title') }}{{ trans('admin/consumables/table.title') }}{{ trans('general.location') }}{{ trans('general.category') }} {{ trans('admin/consumables/general.total') }} {{ trans('admin/consumables/general.remaining') }} {{ trans('general.min_amt') }}{{ trans('general.manufacturer') }}{{ trans('general.model_no') }}{{ trans('admin/consumables/general.item_no') }}{{ trans('admin/consumables/general.order') }}{{ trans('admin/consumables/general.date') }}{{ trans('general.purchase_cost') }} {{ trans('table.actions') }}
    +
    + +
    +
    +
    +
    @stop @section('moar_scripts') diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php index 229688c41f..2048c98d57 100755 --- a/resources/views/models/index.blade.php +++ b/resources/views/models/index.blade.php @@ -53,12 +53,11 @@
    - -
    @stop + @section('moar_scripts') @include ('partials.bootstrap-table', ['exportFile' => 'models-export', 'search' => true]) diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index 97b0f6c025..c48f0959a0 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -8,99 +8,98 @@ @stop @section('header_right') - @can('superuser') + @can('superuser')
    - @endcan + @endcan @stop {{-- Page content --}} @section('content') -
    -
    -
    +
    +
    +
    + @if ($model->id) +
    +
    +

    {{ $model->name }}

    +
    +
    + @endif +
    + + + - @if ($model->id) -
    -
    -

    {{ $model->name }}

    -
    -
    - @endif - - -
    -
    - - - - - - - - - - - - -
    {{ trans('admin/companies/table.title') }}{{ trans('general.id') }}{{ trans('general.name') }}{{ trans('general.asset_tag') }}{{ trans('admin/hardware/table.serial') }}{{ trans('general.user') }}{{ trans('table.actions') }}
    -
    -
    -
    + {{ trans('admin/companies/table.title') }} + {{ trans('general.id') }} + {{ trans('general.name') }} + {{ trans('general.asset_tag') }} + {{ trans('admin/hardware/table.serial') }} + {{ trans('general.user') }} + {{ trans('table.actions') }} + + + +
    +
    +
    -

    More Info:

    +

    More Info:

      - @if ($model->manufacturer) -
    • {{ trans('general.manufacturer') }}: - {{ $model->manufacturer->name }}
      • +
    • + {{ trans('general.manufacturer') }}: + {{ $model->manufacturer->name }} +
      • @endif @if ($model->model_number) -
    • {{ trans('general.model_no') }}: - {{ $model->model_number }}
      • +
    • + {{ trans('general.model_no') }}: + {{ $model->model_number }} +
      • @endif @if ($model->depreciation) -
    • {{ trans('general.depreciation') }}: - {{ $model->depreciation->name }} ({{ $model->depreciation->months }} - {{ trans('general.months') }} - )
      • +
    • + {{ trans('general.depreciation') }}: + {{ $model->depreciation->name }} ({{ $model->depreciation->months.' '.trans('general.months')}}) +
      • @endif @if ($model->eol)
    • {{ trans('general.eol') }}: - {{ $model->eol }} - {{ trans('general.months') }}
      • + {{ $model->eol .' '. trans('general.months') }} {{ trans('general.months') }} + @endif @if ($model->fieldset)
    • {{ trans('admin/models/general.fieldset') }}: - {{ $model->fieldset->name }} + {{ $model->fieldset->name }}
      • - @endif @if ($model->image) @@ -108,18 +107,16 @@ @endif @if ($model->deleted_at!='') -

    • {{ trans('admin/models/general.restore') }}
      • - - @endif - +

    • {{ trans('admin/models/general.restore') }}
      • + @endif
    @if ($model->note) Notes: -

    {!! $model->present()->note() !!} +

    + {!! $model->present()->note() !!}

    @endif -
    @stop diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php index 7cfa2df2ab..36fa5e174c 100644 --- a/resources/views/reports/accessories.blade.php +++ b/resources/views/reports/accessories.blade.php @@ -9,46 +9,41 @@ {{-- Page content --}} @section('content') -
    -
    +
    +
    +
    +
    + -
    -
    - -
    - -
    - - - - - - - - - - - - @foreach ($accessories as $accessory) - - - - - - - @endforeach - -
    {{ trans('admin/companies/table.title') }}{{ trans('admin/accessories/table.title') }}{{ trans('admin/accessories/general.total') }}{{ trans('admin/accessories/general.remaining') }}
    {{ is_null($accessory->company) ? '' : $accessory->company->name }}{{ $accessory->name }}{{ $accessory->qty }}{{ $accessory->numRemaining() }}
    -
    -
    -
    -
    + + + {{ trans('admin/companies/table.title') }} + {{ trans('admin/accessories/table.title') }} + {{ trans('admin/accessories/general.total') }} + {{ trans('admin/accessories/general.remaining') }} + + + + @foreach ($accessories as $accessory) + + {{ is_null($accessory->company) ? '' : $accessory->company->name }} + {{ $accessory->name }} + {{ $accessory->qty }} + {{ $accessory->numRemaining() }} + + @endforeach + + +
    +
    +
    +
    diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php index be7fed15e1..5cc0841ee2 100644 --- a/resources/views/reports/activity.blade.php +++ b/resources/views/reports/activity.blade.php @@ -9,15 +9,12 @@ {{-- Page content --}} @section('content') - -
    -
    +
    +
    +
    -
    -
    - - - - - - - - - - - - - - -
    {{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.type') }}{{ trans('general.item') }}To{{ trans('general.date') }}{{ trans('general.notes') }}
    - - + + + {{ trans('general.admin') }} + {{ trans('general.action') }} + {{ trans('general.type') }} + {{ trans('general.item') }} + To + {{ trans('general.date') }} + {{ trans('general.notes') }} + + + +
    +
    -
    -
    +
    @stop diff --git a/resources/views/reports/asset.blade.php b/resources/views/reports/asset.blade.php index f144ec7c65..d6824e6804 100644 --- a/resources/views/reports/asset.blade.php +++ b/resources/views/reports/asset.blade.php @@ -16,10 +16,8 @@
    -
    -
    +
    +
    -
    -
    +
    +
    -
    -
    - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @foreach ($assetMaintenances as $assetMaintenance) + + + + + + + + + + @if (is_null($assetMaintenance->asset_maintenance_time)) diffInDays(Carbon::parse($assetMaintenance->start_date))); ?> - @foreach ($assetMaintenances as $assetMaintenance) - - - - - - - - - - @if (is_null($assetMaintenance->asset_maintenance_time)) - diffInDays(Carbon::parse($assetMaintenance->start_date))); - ?> - @else - asset_maintenance_time); - ?> - @endif - - - - cost); - ?> - @endforeach - - - - - - - - -
    {{ trans('admin/companies/table.title') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/asset_maintenances/table.asset_name') }}{{ trans('general.supplier') }}{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}{{ trans('admin/asset_maintenances/form.title') }}{{ trans('admin/asset_maintenances/form.start_date') }}{{ trans('admin/asset_maintenances/form.completion_date') }}{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}{{ trans('admin/asset_maintenances/form.cost') }}
    {{ trans('admin/companies/table.title') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/asset_maintenances/table.asset_name') }}{{ trans('general.supplier') }}{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}{{ trans('admin/asset_maintenances/form.title') }}{{ trans('admin/asset_maintenances/form.start_date') }}{{ trans('admin/asset_maintenances/form.completion_date') }}{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}{{ trans('admin/asset_maintenances/form.cost') }}
    {{ is_null($assetMaintenance->asset->company) ? '' : $assetMaintenance->asset->company->name }}{{ $assetMaintenance->asset->asset_tag }}{{ $assetMaintenance->asset->name }}{{ $assetMaintenance->supplier->name }}{{ $assetMaintenance->asset_maintenance_type }}{{ $assetMaintenance->title }}{{ $assetMaintenance->start_date }}{{ is_null($assetMaintenance->completion_date) ? trans('admin/asset_maintenances/message.asset_maintenance_incomplete') : $assetMaintenance->completion_date }}
    {{ is_null($assetMaintenance->asset->company) ? '' : $assetMaintenance->asset->company->name }}{{ $assetMaintenance->asset->asset_tag }}{{ $assetMaintenance->asset->name }}{{ $assetMaintenance->supplier->name }}{{ $assetMaintenance->asset_maintenance_type }}{{ $assetMaintenance->title }}{{ $assetMaintenance->start_date }}{{ is_null($assetMaintenance->completion_date) ? trans('admin/asset_maintenances/message.asset_maintenance_incomplete') : $assetMaintenance->completion_date }}{{ $assetMaintenanceTime }} - {{ $snipeSettings->default_currency }} - {{ number_format($assetMaintenance->cost,2) }} -
    Totals:{{number_format($totalDays)}} - {{ $snipeSettings->default_currency }} - {{ number_format($totalCost,2) }} -
    + @else + asset_maintenance_time); + ?> + @endif + {{ $assetMaintenanceTime }} + + {{ $snipeSettings->default_currency }} + {{ number_format($assetMaintenance->cost,2) }} + + + cost); + ?> + @endforeach + + + + Totals: + {{number_format($totalDays)}} + + {{ $snipeSettings->default_currency }} + {{ number_format($totalCost,2) }} + + + +
    +
    -
    - +@stop @section('moar_scripts') @@ -130,4 +129,3 @@ }); @stop -@stop diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 756ea16f77..fb1c00f39f 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -16,175 +16,162 @@ @section('content')
    -
    +
    - {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }} - - + {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }} + {{csrf_field()}} + +
    +
    +

    Customize Report

    +
    - -
    +
    +
    -
    -

    Customize Report

    -
    - - -
    -
    - -
    - -
    - -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    - -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    -
    - -
    -
    - -
    -
    - -
    - - - - - @foreach ($customfields as $customfield)
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    - @endforeach -
    + @foreach ($customfields as $customfield) +
    + +
    + @endforeach +
    -
    -

    Select the fields you'd like to include in your custom report, and click Generate. The file (YYYY-mm-dd-his-custom-asset-report.csv) will download automatically, and you can open it in Excel.

    -
    +
    +

    Select the fields you'd like to include in your custom report, and click Generate. The file (YYYY-mm-dd-his-custom-asset-report.csv) will download automatically, and you can open it in Excel.

    +
    -
    +
    - +
    -
    - -
    +
    + {{ Form::close() }} +
    @stop diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php index 6fbe9d8331..1729ba370d 100644 --- a/resources/views/reports/depreciation.blade.php +++ b/resources/views/reports/depreciation.blade.php @@ -9,140 +9,138 @@ {{-- Page content --}} @section('content') -
    - -
    - - - - - - - - @if ($snipeSettings->display_asset_name) +
    +
    {{ trans('admin/companies/table.title') }}{{ trans('admin/categories/general.category_name') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/hardware/table.title') }}
    + + + + + + + @if ($snipeSettings->display_asset_name) - @endif - - + @endif + + - - - - - - - - - - - - @foreach ($assets as $asset) - - - - - - @if ($snipeSettings->display_asset_name) + + + + + + + + + + + @foreach ($assets as $asset) + + + + + + @if ($snipeSettings->display_asset_name) - @endif - - - - + + + + + - @endif - - - + - - - @if ($asset->purchase_cost > 0) - - + - + + @else + + + @endif + + @endforeach + +
    {{ trans('admin/companies/table.title') }}{{ trans('admin/categories/general.category_name') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/hardware/table.title') }}{{ trans('general.name') }}{{ trans('admin/hardware/table.serial') }}{{ trans('admin/depreciations/general.depreciation_name') }}{{ trans('admin/hardware/table.serial') }}{{ trans('admin/depreciations/general.depreciation_name') }} {{ trans('admin/depreciations/general.number_of_months') }}{{ trans('admin/hardware/table.checkoutto') }}{{ trans('admin/hardware/table.location') }}{{ trans('admin/hardware/table.purchase_date') }}{{ trans('admin/hardware/table.eol') }}{{ trans('admin/hardware/table.purchase_cost') }}{{ trans('admin/hardware/table.book_value') }}{{ trans('admin/hardware/table.diff') }}
    {{ is_null($asset->company) ? '' : $asset->company->name }} - @if ($asset->model) - {{ $asset->model->category->name }} - @endif - - - @if ($asset->deleted_at!='') - {{ $asset->asset_tag }} - @else - {{ $asset->asset_tag }} - @endif - - {{ $asset->model->name }}{{ trans('admin/hardware/table.checkoutto') }}{{ trans('admin/hardware/table.location') }}{{ trans('admin/hardware/table.purchase_date') }}{{ trans('admin/hardware/table.eol') }}{{ trans('admin/hardware/table.purchase_cost') }}{{ trans('admin/hardware/table.book_value') }}{{ trans('admin/hardware/table.diff') }}
    {{ is_null($asset->company) ? '' : $asset->company->name }} + @if ($asset->model) + {{ $asset->model->category->name }} + @endif + + @if ($asset->deleted_at!='') + {{ $asset->asset_tag }} + @else + {{ $asset->asset_tag }} + @endif + {{ $asset->model->name }}{{ $asset->name }}{{ $asset->serial }} - @if ($asset->model->depreciation) - {{ $asset->model->depreciation->name }} @endif - - @if ($asset->model->depreciation) - {{ $asset->model->depreciation->months }} - @endif - - @if ($asset->assigneduser) - @if ($asset->assigneduser->deleted_at!='') - {{ $asset->assigneduser->present()->fullName() }} - @else - - {{ $asset->assigneduser->present()->fullName() }} - - @endif + {{ $asset->serial }} + @if ($asset->model->depreciation) + {{ $asset->model->depreciation->name }} + @endif + + @if ($asset->model->depreciation) + {{ $asset->model->depreciation->months }} + @endif + + @if ($asset->assigneduser) + @if ($asset->assigneduser->deleted_at!='') + {{ $asset->assigneduser->present()->fullName() }} + @else + + {{ $asset->assigneduser->present()->fullName() }} + + @endif + @endif + + @if ($asset->assetloc) + {{ $asset->assetloc->name }} + @elseif ($asset->defaultloc) + {{ $asset->defaultloc->name }} + @endif + {{ $asset->purchase_date }} - @if ($asset->assetloc) - {{ $asset->assetloc->name }} - @elseif ($asset->defaultloc) - {{ $asset->defaultloc->name }} - @endif - {{ $asset->purchase_date }} + @if ($asset->model->eol) {{ $asset->present()->eol_date() }} + @endif + - @if ($asset->model->eol) {{ $asset->present()->eol_date() }} - @endif - - @if ($asset->assetloc ) + @if ($asset->purchase_cost > 0) + + @if ($asset->assetloc ) {{ $asset->assetloc->currency }} - @else + @else {{ $snipeSettings->default_currency }} - @endif - {{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }} - @if ($asset->assetloc ) + @endif + {{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }} + + @if ($asset->assetloc ) {{ $asset->assetloc->currency }} - @else + @else {{ $snipeSettings->default_currency }} - @endif + @endif - {{ \App\Helpers\Helper::formatCurrencyOutput($asset->getDepreciatedValue()) }} - @if ($asset->assetloc) + {{ \App\Helpers\Helper::formatCurrencyOutput($asset->getDepreciatedValue()) }} + + @if ($asset->assetloc) {{ $asset->assetloc->currency }} - @else + @else {{ $snipeSettings->default_currency }} + @endif + + -{{ \App\Helpers\Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue())) }} +
    +
    +
    +
    +
    +
    - -{{ \App\Helpers\Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue())) }} - @else - - - - @endif - - - - @endforeach - - - - - - +@stop @section('moar_scripts') diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php index 22deae8a62..f16f39eebd 100755 --- a/resources/views/reports/index.blade.php +++ b/resources/views/reports/index.blade.php @@ -9,92 +9,86 @@ {{-- Page content --}} @section('content') -
    -
    {{ trans('admin/hardware/table.dl_csv') }}
    -

    {{ trans('general.depreciation_report') }}

    +
    + + + + + + @if ($snipeSettings->display_asset_name) + + @endif + + + + + + + + + + + + @foreach ($assets as $asset) + + + + @if ($snipeSettings->display_asset_name) + + @endif + + + + -
    -
    {{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/hardware/table.title') }}{{ trans('general.name') }}{{ trans('admin/hardware/table.serial') }}{{ trans('admin/hardware/table.checkoutto') }}{{ trans('admin/hardware/table.location') }}{{ trans('admin/hardware/table.purchase_date') }}{{ trans('admin/hardware/table.eol') }}{{ trans('admin/hardware/table.purchase_cost') }}{{ trans('admin/hardware/table.book_value') }}{{ trans('admin/hardware/table.diff') }}
    {{ $asset->asset_tag }}{{ $asset->model->name }}{{ $asset->name }}{{ $asset->serial }} + @if ($asset->assigned_to != '') + + {{ $asset->assigneduser->present()->fullName() }} + + @endif + + @if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {{ Location::find($asset->assigneduser->location_id)->city }} + , + {{ Location::find($asset->assigneduser->location_id)->state }} + @endif + {{ $asset->purchase_date }}
    - - - - - @if ($snipeSettings->display_asset_name) - - @endif - - - - - - - - - - - - - @foreach ($assets as $asset) - - - - @if ($snipeSettings->display_asset_name) - - @endif - - - - - - - - @if ($asset->purchase_cost > 0) - - - - @else - - - - @endif - - - - @endforeach - -
    {{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/hardware/table.title') }}{{ trans('general.name') }}{{ trans('admin/hardware/table.serial') }}{{ trans('admin/hardware/table.checkoutto') }}{{ trans('admin/hardware/table.location') }}{{ trans('admin/hardware/table.purchase_date') }}{{ trans('admin/hardware/table.eol') }}{{ trans('admin/hardware/table.purchase_cost') }}{{ trans('admin/hardware/table.book_value') }}{{ trans('admin/hardware/table.diff') }}
    {{ $asset->asset_tag }}{{ $asset->model->name }}{{ $asset->name }}{{ $asset->serial }} - @if ($asset->assigned_to != '') - - {{ $asset->assigneduser->present()->fullName() }} - - @endif - - @if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {{ Location::find($asset->assigneduser->location_id)->city }} - , - {{ Location::find($asset->assigneduser->location_id)->state }} - @endif - {{ $asset->purchase_date }} - @if ($asset->model->eol) {{ $asset->present()->eol_date() }} - @endif - - {{ $snipeSettings->default_currency }} - {{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }} - - {{ $snipeSettings->default_currency }} - {{ number_format($asset->depreciate()) }} - - {{ $snipeSettings->default_currency }} - -{{ number_format(($asset->purchase_cost - $asset->depreciate())) }}
    + + @if ($asset->model->eol) {{ $asset->present()->eol_date() }} + @endif + + @if ($asset->purchase_cost > 0) + + {{ $snipeSettings->default_currency }} + {{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost) }} + + + {{ $snipeSettings->default_currency }} + {{ number_format($asset->depreciate()) }} + + + {{ $snipeSettings->default_currency }} + -{{ number_format(($asset->purchase_cost - $asset->depreciate())) }} + + @else {{-- purchase_cost > 0 --}} + + + + @endif + + @endforeach + + +
    @stop diff --git a/resources/views/reports/licenses.blade.php b/resources/views/reports/licenses.blade.php index 06e88786d8..4c77c268ab 100644 --- a/resources/views/reports/licenses.blade.php +++ b/resources/views/reports/licenses.blade.php @@ -8,62 +8,67 @@ {{-- Page content --}} @section('content') - - -
    -
    -
    -
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + -
    -
    {{ trans('admin/companies/table.title') }}{{ trans('admin/licenses/table.title') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('admin/licenses/form.seats') }}{{ trans('admin/licenses/form.remaining_seats') }}{{ trans('admin/licenses/form.expiration') }}{{ trans('general.purchase_date') }}{{ trans('general.purchase_cost') }}{{ trans('general.depreciation') }}{{ trans('admin/hardware/table.book_value') }}{{ trans('admin/hardware/table.diff') }}
    - - - - - - - - - - - - - - - - + + @foreach ($licenses as $license) + + + + + + + + + + + + + + @endforeach + +
    {{ trans('admin/companies/table.title') }}{{ trans('admin/licenses/table.title') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('admin/licenses/form.seats') }}{{ trans('admin/licenses/form.remaining_seats') }}{{ trans('admin/licenses/form.expiration') }}{{ trans('general.purchase_date') }}{{ trans('general.purchase_cost') }}{{ trans('general.depreciation') }}{{ trans('admin/hardware/table.book_value') }}{{ trans('admin/hardware/table.diff') }}
    {{ is_null($license->company) ? '' : $license->company->name }}{{ $license->name }}{{ mb_strimwidth($license->serial, 0, 50, "...") }}{{ $license->seats }}{{ $license->remaincount() }}{{ $license->expiration_date }}{{ $license->purchase_date }} + {{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput($license->purchase_cost) }} + + {{ ($license->depreciation) ? e($license->depreciation->name).' ('.$license->depreciation->months.' '.trans('general.months').')' : '' }} + + {{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput($license->getDepreciatedValue()) }} + + -{{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput(($license->purchase_cost - $license->getDepreciatedValue())) }} +
    +
    +
    +
    +
    +
    - @foreach ($licenses as $license) - - {{ is_null($license->company) ? '' : $license->company->name }} - {{ $license->name }} - {{ mb_strimwidth($license->serial, 0, 50, "...") }} - {{ $license->seats }} - {{ $license->remaincount() }} - {{ $license->expiration_date }} - {{ $license->purchase_date }} - - {{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput($license->purchase_cost) }} - {{ ($license->depreciation) ? e($license->depreciation->name).' ('.$license->depreciation->months.' '.trans('general.months').')' : '' }} - {{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput($license->getDepreciatedValue()) }} - -{{ $snipeSettings->default_currency }}{{ \App\Helpers\Helper::formatCurrencyOutput(($license->purchase_cost - $license->getDepreciatedValue())) }} - - @endforeach - - -
    -
    -
    - - +@stop @section('moar_scripts') @@ -105,5 +110,3 @@ }); @stop - -@stop diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php index 9d346c302b..5afeb5b37f 100644 --- a/resources/views/reports/unaccepted_assets.blade.php +++ b/resources/views/reports/unaccepted_assets.blade.php @@ -13,91 +13,89 @@
    - -
    -
    - -
    - - - - - - - - - - - - - @if ($assetsForReport) - @foreach ($assetsForReport as $assetItem) - - - - - - - - - @endforeach - @endif - - - - - -
    {{ trans('admin/companies/table.title') }}{{ trans('general.category') }}{{ trans('admin/hardware/form.model') }}{{ trans('admin/hardware/form.name') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/hardware/table.checkoutto') }}
    {{ is_null($assetItem->company) ? '' : $assetItem->company->name }}{{ $assetItem->model->category->name }}{{ $assetItem->model->name }}{{ link_to_route('hardware.show',$assetItem->present()->name(), [$assetItem->id]) }}{{ $assetItem->asset_tag }}{{ link_to_route('users.show', $assetItem->assigneduser->present()->fullName(), [$assetItem->assigned_to])}}
    -
    +
    +
    +
    + + + + + + + + + + + + + @if ($assetsForReport) + @foreach ($assetsForReport as $assetItem) + + + + + + + + + @endforeach + @endif + + + + + +
    {{ trans('admin/companies/table.title') }}{{ trans('general.category') }}{{ trans('admin/hardware/form.model') }}{{ trans('admin/hardware/form.name') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/hardware/table.checkoutto') }}
    {{ is_null($assetItem->company) ? '' : $assetItem->company->name }}{{ $assetItem->model->category->name }}{{ $assetItem->model->name }}{{ link_to_route('hardware.show',$assetItem->present()->name(), [$assetItem->id]) }}{{ $assetItem->asset_tag }}{{ link_to_route('users.show', $assetItem->assigneduser->present()->fullName(), [$assetItem->assigned_to])}}
    +
    +
    -
    - - @section('moar_scripts') - - - - - - - - @stop @stop + +@section('moar_scripts') + + + + + + + +@stop diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php index a6583d819d..165c8fca4c 100644 --- a/resources/views/settings/backups.blade.php +++ b/resources/views/settings/backups.blade.php @@ -15,7 +15,6 @@
    - @@ -24,20 +23,24 @@ - @foreach ($files as $file) - - - - - - - @endforeach - + @foreach ($files as $file) + + + + + + + @endforeach +
    File
    {{ $file['filename'] }}{{ date("M d, Y g:i A", $file['modified']) }} {{ $file['filesize'] }} - - - -
    {{ $file['filename'] }}{{ date("M d, Y g:i A", $file['modified']) }} {{ $file['filesize'] }} + {{ Helper::generateDatatableButton( + 'delete', + route('settings/delete-file', $file['filename']), + config('app.lock_passwords'), + trans('admin/settings/message.backup.delete_confirm'), + $file['filename'] + ) + }} +
    diff --git a/resources/views/settings/edit.blade.php b/resources/views/settings/edit.blade.php index 56865e7a3e..01612fcce7 100755 --- a/resources/views/settings/edit.blade.php +++ b/resources/views/settings/edit.blade.php @@ -10,7 +10,6 @@ {{-- Page content --}} @section('content') -
    -
    +
    +
    + {{csrf_field()}} + @if($user->id) + {{ method_field('PUT') }} + @endif + +
    + - - - -@if($user->id) - {{ method_field('PUT') }} -@endif - -
    - +
    +
    +
    +
    + +
    + +
    + + {!! $errors->first('first_name', ':message') !!} +
    +
    -
    -
    -
    -
    + +
    + +
    + + {!! $errors->first('last_name', ':message') !!} +
    +
    - -
    - -
    - - {!! $errors->first('first_name', ':message') !!} -
    -
    + +
    + +
    + @if ($user->ldap_import!='1') + id)) ? ' disabled' : '') }} + > + @if (config('app.lock_passwords') && ($user->id)) +

    {{ trans('admin/users/table.lock_passwords') }}

    + @endif + @else + (Managed via LDAP) + @endif - -
    - -
    - - {!! $errors->first('last_name', ':message') !!} -
    -
    + {!! $errors->first('username', ':message') !!} +
    +
    - -
    - -
    - @if ($user->ldap_import!='1') - id)) ? ' disabled' : '') }} - > - @if (config('app.lock_passwords') && ($user->id)) -

    {{ trans('admin/users/table.lock_passwords') }}

    - @endif - @else - (Managed via LDAP) - @endif + +
    + +
    + @if ($user->ldap_import!='1') + id)) ? ' disabled' : '') }} + > + @else + (Managed via LDAP) + @endif + + {!! $errors->first('password', ':message') !!} +
    +
    + @if ($user->ldap_import!='1') + Generate + @endif +
    +
    - {!! $errors->first('username', ':message') !!} -
    -
    - - -
    - -
    - @if ($user->ldap_import!='1') - id)) ? ' disabled' : '') }} - > - @else - (Managed via LDAP) - @endif - - {!! $errors->first('password', ':message') !!} -
    -
    - @if ($user->ldap_import!='1') - Generate - @endif -
    -
    - - @if ($user->ldap_import!='1') - -
    - -
    - id)) ? ' disabled' : '') }} - > - @if (config('app.lock_passwords') && ($user->id)) -

    {{ trans('admin/users/table.lock_passwords') }}

    - @endif - {!! $errors->first('password_confirm', ':message') !!} -
    -
    - @endif - - -
    - -
    - id)) ? ' disabled' : '') }} - autocomplete="off" - readonly - onfocus="this.removeAttribute('readonly');" - > - @if (config('app.lock_passwords') && ($user->id)) -

    {{ trans('admin/users/table.lock_passwords') }}

    - @endif - {!! $errors->first('email', ':message') !!} -
    -
    - - - @if (\App\Models\Company::canManageUsersCompanies()) - -
    -
    - {{ Form::label('company_id', trans('general.company')) }} -
    -
    - {{ Form::select('company_id', $company_list , Input::old('company_id', $user->company_id), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('company_id', ':message') !!} -
    -
    - @endif - - -
    - -
    - {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} - {!! $errors->first('locale', ':message') !!} -
    -
    - - -
    - -
    - - {!! $errors->first('employee_num', ':message') !!} -
    -
    - - - -
    - -
    - - {!! $errors->first('jobtitle', ':message') !!} -
    -
    - - - -
    - -
    - {{ Form::select('manager_id', $manager_list , Input::old('manager_id', $user->manager_id), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('manager_id', ':message') !!} -
    -
    - - -
    - -
    - {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('location_id', ':message') !!} -
    -
    - - -
    - -
    - - {!! $errors->first('phone', ':message') !!} -
    -
    - - -
    - -
    -
    - - {!! $errors->first('activated', ':message') !!} -
    -
    -
    - - @if ($snipeSettings->two_factor_enabled!='') - - @if ($snipeSettings->two_factor_enabled=='1') -
    -
    - {{ Form::label('two_factor_optin', trans('admin/settings/general.two_factor')) }} -
    -
    - {{ Form::checkbox('two_factor_optin', '1', Input::old('two_factor_optin', $user->two_factor_optin),array('class' => 'minimal')) }} - {{ trans('admin/settings/general.two_factor_enabled_text') }} - -

    {{ trans('admin/users/general.two_factor_admin_optin_help') }}

    -
    + @if ($user->ldap_import!='1') + +
    + +
    + id)) ? ' disabled' : '') }} + > + @if (config('app.lock_passwords') && ($user->id)) +

    {{ trans('admin/users/table.lock_passwords') }}

    + @endif + {!! $errors->first('password_confirm', ':message') !!} +
    @endif + +
    + +
    + id)) ? ' disabled' : '') }} + autocomplete="off" + readonly + onfocus="this.removeAttribute('readonly');" + > + @if (config('app.lock_passwords') && ($user->id)) +

    {{ trans('admin/users/table.lock_passwords') }}

    + @endif + {!! $errors->first('email', ':message') !!} +
    +
    + + + @if (\App\Models\Company::canManageUsersCompanies()) + +
    +
    + {{ Form::label('company_id', trans('general.company')) }} +
    +
    + {{ Form::select('company_id', $company_list , Input::old('company_id', $user->company_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('company_id', ':message') !!} +
    +
    + @endif + + +
    + +
    + {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} + {!! $errors->first('locale', ':message') !!} +
    +
    + + +
    + +
    + + {!! $errors->first('employee_num', ':message') !!} +
    +
    - -
    -
    - {{ trans('admin/settings/general.two_factor_reset') }} - - - - - - + +
    + +
    + + {!! $errors->first('jobtitle', ':message') !!} +
    +
    -
    -
    -

    {{ trans('admin/settings/general.two_factor_reset_help') }}

    -
    + + +
    + +
    + {{ Form::select('manager_id', $manager_list , Input::old('manager_id', $user->manager_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('manager_id', ':message') !!} +
    +
    + + +
    + +
    + {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('location_id', ':message') !!} +
    +
    + + +
    + +
    + + {!! $errors->first('phone', ':message') !!} +
    +
    + + +
    + +
    +
    + + {!! $errors->first('activated', ':message') !!}
    +
    +
    - @endif + @if ($snipeSettings->two_factor_enabled!='') + @if ($snipeSettings->two_factor_enabled=='1') +
    +
    + {{ Form::label('two_factor_optin', trans('admin/settings/general.two_factor')) }} +
    +
    + {{ Form::checkbox('two_factor_optin', '1', Input::old('two_factor_optin', $user->two_factor_optin),array('class' => 'minimal')) }} + {{ trans('admin/settings/general.two_factor_enabled_text') }} - -
    - -
    - - {!! $errors->first('notes', ' :message') !!} -
    -
    +

    {{ trans('admin/users/general.two_factor_admin_optin_help') }}

    +
    +
    + @endif - -
    - -
    + +
    +
    + {{ trans('admin/settings/general.two_factor_reset') }} + + + + + + +
    +
    +

    {{ trans('admin/settings/general.two_factor_reset_help') }}

    +
    +
    + @endif - @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser()))) + +
    + +
    + + {!! $errors->first('notes', ' :message') !!} +
    +
    - @if (count($userGroups->keys()) > 0) + +
    + +
    + @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser()))) + @if (count($userGroups->keys()) > 0)
      @foreach ($groups as $id => $group) {!! ($userGroups->keys()->contains($id) ? '
    • '.e($group).'
      • ' : '') !!} @endforeach
    - @endif - - Only superadmins may edit group memberships.

    - @else -
    + @endif + Only superadmins may edit group memberships.

    + @else +
    {{ trans('admin/users/table.groupnotes') }} +
    + @endif +
    +
    + + + @if (!$user->id) +
    +
    +
    +
    +
    +
    +
    +
    @endif - +
    -
    - - @if (!$user->id) +
    -
    -
    +
    +
    + @if (!Auth::user()->isSuperUser()) +

    Only superadmins may grant a user superadmin access.

    + @endif
    -
    -
    - -
    -
    -
    - @endif -
    -
    -
    + + + + + + + + + -
    -
    - @if (!Auth::user()->isSuperUser()) -

    Only superadmins may grant a user superadmin access.

    - @endif -
    -
    PermissionGrantDenyInherit
    - - - - - - - - - @foreach ($permissions as $area => $permissionsArray) - @if (count($permissionsArray) == 1) + @foreach ($permissions as $area => $permissionsArray) + @if (count($permissionsArray) == 1) - + + - - - - - @else + @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled"]) }} + @else + {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant"]) }} + @endif + + + + + + @else - - - + + - @foreach ($permissionsArray as $index => $permission) - - @if ($permission['display']) - - - - - - @endif - - @endforeach + @foreach ($permissionsArray as $index => $permission) + + @if ($permission['display']) + + + + + @endif + + @endforeach @endif - @endforeach -
    PermissionGrantDenyInherit

    {{ $area . ': ' . $localPermission['label'] }}

    		 - @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled"]) }} - @else - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant"]) }} - @endif - - - @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled"]) }} - @else - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny"]) }} - @endif - - - @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled"] ) }} - @else - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit"] ) }} - @endif -
    + @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled"]) }} + @else + {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny"]) }} + @endif + + @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled"] ) }} + @else + {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit"] ) }} + @endif +
    -

    {{ $area }}

    -     		+
    +

    {{ $area }}

    +     		{{ Form::radio("$area", '1',false,['value'=>"grant"]) }} @@ -495,57 +481,57 @@ {{ Form::radio("$area", '0',false,['value'=>"inherit"] ) }}
    - {{ $permission['label'] }} - - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant"]) }} - @endif - - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny"]) }} - @endif - - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit"]) }} - @endif -
    + {{ $permission['label'] }} + + @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled']) }} + @else + {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant"]) }} + @endif + + @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled']) }} + @else + {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny"]) }} + @endif + + @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled']) }} + @else + {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit"]) }} + @endif +
    -
    -
    -
    - -
    -
    - -
    -
    + @endforeach + +
    +
    +
    + +
    +
    + +
    +
    @stop + @section('moar_scripts') @stop diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 9d517b689c..2cdb0399af 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -10,28 +10,26 @@ @endif {{ trans('general.users') }} - @parent @stop @section('header_right') @can('create', \App\Models\User::class) - @if ($snipeSettings->ldap_enabled == 1) - LDAP - @endif - {{ trans('general.import') }} - {{ trans('general.create') }} + @if ($snipeSettings->ldap_enabled == 1) + LDAP + @endif + {{ trans('general.import') }} + {{ trans('general.create') }} @endcan - @if (Input::get('status')=='deleted') - {{ trans('admin/users/table.show_current') }} - @else - {{ trans('admin/users/table.show_deleted') }} - @endif + @if (Input::get('status')=='deleted') + {{ trans('admin/users/table.show_current') }} + @else + {{ trans('admin/users/table.show_deleted') }} + @endif @can('view', \App\Models\User::class) Export @endcan - @stop {{-- Page content --}} @@ -39,28 +37,24 @@
    -
    -
    - {{ Form::open([ 'method' => 'POST', 'route' => ['users/bulkedit'], 'class' => 'form-inline' ]) }} @if (Input::get('status')!='deleted') - @can('delete', \App\Models\User::class) -
    - - -
    - @endcan + @can('delete', \App\Models\User::class) +
    + + +
    + @endcan @endif - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - {{-- - - - - --}} + + + + +
    - @if (Input::get('status')!='deleted') -
    - @endif -     		{{ trans('general.id') }}{{ trans('admin/companies/table.title') }}{{ trans('admin/users/table.employee_num') }}{{ trans('admin/users/table.name') }}{{ trans('admin/users/table.title') }} - - - {{ trans('admin/users/table.username') }}{{ trans('admin/users/table.manager') }}{{ trans('admin/users/table.location') }} - - - - - - - - - - - - {{ trans('general.groups') }}{{ trans('general.notes') }}{{ trans('admin/users/general.two_factor_enrolled') }}{{ trans('admin/users/general.two_factor_active') }}
    + @if (Input::get('status')!='deleted') +
    + @endif +     		{{ trans('general.id') }}{{ trans('admin/companies/table.title') }}{{ trans('admin/users/table.employee_num') }}{{ trans('admin/users/table.name') }}{{ trans('admin/users/table.title') }} + + + {{ trans('admin/users/table.username') }}{{ trans('admin/users/table.manager') }}{{ trans('admin/users/table.location') }} + + + + + + + + + + + + {{ trans('general.groups') }}{{ trans('general.notes') }}{{ trans('admin/users/general.two_factor_enrolled') }}{{ trans('admin/users/general.two_factor_active') }}{{ trans('general.activated') }}{{ trans('general.created_at') }}{{ trans('table.actions') }}
    - - -
    {{ trans('general.activated') }}{{ trans('general.created_at') }}{{ trans('table.actions') }}
    - {{ Form::close() }}
    -
    -@stop +@stop @section('moar_scripts') @include ('partials.bootstrap-table', ['exportFile' => 'users-export', 'search' => true]) diff --git a/resources/views/users/ldap.blade.php b/resources/views/users/ldap.blade.php index b34a465b49..9d8f3f9df9 100644 --- a/resources/views/users/ldap.blade.php +++ b/resources/views/users/ldap.blade.php @@ -17,39 +17,31 @@ LDAP User Sync @section('content')
    -
    - - -@if ($snipeSettings->ldap_enabled == 0) - {{ trans('admin/users/message.ldap_not_configured') }} -@else - - +
    + @if ($snipeSettings->ldap_enabled == 0) + {{ trans('admin/users/message.ldap_not_configured') }} + @else
    - - - -
    -
    - -
    - -
    - {{ Form::select('location_id', $location_list , Input::old('location_id'), array('class'=>'select2', 'style'=>'width:350px')) }} + {{csrf_field()}} +
    +
    + +
    + +
    + {{ Form::select('location_id', $location_list , Input::old('location_id'), array('class'=>'select2', 'style'=>'width:350px')) }} {!! $errors->first('location_id', ':message') !!} +
    +
    + +
    -
    - -
    -
    -
    -
    @@ -58,53 +50,48 @@ LDAP User Sync

    +
    -
    - +
    @if (Session::get('summary')) -

    Synchronization Results

    - - - - - - + + + + + - @foreach (Session::get('summary') as $entry) - - - - - - - + + + + + + - - - @endforeach + + + @endforeach
    UsernameEmployee NumberFirst NameLast NameEmailNotes
    UsernameEmployee NumberFirst NameLast NameEmailNotes
    {{ $entry['username'] }}{{ $entry['employee_number'] }}{{ $entry['firstname'] }}{{ $entry['lastname'] }}{{ $entry['email'] }} - @if ($entry['status']=='success') - {!! $entry['note'] !!} - @else - {!! $entry['note'] !!} - @endif + @foreach (Session::get('summary') as $entry) +
    {{ $entry['username'] }}{{ $entry['employee_number'] }}{{ $entry['firstname'] }}{{ $entry['lastname'] }}{{ $entry['email'] }} + @if ($entry['status']=='success') + {!! $entry['note'] !!} + @else + {!! $entry['note'] !!} + @endif -
    -
    - - @endif -@endif -
    +
    +@stop + @section('moar_scripts') @stop -@stop diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 9b9f8d7f6d..61bfd71134 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -10,367 +10,406 @@ @section('content')
    -
    +
    +
    + + +
    +
    +
    + @if ($user->deleted_at!='') +
    +
    + + This user has been marked as deleted. + @can('update', $user) + Click here to restore them. + @endcan +
    +
    + @endif +
    @if ($user->avatar) @else @endif
    +
    - -
    - - @if (!is_null($user->company)) - - - - - @endif - +
    +
    Company{{ $user->company->name }}
    + @if (!is_null($user->company)) - - + + - @if ($user->jobtitle) - - - - - @endif + @endif - @if ($user->employee_num) - - - - - @endif + + + + + @if ($user->jobtitle) + + + + + @endif - @if ($user->manager) - - - - - @endif + @if ($user->employee_num) + + + + + @endif - @if ($user->email) - - - - - @endif + @if ($user->manager) + + + + + @endif - @if ($user->phone) - - - - - @endif + @if ($user->email) + + + + + @endif - @if ($user->userloc) - - - - - @endif - @if ($user->created_at) - - - - - @endif + @if ($user->phone) + + + + + @endif -
    Name{{ $user->present()->fullName() }}Company{{ $user->company->name }}
    Title{{ $user->jobtitle }}
    Employee No.{{ $user->employee_num }}
    Name{{ $user->present()->fullName() }}
    Title{{ $user->jobtitle }}
    Manager{{ $user->manager->present()->fullName() }}
    Employee No.{{ $user->employee_num }}
    Email{{ $user->email }}
    Manager{{$user->manager->present()->nameUrl() }}
    Phone{{ $user->phone }}
    Email{{ $user->email }}
    Location{{ $user->userloc->name }}
    {{ trans('general.created_at') }} - {{ $user->created_at->format('F j, Y h:iA') }} -
    Phone{{ $user->phone }}
    -
    + @if ($user->userloc) + + Location + {{ $user->userloc->name }} + + @endif + @if ($user->created_at) + + {{ trans('general.created_at') }} + {{ $user->created_at->format('F j, Y h:iA') }} + + @endif +
    +
    - -
    - @can('update', $user) -
    - - {{ trans('admin/users/general.edit') }} -
    -
    - {{ trans('admin/users/general.clone') }} -
    - - - @if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords'))) - - @if ($user->deleted_at=='') -
    - {{ trans('button.delete') }} -
    -
    -
    - - - - -
    -
    - @else -
    - {{ trans('button.restore') }} -
    - @endif - + +
    + @can('update', $user) +
    + {{ trans('admin/users/general.edit') }} +
    +
    + {{ trans('admin/users/general.clone') }} +
    + @can('delete', $user) + @if ($user->deleted_at=='') +
    +
    + {{csrf_field()}} + {{ method_field("DELETE")}} + +
    +
    +
    +
    + + + + +
    +
    + @else +
    + {{ trans('button.restore') }} +
    @endif @endcan -
    - + @endcan +
    + +
    +
    +
    + +
    + + + + + + + + + + + @foreach ($user->assets as $asset) + + + + + + + @endforeach + +
    {{ trans('admin/hardware/table.asset_model') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('general.name') }}{{ trans('general.action') }}
    + @if ($asset->physical=='1') + {!! $asset->model->present()->nameUrl() !!} + @endif + + @can('view', $asset) + {!! $asset->present()->assetTagUrl() !!} + @endcan + {!! $asset->present()->nameUrl() !!} + @can('checkin', $asset) + Checkin + @endcan +
    +
    +
    + +
    +
    + + + + + + + + + + @foreach ($user->licenses as $license) + + + + + + @endforeach + +
    {{ trans('general.name') }}{{ trans('admin/hardware/form.serial') }}{{ trans('general.action') }}
    + {!! $license->present()->nameUrl() !!} + + {!! $license->present()->serialUrl() !!} + + @can('update', $license) + Checkin + @endcan +
    +
    +
    + +
    +
    + + + + + + + + + @foreach ($user->accessories as $accessory) + + + + + @endforeach + +
    NameActions
    {!!$accessory->present()->nameUrl()!!} + @can('checkin', $accessory) + Checkin + @endcan +
    +
    +
    + +
    +
    + + + + + + + + + @foreach ($user->consumables as $consumable) + + + + + @endforeach + +
    {{ trans('general.name') }}{{ trans('general.date') }}
    {!! $consumable->present()->nameUrl() !!}{{ $consumable->created_at }}
    +
    +
    + +
    +
    +
    +

    {{ trans('admin/hardware/general.filetype_info') }}

    +
    +
    + + @can('update', $user) + + + Select File... + + + + @endcan +
    +
    + +
    + + + - -
    -
    - +
    - - - - + + + + - @foreach ($user->assets as $asset) + @foreach ($user->uploads as $file) - - - + @endforeach
    {{ trans('admin/hardware/table.asset_model') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('general.name') }}{{ trans('general.action') }}{{ trans('general.notes') }}{{ trans('general.file_name') }}
    - @if ($asset->physical=='1') {{ $asset->model->name }} - @endif + @if ($file->note) + {{ $file->note }} + @endif - @can('view', $asset) - {{ $asset->asset_tag }} - @endcan + {{ $file->filename }} {{ $asset->name }} - @can('checkin', $asset) - Checkin - @endcan + + @if ($file->filename) + Download + @endif + + @can('update', $user) + + @endcan
    -
    -
    -
    - - - - - - - - - - @foreach ($user->licenses as $license) - - - - - - @endforeach - -
    {{ trans('general.name') }}{{ trans('admin/hardware/form.serial') }}{{ trans('general.action') }}
    - {{ $license->name }} - - {{ mb_strimwidth($license->serial, 0, 50, "...") }} - @can('update', $license) - Checkin - @endcan -
    -
    -
    -
    - - - - - - - - - @foreach ($user->accessories as $accessory) - - - - - @endforeach - -
    NameActions
    {{ $accessory->name }} - @can('checkin', $accessory) - Checkin - @endcan -
    -
    -
    -
    -
    - - - - - - - - - @foreach ($user->consumables as $consumable) - - - - - @endforeach - -
    {{ trans('general.name') }}{{ trans('general.date') }}
    {{ $consumable->name }}{{ $consumable->created_at }}
    -
    -
    -
    +
    +
    -
    -
    -

    {{ trans('admin/hardware/general.filetype_info') }}

    -
    -
    - - @can('update', $user) - - - Select File... - - - - - @endcan - -
    -
    - -
    - - - - - - - - -
    - -
    - - - - - - - - - - - @foreach ($user->uploads as $file) - - - - - - - @endforeach - - -
    {{ trans('general.notes') }}{{ trans('general.file_name') }}
    - @if ($file->note) {{ $file->note }} - @endif - - {{ $file->filename }} - - @if ($file->filename) - Download - @endif - - @can('update', $user) - - @endcan -
    -
    -
    -
    - - - -
    -
    -
    +
    +
    @@ -380,47 +419,46 @@ - - - @foreach ($userlog as $log) - - - - - - - @endforeach - + + + @foreach ($userlog as $log) + + + + + + + @endforeach +
    {{ trans('general.asset') }} {{ trans('table.by') }}
    - - {{ $log->created_at }}{{ $log->action_type }} - - @if (($log->item) && ($log->itemType()=="asset")) - {{ $log->item->asset_tag }} - {{ $log->item->present()->name() }} - @elseif ($log->item) - - {{ $log->item->name }} - - @else - {{ trans('general.bad_data') }} - @endif - - - @if ($log->action_type != 'requested') - @if (isset($log->user)) - {{ $log->user->present()->fullName() }} - @else - Deleted Admin - @endif - @endif -
    + + {{ $log->created_at }}{{ $log->action_type }} + @if (($log->item) && ($log->itemType()=="asset")) + {!! $log->item->present()->nameUrl() !!} + @elseif ($log->item) + + {{ $log->item->name }} + + @else + {{ trans('general.bad_data') }} + @endif + + @if ($log->action_type != 'requested') + @if (isset($log->user)) + {!! $log->user->present()->nameUrl() !!} + @else + Deleted Admin + @endif + @endif +
    -
    -
    -
    -
    - -
    +
    +
    +
    +
    +
    + +@stop @section('moar_scripts') @stop - -@stop