diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 9a80e1a64e..194a0864ca 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -242,7 +242,7 @@ return [ 'previous' => 'Previous', 'previous_page' => 'Previous Page', 'processing' => 'Processing', - 'profile' => 'Your Profile', + 'profile' => 'View Profile', 'purchase_cost' => 'Purchase Cost', 'purchase_date' => 'Purchase Date', 'qty' => 'QTY', diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 440091ff21..579c19afbf 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -2,28 +2,30 @@ {{-- Page title --}} @section('title') -{{ trans('general.hello_name', array('name' => $user->display_name)) }} +{{ trans('general.hello_name', array('name' => auth()->user()->display_name)) }} @parent @stop {{-- Account page content --}} @section('content') -@if ($acceptanceQuantity = \App\Models\CheckoutAcceptance::forUser(Auth::user())->pending()->sum('qty')) -
-
-
- + @if (!request()->filled('user_id') || auth()->user()->id == $user->id) + @if ($acceptanceQuantity = \App\Models\CheckoutAcceptance::forUser(Auth::user())->pending()->sum('qty')) + -@endif + + + {{ trans_choice('general.unaccepted_profile_warning', $acceptanceQuantity, ['count' => $acceptanceQuantity]) }} + + +
+
+
+ @endif + @endif {{-- Manager View Dropdown --}} @if (isset($settings) && $settings->manager_view_enabled && isset($subordinates) && $subordinates->count() > 1) @@ -135,23 +137,25 @@
{{ $user->display_name }}
-
- - - {{ trans('general.editprofile') }} - -
- - @can('self.profile') - @if (Auth::user()->ldap_import!='1') -
- - - {{ trans('general.changepassword') }} - -
- @endif + @if (!request()->filled('user_id') || auth()->user()->id == $user->id) +
+ + + {{ trans('general.editprofile') }} + +
+ + + @can('self.profile') + @if (Auth::user()->ldap_import!='1') +
+ + + {{ trans('general.changepassword') }} + +
+ @endif @endcan @can('self.api') @@ -162,7 +166,7 @@ @endcan - + @endif