IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename admin to settings.

Browse Source
This commit is contained in:
James Cole 2025-01-18 17:26:31 +01:00
parent 649736cb31
commit 4b2807de48
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
19 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/HomeController.php
View File

@ -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'));
}
}

12
app/Http/Controllers/Admin/LinkController.php
View File

@ -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.

2
app/Http/Controllers/Admin/NotificationController.php
View File

@ -71,7 +71,7 @@ class NotificationController extends Controller
$forcedAvailability['pushover'] = '' !== $pushoverAppToken && '' !== $pushoverUserToken;
return view(
'admin.notifications.index',
'settings.notifications.index',
compact(
'title',
'subTitle',

2
app/Http/Controllers/Admin/UpdateController.php
View File

@ -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'));
}
/**

6
app/Http/Controllers/Admin/UserController.php
View File

@ -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',

2
resources/views/partials/menu-sidebar.twig
View File

@ -235,7 +235,7 @@
</li>
{% if hasRole('owner') %}
<li class="{{ activeRoutePartial('settings') }}">
<a class="{{ activeRoutePartial('settings') }}" href="{{ route('admin.index') }}">
<a class="{{ activeRoutePartial('settings') }}" href="{{ route('settings.index') }}">
<span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'system_settings'|_ }}</span>
</a>

2
resources/views/settings/configuration/index.twig
View File

@ -4,7 +4,7 @@
{{ Breadcrumbs.render }}
{% endblock %}
{% block content %}
<form action="{{ route('admin.configuration.index.post') }}" method="post" id="store" class="form-horizontal">
<form action="{{ route('settings.configuration.index.post') }}" method="post" id="store" class="form-horizontal">
<div class="row">

10
resources/views/settings/index.twig
View File

@ -13,11 +13,11 @@
<div class="box-body">
<ul>
<li>
<a href="{{ route('admin.configuration.index') }}">{{ 'firefly_instance_configuration'|_ }}</a>
<a href="{{ route('settings.configuration.index') }}">{{ 'firefly_instance_configuration'|_ }}</a>
</li>
<li><a href="{{ route('admin.links.index') }}">{{ 'journal_link_configuration'|_ }}</a></li>
<li><a href="{{ route('admin.update-check') }}">{{ 'update_check_title'|_ }}</a></li>
<li><a href="{{ route('admin.notification.index') }}">{{ 'settings_notifications'|_ }}</a></li>
<li><a href="{{ route('settings.links.index') }}">{{ 'journal_link_configuration'|_ }}</a></li>
<li><a href="{{ route('settings.update-check') }}">{{ 'update_check_title'|_ }}</a></li>
<li><a href="{{ route('settings.notification.index') }}">{{ 'settings_notifications'|_ }}</a></li>
</ul>
</div>
</div>
@ -27,7 +27,7 @@
</div>
<div class="box-body">
<ul>
<li><a href="{{ route('admin.users') }}">{{ 'list_all_users'|_ }}</a></li>
<li><a href="{{ route('settings.users') }}">{{ 'list_all_users'|_ }}</a></li>
</ul>
</div>
</div>

2
resources/views/settings/link/create.twig
View File

@ -6,7 +6,7 @@
{% block content %}
<form method="POST" action="{{ route('admin.links.store') }}" accept-charset="UTF-8" class="form-horizontal">
<form method="POST" action="{{ route('settings.links.store') }}" accept-charset="UTF-8" class="form-horizontal">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">

2
resources/views/settings/link/delete.twig
View File

@ -6,7 +6,7 @@
{% block content %}
<form method="POST" action="{{ route('admin.links.destroy',linkType.id) }}" accept-charset="UTF-8"
<form method="POST" action="{{ route('settings.links.destroy',linkType.id) }}" accept-charset="UTF-8"
class="form-horizontal" id="destroy">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">

2
resources/views/settings/link/edit.twig
View File

@ -6,7 +6,7 @@
{% block content %}
<form method="post" action="{{ route('admin.links.update', linkType.id) }}" class="form-horizontal"
<form method="post" action="{{ route('settings.links.update', linkType.id) }}" class="form-horizontal"
accept-charset="UTF-8"
enctype="multipart/form-data">
<input type="hidden" name="id" value="{{ linkType.id }}"/>

8
resources/views/settings/link/index.twig
View File

@ -27,9 +27,9 @@
<td>
{% if linkType.editable %}
<div class="btn-group btn-group-xs">
<a class="btn btn-default btn-xs" href="{{ route('admin.links.edit',linkType.id) }}"><span
<a class="btn btn-default btn-xs" href="{{ route('settings.links.edit',linkType.id) }}"><span
class="fa fa-fw fa-pencil"></span></a>
<a class="btn btn-danger btn-xs" href="{{ route('admin.links.delete',linkType.id) }}"><span
<a class="btn btn-danger btn-xs" href="{{ route('settings.links.delete',linkType.id) }}"><span
class="fa fa-fw fa-trash-o"></span></a>
</div>
{% endif %}
@ -44,7 +44,7 @@
{{ journalLinkTranslation('outward', linkType.outward) }}
</td>
<td data-value="{{ linkType.journalCount }}">
<a href="{{ route('admin.links.show', [linkType.id]) }}">{{ linkType.journalCount }}</a>
<a href="{{ route('settings.links.show', [linkType.id]) }}">{{ linkType.journalCount }}</a>
</td>
</tr>
{% endfor %}
@ -52,7 +52,7 @@
</table>
</div>
<div class="box-footer">
<a href="{{ route('admin.links.create') }}" class="btn btn-success">{{ 'create_new_link_type'|_ }}</a>
<a href="{{ route('settings.links.create') }}" class="btn btn-success">{{ 'create_new_link_type'|_ }}</a>
</div>
</div>
</div>

4
resources/views/settings/notifications/index.twig
View File

@ -6,7 +6,7 @@
{% block content %}
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<form action="{{ route('admin.notification.post') }}" method="post">
<form action="{{ route('settings.notification.post') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="box box-default">
<div class="box-header with-border">
@ -43,7 +43,7 @@
</div>
</form>
</div>
<form action="{{ route('admin.notification.test') }}" method="post">
<form action="{{ route('settings.notification.test') }}" method="post">
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="box box-default">

6
resources/views/settings/update/index.twig
View File

@ -4,7 +4,7 @@
{{ Breadcrumbs.render }}
{% endblock %}
{% block content %}
<form action="{{ route('admin.update-check.post') }}" method="post" id="store" class="form-horizontal">
<form action="{{ route('settings.update-check.post') }}" method="post" id="store" class="form-horizontal">
<div class="row">
@ -50,7 +50,7 @@
{{ 'admin_update_check_now_explain'|_ }}
</p>
<p>
<a href="{{ route('admin.update-check.manual') }}" class="btn btn-info">{{ 'check_for_updates_button'|_ }}</a>
<a href="{{ route('settings.update-check.manual') }}" class="btn btn-info">{{ 'check_for_updates_button'|_ }}</a>
</p>
</div>
</div>
@ -69,7 +69,7 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var updateCheckUrl = '{{ route('admin.update-check.manual') }}';
var updateCheckUrl = '{{ route('settings.update-check.manual') }}';
</script>
<script type="text/javascript" src="v1/js/ff/admin/update/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/settings/users/delete.twig
View File

@ -6,7 +6,7 @@
{% block content %}
<form method="POST" action="{{ route('admin.users.destroy',user.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">
<form method="POST" action="{{ route('settings.users.destroy',user.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<div class="row">

2
resources/views/settings/users/edit.twig
View File

@ -5,7 +5,7 @@
{% endblock %}
{% block content %}
<form method="post" action="{{ route('admin.users.update',user.id) }}" class="form-horizontal"
<form method="post" action="{{ route('settings.users.update',user.id) }}" class="form-horizontal"
accept-charset="UTF-8"
enctype="multipart/form-data">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>

10
resources/views/settings/users/index.twig
View File

@ -7,7 +7,7 @@
{% if allowInvites %}
<div class="row">
<div class="col-lg-6">
<form action="{{ route('admin.users.invite') }}" method="post">
<form action="{{ route('settings.users.invite') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="box box-primary">
<div class="box-header with-border">
@ -54,15 +54,15 @@
<tr>
<td class="hidden-xs" data-value="{{ user.id }}">
<div class="btn-group btn-group-xs">
<a class="btn btn-default" href="{{ route('admin.users.edit',user.id) }}"><span
<a class="btn btn-default" href="{{ route('settings.users.edit',user.id) }}"><span
class="fa fa-pencil"></span></a>
<a class="btn btn-danger" href="{{ route('admin.users.delete',user.id) }}"><span
<a class="btn btn-danger" href="{{ route('settings.users.delete',user.id) }}"><span
class="fa fa-trash"></span></a>
</div>
</td>
<td class="hidden-xs" data-value="{{ user.id }}">#{{ user.id }}</td>
<td data-value="{{ user.email }}">
<a href="{{ route('admin.users.show',user.id) }}">{{ user.email }}</a></td>
<a href="{{ route('settings.users.show',user.id) }}">{{ user.email }}</a></td>
<td class="hidden-xs" data-value="{{ user.created_at.format('Y-m-d H-i-s') }}">
{{ user.created_at.isoFormat(monthAndDayFormat) }}
{{ user.created_at.format('H:i') }}
@ -137,7 +137,7 @@
<tr>
<td class="hidden-xs" data-value="{{ user.id }}">
<div class="btn-group btn-group-xs">
<a class="btn btn-danger delete-invite" href="{{ route('admin.users.delete-invite', invitee.id) }}"><span
<a class="btn btn-danger delete-invite" href="{{ route('settings.users.delete-invite', invitee.id) }}"><span
class="fa fa-trash"></span></a>
</div>
</td>

2
resources/views/v2/partials/layout/topbar.blade.php
View File

@ -18,7 +18,7 @@
<i class="fa-solid fa-gears"></i>
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-end">
<a href="{{ route('admin.index') }}" class="dropdown-item">
<a href="{{ route('settings.index') }}" class="dropdown-item">
<em class="fa-regular fa-user me-2 fa-fw"></em>
{{ __('firefly.system_settings') }}
</a>

82
routes/breadcrumbs.php
View File

@ -172,112 +172,112 @@ Breadcrumbs::for(
// ADMIN
Breadcrumbs::for(
'admin.index',
'settings.index',
static function (Generator $breadcrumbs): void {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.system_settings'), route('admin.index'));
$breadcrumbs->push(trans('firefly.system_settings'), route('settings.index'));
}
);
Breadcrumbs::for(
'admin.notification.index',
'settings.notification.index',
static function (Generator $breadcrumbs): void {
$breadcrumbs->parent('home');
$breadcrumbs->push(trans('firefly.administration'), route('admin.index'));
$breadcrumbs->push(trans('breadcrumbs.notification_index'), route('admin.notification.index'));
$breadcrumbs->push(trans('firefly.administration'), route('settings.index'));
$breadcrumbs->push(trans('breadcrumbs.notification_index'), route('settings.notification.index'));
}
);
Breadcrumbs::for(
'admin.users',
'settings.users',
static function (Generator $breadcrumbs): void {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.list_all_users'), route('admin.users'));
$breadcrumbs->parent('settings.index');
$breadcrumbs->push(trans('firefly.list_all_users'), route('settings.users'));
}
);
Breadcrumbs::for(
'admin.users.show',
'settings.users.show',
static function (Generator $breadcrumbs, User $user): void {
$breadcrumbs->parent('admin.users');
$breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', [$user->id]));
$breadcrumbs->parent('settings.users');
$breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('settings.users.show', [$user->id]));
}
);
Breadcrumbs::for(
'admin.users.edit',
'settings.users.edit',
static function (Generator $breadcrumbs, User $user): void {
$breadcrumbs->parent('admin.users');
$breadcrumbs->push(trans('firefly.edit_user', ['email' => $user->email]), route('admin.users.edit', [$user->id]));
$breadcrumbs->parent('settings.users');
$breadcrumbs->push(trans('firefly.edit_user', ['email' => $user->email]), route('settings.users.edit', [$user->id]));
}
);
Breadcrumbs::for(
'admin.users.delete',
'settings.users.delete',
static function (Generator $breadcrumbs, User $user): void {
$breadcrumbs->parent('admin.users');
$breadcrumbs->push(trans('firefly.delete_user', ['email' => $user->email]), route('admin.users.delete', [$user->id]));
$breadcrumbs->parent('settings.users');
$breadcrumbs->push(trans('firefly.delete_user', ['email' => $user->email]), route('settings.users.delete', [$user->id]));
}
);
Breadcrumbs::for(
'admin.users.domains',
'settings.users.domains',
static function (Generator $breadcrumbs): void {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.blocked_domains'), route('admin.users.domains'));
$breadcrumbs->parent('settings.index');
$breadcrumbs->push(trans('firefly.blocked_domains'), route('settings.users.domains'));
}
);
Breadcrumbs::for(
'admin.configuration.index',
'settings.configuration.index',
static function (Generator $breadcrumbs): void {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.instance_configuration'), route('admin.configuration.index'));
$breadcrumbs->parent('settings.index');
$breadcrumbs->push(trans('firefly.instance_configuration'), route('settings.configuration.index'));
}
);
Breadcrumbs::for(
'admin.update-check',
'settings.update-check',
static function (Generator $breadcrumbs): void {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.update_check_title'), route('admin.update-check'));
$breadcrumbs->parent('settings.index');
$breadcrumbs->push(trans('firefly.update_check_title'), route('settings.update-check'));
}
);
Breadcrumbs::for(
'admin.links.index',
'settings.links.index',
static function (Generator $breadcrumbs): void {
$breadcrumbs->parent('admin.index');
$breadcrumbs->push(trans('firefly.journal_link_configuration'), route('admin.links.index'));
$breadcrumbs->parent('settings.index');
$breadcrumbs->push(trans('firefly.journal_link_configuration'), route('settings.links.index'));
}
);
Breadcrumbs::for(
'admin.links.create',
'settings.links.create',
static function (Generator $breadcrumbs): void {
$breadcrumbs->parent('admin.links.index');
$breadcrumbs->push(trans('firefly.create_new_link_type'), route('admin.links.create'));
$breadcrumbs->parent('settings.links.index');
$breadcrumbs->push(trans('firefly.create_new_link_type'), route('settings.links.create'));
}
);
Breadcrumbs::for(
'admin.links.show',
'settings.links.show',
static function (Generator $breadcrumbs, LinkType $linkType): void {
$breadcrumbs->parent('admin.links.index');
$breadcrumbs->push(trans('firefly.overview_for_link', ['name' => limitStringLength($linkType->name)]), route('admin.links.show', [$linkType->id]));
$breadcrumbs->parent('settings.links.index');
$breadcrumbs->push(trans('firefly.overview_for_link', ['name' => limitStringLength($linkType->name)]), route('settings.links.show', [$linkType->id]));
}
);
Breadcrumbs::for(
'admin.links.edit',
'settings.links.edit',
static function (Generator $breadcrumbs, LinkType $linkType): void {
$breadcrumbs->parent('admin.links.index');
$breadcrumbs->push(trans('firefly.edit_link_type', ['name' => limitStringLength($linkType->name)]), route('admin.links.edit', [$linkType->id]));
$breadcrumbs->parent('settings.links.index');
$breadcrumbs->push(trans('firefly.edit_link_type', ['name' => limitStringLength($linkType->name)]), route('settings.links.edit', [$linkType->id]));
}
);
Breadcrumbs::for(
'admin.links.delete',
'settings.links.delete',
static function (Generator $breadcrumbs, LinkType $linkType): void {
$breadcrumbs->parent('admin.links.index');
$breadcrumbs->push(trans('firefly.delete_link_type', ['name' => limitStringLength($linkType->name)]), route('admin.links.delete', [$linkType->id]));
$breadcrumbs->parent('settings.links.index');
$breadcrumbs->push(trans('firefly.delete_link_type', ['name' => limitStringLength($linkType->name)]), route('settings.links.delete', [$linkType->id]));
}
);