Skip to content
This repository was archived by the owner on May 27, 2023. It is now read-only.

Commit 5f0dcee

Browse files
GuiteGuite
committed
Twig namespacing
1 parent 59a7bfc commit 5f0dcee

10 files changed

+21
-23
lines changed

‎Controller/ConfigController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ConfigController extends AbstractController
3232
/**
3333
* @Route("/config")
3434
* @Theme("admin")
35-
* @Template("ZikulaProfileModule:Config:config.html.twig")
35+
* @Template("@ZikulaProfileModule/Config/config.html.twig")
3636
*
3737
* @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
3838
*/

‎Controller/MembersController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class MembersController extends AbstractController
3232
{
3333
/**
3434
* @Route("/list")
35-
* @Template("ZikulaProfileModule:Members:list.html.twig")
35+
* @Template("@ZikulaProfileModule/Members/list.html.twig")
3636
*
3737
* @throws AccessDeniedException on failed permission check
3838
*/
@@ -84,7 +84,7 @@ public function listAction(
8484

8585
/**
8686
* @Route("/recent")
87-
* @Template("ZikulaProfileModule:Members:recent.html.twig")
87+
* @Template("@ZikulaProfileModule/Members/recent.html.twig")
8888
*
8989
* Displays last X registered users.
9090
*
@@ -109,7 +109,7 @@ public function recentAction(
109109

110110
/**
111111
* @Route("/online")
112-
* @Template("ZikulaProfileModule:Members:online.html.twig")
112+
* @Template("@ZikulaProfileModule/Members/online.html.twig")
113113
*
114114
* View users online.
115115
*

‎Controller/ProfileController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ProfileController extends AbstractController
3232
{
3333
/**
3434
* @Route("/display/{uid}", requirements={"uid" = "\d+"}, defaults={"uid" = null})
35-
* @Template("ZikulaProfileModule:Profile:display.html.twig")
35+
* @Template("@ZikulaProfileModule/Profile/display.html.twig")
3636
*
3737
* @throws AccessDeniedException on failed permission check
3838
*/
@@ -60,7 +60,7 @@ public function displayAction(
6060

6161
/**
6262
* @Route("/edit/{uid}", requirements={"uid" = "\d+"}, defaults={"uid" = null})
63-
* @Template("ZikulaProfileModule:Profile:edit.html.twig")
63+
* @Template("@ZikulaProfileModule/Profile/edit.html.twig")
6464
*
6565
* @return array|RedirectResponse
6666
*/

‎Controller/PropertyController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class PropertyController extends AbstractController
3333
/**
3434
* @Route("/list")
3535
* @Theme("admin")
36-
* @Template("ZikulaProfileModule:Property:list.html.twig")
36+
* @Template("@ZikulaProfileModule/Property/list.html.twig")
3737
*/
3838
public function listAction(PropertyRepositoryInterface $propertyRepository): array
3939
{
@@ -50,7 +50,7 @@ public function listAction(PropertyRepositoryInterface $propertyRepository): arr
5050
/**
5151
* @Route("/edit/{id}", defaults={"id" = null})
5252
* @Theme("admin")
53-
* @Template("ZikulaProfileModule:Property:edit.html.twig")
53+
* @Template("@ZikulaProfileModule/Property/edit.html.twig")
5454
*
5555
* @return array|RedirectResponse
5656
*/
@@ -86,7 +86,7 @@ public function editAction(Request $request, PropertyEntity $propertyEntity = nu
8686
/**
8787
* @Route("/delete/{id}")
8888
* @Theme("admin")
89-
* @Template("ZikulaProfileModule:Property:delete.html.twig")
89+
* @Template("@ZikulaProfileModule/Property/delete.html.twig")
9090
*
9191
* @return array|RedirectResponse
9292
*/

‎Controller/UserBlockController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class UserBlockController extends AbstractController
3030
{
3131
/**
3232
* @Route("/usersblock")
33-
* @Template("ZikulaProfileModule:UserBlock:edit.html.twig")
33+
* @Template("@ZikulaProfileModule/UserBlock/edit.html.twig")
3434
*
3535
* Display the configuration options for the users block.
3636
*

‎Resources/views/Config/config.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% form_theme form with [
2-
'ZikulaFormExtensionBundle:Form:bootstrap_3_zikula_admin_layout.html.twig',
3-
'ZikulaFormExtensionBundle:Form:form_div_layout.html.twig'
2+
'@ZikulaFormExtension/Form/bootstrap_3_zikula_admin_layout.html.twig',
3+
'@ZikulaFormExtension/Form/form_div_layout.html.twig'
44
] %}
55
{{ adminHeader() }}
66

‎Resources/views/Profile/edit.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% form_theme form with [
2-
'ZikulaFormExtensionBundle:Form:bootstrap_3_zikula_admin_layout.html.twig',
3-
'ZikulaFormExtensionBundle:Form:form_div_layout.html.twig'
2+
'@ZikulaFormExtension/Form/bootstrap_3_zikula_admin_layout.html.twig',
3+
'@ZikulaFormExtension/Form/form_div_layout.html.twig'
44
] %}
55
{{ moduleHeader('user', __('Edit profile'), true, true) }}
66

‎Resources/views/Property/delete.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% form_theme form with [
2-
'ZikulaFormExtensionBundle:Form:bootstrap_3_zikula_admin_layout.html.twig',
3-
'ZikulaFormExtensionBundle:Form:form_div_layout.html.twig'
2+
'@ZikulaFormExtension/Form/bootstrap_3_zikula_admin_layout.html.twig',
3+
'@ZikulaFormExtension/Form/form_div_layout.html.twig'
44
] %}
55
{{ adminHeader() }}
66
{{ pageSetVar('title', __('Delete property')) }}
77
{{ form_start(form) }}
8-
<div class="alert alert-danger">{{ __f('Are you sure you want to delete the property with ID: %id', {'%id': id}) }}</div>
8+
<p class="alert alert-danger">{{ __f('Are you sure you want to delete the property with ID: %id', {'%id': id}) }}</p>
99
<div class="form-group">
1010
<div class="col-sm-offset-3 col-sm-9">
1111
{{ form_widget(form.delete) }}

‎Resources/views/Property/edit.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% form_theme form with [
2-
'ZikulaFormExtensionBundle:Form:bootstrap_3_zikula_admin_layout.html.twig',
3-
'ZikulaFormExtensionBundle:Form:form_div_layout.html.twig'
2+
'@ZikulaFormExtension/Form/bootstrap_3_zikula_admin_layout.html.twig',
3+
'@ZikulaFormExtension/Form/form_div_layout.html.twig'
44
] %}
55
{{ adminHeader() }}
66
{{ pageSetVar('title', __('Edit property')) }}

‎Resources/views/UserBlock/edit.html.twig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<h2>{{ __('Personal custom block') }}</h2>
2-
32
{% form_theme form with [
4-
'ZikulaFormExtensionBundle:Form:bootstrap_3_zikula_admin_layout.html.twig',
5-
'ZikulaFormExtensionBundle:Form:form_div_layout.html.twig'
3+
'@ZikulaFormExtension/Form/bootstrap_3_zikula_admin_layout.html.twig',
4+
'@ZikulaFormExtension/Form/form_div_layout.html.twig'
65
] %}
76

87
{{ form_start(form) }}
98
{{ form_errors(form) }}
10-
119
<fieldset>
1210
<legend>{{ __('Block content') }}</legend>
1311
{{ form_row(form.ublockon) }}

0 commit comments

Comments
 (0)