restructured templates

sulu · Jun 23, 2016 · 8d14ee6 · 8d14ee6
1 parent c055b24
commit 8d14ee6
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 17 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -91,16 +91,16 @@ public function getConfigTreeBuilder()
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Login configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:login.html.twig')->end()
-                                    ->scalarNode(self::EMBED_TEMPLATE)->defaultValue('SuluCommunityBundle:community:login-embed.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Login:login.html.twig')->end()
+                                    ->scalarNode(self::EMBED_TEMPLATE)->defaultValue('SuluCommunityBundle:Login:login-embed.html.twig')->end()
                                 ->end()
                             ->end()
                             // Registration
                             ->arrayNode(self::TYPE_REGISTRATION)
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Registration configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:registration.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Registration:form.html.twig')->end()
                                     ->scalarNode(self::FORM_TYPE)->defaultValue(RegistrationType::class)->end()
                                     ->arrayNode(self::FORM_TYPE_OPTIONS)
                                         ->addDefaultsIfNotSet()
@@ -113,7 +113,7 @@ public function getConfigTreeBuilder()
                                         ->children()
                                             ->scalarNode(self::EMAIL_SUBJECT)->defaultValue('Registration')->end()
                                             ->scalarNode(self::EMAIL_ADMIN_TEMPLATE)->defaultValue(null)->end()
-                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:community:registration-email.html.twig')->end()
+                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:Registration:email.html.twig')->end()
                                         ->end()
                                     ->end()
                                 ->end()
@@ -123,7 +123,7 @@ public function getConfigTreeBuilder()
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Registration configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:profile.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Profile:form.html.twig')->end()
                                     ->scalarNode(self::FORM_TYPE)->defaultValue(ProfileType::class)->end()
                                     ->arrayNode(self::FORM_TYPE_OPTIONS)
                                         ->addDefaultsIfNotSet()
@@ -144,7 +144,7 @@ public function getConfigTreeBuilder()
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Confirmation configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:confirmation.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Confirmation:message.html.twig')->end()
                                     ->scalarNode(self::ACTIVATE_USER)->defaultValue(true)->end()
                                     ->scalarNode(self::AUTO_LOGIN)->defaultValue(true)->end()
                                     ->scalarNode(self::REDIRECT_TO)->defaultValue(null)->end()
@@ -163,12 +163,11 @@ public function getConfigTreeBuilder()
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Blacklisted configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:blacklist.html.twig')->end()
                                     ->arrayNode(self::EMAIL)
                                         ->addDefaultsIfNotSet()
                                         ->children()
                                             ->scalarNode(self::EMAIL_SUBJECT)->defaultValue('Blacklisted')->end()
-                                            ->scalarNode(self::EMAIL_ADMIN_TEMPLATE)->defaultValue('SuluCommunityBundle:community:blacklisted-email.html.twig')->end()
+                                            ->scalarNode(self::EMAIL_ADMIN_TEMPLATE)->defaultValue('SuluCommunityBundle:Blacklist:email.html.twig')->end()
                                             ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue(null)->end()
                                         ->end()
                                     ->end()
@@ -179,7 +178,7 @@ public function getConfigTreeBuilder()
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Denied configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:blacklist-denied.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Blacklist:denied.html.twig')->end()
                                     ->scalarNode(self::DELETE_USER)->defaultTrue()->end()
                                     ->arrayNode(self::EMAIL)
                                         ->addDefaultsIfNotSet()
@@ -196,13 +195,13 @@ public function getConfigTreeBuilder()
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Confirmed configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:blacklist-confirmed.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Blacklist:confirmed.html.twig')->end()
                                     ->arrayNode(self::EMAIL)
                                         ->addDefaultsIfNotSet()
                                         ->children()
                                             ->scalarNode(self::EMAIL_SUBJECT)->defaultValue('Registration')->end()
                                             ->scalarNode(self::EMAIL_ADMIN_TEMPLATE)->defaultValue(null)->end()
-                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:community:registration-email.html.twig')->end()
+                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:Password:email.html.twig')->end()
                                         ->end()
                                     ->end()
                                 ->end()
@@ -212,7 +211,7 @@ public function getConfigTreeBuilder()
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Password Forget configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:password-forget.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Password:forget.html.twig')->end()
                                     ->scalarNode(self::FORM_TYPE)->defaultValue(PasswordForgetType::class)->end()
                                     ->arrayNode(self::FORM_TYPE_OPTIONS)
                                         ->addDefaultsIfNotSet()
