From 4b2807de48c2b56c2182645b4592bfef172016b7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 18 Jan 2025 17:26:31 +0100 Subject: [PATCH] rename admin to settings. --- app/Http/Controllers/Admin/HomeController.php | 2 +- app/Http/Controllers/Admin/LinkController.php | 12 +-- .../Admin/NotificationController.php | 2 +- .../Controllers/Admin/UpdateController.php | 2 +- app/Http/Controllers/Admin/UserController.php | 6 +- resources/views/partials/menu-sidebar.twig | 2 +- .../views/settings/configuration/index.twig | 2 +- resources/views/settings/index.twig | 10 +-- resources/views/settings/link/create.twig | 2 +- resources/views/settings/link/delete.twig | 2 +- resources/views/settings/link/edit.twig | 2 +- resources/views/settings/link/index.twig | 8 +- .../views/settings/notifications/index.twig | 4 +- resources/views/settings/update/index.twig | 6 +- resources/views/settings/users/delete.twig | 2 +- resources/views/settings/users/edit.twig | 2 +- resources/views/settings/users/index.twig | 10 +-- .../views/v2/partials/layout/topbar.blade.php | 2 +- routes/breadcrumbs.php | 82 +++++++++---------- 19 files changed, 80 insertions(+), 80 deletions(-) diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 2d4dc8bff7..6f4fc059f2 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -59,6 +59,6 @@ class HomeController extends Controller $email = $pref->data; } - return view('admin.index', compact('title', 'mainTitleIcon', 'email')); + return view('settings.index', compact('title', 'mainTitleIcon', 'email')); } } diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index d14aede448..88d87ac3a1 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -78,7 +78,7 @@ class LinkController extends Controller $this->rememberPreviousUrl('link-types.create.url'); } - return view('admin.link.create', compact('subTitle', 'subTitleIcon')); + return view('settings.link.create', compact('subTitle', 'subTitleIcon')); } /** @@ -111,7 +111,7 @@ class LinkController extends Controller // put previous url in session $this->rememberPreviousUrl('link-types.delete.url'); - return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count')); + return view('settings.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count')); } /** @@ -155,7 +155,7 @@ class LinkController extends Controller } $request->session()->forget('link-types.edit.fromUpdate'); - return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType')); + return view('settings.link.edit', compact('subTitle', 'subTitleIcon', 'linkType')); } /** @@ -176,7 +176,7 @@ class LinkController extends Controller } ); - return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes')); + return view('settings.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes')); } /** @@ -192,7 +192,7 @@ class LinkController extends Controller Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id)); - return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links')); + return view('settings.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links')); } /** @@ -253,7 +253,7 @@ class LinkController extends Controller // set value so edit routine will not overwrite URL: $request->session()->put('link-types.edit.fromUpdate', true); - $redirect = redirect(route('admin.links.edit', [$linkType->id]))->withInput(['return_to_edit' => 1]); + $redirect = redirect(route('settings.links.edit', [$linkType->id]))->withInput(['return_to_edit' => 1]); } // redirect to previous URL. diff --git a/app/Http/Controllers/Admin/NotificationController.php b/app/Http/Controllers/Admin/NotificationController.php index 1fc2c9256d..aafcb69f69 100644 --- a/app/Http/Controllers/Admin/NotificationController.php +++ b/app/Http/Controllers/Admin/NotificationController.php @@ -71,7 +71,7 @@ class NotificationController extends Controller $forcedAvailability['pushover'] = '' !== $pushoverAppToken && '' !== $pushoverUserToken; return view( - 'admin.notifications.index', + 'settings.notifications.index', compact( 'title', 'subTitle', diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 4a165a896f..ab35af1662 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -81,7 +81,7 @@ class UpdateController extends Controller 'alpha' => (string) trans('firefly.update_channel_alpha'), ]; - return view('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions')); + return view('settings.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions')); } /** diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 52b8b5edd4..07abf76b4d 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -144,7 +144,7 @@ class UserController extends Controller 'email_changed' => (string) trans('firefly.block_code_email_changed'), ]; - return view('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin')); + return view('settings.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin')); } /** @@ -174,7 +174,7 @@ class UserController extends Controller } ); - return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users', 'allowInvites', 'invitedUsers')); + return view('settings.users.index', compact('subTitle', 'subTitleIcon', 'users', 'allowInvites', 'invitedUsers')); } public function invite(InviteUserFormRequest $request): RedirectResponse @@ -203,7 +203,7 @@ class UserController extends Controller $information = $this->repository->getUserData($user); return view( - 'admin.users.show', + 'settings.users.show', compact( 'title', 'mainTitleIcon', diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig index ee9184b31b..4215b9ceed 100644 --- a/resources/views/partials/menu-sidebar.twig +++ b/resources/views/partials/menu-sidebar.twig @@ -235,7 +235,7 @@ {% if hasRole('owner') %}
  • - + {{ 'system_settings'|_ }} diff --git a/resources/views/settings/configuration/index.twig b/resources/views/settings/configuration/index.twig index 451f4d6424..63c1d67104 100644 --- a/resources/views/settings/configuration/index.twig +++ b/resources/views/settings/configuration/index.twig @@ -4,7 +4,7 @@ {{ Breadcrumbs.render }} {% endblock %} {% block content %} -
    +
    diff --git a/resources/views/settings/index.twig b/resources/views/settings/index.twig index c12dd19276..2b0232c07d 100644 --- a/resources/views/settings/index.twig +++ b/resources/views/settings/index.twig @@ -13,11 +13,11 @@
    @@ -27,7 +27,7 @@ diff --git a/resources/views/settings/link/create.twig b/resources/views/settings/link/create.twig index a1c0deb63f..e8932d73e6 100644 --- a/resources/views/settings/link/create.twig +++ b/resources/views/settings/link/create.twig @@ -6,7 +6,7 @@ {% block content %} - +
    diff --git a/resources/views/settings/link/delete.twig b/resources/views/settings/link/delete.twig index 6d7d0f1bbb..dee7289166 100644 --- a/resources/views/settings/link/delete.twig +++ b/resources/views/settings/link/delete.twig @@ -6,7 +6,7 @@ {% block content %} -
    diff --git a/resources/views/settings/link/edit.twig b/resources/views/settings/link/edit.twig index e27a5f1432..b5b289509c 100644 --- a/resources/views/settings/link/edit.twig +++ b/resources/views/settings/link/edit.twig @@ -6,7 +6,7 @@ {% block content %} - diff --git a/resources/views/settings/link/index.twig b/resources/views/settings/link/index.twig index 5bd01d1ecf..8c85b09c19 100644 --- a/resources/views/settings/link/index.twig +++ b/resources/views/settings/link/index.twig @@ -27,9 +27,9 @@ {% if linkType.editable %}
    - -
    {% endif %} @@ -44,7 +44,7 @@ {{ journalLinkTranslation('outward', linkType.outward) }} - {{ linkType.journalCount }} + {{ linkType.journalCount }} {% endfor %} @@ -52,7 +52,7 @@
    diff --git a/resources/views/settings/notifications/index.twig b/resources/views/settings/notifications/index.twig index d569f22c49..e8a60b6b43 100644 --- a/resources/views/settings/notifications/index.twig +++ b/resources/views/settings/notifications/index.twig @@ -6,7 +6,7 @@ {% block content %}
    - +
    @@ -43,7 +43,7 @@
    -
    +
    diff --git a/resources/views/settings/update/index.twig b/resources/views/settings/update/index.twig index 9655a7fe14..460434c05a 100644 --- a/resources/views/settings/update/index.twig +++ b/resources/views/settings/update/index.twig @@ -4,7 +4,7 @@ {{ Breadcrumbs.render }} {% endblock %} {% block content %} - +
    @@ -50,7 +50,7 @@ {{ 'admin_update_check_now_explain'|_ }}

    - {{ 'check_for_updates_button'|_ }} + {{ 'check_for_updates_button'|_ }}

    @@ -69,7 +69,7 @@ {% endblock %} {% block scripts %} {% endblock %} diff --git a/resources/views/settings/users/delete.twig b/resources/views/settings/users/delete.twig index 7c28294518..8c0f2ee57d 100644 --- a/resources/views/settings/users/delete.twig +++ b/resources/views/settings/users/delete.twig @@ -6,7 +6,7 @@ {% block content %} - +
    diff --git a/resources/views/settings/users/edit.twig b/resources/views/settings/users/edit.twig index 9970950c13..260fee2262 100644 --- a/resources/views/settings/users/edit.twig +++ b/resources/views/settings/users/edit.twig @@ -5,7 +5,7 @@ {% endblock %} {% block content %} - diff --git a/resources/views/settings/users/index.twig b/resources/views/settings/users/index.twig index 80a766402a..52a0d07fc7 100644 --- a/resources/views/settings/users/index.twig +++ b/resources/views/settings/users/index.twig @@ -7,7 +7,7 @@ {% if allowInvites %}
    - +
    @@ -54,15 +54,15 @@
    - -
    #{{ user.id }} - {{ user.email }} + {{ user.email }} {{ user.created_at.isoFormat(monthAndDayFormat) }} {{ user.created_at.format('H:i') }} @@ -137,7 +137,7 @@
    -
    diff --git a/resources/views/v2/partials/layout/topbar.blade.php b/resources/views/v2/partials/layout/topbar.blade.php index 2d84103142..37e070589c 100644 --- a/resources/views/v2/partials/layout/topbar.blade.php +++ b/resources/views/v2/partials/layout/topbar.blade.php @@ -18,7 +18,7 @@