Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Providers/BreadcrumbsServiceProvider.php

@@ -56,7 +56,6 @@ public function boot()
                 Breadcrumbs::for('hardware.index', fn (Trail $trail) =>
                 $trail->parent('home', route('home'))
                     ->push(trans('general.assets'), route('hardware.index'))
-                    ->push(trans('general.list_all'), route('hardware.index'))
                 );
             }
 

resources/lang/en-US/general.php

@@ -36,6 +36,7 @@
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
     'accept_item'           => 'Accept Item',
+    'accept_items'          => 'Accept Items',
     'audit'				    => 'Audit',
     'audited'				=> 'Audited',
     'audits'				=> 'Audits',
@@ -239,7 +240,7 @@
     'previous'				=> 'Previous',
     'previous_page'			=> 'Previous Page',
     'processing'			=> 'Processing',
-    'profile'				=> 'Your profile',
+    'profile'				=> 'Your Profile',
     'purchase_cost'                              => 'Purchase Cost',
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',

resources/views/account/view-assets.blade.php

@@ -146,7 +146,7 @@
 
                 @if ($user->ldap_import!='1')
                 <div class="col-md-12" style="padding-top: 5px;">
-                  <a href="{{ route('account.password.index') }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print" target="_blank" rel="noopener">
+                  <a href="{{ route('account.password.index') }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print" rel="noopener">
                     <x-icon type="password" class="fa-fw" />
                     {{ trans('general.changepassword') }}
                   </a>
@@ -155,7 +155,7 @@
 
                 @can('self.api')
                 <div class="col-md-12" style="padding-top: 5px;">
-                  <a href="{{ route('user.api') }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print" target="_blank" rel="noopener">
+                  <a href="{{ route('user.api') }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print" rel="noopener">
                     <x-icon type="api-key" class="fa-fw" />
                     {{ trans('general.manage_api_keys') }}
                   </a>

routes/web.php

@@ -366,6 +366,7 @@
         ->name('account.password.index')
         ->breadcrumbs(fn (Trail $trail) =>
         $trail->parent('home')
+            ->push(trans('general.profile'), route('account'))
             ->push(trans('general.changepassword'), route('account.password.index')));
 
     Route::post('password', [ProfileController::class, 'passwordSave'])
@@ -375,19 +376,22 @@
         ->name('user.api')
         ->breadcrumbs(fn (Trail $trail) =>
         $trail->parent('home')
+            ->push(trans('general.profile'), route('account'))
             ->push(trans('general.manage_api_keys'), route('user.api')));
 
     // View Assets
     Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])
         ->name('view-assets')
         ->breadcrumbs(fn (Trail $trail) =>
         $trail->parent('home')
+            ->push(trans('general.profile'), route('account'))
             ->push(trans('general.viewassets'), route('view-assets')));
 
     Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])
         ->name('account.requested')
         ->breadcrumbs(fn (Trail $trail) =>
         $trail->parent('home')
+            ->push(trans('general.profile'), route('account'))
             ->push(trans('general.requested_assets_menu'), route('account.requested')));
 
     Route::get(
@@ -425,12 +429,14 @@
         ->name('account.accept')
         ->breadcrumbs(fn (Trail $trail) =>
         $trail->parent('home')
-            ->push(trans('general.accept_assets_menu'), route('account.accept')));
+            ->push(trans('general.profile'), route('account'))
+            ->push(trans('general.accept_items'), route('account.accept')));
 
     Route::get('accept/{id}', [Account\AcceptanceController::class, 'create'])
         ->name('account.accept.item')
         ->breadcrumbs(fn (Trail $trail, $id) =>
-        $trail->parent('account.accept')
+        $trail->parent('home')
+            ->push(trans('general.profile'), route('account'))
             ->push(trans('general.accept_item'), route('account.accept.item', $id)));
 
     Route::post('accept/{id}', [Account\AcceptanceController::class, 'store'])