Rename rapsys_blog route to rapsysblog

Rename rapsys_user route to rapsysuser
Add rapsysuser.default.languages key
Fix title tree

diff --git a/Resources/config/packages/rapsys_blog.yaml b/Resources/config/packages/rapsys_blog.yaml
index 7e439c34ed4e36d0e14824ef10cc1cccf0f5d122..3dfa5db771f0f320ac31f1fdc37e53a64186ca0d 100644 (file)
--- a/Resources/config/packages/rapsys_blog.yaml
+++ b/Resources/config/packages/rapsys_blog.yaml
@@ -1,6 +1,6 @@
 # Dev log configuration
 #TODO: set mail, calendar and facebook app id as env variables ???
-rapsys_blog:
+rapsysblog:
     contact:
         address: 'blog@rapsys.eu'
         name: 'Raphaël Gertz'
@@ -61,11 +61,11 @@ rapsys_blog:
         alt: 'Rapsys'' dev log logo'
         png: '@RapsysBlog/png/logo.png'
         svg: '@RapsysBlog/svg/logo.svg'
-    root: 'rapsys_blog'
+    root: 'rapsysblog'
     title: 'Rapsys'' dev log'
 
 #RapsysUser configuration
-rapsys_user:
+rapsysuser:
     #Class replacement
     class:
         group: 'Rapsys\BlogBundle\Entity\Group'
@@ -76,26 +76,26 @@ rapsys_user:
         admin: 'ROLE_ADMIN'
         civility: 'Mister'
         group: [ 'User' ]
+        languages: '%rapsysblog.languages%'
     #Route replacement
     route:
         index:
-            name: 'rapsys_blog'
+            name: 'rapsysblog'
         register:
-            name: 'rapsys_user_register'
+            name: 'rapsysuser_register'
     #Translate replacement
-    translate: [ 'title', 'password', 'copy.by', 'copy.long', 'copy.short', 'copy.title', 'head.logo.alt', 'head.site' ]
-    #Languages replacement
-    languages: '%rapsys_blog.languages%'
+    translate: [ 'title.page', 'title.section', 'title.site', 'password', 'copy.by', 'copy.long', 'copy.short', 'copy.title', 'logo.alt' ]
     #Contact replacement
-    contact: '%rapsys_blog.contact%'
+    contact: '%rapsysblog.contact%'
     #Context replacement
     context:
-        copy: '%rapsys_blog.copy%'
-        head:
-            icon: '%rapsys_blog.icon%'
-            logo: '%rapsys_blog.logo%'
-            root: '%rapsys_blog.root%'
-            site: '%rapsys_blog.title%'
+        copy: '%rapsysblog.copy%'
+        icon: '%rapsysblog.icon%'
+        logo: '%rapsysblog.logo%'
+        root: '%rapsysblog.root%'
+        title:
+            section: 'User'
+            site: '%rapsysblog.title%'
     #Edit replacement
     edit:
         admin:
@@ -107,7 +107,8 @@ rapsys_user:
             edit: 'Rapsys\BlogBundle\Form\EditType'
             name: '@RapsysBlog/form/edit.html.twig'
             context:
-                title: 'Modify account'
+                title:
+                    page: 'Modify account'
                 password: 'Modify password'
     #Index replacement
     index:
@@ -116,7 +117,8 @@ rapsys_user:
         view:
             name: '@RapsysBlog/user/index.html.twig'
             context:
-                title: 'User list'
+                title:
+                    page: 'User list'
     #Login replacement
     login:
         route:
@@ -124,7 +126,8 @@ rapsys_user:
         view:
             name: '@RapsysBlog/form/login.html.twig'
             context:
-                title: 'Login'
+                title:
+                    page: 'Login'
     #Recover replacement
     recover:
         route:
@@ -133,7 +136,8 @@ rapsys_user:
         view:
             name: '@RapsysBlog/form/recover.html.twig'
             context:
-                title: 'Recover'
+                title:
+                    page: 'Recover'
         mail:
             subject: 'Welcome back %%recipient_name%% to %%head.site%%'
             html: '@RapsysBlog/mail/recover.html.twig'
@@ -151,7 +155,8 @@ rapsys_user:
             form: 'Rapsys\BlogBundle\Form\RegisterType'
             name: '@RapsysBlog/form/register.html.twig'
             context:
-                title: 'Register'
+                title:
+                    page: 'Register'
         mail:
             subject: 'Welcome %%recipient_name%% to %%head.site%%'
             html: '@RapsysBlog/mail/register.html.twig'
