Skip to content

Commit 675a236

Browse files
thorstenthorsten
committed
refactor: code cleanup (#3257)
1 parent 2da1987 commit 675a236

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+383
-386
lines changed

‎phpmyfaq/admin/category.showstructure.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
'basePath' => $request->getBasePath(),
115115
'faqlangcode' => $faqLangCode,
116116
'msgCategoryRemark_overview' => Translation::get('msgCategoryRemark_overview'),
117-
'ad_categ_title' => Translation::get('ad_categ_titel'),
117+
'categoryNameLabel' => Translation::get('categoryNameLabel'),
118118
'ad_categ_translate' => Translation::get('ad_categ_translate'),
119119
'ad_menu_categ_structure' => Translation::get('ad_menu_categ_structure'),
120120
'msgAddCategory' => Translation::get('msgAddCategory'),

‎phpmyfaq/admin/category.translate.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@
7171
'groupPermission' => $groupPermission[0],
7272
'userPermission' => $userPermission[0],
7373
'csrf' => Token::getInstance($container->get('session'))->getTokenString('update-category'),
74-
'ad_categ_title' => Translation::get('ad_categ_titel'),
74+
'categoryNameLabel' => Translation::get('categoryNameLabel'),
7575
'ad_categ_lang' => Translation::get('ad_categ_lang'),
7676
'langToTranslate' => $category->getCategoryLanguagesToTranslate($id, $selectedLanguage),
77-
'ad_categ_desc' => Translation::get('ad_categ_desc'),
78-
'ad_categ_owner' => Translation::get('ad_categ_owner'),
77+
'categoryDescriptionLabel' => Translation::get('categoryDescriptionLabel'),
78+
'categoryOwnerLabel' => Translation::get('categoryOwnerLabel'),
7979
'userOptions' => $userHelper->getAllUserOptions($category->categoryName[$id]['user_id']),
8080
'ad_categ_transalready' => Translation::get('ad_categ_transalready'),
8181
'langTranslated' => $category->getCategoryLanguagesTranslated($id),

‎phpmyfaq/admin/faqs.editor.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,6 @@
361361
'msgSeoCenter' => Translation::get('seoCenter'),
362362
'msgSerp' => Translation::get('msgSerp'),
363363
'msgSerpTitle' => Translation::get('msgSerpTitle'),
364-
'msgSerpDescription' => Translation::get('msgSerpDescription'),
365364
'ad_entry_grouppermission' => Translation::get('ad_entry_grouppermission'),
366365
'ad_entry_all_groups' => Translation::get('ad_entry_all_groups'),
367366
'allGroups' => $allGroups,
@@ -371,7 +370,7 @@
371370
$user->perm->getAllGroupsOptions($groupPermission, $user) : '',
372371
'ad_entry_userpermission' => Translation::get('ad_entry_userpermission'),
373372
'allUsers' => $allUsers,
374-
'ad_entry_all_users' => Translation::get('ad_entry_all_users'),
373+
'msgAccessAllUsers' => Translation::get('msgAccessAllUsers'),
375374
'restrictedUsers' => $restrictedUsers,
376375
'ad_entry_restricted_users' => Translation::get('ad_entry_restricted_users'),
377376
'userPermissionOptions' => $userHelper->getAllUserOptions($userPermission[0], true),

‎phpmyfaq/assets/templates/admin/content/category.add.twig‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
{% block content %}
44
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
55
<h1 class="h2">
6-
<i aria-hidden="true" class="bi bi-folder"></i> {{ ad_categ_new }}
6+
<i aria-hidden="true" class="bi bi-folder"></i> {{ 'msgNewCategory' | translate }}
77
</h1>
88
<div class="btn-toolbar mb-2 mb-md-0">
99
<div class="btn-group mr-2">
1010
<a class="btn btn-info" href="./category">
11-
<i aria-hidden="true" class="bi bi-list"></i> {{ msgCategoryMatrix }}
11+
<i aria-hidden="true" class="bi bi-list"></i> {{ 'msgCategoryMatrix' | translate }}
1212
</a>
1313
</div>
1414
</div>
@@ -34,7 +34,7 @@
3434
{% endif %}
3535
<div class="row mb-2">
3636
<label class="col-lg-2 col-form-label" for="name">
37-
{{ ad_categ_title }}
37+
{{ 'categoryNameLabel' | translate }}
3838
</label>
3939
<div class="col-lg-4">
4040
<input type="text" id="name" name="name" class="form-control" required>
@@ -43,7 +43,7 @@
4343

4444
<div class="row mb-2">
4545
<label class="col-lg-2 col-form-label" for="description">
46-
{{ ad_categ_desc }}
46+
{{ 'categoryDescriptionLabel' | translate }}
4747
</label>
4848
<div class="col-lg-4">
4949
<textarea id="description" name="description" rows="3" class="form-control"></textarea>
@@ -55,7 +55,7 @@
5555
<div class="form-check">
5656
<input type="checkbox" name="active" id="active" value="1" class="form-check-input" checked>
5757
<label class="form-check-label" for="active">
58-
{{ ad_user_active }}
58+
{{ 'msgActive' | translate }}
5959
</label>
6060
</div>
6161
</div>
@@ -66,15 +66,15 @@
6666
<div class="form-check">
6767
<input type="checkbox" name="show_home" id="show_home" value="1" class="form-check-input">
6868
<label class="form-check-label" for="show_home">
69-
{{ ad_user_show_home }}
69+
{{ 'categoryShowHomeLabel' | translate }}
7070
</label>
7171
</div>
7272
</div>
7373
</div>
7474

7575
<div class="row mb-2">
7676
<label class="col-lg-2 col-form-label" for="pmf-category-image-upload">
77-
{{ ad_category_image }}:
77+
{{ categoryShowHomeLabel }}:
7878
</label>
7979
<div class="col-lg-4">
8080
<input class="form-control" type="file" name="image" id="pmf-category-image-upload">
@@ -83,7 +83,7 @@
8383

8484
<div class="row mb-2">
8585
<label class="col-lg-2 col-form-label" for="user_id">
86-
{{ ad_categ_owner }}
86+
{{ 'categoryOwnerLabel' | translate }}
8787
</label>
8888
<div class="col-lg-4">
8989
<select name="user_id" id="user_id" class="form-select">
@@ -94,7 +94,8 @@
9494
{% if permLevel != 'basic' %}
9595
<div class="row mb-2">
9696
<label class="col-lg-2 col-form-label" for="group_id">
97-
{{ ad_categ_moderator }}</label>
97+
{{ 'categoryModeratorLabel' | translate }}
98+
</label>
9899
<div class="col-lg-4">
99100
<select name="group_id" id="group_id" class="form-select">
100101
{{ groupsOptions|raw }}
@@ -143,7 +144,7 @@
143144
<input type="radio" name="userpermission" id="userpermission_all" value="all"
144145
class="form-check-input" checked>
145146
<label class="form-check-label" for="userpermission_all">
146-
{{ ad_entry_all_users }}
147+
{{ 'msgAccessAllUsers' | translate }}
147148
</label>
148149
</div>
149150
<div class="form-check">
@@ -169,7 +170,9 @@
169170

170171
<!-- SERP Description -->
171172
<div class="row mb-2">
172-
<label class="col-lg-2 col-form-label" for="serpDescription">{{ msgSerpDescription }}</label>
173+
<label class="col-lg-2 col-form-label" for="serpDescription">
174+
{{ 'msgSerpDescription' | translate }}
175+
</label>
173176
<div class="col-lg-4">
174177
<textarea type="text" name="serpDescription" id="serpDescription" rows="5" class="form-control"
175178
></textarea>

‎phpmyfaq/assets/templates/admin/content/category.edit.twig‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<div class="row mb-2">
2020
<label class="col-lg-2 col-form-label" for="name">
21-
{{ categoryNameLabel }}
21+
{{ 'categoryNameLabel' | translate }}
2222
</label>
2323
<div class="col-lg-4">
2424
<input type="text" id="name" name="name" value="{{ categoryName }}" class="form-control">
@@ -27,7 +27,7 @@
2727

2828
<div class="row mb-2">
2929
<label class="col-lg-2 col-form-label" for="description">
30-
{{ categoryDescriptionLabel }}
30+
{{ 'categoryDescriptionLabel' | translate }}
3131
</label>
3232
<div class="col-lg-4">
3333
<textarea id="description" name="description" rows="3" class="form-control"
@@ -39,7 +39,9 @@
3939
<div class="offset-lg-2 col-lg-4">
4040
<div class="form-check">
4141
<input class="form-check-input" type="checkbox" name="active" id='active' value="1" {{ categoryActive }}>
42-
<label class="form-check-label" for="active">{{ categoryActiveLabel }}</label>
42+
<label class="form-check-label" for="active">
43+
{{ 'msgActive' | translate }}
44+
</label>
4345
</div>
4446
</div>
4547
</div>
@@ -49,15 +51,17 @@
4951
<div class="form-check">
5052
<input class="form-check-input" type="checkbox" name="show_home" id='show_home' value="1"
5153
{{ categoryShowHome }}>
52-
<label class="form-check-label" for="show_home">{{ categoryShowHomeLabel }}</label>
54+
<label class="form-check-label" for="show_home">
55+
{{ 'categoryShowHomeLabel' | translate }}
56+
</label>
5357
</div>
5458
</div>
5559
</div>
5660

5761

5862
<div class="row mb-2">
5963
<label class="col-lg-2 col-form-label" for="pmf-category-image-upload">
60-
{{ categoryImageLabel }}
64+
{{ 'categoryImageLabel' | translate }}
6165
</label>
6266
<div class="col-lg-4">
6367
<div class="input-group">
@@ -75,7 +79,7 @@
7579

7680
<div class="row mb-2">
7781
<label class="col-lg-2 col-form-label" for="user_id">
78-
{{ categoryOwnerLabel }}
82+
{{ 'categoryOwnerLabel' | translate }}
7983
</label>
8084
<div class="col-lg-4">
8185
<select id="user_id" name="user_id" class="form-select">
@@ -87,7 +91,7 @@
8791
{% if isMediumPermission %}
8892
<div class="row mb-2">
8993
<label class="col-lg-2 col-form-label" for="group_id">
90-
{{ categoryModeratorLabel }}
94+
{{ 'categoryModeratorLabel' | translate }}
9195
</label>
9296
<div class="col-lg-4">
9397
<select name="group_id" id="group_id" class="form-select">
@@ -134,7 +138,7 @@
134138
<input type="radio" name="userpermission" id="userpermission_all" value="all"
135139
class="form-check-input" {{ allUsers }}>
136140
<label class="form-check-label" for="userpermission_all">
137-
{{ allUsersLabel }}
141+
{{ 'msgAccessAllUsers' | translate }}
138142
</label>
139143
</div>
140144
<div class="form-check">
@@ -160,7 +164,9 @@
160164

161165
<!-- SERP Description -->
162166
<div class="row mb-2">
163-
<label class="col-lg-2 col-form-label" for="serpDescription">{{ msgSerpDescription }}</label>
167+
<label class="col-lg-2 col-form-label" for="serpDescription">
168+
{{ 'msgSerpDescription' | translate }}
169+
</label>
164170
<div class="col-lg-4">
165171
<textarea type="text" name="serpDescription" id="serpDescription" rows="5" class="form-control"
166172
>{{ serpDescription }}</textarea>

‎phpmyfaq/assets/templates/admin/content/category.translate.twig‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<input type="hidden" name="csrf" id="csrf" value="{{ csrf }}">
2222

2323
<div class="row mb-2">
24-
<label class="col-lg-2 col-form-label" for="name">{{ ad_categ_title }}:</label>
24+
<label class="col-lg-2 col-form-label" for="name">{{ 'categoryNameLabel' | translate }}:</label>
2525
<div class="col-lg-4">
2626
<input type="text" name="name" class="form-control" id="name">
2727
</div>
@@ -37,14 +37,16 @@
3737
</div>
3838

3939
<div class="row mb-2">
40-
<label class="col-lg-2 col-form-label">{{ ad_categ_desc }}:</label>
40+
<label class="col-lg-2 col-form-label">{{ 'categoryDescriptionLabel' | translate }}</label>
4141
<div class="col-lg-4">
4242
<textarea name="description" rows="3" class="form-control"></textarea>
4343
</div>
4444
</div>
4545

4646
<div class="row mb-2">
47-
<label class="col-lg-2 col-form-label">{{ ad_categ_owner }}:</label>
47+
<label class="col-lg-2 col-form-label">
48+
{{ 'categoryOwnerLabel' | translate }}
49+
</label>
4850
<div class="col-lg-4">
4951
<select name="user_id" class="form-control">
5052
{{ userOptions|raw }}

‎phpmyfaq/assets/templates/admin/content/faq.editor.twig‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@
260260

261261
<!-- SERP Description -->
262262
<div class="row mb-2">
263-
<label class="col-lg-3 col-form-label" for="serpDescription">{{ msgSerpDescription }}</label>
263+
<label class="col-lg-3 col-form-label" for="serpDescription">
264+
{{ 'msgSerpDescription' | translate }}
265+
</label>
264266
<div class="col-lg-9">
265267
<textarea type="text" name="serpDescription" id="serpDescription" rows="5" class="form-control"
266268
>{{ faqData['serp-description'] }}</textarea>
@@ -307,7 +309,7 @@
307309
<input type="radio" id="allusers" name="userpermission" value="all" class="form-check-input"
308310
{{ allUsers ? 'checked' : '' }}>
309311
<label class="form-check-label" for="allusers">
310-
{{ ad_entry_all_users }}
312+
{{ 'msgAccessAllUsers' | translate }}
311313
</label>
312314
</div>
313315
<div class="form-check">

‎phpmyfaq/assets/templates/admin/content/faq.overview.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
{{ msgSticky }}
7575
</th>
7676
<th class="align-middle">
77-
{{ msgActive }}
77+
{{ 'msgActive' | translate }}
7878
</th>
7979
<th colspan="4" class="align-middle">
8080
Actions

‎phpmyfaq/assets/templates/admin/user/user.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</label>
7474
<div class="col-lg-8">
7575
<select id="user_status" class="form-select" name="user_status" disabled>
76-
<option value="active">{{ 'ad_user_active' | translate }}</option>
76+
<option value="active">{{ 'msgActive' | translate }}</option>
7777
<option value="blocked">{{ 'ad_user_blocked' | translate }}</option>
7878
<option value="protected">{{ 'ad_user_protected' | translate }}</option>
7979
</select>

‎phpmyfaq/src/admin-routes.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@
8282
'controller' => [CategoryController::class, 'addChild'],
8383
'methods' => 'GET'
8484
],
85+
'admin.category.create' => [
86+
'path' => '/category/create',
87+
'controller' => [CategoryController::class, 'create'],
88+
'methods' => 'POST'
89+
],
8590
'admin.category.edit' => [
8691
'path' => '/category/edit/{categoryId}',
8792
'controller' => [CategoryController::class, 'edit'],

0 commit comments

Comments
 (0)