diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php
new file mode 100644
index 0000000000..3d20a6ce11
--- /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 810635b871..31e6453694 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')
@@ -158,18 +154,23 @@
@endif
-
+
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 1dd684ca31..f360005b04 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -355,7 +355,47 @@
+
+