@@ -183,7 +188,7 @@ doctrine:
 
 # Framework configuration
 framework:
-    default_locale: '%rapsys_blog.locale%'
+    default_locale: '%rapsysblog.locale%'
     disallow_search_engine_index: false
     #error_controller: 'Rapsys\BlogBundle\Controller\ErrorController::show'
     mailer:
@@ -198,7 +203,7 @@ framework:
         cookie_secure: 'auto'
         cookie_samesite: 'lax'
     translator:
-        fallbacks: '%rapsys_blog.locales%'
+        fallbacks: '%rapsysblog.locales%'
 
 # Security configuration
 security:
@@ -249,9 +254,9 @@ security:
                 # Redirect to referer if different from login route
                 use_referer: true
                 # Login path
-                login_path: rapsys_user_login
+                login_path: 'rapsysuser_login'
                 # Check path
-                check_path: rapsys_user_login
+                check_path: 'rapsysuser_login'
                 # Username parameter
                 username_parameter: 'login[mail]'
                 # Password parameter
@@ -266,9 +271,9 @@ security:
             # Set logout route
             logout:
                 # Logout route
-                path: rapsys_user_logout
+                path: 'rapsysuser_logout'
                 # Logout default target
-                target: rapsys_blog
+                target: 'rapsysblog'
 
             # Set custom access denied handler
             #access_denied_handler: Rapsys\BlogBundle\Handler\AccessDeniedHandler
@@ -290,29 +295,29 @@ security:
 services:
     #Register abstract controller
     Rapsys\BlogBundle\Controller\AbstractController:
