From a72bd75e3aeae33ff77a7a67073bd960ee7a5786 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 4 Jan 2022 13:33:24 +0000 Subject: [PATCH] Added page titles to many missing app areas Many pages were missing their unique tab/page titles so this change is just to distribute them back over many common areas where they were missing. --- app/Http/Controllers/Auth/MfaBackupCodesController.php | 2 ++ app/Http/Controllers/Auth/MfaController.php | 2 ++ app/Http/Controllers/Auth/MfaTotpController.php | 2 ++ app/Http/Controllers/FavouriteController.php | 2 ++ app/Http/Controllers/PageController.php | 2 ++ app/Http/Controllers/RoleController.php | 4 ++++ app/Http/Controllers/TagController.php | 2 ++ app/Http/Controllers/UserProfileController.php | 2 ++ app/Http/Controllers/WebhookController.php | 7 +++++++ 9 files changed, 25 insertions(+) diff --git a/app/Http/Controllers/Auth/MfaBackupCodesController.php b/app/Http/Controllers/Auth/MfaBackupCodesController.php index e24090022..4ceb394b0 100644 --- a/app/Http/Controllers/Auth/MfaBackupCodesController.php +++ b/app/Http/Controllers/Auth/MfaBackupCodesController.php @@ -29,6 +29,8 @@ class MfaBackupCodesController extends Controller $downloadUrl = 'data:application/octet-stream;base64,' . base64_encode(implode("\n\n", $codes)); + $this->setPageTitle(trans('auth.mfa_gen_backup_codes_title')); + return view('mfa.backup-codes-generate', [ 'codes' => $codes, 'downloadUrl' => $downloadUrl, diff --git a/app/Http/Controllers/Auth/MfaController.php b/app/Http/Controllers/Auth/MfaController.php index ca77cc708..6f6beb873 100644 --- a/app/Http/Controllers/Auth/MfaController.php +++ b/app/Http/Controllers/Auth/MfaController.php @@ -21,6 +21,8 @@ class MfaController extends Controller ->get(['id', 'method']) ->groupBy('method'); + $this->setPageTitle(trans('auth.mfa_setup')); + return view('mfa.setup', [ 'userMethods' => $userMethods, ]); diff --git a/app/Http/Controllers/Auth/MfaTotpController.php b/app/Http/Controllers/Auth/MfaTotpController.php index 5644f0268..a4cb63155 100644 --- a/app/Http/Controllers/Auth/MfaTotpController.php +++ b/app/Http/Controllers/Auth/MfaTotpController.php @@ -34,6 +34,8 @@ class MfaTotpController extends Controller $qrCodeUrl = $totp->generateUrl($totpSecret, $this->currentOrLastAttemptedUser()); $svg = $totp->generateQrCodeSvg($qrCodeUrl); + $this->setPageTitle(trans('auth.mfa_gen_totp_title')); + return view('mfa.totp-generate', [ 'url' => $qrCodeUrl, 'svg' => $svg, diff --git a/app/Http/Controllers/FavouriteController.php b/app/Http/Controllers/FavouriteController.php index 8643073c9..b4cbdf5c2 100644 --- a/app/Http/Controllers/FavouriteController.php +++ b/app/Http/Controllers/FavouriteController.php @@ -21,6 +21,8 @@ class FavouriteController extends Controller $hasMoreLink = ($favourites->count() > $viewCount) ? url('/favourites?page=' . ($page + 1)) : null; + $this->setPageTitle(trans('entities.my_favourites')); + return view('common.detailed-listing-with-more', [ 'title' => trans('entities.my_favourites'), 'entities' => $favourites->slice(0, $viewCount), diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 84187f745..3e57657da 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -368,6 +368,8 @@ class PageController extends Controller ->paginate(20) ->setPath(url('/pages/recently-updated')); + $this->setPageTitle(trans('entities.recently_updated_pages')); + return view('common.detailed-listing-paginated', [ 'title' => trans('entities.recently_updated_pages'), 'entities' => $pages, diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php index 7c72b5970..ea117c000 100644 --- a/app/Http/Controllers/RoleController.php +++ b/app/Http/Controllers/RoleController.php @@ -29,6 +29,7 @@ class RoleController extends Controller $this->checkPermission('user-roles-manage'); $roles = $this->permissionsRepo->getAllRoles(); + $this->setPageTitle(trans('settings.roles')); return view('settings.roles.index', ['roles' => $roles]); } @@ -49,6 +50,7 @@ class RoleController extends Controller $role->display_name .= ' (' . trans('common.copy') . ')'; } + $this->setPageTitle(trans('settings.role_create')); return view('settings.roles.create', ['role' => $role]); } @@ -82,6 +84,7 @@ class RoleController extends Controller throw new PermissionsException(trans('errors.role_cannot_be_edited')); } + $this->setPageTitle(trans('settings.role_edit')); return view('settings.roles.edit', ['role' => $role]); } @@ -116,6 +119,7 @@ class RoleController extends Controller $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]); $roles->prepend($blankRole); + $this->setPageTitle(trans('settings.role_delete')); return view('settings.roles.delete', ['role' => $role, 'roles' => $roles]); } diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 1fe32e5ca..e59580b60 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -32,6 +32,8 @@ class TagController extends Controller 'name' => $nameFilter, ])); + $this->setPageTitle(trans('entities.tags')); + return view('tags.index', [ 'tags' => $tags, 'search' => $search, diff --git a/app/Http/Controllers/UserProfileController.php b/app/Http/Controllers/UserProfileController.php index 63565f3b2..5fd8f7b88 100644 --- a/app/Http/Controllers/UserProfileController.php +++ b/app/Http/Controllers/UserProfileController.php @@ -18,6 +18,8 @@ class UserProfileController extends Controller $recentlyCreated = $repo->getRecentlyCreated($user, 5); $assetCounts = $repo->getAssetCounts($user); + $this->setPageTitle($user->name); + return view('users.profile', [ 'user' => $user, 'activity' => $userActivity, diff --git a/app/Http/Controllers/WebhookController.php b/app/Http/Controllers/WebhookController.php index 81e3b7792..1a4fa79d7 100644 --- a/app/Http/Controllers/WebhookController.php +++ b/app/Http/Controllers/WebhookController.php @@ -25,6 +25,8 @@ class WebhookController extends Controller ->with('trackedEvents') ->get(); + $this->setPageTitle(trans('settings.webhooks')); + return view('settings.webhooks.index', ['webhooks' => $webhooks]); } @@ -33,6 +35,7 @@ class WebhookController extends Controller */ public function create() { + $this->setPageTitle(trans('settings.webhooks_create')); return view('settings.webhooks.create'); } @@ -69,6 +72,8 @@ class WebhookController extends Controller ->with('trackedEvents') ->findOrFail($id); + $this->setPageTitle(trans('settings.webhooks_edit')); + return view('settings.webhooks.edit', ['webhook' => $webhook]); } @@ -105,6 +110,8 @@ class WebhookController extends Controller /** @var Webhook $webhook */ $webhook = Webhook::query()->findOrFail($id); + $this->setPageTitle(trans('settings.webhooks_delete')); + return view('settings.webhooks.delete', ['webhook' => $webhook]); }