diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php index 59ffc3ddda..55387a57af 100644 --- a/resources/views/hardware/requested.blade.php +++ b/resources/views/hardware/requested.blade.php @@ -13,124 +13,118 @@ {{-- Page content --}} @section('content') -
-
-
-
-
-
+
+
+
+
+
+
- - - - - - - - - - - - - - - @foreach ($requestedItems as $request) +
{{ trans('general.image') }}{{ trans('general.name') }}{{ trans('admin/hardware/table.location') }}{{ trans('admin/hardware/form.expected_checkin') }}{{ trans('admin/hardware/table.requesting_user') }}{{ trans('admin/hardware/table.requested_date') }}{{ trans('button.actions') }}{{ trans('general.checkout') }}
+ + + + + + + + + + + + + + @foreach ($requestedItems as $request) - @if ($request->requestable) - - {{ csrf_field() }} - + {{ csrf_field() }} + + - + - @if ($request->itemType() == "asset") - - {{ $request->name() }} - - @elseif ($request->itemType() == "asset_model") - - {{ $request->name() }} - - @endif + + + + + - - @if ($request->location()) - - @else - - @endif - - - - - - @endif + @endforeach + +
{{ trans('general.image') }}{{ trans('general.name') }}{{ trans('admin/hardware/table.location') }}{{ trans('admin/hardware/form.expected_checkin') }}{{ trans('admin/hardware/table.requesting_user') }}{{ trans('admin/hardware/table.requested_date') }}{{ trans('button.actions') }}{{ trans('general.checkout') }}
- @if (($request->itemType() == "asset") && ($request->requestable)) - {{ $request->requestable->name }} - @elseif (($request->itemType() == "asset_model") && ($request->requestable)) - {{ $request->requestable->name }} - @endif + @if ($request->requestable) +
+ @if (($request->itemType() == "asset") && ($request->requestable)) + {{ $request->requestable->name }} + @elseif (($request->itemType() == "asset_model") && ($request->requestable)) + {{ $request->requestable->name }} + @endif + + @if ($request->itemType() == "asset") + + {{ $request->name() }} + + @elseif ($request->itemType() == "asset_model") + + {{ $request->name() }} + + @endif - + + {{ $request->location() ? $request->location()->name : '' }} + + @if ($request->itemType() == "asset") + {{ App\Helpers\Helper::getFormattedDateObject($request->requestable->expected_checkin, 'datetime', false) }} + @endif + + @if ($request->requestingUser() && !$request->requestingUser()->trashed()) + + {{ $request->requestingUser()->display_name }} + + @else + {{ trans('admin/reports/general.deleted_user') }} + @endif + + {{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }} + +
+ @csrf + +
+
+ @if ($request->itemType() == "asset") + @if ($request->requestable->assigned_to=='') + {{ trans('general.checkout') }} + @else + {{ trans('general.checkin') }} + @endif + @endif + {{ $request->location()->name }} - @if ($request->itemType() == "asset") - {{ App\Helpers\Helper::getFormattedDateObject($request->requestable->expected_checkin, 'datetime', false) }} - @endif - - @if ($request->requestingUser() && !$request->requestingUser()->trashed()) - - {{ $request->requestingUser()->display_name }} - - @else - (deleted user) - @endif - {{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }} -
- @csrf - -
-
- @if ($request->itemType() == "asset") - @if ($request->requestable->assigned_to=='') - {{ trans('general.checkout') }} - @else - {{ trans('general.checkin') }} +
- @endif - - - - - @endif - @endforeach - - -
- - -
-
-
-
-
+
+
+
+
+
@stop diff --git a/resources/views/users/ldap.blade.php b/resources/views/users/ldap.blade.php index 14c6a25798..7503413f14 100644 --- a/resources/views/users/ldap.blade.php +++ b/resources/views/users/ldap.blade.php @@ -5,121 +5,113 @@ @parent @stop - -@section('header_right') - - {{ trans('general.back') }} -@stop - - {{-- Page content --}} @section('content')
- @if ($snipeSettings->ldap_enabled == 0) - {{ trans('admin/users/message.ldap_not_configured') }} - @else -
- {{csrf_field()}} -
-
+ @if ($snipeSettings->ldap_enabled == 0) + {{ trans('admin/users/message.ldap_not_configured') }} + @else -
-

- - {!! trans('admin/users/general.ldap_sync_intro', ['link' => 'https://snipe-it.readme.io/docs/ldap-sync#/']) !!} -

-
- - -
- - @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.ldap_sync_location'), 'help_text' => trans('admin/users/general.ldap_config_text'), 'fieldname' => 'location_id[]', 'multiple' => true]) -
-
- +
+ + {{csrf_field()}} +
+
+

+ + + {!! trans('admin/users/general.ldap_sync_intro', ['link' => 'https://snipe-it.readme.io/docs/ldap-sync#/']) !!} + +

+
+ + @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.ldap_sync_location'), 'help_text' => trans('admin/users/general.ldap_config_text'), 'fieldname' => 'location_id[]', 'multiple' => true]) -
- -
-
+
-
-
+ + +
+ + @endif + + @if (Session::get('summary'))
-
+
-
-
-

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

-
-
- +
+

+ {{ trans('general.sync_results') }} +

+
+ +
+
- - - - - - - - - - - - - + + + + + + + + + + + + + - @foreach (Session::get('summary') as $entry) - - - - - - - - - + + + + + + + + + + @endforeach + +
{{ trans('general.id') }}{{ trans('general.username') }}{{ trans('admin/users/table.display_name') }}{{ trans('general.employee_number') }}{{ trans('general.first_name') }}{{ trans('general.last_name') }}{{ trans('general.email') }}{{ trans('general.notes') }}
{{ trans('general.id') }}{{ trans('general.username') }}{{ trans('admin/users/table.display_name') }}{{ trans('general.employee_number') }}{{ trans('general.first_name') }}{{ trans('general.last_name') }}{{ trans('general.email') }}{{ trans('general.notes') }}
{{ (array_key_exists('id', $entry)) ? $entry['id'] : '' }}{{ $entry['username'] }}{{ $entry['display_name'] }}{{ $entry['employee_number'] }}{{ $entry['firstname'] }}{{ $entry['lastname'] }}{{ $entry['email'] }} - @if ($entry['status']=='success') - {!! $entry['note'] !!} - @else - - @endif + @foreach (Session::get('summary') as $entry) +
{{ (array_key_exists('id', $entry)) ? $entry['id'] : '' }}{{ $entry['username'] }}{{ $entry['display_name'] }}{{ $entry['employee_number'] }}{{ $entry['firstname'] }}{{ $entry['lastname'] }}{{ $entry['email'] }} + @if ($entry['status']=='success') + {!! $entry['note'] !!} + @else + + @endif +
+
+
+
+
- - - @endforeach - - -
- - @endif - - - @endif @stop