@@ -223,7 +222,7 @@ public function getConfigTreeBuilder()
                                         ->children()
                                             ->scalarNode(self::EMAIL_SUBJECT)->defaultValue('Password Forget')->end()
                                             ->scalarNode(self::EMAIL_ADMIN_TEMPLATE)->defaultValue(null)->end()
-                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:community:password-forget-email.html.twig')->end()
+                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:Password:forget-email.html.twig')->end()
                                         ->end()
                                     ->end()
                                 ->end()
@@ -233,7 +232,7 @@ public function getConfigTreeBuilder()
                                 ->addDefaultsIfNotSet()
                                 ->children()
                                     // Password Forget configuration
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:password-reset.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Password:reset.html.twig')->end()
                                     ->scalarNode(self::FORM_TYPE)->defaultValue(PasswordResetType::class)->end()
                                     ->arrayNode(self::FORM_TYPE_OPTIONS)
                                         ->addDefaultsIfNotSet()
@@ -245,7 +244,7 @@ public function getConfigTreeBuilder()
                                         ->children()
                                             ->scalarNode(self::EMAIL_SUBJECT)->defaultValue('Password Reset')->end()
                                             ->scalarNode(self::EMAIL_ADMIN_TEMPLATE)->defaultValue(null)->end()
-                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:community:password-reset-email.html.twig')->end()
+                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:Password:reset-email.html.twig')->end()
                                         ->end()
                                     ->end()
                                 ->end()
@@ -256,7 +255,7 @@ public function getConfigTreeBuilder()
                                 ->children()
                                     // Completion Configuration
                                     ->scalarNode(self::SERVICE)->defaultValue(null)->end()
-                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:community:completion.html.twig')->end()
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:Completion:form.html.twig')->end()
                                     ->scalarNode(self::FORM_TYPE)->defaultValue(CompletionType::class)->end()
                                     ->arrayNode(self::FORM_TYPE_OPTIONS)
                                         ->addDefaultsIfNotSet()

diff --git a/...s/community/blacklist-confirmed.html.twig → ...urces/views/Blacklist/confirmed.html.twig b/...s/community/blacklist-confirmed.html.twig → ...urces/views/Blacklist/confirmed.html.twig
diff --git a/...iews/community/blacklist-denied.html.twig → Resources/views/Blacklist/denied.html.twig b/...iews/community/blacklist-denied.html.twig → Resources/views/Blacklist/denied.html.twig
diff --git a/...ews/community/blacklisted-email.html.twig → Resources/views/Blacklist/email.html.twig b/...ews/community/blacklisted-email.html.twig → Resources/views/Blacklist/email.html.twig
diff --git a/...rces/views/community/completion.html.twig → Resources/views/Completion/form.html.twig b/...rces/views/community/completion.html.twig → Resources/views/Completion/form.html.twig
diff --git a/...es/views/community/confirmation.html.twig → ...rces/views/Confirmation/message.html.twig b/...es/views/community/confirmation.html.twig → ...rces/views/Confirmation/message.html.twig
diff --git a/...ces/views/community/login-embed.html.twig → Resources/views/Login/login-embed.html.twig b/...ces/views/community/login-embed.html.twig → Resources/views/Login/login-embed.html.twig
diff --git a/Resources/views/community/login.html.twig → Resources/views/Login/login.html.twig b/Resources/views/community/login.html.twig → Resources/views/Login/login.html.twig
diff --git a/...community/password-forget-email.html.twig → ...ces/views/Password/forget-email.html.twig b/...community/password-forget-email.html.twig → ...ces/views/Password/forget-email.html.twig
diff --git a/...views/community/password-forget.html.twig → Resources/views/Password/forget.html.twig b/...views/community/password-forget.html.twig → Resources/views/Password/forget.html.twig
diff --git a/.../community/password-reset-email.html.twig → ...rces/views/Password/reset-email.html.twig b/.../community/password-reset-email.html.twig → ...rces/views/Password/reset-email.html.twig
diff --git a/.../views/community/password-reset.html.twig → Resources/views/Password/reset.html.twig b/.../views/community/password-reset.html.twig → Resources/views/Password/reset.html.twig
diff --git a/Resources/views/community/profile.html.twig → Resources/views/Profile/form.html.twig b/Resources/views/community/profile.html.twig → Resources/views/Profile/form.html.twig
diff --git a/...ws/community/registration-email.html.twig → Resources/views/Registration/email.html.twig b/...ws/community/registration-email.html.twig → Resources/views/Registration/email.html.twig
diff --git a/...es/views/community/registration.html.twig → Resources/views/Registration/form.html.twig b/...es/views/community/registration.html.twig → Resources/views/Registration/form.html.twig
diff --git a/Resources/views/community/denied-email.html.twig b/Resources/views/community/denied-email.html.twig