-        arguments: [ '@security.authorization_checker', '@service_container', '@rapsys_user.access_decision_manager', '@doctrine', '@rapsys_pack.facebook_util', '@form.factory', '@rapsys_pack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsys_pack.path_package', '@router', '@rapsys_pack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
+        arguments: [ '@security.authorization_checker', '@service_container', '@rapsysuser.access_decision_manager', '@doctrine', '@rapsysblog.facebook_util', '@form.factory', '@rapsyspack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsyspack.path_package', '@router', '@rapsyspack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
         tags: [ 'controller.service_arguments' ]
     #Register article controller
     Rapsys\BlogBundle\Controller\ArticleController:
-        arguments: [ '@security.authorization_checker', '@service_container', '@rapsys_user.access_decision_manager', '@doctrine', '@rapsys_pack.facebook_util', '@form.factory', '@rapsys_pack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsys_pack.path_package', '@router', '@rapsys_pack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
+        arguments: [ '@security.authorization_checker', '@service_container', '@rapsysuser.access_decision_manager', '@doctrine', '@rapsysblog.facebook_util', '@form.factory', '@rapsyspack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsyspack.path_package', '@router', '@rapsyspack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
         tags: [ 'controller.service_arguments' ]
     #Register default controller
     Rapsys\BlogBundle\Controller\DefaultController:
-        arguments: [ '@security.authorization_checker', '@service_container', '@rapsys_user.access_decision_manager', '@doctrine', '@rapsys_pack.facebook_util', '@form.factory', '@rapsys_pack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsys_pack.path_package', '@router', '@rapsys_pack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
+        arguments: [ '@security.authorization_checker', '@service_container', '@rapsysuser.access_decision_manager', '@doctrine', '@rapsysblog.facebook_util', '@form.factory', '@rapsyspack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsyspack.path_package', '@router', '@rapsyspack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
         tags: [ 'controller.service_arguments' ]
     #Register keyword controller
     Rapsys\BlogBundle\Controller\KeywordController:
-        arguments: [ '@security.authorization_checker', '@service_container', '@rapsys_user.access_decision_manager', '@doctrine', '@rapsys_pack.facebook_util', '@form.factory', '@rapsys_pack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsys_pack.path_package', '@router', '@rapsys_pack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
+        arguments: [ '@security.authorization_checker', '@service_container', '@rapsysuser.access_decision_manager', '@doctrine', '@rapsysblog.facebook_util', '@form.factory', '@rapsyspack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsyspack.path_package', '@router', '@rapsyspack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
         tags: [ 'controller.service_arguments' ]
     #Register user controller
     Rapsys\BlogBundle\Controller\UserController:
-        arguments: [ '@security.authorization_checker', '@service_container', '@rapsys_user.access_decision_manager', '@doctrine', '@rapsys_pack.facebook_util', '@form.factory', '@rapsys_pack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsys_pack.path_package', '@router', '@rapsys_pack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
+        arguments: [ '@security.authorization_checker', '@service_container', '@rapsysuser.access_decision_manager', '@doctrine', '@rapsysblog.facebook_util', '@form.factory', '@rapsyspack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsyspack.path_package', '@router', '@rapsyspack.slugger_util', '@security.helper', '@request_stack', '@translator', '@twig' ]
         tags: [ 'controller.service_arguments' ]
     Rapsys\BlogBundle\Factory\RepositoryFactory:
-        arguments: [ '@request_stack', '@router', '@rapsys_pack.slugger_util', '@translator', '%rapsys_blog.languages%', '%rapsys_blog.locale%' ]
+        arguments: [ '@request_stack', '@router', '@rapsyspack.slugger_util', '@translator', '%rapsysblog.languages%', '%rapsysblog.locale%' ]
     #Register blog fixture
     Rapsys\BlogBundle\Fixture\BlogFixture:
-        arguments: [ '@rapsys_pack.slugger_util' ]
+        arguments: [ '@rapsyspack.slugger_util' ]
         tags: [ 'doctrine.fixture.orm' ]
     #Register form factory as public
     form.factory:
@@ -321,18 +326,19 @@ services:
         public: true
     #Register facebook event subscriber
     Rapsys\PackBundle\Subscriber\FacebookSubscriber:
-        arguments: [ '@router', '%rapsys_blog.locales%' ]
+        arguments: [ '@router', '%rapsysblog.locales%' ]
         tags: [ 'kernel.event_subscriber' ]
     #Register facebook util service
-    rapsys_blog.facebook_util:
+    rapsysblog.facebook_util:
         class: 'Rapsys\PackBundle\Util\FacebookUtil'
         #TODO: create the facebook.png file and add the fonts
         #TODO: add a default font
-        arguments: [ '@router',  '%kernel.project_dir%/var/cache', '%rapsys_pack.path%', 'facebook', '%rapsys_blog.path%/png/facebook.png', { irishgrover: '%rapsys_blog.path%/ttf/irishgrover.v10.ttf', labelleaurore: '%rapsys_blog.path%/ttf/labelleaurore.v10.ttf', dejavusans: '%rapsys_blog.path%/ttf/dejavusans.2.37.ttf', droidsans: '%rapsys_blog.path%/ttf/droidsans.regular.ttf' } ]
+        arguments: [ '@service_container', '@router', '@rapsyspack.slugger_util' ]
+        #arguments: [ '@service_container', '@router',  '%kernel.project_dir%/var/cache', '%rapsyspack.path%', 'facebook', '%rapsysblog.path%/png/facebook.png', { irishgrover: '%rapsysblog.path%/ttf/irishgrover.v10.ttf', labelleaurore: '%rapsysblog.path%/ttf/labelleaurore.v10.ttf', dejavusans: '%rapsysblog.path%/ttf/dejavusans.2.37.ttf', droidsans: '%rapsysblog.path%/ttf/droidsans.regular.ttf' } ]
         public: true
     #Register contact form type
     Rapsys\BlogBundle\Form\ContactType:
-        arguments: [ '@rapsys_pack.image_util', '@rapsys_pack.slugger_util', '@translator' ]
+        arguments: [ '@rapsyspack.image_util', '@rapsyspack.slugger_util', '@translator' ]
         tags: [ 'form.type' ]
 
 # Twig configuration
@@ -344,10 +350,10 @@ twig:
     #XXX: enable forced regeneration of css and js at each page load
     cache: false
     #Fix form layout for css
-    #XXX: @RapsysBlog is a shortcut to vendor/rapsys/blogbundle/Resources/views directory here
+    #XXX: @RapsysBlog is a shortcut to vendor/rapsys/blogbundle/templates directory here
     form_theme: [ '@RapsysBlog/form/form_div_layout.html.twig' ]
     #Set twig paths
     paths:
         #Required by email.image(site_logo) directive
-        #XXX: Allow twig to resolve @RapsysBlog/png/logo.png in vendor/rapsys/blogbundle/Resources/public/png/logo.png
-        '%kernel.project_dir%/vendor/rapsys/blogbundle/Resources/public': 'RapsysBlog'
+        #XXX: Allow twig to resolve @RapsysBlog/png/logo.png in vendor/rapsys/blogbundle/public/png/logo.png
+        '%kernel.project_dir%/vendor/rapsys/blogbundle/public': 'RapsysBlog'