From a97c4537069d8bcfc639de5715e48f05bc413985 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Nov 2025 11:59:54 +0000
Subject: [PATCH] Small fixes for user profiles

---
 app/Providers/BreadcrumbsServiceProvider.php  |  1 -
 resources/lang/en-US/general.php              |  3 ++-
 resources/views/account/view-assets.blade.php |  4 ++--
 routes/web.php                                | 10 ++++++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Providers/BreadcrumbsServiceProvider.php b/app/Providers/BreadcrumbsServiceProvider.php
index af9516200e..bc6d61d968 100644
--- a/app/Providers/BreadcrumbsServiceProvider.php
+++ b/app/Providers/BreadcrumbsServiceProvider.php
@@ -56,7 +56,6 @@ class BreadcrumbsServiceProvider extends ServiceProvider
                 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'))
                 );
             }
 
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index a9e04ed5e2..67f45cf047 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -36,6 +36,7 @@ return [
     '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 @@ return [
     'previous'				=> 'Previous',
     'previous_page'			=> 'Previous Page',
     'processing'			=> 'Processing',
-    'profile'				=> 'Your profile',
+    'profile'				=> 'Your 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 62adfa6cc3..6b35924101 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/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>
diff --git a/routes/web.php b/routes/web.php
index 47e1c46003..9a20322d0e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -366,6 +366,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
         ->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,6 +376,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
         ->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
@@ -382,12 +384,14 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
         ->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 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
         ->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'])