Merge branch 'master' into rewrite

core/lib/Thelia/Config/Resources/action.xml

@@ -22,12 +22,22 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
-        <service id="thelia.action.category" class="Thelia\Action\Image">
+        <service id="thelia.action.image" class="Thelia\Action\Image">
             <argument type="service" id="service_container"/>
              <tag name="kernel.event_subscriber"/>
         </service>
 
-        <service id="thelia.action.customer" class="Thelia\Action\Category">
+        <service id="thelia.action.category" class="Thelia\Action\Category">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="thelia.action.category" class="Thelia\Action\Config">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="thelia.action.messages" class="Thelia\Action\Message">
             <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>
         </service>

core/lib/Thelia/Config/Resources/config.xml

@@ -32,6 +32,8 @@
         <loop class="Thelia\Core\Template\Loop\CategoryTree" name="category-tree"/>
         <loop class="Thelia\Core\Template\Loop\Cart" name="cart"/>
         <loop class="Thelia\Core\Template\Loop\Image" name="image"/>
+        <loop class="Thelia\Core\Template\Loop\Config" name="config"/>
+        <loop class="Thelia\Core\Template\Loop\Message" name="message"/>
     </loops>
 
     <forms>
@@ -45,6 +47,12 @@
         <form name="thelia.admin.category.deletion" class="Thelia\Form\CategoryDeletionForm"/>
 
         <form name="thelia.cart.add" class="Thelia\Form\CartAdd"/>
+
+        <form name="thelia.admin.config.creation" class="Thelia\Form\ConfigCreationForm"/>
+        <form name="thelia.admin.config.modification" class="Thelia\Form\ConfigModificationForm"/>
+
+        <form name="thelia.admin.message.creation" class="Thelia\Form\MessageCreationForm"/>
+        <form name="thelia.admin.message.modification" class="Thelia\Form\MessageModificationForm"/>
     </forms>
 
 
@@ -113,6 +121,11 @@
             <tag name="thelia.parser.register_plugin"/>
         </service>
 
+        <service id="smarty.plugin.format" class="Thelia\Core\Template\Smarty\Plugins\Format" scope="request">
+            <argument type="service" id="request"/>
+            <tag name="thelia.parser.register_plugin"/>
+        </service>
+
         <service id="smarty.plugin.thelialoop" class="Thelia\Core\Template\Smarty\Plugins\TheliaLoop" scope="request">
             <tag name="thelia.parser.register_plugin"/>
 

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -35,10 +35,59 @@
         <default key="_controller">Thelia\Controller\Admin\CategoryController::processAction</default>
     </route>
 
+    <!-- Routes to the Config (system variables) controller -->
+
+    <route id="admin.configuration.variables.default" path="/admin/configuration/variables">
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::defaultAction</default>
+    </route>
+
+    <route id="admin.configuration.variables.change-values" path="/admin/configuration/variables/change-values">
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::changeValuesAction</default>
+    </route>
+
+    <route id="admin.configuration.variables.create" path="/admin/configuration/variables/create">
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::createAction</default>
+    </route>
+
+    <route id="admin.configuration.variables.change" path="/admin/configuration/variables/change">
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::changeAction</default>
+    </route>
+
+    <route id="admin.configuration.variables.save-change" path="/admin/configuration/variables/save-change">
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::saveChangeAction</default>
+    </route>
+
+    <route id="admin.configuration.variables.delete" path="/admin/configuration/variables/delete">
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::deleteAction</default>
+    </route>
+
+    <!-- Routes to the Messages controller -->
+
+    <route id="admin.configuration.messages.default" path="/admin/configuration/messages">
+        <default key="_controller">Thelia\Controller\Admin\MessageController::defaultAction</default>
+    </route>
+
+    <route id="admin.configuration.messages.create" path="/admin/configuration/messages/create">
+        <default key="_controller">Thelia\Controller\Admin\MessageController::createAction</default>
+    </route>
+
+    <route id="admin.configuration.messages.change" path="/admin/configuration/messages/change">
+        <default key="_controller">Thelia\Controller\Admin\MessageController::changeAction</default>
+    </route>
+
+    <route id="admin.configuration.messages.save-change" path="/admin/configuration/messages/save-change">
+        <default key="_controller">Thelia\Controller\Admin\MessageController::saveChangeAction</default>
+    </route>
+
+    <route id="admin.configuration.messages.delete" path="/admin/configuration/messages/delete">
+        <default key="_controller">Thelia\Controller\Admin\MessageController::deleteAction</default>
+    </route>
+
 	<!-- The default route, to display a template -->
 
     <route id="admin.processTemplate" path="/admin/{template}">
         <default key="_controller">Thelia\Controller\Admin\AdminController::processTemplateAction</default>
         <requirement key="template">.*</requirement>
     </route>
+
 </routes>

core/lib/Thelia/Config/Resources/routing/front.xml

@@ -18,10 +18,14 @@
         <default key="_controller">Thelia\Controller\Front\CustomerController::updateAction</default>
     </route>
 
-    <route id="customler.login.process" path="/customer/login" methods="post">
+    <route id="customer.login.process" path="/customer/login" methods="post">
         <default key="_controller">Thelia\Controller\Front\CustomerController::loginAction</default>
     </route>
 
+    <route id="customer.logout.process" path="/customer/logout">
+        <default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default>
+    </route>
+
     <route id="cart.add.process" path="/cart/add">
         <default key="_controller">Thelia\Controller\Front\CartController::addItem</default>
         <default key="_view">cart</default>