+ @endcan
diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php
new file mode 100644
index 000000000..3d20a6ce1
--- /dev/null
+++ b/resources/views/locations/print.blade.php
@@ -0,0 +1,188 @@
+
+
+
+
+
Assigned to {{ $location->present()->fullName() }} Location
+
+
+
+
+@if ($snipeSettings->logo_print_assets=='1')
+ @if ($snipeSettings->brand == '3')
+
+
+ @if ($snipeSettings->logo!='')
+
+ @endif
+ {{ $snipeSettings->site_name }}
+
+ @elseif ($snipeSettings->brand == '2')
+ @if ($snipeSettings->logo!='')
+
 }}/uploads/{{ $snipeSettings->logo }})
+ @endif
+ @else
+
{{ $snipeSettings->site_name }}
+ @endif
+@endif
+
+
Asset Management System
+
Assigned To: {{ $location->present()->fullName() }}
+ @if ($parent)
+ {{ $parent->present()->fullName() }}
+ @endif
+
+@if ($manager)
+
Manager: {{ $manager->present()->fullName() }}
+@endif
+
Current Date: {{ date("d/m/Y h:i:s A") }}
+
+@if ($users->count() > 0)
+ @php
+ $counter = 1;
+ @endphp
+
+
+
+ {{ trans('general.users') }} |
+
+
+
+
+ |
+ Company |
+ User Name |
+ Employee No. |
+ Department |
+ Location |
+
+
+ @foreach ($users as $user)
+
+
+ {{ $counter }} |
+ {{ $user->company->name }} |
+ {{ $user->first_name }} {{ $user->last_name }} |
+ {{ $user->employee_num }} |
+ {{ $user->department->name }} |
+ {{ $user->location->name }} |
+
+ @php
+ $counter++
+ @endphp
+ @endforeach
+
+@endif
+
+
+
+@if ($assets->count() > 0)
+
+
+
+
+ {{ trans('general.assets') }} |
+
+
+
+
+ |
+ Asset Tag |
+ Name |
+ Category |
+ Manufacturer |
+ Model |
+ Serial |
+ Location |
+ Checked Out |
+ Expected Checkin |
+
+
+ @php
+ $counter = 1;
+ @endphp
+
+ @foreach ($assets as $asset)
+
+
+ {{ $counter }} |
+ {{ $asset->asset_tag }} |
+ {{ $asset->name }} |
+ {{ $asset->model->category->name }} |
+ {{ $asset->model->manufacturer->name }} |
+ {{ $asset->model->name }} {{ $asset->model->model_number }} |
+ {{ $asset->serial }} |
+ {{ $asset->location->name }} |
+ {{ $asset->last_checkout }} |
+ {{ $asset->expected_checkin }} |
+
+ @php
+ $counter++
+ @endphp
+ @endforeach
+
+@endif
+
+
+
+
+
+
+ Signed By (Asset Auditor): |
+ ___________________________ |
+ |
+ Date: |
+ ____________________ |
+
+
+
+
+
+
+
+ Signed By (Finance Asset Auditor): |
+ ____________________ |
+ |
+ Date: |
+ ____________________ |
+
+
+
+
+
+
+
+ Signed By (Location Manager): |
+ _______________________ |
+ |
+ Date: |
+ ____________________ |
+
+
+
+
+
+
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 810635b87..90b100ee4 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -9,10 +9,6 @@
@parent
@stop
-@section('header_right')
-
{{ trans('admin/locations/table.update') }}
-@stop
-
{{-- Page content --}}
@section('content')
@@ -86,6 +82,71 @@
+
+
+
@endif
-
+
+
+
+
+
-
-
-
-
-
@stop
@section('moar_scripts')
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 2faf968da..a458d3c8a 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -41,7 +41,6 @@
iconsPrefix: 'fa',
cookie: true,
cookieExpire: '2y',
- cookieIdTable: '{{ Route::currentRouteName() }}',
mobileResponsive: true,
maintainSelected: true,
trimOnSearch: false,
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 5081d25fc..6b52b7d65 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -150,7 +150,7 @@
-
+
+
+
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 1dd684ca3..8156ccf6c 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -333,13 +333,26 @@
{{ Form::label('ldap_emp_num', trans('admin/settings/general.ldap_emp_num')) }}
- {{ Form::text('ldap_emp_num', Request::old('ldap_emp_num', $setting->ldap_emp_num), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }}
+ {{ Form::text('ldap_emp_num', Request::old('ldap_emp_num', $setting->ldap_emp_num), ['class' => 'form-control','placeholder' => 'employeenumber/employeeid', $setting->demoMode]) }}
{!! $errors->first('ldap_emp_num', '
:message') !!}
@if (config('app.lock_passwords')===true)
{{ trans('general.feature_disabled') }}
@endif
+
+
@@ -347,7 +360,7 @@
{{ Form::label('ldap_email', trans('admin/settings/general.ldap_email')) }}
- {{ Form::text('ldap_email', Request::old('ldap_email', $setting->ldap_email), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }}
+ {{ Form::text('ldap_email', Request::old('ldap_email', $setting->ldap_email), ['class' => 'form-control','placeholder' => 'mail', $setting->demoMode]) }}
{!! $errors->first('ldap_email', '
:message') !!}
@if (config('app.lock_passwords')===true)
{{ trans('general.feature_disabled') }}
@@ -355,7 +368,47 @@
+
+
+
+
+
+
+
@if ($setting->ldap_enabled)
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index adddf700f..55d79e0c7 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -157,7 +157,9 @@
{{ Form::label('saml_custom_settings', trans('admin/settings/general.saml_custom_settings')) }}
- {{ Form::textarea('saml_custom_settings', old('saml_custom_settings', $setting->saml_custom_settings), ['class' => 'form-control','placeholder' => 'example.option=false', 'wrap' => 'off', $setting->demoMode]) }}
+ {{ Form::textarea('saml_custom_settings', old('saml_custom_settings', $setting->saml_custom_settings), ['class' => 'form-control','placeholder' => 'example.option=false
+sp_x509cert=file:///...
+sp_private_key=file:///', 'wrap' => 'off', $setting->demoMode]) }}
{{ trans('admin/settings/general.saml_custom_settings_help') }}
{!! $errors->first('saml_custom_settings', '
:message') !!}
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 09dae27a4..e9a50c795 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -106,7 +106,7 @@