Small fixes for user profiles
This commit is contained in:
@@ -56,7 +56,6 @@ class BreadcrumbsServiceProvider extends ServiceProvider
|
|||||||
Breadcrumbs::for('hardware.index', fn (Trail $trail) =>
|
Breadcrumbs::for('hardware.index', fn (Trail $trail) =>
|
||||||
$trail->parent('home', route('home'))
|
$trail->parent('home', route('home'))
|
||||||
->push(trans('general.assets'), route('hardware.index'))
|
->push(trans('general.assets'), route('hardware.index'))
|
||||||
->push(trans('general.list_all'), route('hardware.index'))
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ return [
|
|||||||
'accept_assets' => 'Accept Assets :name',
|
'accept_assets' => 'Accept Assets :name',
|
||||||
'accept_assets_menu' => 'Accept Assets',
|
'accept_assets_menu' => 'Accept Assets',
|
||||||
'accept_item' => 'Accept Item',
|
'accept_item' => 'Accept Item',
|
||||||
|
'accept_items' => 'Accept Items',
|
||||||
'audit' => 'Audit',
|
'audit' => 'Audit',
|
||||||
'audited' => 'Audited',
|
'audited' => 'Audited',
|
||||||
'audits' => 'Audits',
|
'audits' => 'Audits',
|
||||||
@@ -239,7 +240,7 @@ return [
|
|||||||
'previous' => 'Previous',
|
'previous' => 'Previous',
|
||||||
'previous_page' => 'Previous Page',
|
'previous_page' => 'Previous Page',
|
||||||
'processing' => 'Processing',
|
'processing' => 'Processing',
|
||||||
'profile' => 'Your profile',
|
'profile' => 'Your Profile',
|
||||||
'purchase_cost' => 'Purchase Cost',
|
'purchase_cost' => 'Purchase Cost',
|
||||||
'purchase_date' => 'Purchase Date',
|
'purchase_date' => 'Purchase Date',
|
||||||
'qty' => 'QTY',
|
'qty' => 'QTY',
|
||||||
|
|||||||
@@ -146,7 +146,7 @@
|
|||||||
|
|
||||||
@if ($user->ldap_import!='1')
|
@if ($user->ldap_import!='1')
|
||||||
<div class="col-md-12" style="padding-top: 5px;">
|
<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" />
|
<x-icon type="password" class="fa-fw" />
|
||||||
{{ trans('general.changepassword') }}
|
{{ trans('general.changepassword') }}
|
||||||
</a>
|
</a>
|
||||||
@@ -155,7 +155,7 @@
|
|||||||
|
|
||||||
@can('self.api')
|
@can('self.api')
|
||||||
<div class="col-md-12" style="padding-top: 5px;">
|
<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" />
|
<x-icon type="api-key" class="fa-fw" />
|
||||||
{{ trans('general.manage_api_keys') }}
|
{{ trans('general.manage_api_keys') }}
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -366,6 +366,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
|
|||||||
->name('account.password.index')
|
->name('account.password.index')
|
||||||
->breadcrumbs(fn (Trail $trail) =>
|
->breadcrumbs(fn (Trail $trail) =>
|
||||||
$trail->parent('home')
|
$trail->parent('home')
|
||||||
|
->push(trans('general.profile'), route('account'))
|
||||||
->push(trans('general.changepassword'), route('account.password.index')));
|
->push(trans('general.changepassword'), route('account.password.index')));
|
||||||
|
|
||||||
Route::post('password', [ProfileController::class, 'passwordSave'])
|
Route::post('password', [ProfileController::class, 'passwordSave'])
|
||||||
@@ -375,6 +376,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
|
|||||||
->name('user.api')
|
->name('user.api')
|
||||||
->breadcrumbs(fn (Trail $trail) =>
|
->breadcrumbs(fn (Trail $trail) =>
|
||||||
$trail->parent('home')
|
$trail->parent('home')
|
||||||
|
->push(trans('general.profile'), route('account'))
|
||||||
->push(trans('general.manage_api_keys'), route('user.api')));
|
->push(trans('general.manage_api_keys'), route('user.api')));
|
||||||
|
|
||||||
// View Assets
|
// View Assets
|
||||||
@@ -382,12 +384,14 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
|
|||||||
->name('view-assets')
|
->name('view-assets')
|
||||||
->breadcrumbs(fn (Trail $trail) =>
|
->breadcrumbs(fn (Trail $trail) =>
|
||||||
$trail->parent('home')
|
$trail->parent('home')
|
||||||
|
->push(trans('general.profile'), route('account'))
|
||||||
->push(trans('general.viewassets'), route('view-assets')));
|
->push(trans('general.viewassets'), route('view-assets')));
|
||||||
|
|
||||||
Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])
|
Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])
|
||||||
->name('account.requested')
|
->name('account.requested')
|
||||||
->breadcrumbs(fn (Trail $trail) =>
|
->breadcrumbs(fn (Trail $trail) =>
|
||||||
$trail->parent('home')
|
$trail->parent('home')
|
||||||
|
->push(trans('general.profile'), route('account'))
|
||||||
->push(trans('general.requested_assets_menu'), route('account.requested')));
|
->push(trans('general.requested_assets_menu'), route('account.requested')));
|
||||||
|
|
||||||
Route::get(
|
Route::get(
|
||||||
@@ -425,12 +429,14 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
|
|||||||
->name('account.accept')
|
->name('account.accept')
|
||||||
->breadcrumbs(fn (Trail $trail) =>
|
->breadcrumbs(fn (Trail $trail) =>
|
||||||
$trail->parent('home')
|
$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'])
|
Route::get('accept/{id}', [Account\AcceptanceController::class, 'create'])
|
||||||
->name('account.accept.item')
|
->name('account.accept.item')
|
||||||
->breadcrumbs(fn (Trail $trail, $id) =>
|
->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)));
|
->push(trans('general.accept_item'), route('account.accept.item', $id)));
|
||||||
|
|
||||||
Route::post('accept/{id}', [Account\AcceptanceController::class, 'store'])
|
Route::post('accept/{id}', [Account\AcceptanceController::class, 'store'])
|
||||||
|
|||||||
Reference in New Issue
Block a user