diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index f94ec9e004..7887ec8b5f 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -120,39 +120,62 @@ @endif -
- @if ($user->avatar) - {{ $user->present()->fullName() }} - @else - {{ $user->present()->fullName() }} - @endif -
+ +
-
-
- - @if (!is_null($user->company)) - - - - - @endif +
+ +
+ + +
+ {{ trans('admin/users/table.name') }} +
+
+ {{ $user->present()->fullName() }} +
-
- - - + - - - - + + + + @if (!is_null($user->company)) +
+ +
+ {{ trans('general.company') }} +
+
+ {{ $user->company->name }} +
+ +
+ + @endif + + +
+ +
+ {{ trans('admin/users/table.username') }} +
+
+ {{ $user->username }} +
+ +
+ + @if (($user->address) || ($user->city) || ($user->state) || ($user->country)) - - - - + + @endif - - - - + @if ($user->jobtitle) + +
+
+ {{ trans('admin/users/table.job') }} +
+
+ {{ $user->jobtitle }} +
- @if ($user->jobtitle) -
- - - - @endif - - @if ($user->employee_num) - - - - - @endif - - @if ($user->manager) - - - - - @endif - - @if ($user->email) - - - - - @endif - - @if ($user->website) - - - - - @endif - - @if ($user->phone) - - - - - @endif - - @if ($user->userloc) - - - - - - - @endif - @if ($user->last_login) - - - - + @endif + @if ($user->employee_num) + +
+ +
+ {{ trans('admin/users/table.employee_num') }} +
+
+ {{ $user->employee_num }} +
+ +
+ @endif + + @if ($user->manager) + +
+ +
+ {{ trans('admin/users/table.manager') }} +
+ + +
+ + @endif + + + @if ($user->email) + +
+
+ {{ trans('admin/users/table.email') }} +
+ +
+ @endif + + @if ($user->phone) + +
+
+ {{ trans('general.website') }} +
+ +
+ @endif + + @if ($user->phone) + +
+
+ {{ trans('admin/users/table.phone') }} +
+ +
+ @endif + + @if ($user->userloc) + +
+
+ {{ trans('admin/users/table.location') }} +
+
+ {{ link_to_route('locations.show', $user->userloc->name, [$user->userloc->id]) }} +
+
+ @endif + + +
+
+ {{ trans('general.last_login') }} +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }} +
+
+ + @if ($user->department) - - - - + +
+
+ {{ trans('general.department') }} +
+ +
@endif - @if ($user->created_at) - - - - - @endif - - - - - - - + + + @if ($user->activated == '1') - @if ($user->activated=='1') - - - - - - - - - - @endif + {{ Auth::user()->isSuperUser() }} + && + {{ $snipeSettings->two_factor_enabled }} + && + {{ $snipeSettings->two_factor_enabled }} + + + + @if ((Auth::user()->isSuperUser()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!='')) + + +
+
+ +
+
+ + + {{ trans('admin/settings/general.two_factor_reset') }} + + + + + + + +
+

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

+ + +
+
+ @endif + @endif + @if ($user->notes) - - - - + +
+ +
+ {{ trans('admin/users/table.notes') }} +
+
+ {{ $user->notes }} +
+ +
@endif - -
{{ trans('general.company') }}{{ $user->company->name }}
{{ trans('admin/users/table.name') }}{{ $user->present()->fullName() }}
{{ trans('admin/users/table.username') }}{{ $user->username }}
{{ trans('general.address') }} +
+
+ {{ trans('general.address') }} +
+
+ @if ($user->address) - {{ $user->address }}
+ {{ $user->address }}
@endif @if ($user->city) {{ $user->city }} @@ -163,170 +186,275 @@ @if ($user->country) {{ $user->country }} @endif -
{{ trans('general.groups') }} - @if ($user->groups->count() > 0) + + + +
+
+ {{ trans('general.groups') }} +
+
+ @if ($user->groups->count() > 0) @foreach ($user->groups as $group) @can('superadmin') {{ $group->name }} - @else + @else {{ $group->name }} - @endcan + @endcan @endforeach - @else - -- - @endif + @else + -- + @endif +
+
-
{{ trans('admin/users/table.job') }}{{ $user->jobtitle }}
{{ trans('admin/users/table.employee_num') }}{{ $user->employee_num }}
{{ trans('admin/users/table.manager') }} - {{ $user->manager->getFullNameAttribute() }} - -
{{ trans('admin/users/table.email') }}{{ $user->email }}
{{ trans('general.website') }}{{ $user->website }}
{{ trans('admin/users/table.phone') }}{{ $user->phone }}
{{ trans('admin/users/table.location') }}{{ link_to_route('locations.show', $user->userloc->name, [$user->userloc->id]) }}
{{ trans('general.last_login') }}{{ \App\Helpers\Helper::getFormattedDateObject($user->last_login, 'datetime', false) }}
{{ trans('general.department') }} - - {{ $user->department->name }} - -
{{ trans('general.created_at') }}{{ $user->created_at->format('F j, Y h:iA') }}
{{ trans('general.login_enabled') }} + + @if ($user->created_at) + +
+
+ {{ trans('general.created_at') }} +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($user->created_at, 'datetime')['formatted']}} +
+
+ @endif + + + +
+
+ {{ trans('general.login_enabled') }} +
+
{!! ($user->activated=='1') ? ' '.trans('general.yes') : ' '.trans('general.no') !!} -
LDAP + + + + +
+
+ LDAP +
+
{!! ($user->ldap_import=='1') ? ' '.trans('general.yes') : ' '.trans('general.no') !!} -
{{ trans('admin/users/general.two_factor_active') }} - {!! ($user->two_factor_active()) ? ' '.trans('general.yes') : ' '.trans('general.no') !!} -
{{ trans('admin/users/general.two_factor_enrolled') }} +
-
- {!! ($user->two_factor_active_and_enrolled()) ? ' '.trans('general.yes') : ' '.trans('general.no') !!} -
- - @if ((Auth::user()->isSuperUser()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!='')) -
- {{ trans('admin/settings/general.two_factor_reset') }} - - - - - - - -

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

+
+ {{ trans('admin/users/general.two_factor_active') }} +
+
+ + {!! ($user->two_factor_active()) ? ' '.trans('general.yes') : ' '.trans('general.no') !!} +
- @endif + + +
+
+ {{ trans('admin/users/general.two_factor_enrolled') }} +
+
+ {!! ($user->two_factor_active_and_enrolled()) ? ' '.trans('general.yes') : ' '.trans('general.no') !!} -
{{ trans('admin/users/table.notes') }}{{ $user->notes }}
-
-
- +
+ + + -
+
+ + @if ($user->avatar) +
+ {{ $user->present()->fullName() }} + @else + {{ $user->present()->fullName() }} +
+ @endif + + @can('update', $user)
+