From 271e6c64f0e4682e52df4f217d6a8c2a70cf4f69 Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Thu, 5 Sep 2013 10:00:17 +0200
Subject: [PATCH 01/29] Before merging coupon

---
 core/lib/Thelia/Action/Currency.php           | 27 +++++++++-----
 .../Controller/Admin/CurrencyController.php   | 21 ++++++-----
 .../Core/Event/BaseUpdatePositionEvent.php    | 10 ------
 .../Event/CurrencyUpdatePositionEvent.php     |  2 +-
 .../Smarty/Plugins/AdminUtilities.php         |  4 +--
 .../Model/Tools/ModelEventDispatcherTrait.php |  5 +++
 .../Model/Tools/PositionManagementTrait.php   | 36 +++++++++++--------
 templates/admin/default/currencies.html       |  4 +--
 8 files changed, 64 insertions(+), 45 deletions(-)

diff --git a/core/lib/Thelia/Action/Currency.php b/core/lib/Thelia/Action/Currency.php
index 68cc5904a..7f9c3281f 100644
--- a/core/lib/Thelia/Action/Currency.php
+++ b/core/lib/Thelia/Action/Currency.php
@@ -107,6 +107,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
                 CurrencyQuery::create()->filterByByDefault(true)->update(array('ByDefault' => false));
 
                 $currency
+                    ->setDispatcher($this->getDispatcher())
                     ->setByDefault($event->getIsDefault())
                     ->save()
                 ;
@@ -139,7 +140,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
 
         $rates_url = ConfigQuery::read('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml');
 
-        $rate_data = file_get_contents($rates_url);
+        $rate_data = @file_get_contents($rates_url);
 
         if ($rate_data && $sxe = new \SimpleXMLElement($rate_data)) {
 
@@ -149,12 +150,16 @@ class Currency extends BaseAction implements EventSubscriberInterface
                 $rate = floatval($last['rate']);
 
                 if (null !== $currency = CurrencyQuery::create()->findOneByCode($code)) {
-                    $currency->setRate($rate)->save();
+                    $currency
+                        ->setDispatcher($this->getDispatcher())
+                        ->setRate($rate)
+                        ->save()
+                    ;
                 }
             }
         }
         else {
-            throw new \RuntimeException(sprintf("Failed to get currency rates data from URL %s", $url));
+            throw new \RuntimeException(sprintf("Failed to get currency rates data from URL %s", $rates_url));
         }
     }
 
@@ -165,12 +170,18 @@ class Currency extends BaseAction implements EventSubscriberInterface
      */
     public function updatePosition(CurrencyUpdatePositionEvent $event)
     {
-        if (null !== $category = CurrencyQuery::create()->findOneById($event->getObjectId())) {
+        if (null !== $currency = CurrencyQuery::create()->findOneById($event->getObjectId())) {
 
-            if ($event->getMode() == BaseChangePositionEvent::POSITION_ABSOLUTE)
-                return $category->changeAbsolutePosition($event->getPosition());
-            else
-                return $this->exchangePosition($event->getMode());
+            $currency->setDispatcher($this->getDispatcher());
+
+            $mode = $event->getMode();
+
+            if ($mode == CurrencyUpdatePositionEvent::POSITION_ABSOLUTE)
+                return $currency->changeAbsolutePosition($event->getPosition());
+            else if ($mode == CurrencyUpdatePositionEvent::POSITION_UP)
+                return $currency->movePositionUp();
+            else if ($mode == CurrencyUpdatePositionEvent::POSITION_DOWN)
+                return $currency->movePositionDown();
         }
     }
 
diff --git a/core/lib/Thelia/Controller/Admin/CurrencyController.php b/core/lib/Thelia/Controller/Admin/CurrencyController.php
index caa3d1bed..56acfb89d 100644
--- a/core/lib/Thelia/Controller/Admin/CurrencyController.php
+++ b/core/lib/Thelia/Controller/Admin/CurrencyController.php
@@ -316,17 +316,22 @@ class CurrencyController extends BaseAdminController
         if (null !== $response = $this->checkAuth("admin.configuration.currencies.update")) return $response;
 
         try {
-            $id = $this->getRequest()->get('currency_id', 0);
             $mode = $this->getRequest()->get('mode', null);
+
+            if ($mode == 'up')
+                $mode = CurrencyUpdatePositionEvent::POSITION_UP;
+            else if ($mode == 'down')
+                $mode = CurrencyUpdatePositionEvent::POSITION_DOWN;
+            else
+                $mode = CurrencyUpdatePositionEvent::POSITION_ABSOLUTE;
+
             $position = $this->getRequest()->get('position', null);
 
-            $event = new CurrencyUpdatePositionEvent();
-
-            $event
-                ->setObjectId($this->getRequest()->get('currency_id', 0))
-                ->setPosition($this->getRequest()->get('position', 0))
-                ->setMode($mode)
-            ;
+            $event = new CurrencyUpdatePositionEvent(
+                    $this->getRequest()->get('currency_id', null),
+                    $mode,
+                    $this->getRequest()->get('position', null)
+            );
 
             $this->dispatch(TheliaEvents::CURRENCY_UPDATE_POSITION, $event);
         }
diff --git a/core/lib/Thelia/Core/Event/BaseUpdatePositionEvent.php b/core/lib/Thelia/Core/Event/BaseUpdatePositionEvent.php
index 3587a0757..41907c29c 100644
--- a/core/lib/Thelia/Core/Event/BaseUpdatePositionEvent.php
+++ b/core/lib/Thelia/Core/Event/BaseUpdatePositionEvent.php
@@ -74,14 +74,4 @@ class BaseUpdatePositionEvent extends ActionEvent
         $this->object_id = $object_id;
         return $this;
     }
-
-    public function getObjectId()
-    {
-        return $this->object_id;
-    }
-
-    public function setObjectId($object_id)
-    {
-        $this->object_id = $object_id;
-    }
 }
diff --git a/core/lib/Thelia/Core/Event/CurrencyUpdatePositionEvent.php b/core/lib/Thelia/Core/Event/CurrencyUpdatePositionEvent.php
index 655e24c9a..3a3dbb18f 100644
--- a/core/lib/Thelia/Core/Event/CurrencyUpdatePositionEvent.php
+++ b/core/lib/Thelia/Core/Event/CurrencyUpdatePositionEvent.php
@@ -23,6 +23,6 @@
 
 namespace Thelia\Core\Event;
 
-class CategoryChangePositionEvent extends BaseChangePositionEvent
+class CurrencyUpdatePositionEvent extends BaseUpdatePositionEvent
 {
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
index fcea9ffd6..12ac13276 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
@@ -71,11 +71,11 @@ class AdminUtilities extends AbstractSmartyPlugin
         if ($permissions == null || $this->securityContext->isGranted("ADMIN", array($permission))) {
             return sprintf(
                 '<a href="%s"><i class="glyphicon glyphicon-arrow-up"></i></a><span class="%s" data-id="%s">%s</span><a href="%s"><i class="glyphicon glyphicon-arrow-down"></i></a>',
-                URL::getInstance()->absoluteUrl("$path/positionUp", array($url_parameter => $id)),
+                URL::getInstance()->absoluteUrl($path, array('mode' => 'up', $url_parameter => $id)),
                 $in_place_edit_class,
                 $id,
                 $position,
-                URL::getInstance()->absoluteUrl("$path/positionDown", array($url_parameter => $id))
+                URL::getInstance()->absoluteUrl($path, array('mode' => 'down', $url_parameter => $id))
             );
         }
         else {
diff --git a/core/lib/Thelia/Model/Tools/ModelEventDispatcherTrait.php b/core/lib/Thelia/Model/Tools/ModelEventDispatcherTrait.php
index 7e2e34d83..17af1e44d 100644
--- a/core/lib/Thelia/Model/Tools/ModelEventDispatcherTrait.php
+++ b/core/lib/Thelia/Model/Tools/ModelEventDispatcherTrait.php
@@ -44,6 +44,11 @@ trait ModelEventDispatcherTrait {
         return $this;
     }
 
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
+    }
+
     protected function dispatchEvent($eventName, ActionEvent $event)
     {
         if (!is_null($this->dispatcher)) {
diff --git a/core/lib/Thelia/Model/Tools/PositionManagementTrait.php b/core/lib/Thelia/Model/Tools/PositionManagementTrait.php
index eccbb00dd..3261f42ec 100644
--- a/core/lib/Thelia/Model/Tools/PositionManagementTrait.php
+++ b/core/lib/Thelia/Model/Tools/PositionManagementTrait.php
@@ -25,6 +25,7 @@ namespace Thelia\Model\Tools;
 
 use Propel\Runtime\ActiveQuery\PropelQuery;
 use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\Propel;
 
 trait PositionManagementTrait {
 
@@ -51,10 +52,12 @@ trait PositionManagementTrait {
     public function getNextPosition($parent) {
 
         $last = $this->createQuery()
-            ->filterByParent($parent)
             ->orderByPosition(Criteria::DESC)
-            ->limit(1)
-            ->findOne()
+            ->limit(1);
+
+            if ($parent !== null) $last->filterByParent($parent);
+
+            $last->findOne()
         ;
 
         return $last != null ? $last->getPosition() + 1 : 1;
@@ -63,14 +66,14 @@ trait PositionManagementTrait {
     /**
      * Move up a object
      */
-    protected function movePositionUp() {
+    public function movePositionUp() {
         $this->movePositionUpOrDown(true);
     }
 
     /**
      * Move down a object
      */
-    protected function movePositionDown() {
+    public function movePositionDown() {
         $this->movePositionUpOrDown(false);
     }
 
@@ -85,8 +88,9 @@ trait PositionManagementTrait {
         $my_position = $this->getPosition();
 
         // Find object to exchange position with
-        $search = $this->createQuery()
-            ->filterByParent($this->getParent());
+        $search = $this->createQuery();
+
+        if (method_exists($this, 'getParent')) $search->filterByParent($this->getParent());
 
         // Up or down ?
         if ($up === true) {
@@ -103,18 +107,21 @@ trait PositionManagementTrait {
         // If we found the proper object, exchange their positions
         if ($result) {
 
-            $cnx = Propel::getWriteConnection(CategoryTableMap::DATABASE_NAME);
+            // Find DATABASE_NAME constant
+            $mapClassName = self::TABLE_MAP;
+            $database_name = $mapClassName::DATABASE_NAME;
+
+            $cnx = Propel::getWriteConnection($database_name);
 
             $cnx->beginTransaction();
 
             try {
                 $this
-                    ->setDispatcher($this->getDispatcher())
                     ->setPosition($result->getPosition())
                     ->save()
                 ;
 
-                $result->setPosition($my_position)->save();
+                $result->setDispatcher($this->getDispatcher())->setPosition($my_position)->save();
 
                 $cnx->commit();
             } catch (Exception $e) {
@@ -128,7 +135,7 @@ trait PositionManagementTrait {
      *
      * @param newPosition
      */
-    protected function changeAbsolutePosition($newPosition)
+    public function changeAbsolutePosition($newPosition)
     {
         // The current position
         $current_position = $this->getPosition();
@@ -136,7 +143,9 @@ trait PositionManagementTrait {
         if ($newPosition != null && $newPosition > 0 && $newPosition != $current_position) {
 
              // Find categories to offset
-            $search = $this->createQuery()->filterByParent($this->getParent());
+            $search = $this->createQuery();
+
+            if (method_exists($this, 'getParent')) $search->filterByParent($this->getParent());
 
             if ($newPosition > $current_position) {
                 // The new position is after the current position -> we will offset + 1 all categories located between us and the new position
@@ -158,11 +167,10 @@ trait PositionManagementTrait {
 
             try {
                 foreach ($results as $result) {
-                    $result->setPosition($result->getPosition() + $delta)->save($cnx);
+                    $result->setDispatcher($this->getDispatcher())->setPosition($result->getPosition() + $delta)->save($cnx);
                 }
 
                 $this
-                    ->setDispatcher($this->getDispatcher())
                     ->setPosition($newPosition)
                     ->save($cnx)
                 ;
diff --git a/templates/admin/default/currencies.html b/templates/admin/default/currencies.html
index d446de776..7b7610d59 100644
--- a/templates/admin/default/currencies.html
+++ b/templates/admin/default/currencies.html
@@ -138,7 +138,7 @@
                                     <td class="text-center">
 	                                   {admin_position_block
 	                                       permission="admin.currencies.edit"
-	                                       path="/admin/configuration/currencies"
+	                                       path="/admin/configuration/currencies/update-position"
 	                                       url_parameter="currency_id"
 	                                       in_place_edit_class="currencyPositionChange"
 	                                       position="$POSITION"
@@ -371,7 +371,7 @@
             placement   : 'left',
             success     : function(response, newValue) {
                 // The URL template
-                var url = "{url path='/admin/configuration/currencies/updatePosition' currency_id='__ID__' position='__POS__'}";
+                var url = "{url path='/admin/configuration/currencies/update-position' currency_id='__ID__' position='__POS__'}";
 
                 // Perform subtitutions
                 url = url.replace('__ID__', $(this).data('id'))

From c63120478bc7c85974f5c0959c84cedd9d287d4c Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 5 Sep 2013 12:25:27 +0200
Subject: [PATCH 02/29] start refactorin rewriting routing

---
 .../Controller/Front/UrlRewritingController.php      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/core/lib/Thelia/Controller/Front/UrlRewritingController.php b/core/lib/Thelia/Controller/Front/UrlRewritingController.php
index 2e725aecd..a024cbaea 100755
--- a/core/lib/Thelia/Controller/Front/UrlRewritingController.php
+++ b/core/lib/Thelia/Controller/Front/UrlRewritingController.php
@@ -53,7 +53,7 @@ class UrlRewritingController extends BaseFrontController
             /* define GET arguments in request */
 
             if(null !== $rewrittenUrlData->view) {
-                $request->query->set('view', $rewrittenUrlData->view);
+                $request->attributes->set('_view', $rewrittenUrlData->view);
                 if(null !== $rewrittenUrlData->viewId) {
                     $request->query->set($rewrittenUrlData->view . '_id', $rewrittenUrlData->viewId);
                 }
@@ -66,16 +66,6 @@ class UrlRewritingController extends BaseFrontController
                 $request->query->set($parameter, $value);
             }
         }
-
-        if (! $view = $request->query->get('view')) {
-            $view = "index";
-            if ($request->request->has('view')) {
-                $view = $request->request->get('view');
-            }
-        }
-
-        $request->attributes->set('_view', $view);
-
     }
 
 }

From e289c8026fbea4089d29965131b00f12766f32bd Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 5 Sep 2013 16:51:45 +0200
Subject: [PATCH 03/29] Working : For attributes on labels

---
 templates/admin/default/admin-layout.tpl   |  4 +---
 templates/admin/default/categories.html    | 12 ++--------
 templates/admin/default/currencies.html    | 28 +++++++++++-----------
 templates/admin/default/currency-edit.html | 24 +++++++++----------
 4 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index 8bef5c011..3752c355b 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -210,9 +210,7 @@
 
 	{block name="before-javascript-include"}{/block}
 
-	{javascripts file='assets/js/jquery.min.js'}
-	    <script src="{$asset_url}"></script>
-	{/javascripts}
+	<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
 
 	{block name="after-javascript-include"}{/block}
 
diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index fdf2ab093..e3f3e9fde 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -4,12 +4,6 @@
 
 {block name="check-permissions"}admin.catalog.view{/block}
 
-{block name="after-admin-css"}
-    {stylesheets file='assets/bootstrap-editable/css/bootstrap-editable.css' filters='cssembed'}
-        <link rel="stylesheet" href="{$asset_url}">
-    {/stylesheets}
-{/block}
-
 {block name="main-content"}
 <div class="catalog">
 	<div id="wrapper" class="container">
@@ -278,13 +272,11 @@
 {include file="includes/delete-category-dialog.html"}
 {/block}
 
-{block name="after-javascript-include"}
-	{javascripts file='assets/bootstrap-editable/js/bootstrap-editable.js'}
+{block name="javascript-initialization"}
+	{javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'}
 	    <script src="{$asset_url}"></script>
 	{/javascripts}
-{/block}
 
-{block name="javascript-initialization"}
 <script>
 $(function() {
 
diff --git a/templates/admin/default/currencies.html b/templates/admin/default/currencies.html
index 97fac58c8..550c8b973 100644
--- a/templates/admin/default/currencies.html
+++ b/templates/admin/default/currencies.html
@@ -225,23 +225,23 @@
                             {form_field form=$form field='name'}
                                 <div class="form-group {if $error}has-error{/if}">
 
-                                    <label>{intl l='Name *'}</label>
+                                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
                                     
                                     {loop type="lang" name="default-lang" default_only="1"}
 
+                                        <div class="input-group">
+                                            <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Currency name'}" placeholder="{intl l='Name'}">
+                                            <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                                        </div>
+
+                                        <div class="help-block">{intl l="Enter here the currency name in the default language ($TITLE)"}</div>
+
                                         {* Switch edition to the current locale *}
                                         <input type="hidden" name="edit_language_id" value="{$ID}" />
 
                                         {form_field form=$form field='locale'}
                                             <input type="hidden" name="{$name}" value="{$LOCALE}" />
                                         {/form_field}
-
-                                        <div class="input-group">
-                                            <input type="text" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Currency name'}" placeholder="{intl l='Name'}">
-                                            <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
-                                        </div>
-
-                                        <div class="help-block">{intl l="Enter here the currency name in the default language ($TITLE)"}</div>
                                     {/loop}
                                    
                                 </div>
@@ -249,23 +249,23 @@
                                 
                             {form_field form=$form field='code'}
                                 <div class="form-group {if $error}has-error{/if}">
-                                    <label class="control-label">{intl l='ISO 4217 code *'}</label>
-                                    <input type="text" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='ISO 4217 code'}" placeholder="{intl l='Code'}">
+                                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='ISO 4217 code'}" placeholder="{intl l='Code'}">
                                     <span class="help-block"><a href="http://fr.wikipedia.org/wiki/ISO_4217" target="_blank">{intl l='More information about ISO 4217'}</a></span>
                                 </div>
                             {/form_field}
                             
                             {form_field form=$form field='symbol'}
                                 <div class="form-group {if $error}has-error{/if}">
-                                    <label class="control-label">{intl l='Symbol *'}</label>
-                                    <input type="text" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Currency symbol'}" placeholder="{intl l='Symbol'}">
+                                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Currency symbol'}" placeholder="{intl l='Symbol'}">
                                 </div>
                             {/form_field}
                             
                             {form_field form=$form field='rate'}
                                 <div class="form-group {if $error}has-error{/if}">
-                                    <label class="control-label">{intl l='Rate *'}</label>
-                                    <input type="text" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Currency rate'}" placeholder="{intl l='Rate'}">
+                                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Currency rate'}" placeholder="{intl l='Rate'}">
                                     <span class="help-block">{intl l="The rate from Euro (Price in Euro * rate = Price in this currency)"}</span>                                
                                 </div>
                             {/form_field}
diff --git a/templates/admin/default/currency-edit.html b/templates/admin/default/currency-edit.html
index 9add46f0a..072e5e1c8 100644
--- a/templates/admin/default/currency-edit.html
+++ b/templates/admin/default/currency-edit.html
@@ -47,26 +47,26 @@
         			                        	<input type="hidden" name="{$name}" value="{$edit_language_locale}" />
         			                        {/form_field}
 
-        					            	{if $form_error}<div class="alert alert-block alert-error">{$form_error_message}</div>{/if}                                
+        					            	{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}                                
                                         	
         	                                <div class="col-md-6">
         										
         										{form_field form=$form field='name'}
         								            <div class="form-group {if $error}has-error{/if}">
-        								                <label>{intl l='Name *'}</label>
-        												<input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency name'}" placeholder="{intl l='Currency name'}" class="form-control">							                
+        								                <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+        												<input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency name'}" placeholder="{intl l='Currency name'}" class="form-control">							                
         								            </div>
         							            {/form_field}
         										
         										{form_field form=$form field='code'}
         		                                    <div class="form-group {if $error}has-error{/if}">
-        		                                        <label>
-                                                            {intl l='ISO 4217 Code *'}    
+        		                                        <label for="{$label_attr.for}" class="control-label">
+                                                            {intl l="{$label}"} : 
                                                             <span class="label-help-block">
                                                                 <a title="{intl l='More information about ISO 4217'}" href="http://fr.wikipedia.org/wiki/ISO_4217" target="_blank">List of ISO 4217 code</a>
                                                             </span>
         		                                       	</label>
-                                                        <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency ISO 4217 Code'}" placeholder="{intl l='Code'}" class="form-control">
+                                                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency ISO 4217 Code'}" placeholder="{intl l='Code'}" class="form-control">
         		                                    </div>
         		                               	{/form_field}
 
@@ -76,21 +76,21 @@
 
                                                 {form_field form=$form field='symbol'}
             	                                    <div class="form-group {if $error}has-error{/if}">
-            	                                        <label>
-            	                                           {intl l='Symbol *'}
+            	                                        <label for="{$label_attr.for}" class="control-label">
+            	                                           {intl l="{$label}"} : 
             	                                           <span class="label-help-block">The symbol, sur as $, £, &euro;...</span>
             	                                        </label>
-                                                        <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency symbol'}" placeholder="{intl l='Symbol'}" class="form-control">
+                                                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency symbol'}" placeholder="{intl l='Symbol'}" class="form-control">
             	                                    </div>
                                                 {/form_field}
                                                 
                                                 {form_field form=$form field='rate'}
             	                                    <div class="form-group {if $error}has-error{/if}">
-            	                                        <label>
-            	                                           {intl l='Rate from &euro; *'}
+            	                                        <label for="{$label_attr.for}" class="control-label">
+            	                                           {intl l="{$label}"} : 
             	                                           <span class="label-help-block">The rate from Euro</span>
             	                                        </label>
-                                                        <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Rate from Euro'}" placeholder="{intl l='Rate'}" class="form-control">
+                                                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Rate from Euro'}" placeholder="{intl l='Rate'}" class="form-control">
                                                         <span class="help-block">Price in Euro x rate = Price in this currency</span>        	                                        
             	                                    </div>
                                                 {/form_field}

From baa1df6d59367a351cbb7d868f723d320ead2f39 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Thu, 5 Sep 2013 16:52:17 +0200
Subject: [PATCH 04/29] Working : For attributes on labels

---
 core/lib/Thelia/Form/CurrencyCreationForm.php | 46 +++++++++++++++++--
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/core/lib/Thelia/Form/CurrencyCreationForm.php b/core/lib/Thelia/Form/CurrencyCreationForm.php
index a4d858ed6..3328cd342 100644
--- a/core/lib/Thelia/Form/CurrencyCreationForm.php
+++ b/core/lib/Thelia/Form/CurrencyCreationForm.php
@@ -40,11 +40,47 @@ class CurrencyCreationForm extends BaseForm
         }
 
         $this->formBuilder
-            ->add("name"   , "text"  , array("constraints" => array(new NotBlank())))
-            ->add("locale" , "text"  , array("constraints" => array(new NotBlank())))
-            ->add("symbol" , "text"  , array("constraints" => array(new NotBlank())))
-            ->add("rate"   , "text"  , array("constraints" => array(new NotBlank())))
-            ->add("code"   , "text"  , array("constraints" => $code_constraints))
+            ->add("name"   , "text"  , array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => "Name *",
+                "label_attr" => array(
+                    "for" => "name"
+                ))
+            )
+            ->add("locale" , "text"  , array(
+                "constraints" => array(
+                    new NotBlank()
+                ))
+            )
+            ->add("symbol" , "text"  , array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => "Symbol *",
+                "label_attr" => array(
+                    "for" => "symbol"
+                ))
+            )
+            ->add("rate"   , "text"  , array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => "Rate from &euro; *",
+                "label_attr" => array(
+                    "for" => "rate"
+                ))
+            )
+            ->add("code"   , "text"  , array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => "ISO 4217 code *",
+                "label_attr" => array(
+                    "for" => "iso_4217_code"
+                ))
+            )
         ;
     }
 

From a0f894d70f9fbc274f9ef9c98b04bce36eb6710f Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Thu, 5 Sep 2013 17:54:04 +0200
Subject: [PATCH 05/29] customer substitutions

---
 .../Template/Smarty/Plugins/DataAccessFunctions.php | 12 ++++++------
 templates/default/debug.html                        | 13 ++-----------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
index ee65f34b3..a2fd10c15 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
@@ -68,14 +68,14 @@ class DataAccessFunctions extends AbstractSmartyPlugin
      }
 
     /**
-     * Provides access to user attributes using the accessors.
+     * @param $objectLabel
+     * @param $user
+     * @param $params
      *
-     * @param  array                    $params
-     * @param  unknown                  $smarty
-     * @return string                   the value of the requested attribute
-     * @throws InvalidArgumentException if the object does not have the requested attribute.
+     * @return string
+     * @throws \InvalidArgumentException
      */
-     protected function userDataAccess($objectLabel, $user, $params)
+    protected function userDataAccess($objectLabel, $user, $params)
      {
          $attribute = $this->getNormalizedParam($params, array('attribute', 'attrib', 'attr'));
 
diff --git a/templates/default/debug.html b/templates/default/debug.html
index 461e8eed7..1c54c05a4 100755
--- a/templates/default/debug.html
+++ b/templates/default/debug.html
@@ -1,11 +1,2 @@
-<h2>ALL ATTRIBUTES</h2>
-
-<ul>
-    {loop name="attr" type="attribute"}
-    <li>
-        #TITLE - (#LOOP_COUNT / #LOOP_TOTAL)<br />
-        created at {format_date date=$CREATE_DATE} - updated at {format_date date=$UPDATE_DATE}
-        <hr />
-    </li>
-    {/loop}
-</ul>
\ No newline at end of file
+::{customer attr="firstname"};;
+::{customer attr="titleId"};;
\ No newline at end of file

From 00d7d9b29a9afbd152d3e096442e021d7544dedd Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 5 Sep 2013 20:46:46 +0200
Subject: [PATCH 06/29] create router for rewriting matching

---
 core/lib/Thelia/Config/Resources/routing.xml  |   4 +
 .../Thelia/Config/Resources/routing/front.xml |   9 -
 .../Thelia/Core/Routing/RewritingRouter.php   | 218 ++++++++++++++++++
 3 files changed, 222 insertions(+), 9 deletions(-)
 create mode 100644 core/lib/Thelia/Core/Routing/RewritingRouter.php

diff --git a/core/lib/Thelia/Config/Resources/routing.xml b/core/lib/Thelia/Config/Resources/routing.xml
index 5200aefc1..a8ad18abf 100755
--- a/core/lib/Thelia/Config/Resources/routing.xml
+++ b/core/lib/Thelia/Config/Resources/routing.xml
@@ -75,6 +75,10 @@
                 <argument key="debug">%kernel.debug%</argument>
             </argument>
             <argument type="service" id="request.context"/>
+            <tag name="router.register" priority="254"/>
+        </service>
+
+        <service id="router.rewrite" class="Thelia\Core\Routing\RewritingRouter">
             <tag name="router.register" priority="255"/>
         </service>
 
diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml
index 4cf2d710c..861ccb93e 100755
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -60,13 +60,4 @@
         <default key="_view">cart</default>
     </route>
 
-
-<!-- Empêche l'accès àl'admin, genre: http://localhost/thelia2/index_dev.php/admin/login amène sur l'accueuil de la boutique
-
-    <route id="url-rewriting.check" path="/{rewritten_url}" methods="GET">
-        <default key="_controller">Thelia\Controller\Front\UrlRewritingController::check</default>
-        <requirement key="rewritten_url">.*</requirement>
-    </route>
-
--->
 </routes>
diff --git a/core/lib/Thelia/Core/Routing/RewritingRouter.php b/core/lib/Thelia/Core/Routing/RewritingRouter.php
new file mode 100644
index 000000000..570372f60
--- /dev/null
+++ b/core/lib/Thelia/Core/Routing/RewritingRouter.php
@@ -0,0 +1,218 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Routing;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Exception\InvalidParameterException;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
+use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouterInterface;
+use Thelia\Exception\RedirectException;
+use Thelia\Exception\UrlRewritingException;
+use Thelia\Model\ConfigQuery;
+use Thelia\Tools\Redirect;
+use Thelia\Tools\URL;
+
+
+/**
+ * Class RewritingRouter
+ * @package Thelia\Core\Routing
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class RewritingRouter implements RouterInterface, RequestMatcherInterface
+{
+
+    /**
+     * @var RequestContext The context
+     */
+    protected $context;
+
+    /**
+     * @var options, don't use for now but mandatory
+     */
+    protected $options;
+
+    /**
+     * Sets the request context.
+     *
+     * @param RequestContext $context The context
+     *
+     * @api
+     */
+    public function setContext(RequestContext $context)
+    {
+        // TODO: Implement setContext() method.
+        $this->context = $context;
+    }
+
+    /**
+     * Gets the request context.
+     *
+     * @return RequestContext The context
+     *
+     * @api
+     */
+    public function getContext()
+    {
+        // TODO: Implement getContext() method.
+        return $this->context;
+    }
+
+    public function setOption($key, $value)
+    {
+        //NOTHING TO DO FOR NOW
+    }
+
+    /**
+     * Gets the RouteCollection instance associated with this Router.
+     *
+     * @return RouteCollection A RouteCollection instance
+     */
+    public function getRouteCollection()
+    {
+        return new RouteCollection();
+    }
+
+    /**
+     * Generates a URL or path for a specific route based on the given parameters.
+     *
+     * Parameters that reference placeholders in the route pattern will substitute them in the
+     * path or host. Extra params are added as query string to the URL.
+     *
+     * When the passed reference type cannot be generated for the route because it requires a different
+     * host or scheme than the current one, the method will return a more comprehensive reference
+     * that includes the required params. For example, when you call this method with $referenceType = ABSOLUTE_PATH
+     * but the route requires the https scheme whereas the current scheme is http, it will instead return an
+     * ABSOLUTE_URL with the https scheme and the current host. This makes sure the generated URL matches
+     * the route in any case.
+     *
+     * If there is no route with the given name, the generator must throw the RouteNotFoundException.
+     *
+     * @param string $name          The name of the route
+     * @param mixed $parameters    An array of parameters
+     * @param Boolean|string $referenceType The type of reference to be generated (one of the constants)
+     *
+     * @return string The generated URL
+     *
+     * @throws RouteNotFoundException              If the named route doesn't exist
+     * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
+     * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because
+     *                                             it does not match the requirement
+     *
+     * @api
+     */
+    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
+    {
+        // TODO: Implement generate() method.
+    }
+
+    /**
+     * Tries to match a URL path with a set of routes.
+     *
+     * If the matcher can not find information, it must throw one of the exceptions documented
+     * below.
+     *
+     * @param string $pathinfo The path info to be parsed (raw format, i.e. not urldecoded)
+     *
+     * @return array An array of parameters
+     *
+     * @throws ResourceNotFoundException If the resource could not be found
+     * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
+     *
+     * @api
+     */
+    public function match($pathinfo)
+    {
+        throw new ResourceNotFoundException("impossible to find route with this method, please use matchRequest method");
+    }
+
+    /**
+     * Tries to match a request with a set of routes.
+     *
+     * If the matcher can not find information, it must throw one of the exceptions documented
+     * below.
+     *
+     * @param Request $request The request to match
+     *
+     * @throws \Exception|\Thelia\Exception\UrlRewritingException
+     * @throws \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     * @throws \Thelia\Exception\RedirectException
+     * @return array An array of parameters
+     *
+     */
+    public function matchRequest(Request $request)
+    {
+        if(ConfigQuery::isRewritingEnable()) {
+            try {
+                $rewrittenUrlData = URL::getInstance()->resolve($request->getPathInfo());
+                var_dump($rewrittenUrlData); exit;
+            } catch(UrlRewritingException $e) {
+                switch($e->getCode()) {
+                    case UrlRewritingException::URL_NOT_FOUND :
+                        throw new ResourceNotFoundException();
+                        break;
+                    default:
+                        throw $e;
+                }
+            }
+
+            /* is the URL redirected ? */
+
+            if(null !== $rewrittenUrlData->redirectedToUrl) {
+                $this->redirect($rewrittenUrlData->redirectedToUrl, 301);
+            }
+
+            /* define GET arguments in request */
+
+            if(null !== $rewrittenUrlData->view) {
+                $request->attributes->set('_view', $rewrittenUrlData->view);
+                if(null !== $rewrittenUrlData->viewId) {
+                    $request->query->set($rewrittenUrlData->view . '_id', $rewrittenUrlData->viewId);
+                }
+            }
+            if(null !== $rewrittenUrlData->locale) {
+                $request->query->set('locale', $rewrittenUrlData->locale);
+            }
+
+            foreach($rewrittenUrlData->otherParameters as $parameter => $value) {
+                $request->query->set($parameter, $value);
+            }
+
+            return array (
+                '_controller' => 'Thelia\\Controller\\Front\\DefaultController::noAction',
+                '_route' => 'rewrite'
+            );
+        }
+        throw new ResourceNotFoundException();
+    }
+
+    protected function redirect($url, $code = 302)
+    {
+        Redirect::exec($url, $status);
+    }
+}
\ No newline at end of file

From e82a49d32607f46df05ee671ca369fe401e2923b Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 5 Sep 2013 20:53:03 +0200
Subject: [PATCH 07/29] remove unused UrlWritin controller

---
 .../Front/UrlRewritingController.php          | 81 -------------------
 1 file changed, 81 deletions(-)
 delete mode 100755 core/lib/Thelia/Controller/Front/UrlRewritingController.php

diff --git a/core/lib/Thelia/Controller/Front/UrlRewritingController.php b/core/lib/Thelia/Controller/Front/UrlRewritingController.php
deleted file mode 100755
index 2e725aecd..000000000
--- a/core/lib/Thelia/Controller/Front/UrlRewritingController.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*************************************************************************************/
-/*                                                                                   */
-/*      Thelia	                                                                     */
-/*                                                                                   */
-/*      Copyright (c) OpenStudio                                                     */
-/*	    email : info@thelia.net                                                      */
-/*      web : http://www.thelia.net                                                  */
-/*                                                                                   */
-/*      This program is free software; you can redistribute it and/or modify         */
-/*      it under the terms of the GNU General Public License as published by         */
-/*      the Free Software Foundation; either version 3 of the License                */
-/*                                                                                   */
-/*      This program is distributed in the hope that it will be useful,              */
-/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
-/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
-/*      GNU General Public License for more details.                                 */
-/*                                                                                   */
-/*      You should have received a copy of the GNU General Public License            */
-/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
-/*                                                                                   */
-/*************************************************************************************/
-namespace Thelia\Controller\Front;
-
-use Thelia\Core\HttpFoundation\Request;
-use Thelia\Exception\UrlRewritingException;
-use Thelia\Model\ConfigQuery;
-use Thelia\Tools\URL;
-
-class UrlRewritingController extends BaseFrontController
-{
-    public function check(Request $request, $rewritten_url)
-    {
-        if(ConfigQuery::isRewritingEnable()) {
-            try {
-                $rewrittenUrlData = URL::getInstance()->resolve($rewritten_url);
-            } catch(UrlRewritingException $e) {
-                switch($e->getCode()) {
-                    case UrlRewritingException::URL_NOT_FOUND :
-                        return $this->pageNotFound();
-                        break;
-                    default:
-                        throw $e;
-                }
-            }
-
-            /* is the URL redirected ? */
-
-            if(null !== $rewrittenUrlData->redirectedToUrl) {
-                $this->redirect($rewrittenUrlData->redirectedToUrl, 301);
-            }
-
-            /* define GET arguments in request */
-
-            if(null !== $rewrittenUrlData->view) {
-                $request->query->set('view', $rewrittenUrlData->view);
-                if(null !== $rewrittenUrlData->viewId) {
-                    $request->query->set($rewrittenUrlData->view . '_id', $rewrittenUrlData->viewId);
-                }
-            }
-            if(null !== $rewrittenUrlData->locale) {
-                $request->query->set('locale', $rewrittenUrlData->locale);
-            }
-
-            foreach($rewrittenUrlData->otherParameters as $parameter => $value) {
-                $request->query->set($parameter, $value);
-            }
-        }
-
-        if (! $view = $request->query->get('view')) {
-            $view = "index";
-            if ($request->request->has('view')) {
-                $view = $request->request->get('view');
-            }
-        }
-
-        $request->attributes->set('_view', $view);
-
-    }
-
-}

From c8a5734a9e7e53ee14cec53a3b46e9c568dd258f Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Fri, 6 Sep 2013 01:55:16 +0200
Subject: [PATCH 08/29] Added Tools\URL test case, and a test case superclass
 for initializing Tools\URL

---
 .../Thelia/Config/Resources/routing/admin.xml |   2 +-
 core/lib/Thelia/Tests/Action/ImageTest.php    |  16 +-
 .../Core/Template/Element/BaseLoopTestor.php  |   2 +-
 .../Thelia/Tests/TestCaseWithURLToolSetup.php |  64 ++++++
 core/lib/Thelia/Tests/Tools/URLTest.php       | 198 ++++++++++++++++++
 core/lib/Thelia/Tools/URL.php                 |  33 ++-
 6 files changed, 279 insertions(+), 36 deletions(-)
 create mode 100644 core/lib/Thelia/Tests/TestCaseWithURLToolSetup.php

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index ac652017c..313fb3a57 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -113,7 +113,7 @@
         <default key="_controller">Thelia\Controller\Admin\CurrencyController::deleteAction</default>
     </route>
 
-    <route id="admin.configuration.currencies.delete" path="/admin/configuration/currencies/update-position">
+    <route id="admin.configuration.currencies.update-position" path="/admin/configuration/currencies/update-position">
         <default key="_controller">Thelia\Controller\Admin\CurrencyController::updatePositionAction</default>
     </route>
 
diff --git a/core/lib/Thelia/Tests/Action/ImageTest.php b/core/lib/Thelia/Tests/Action/ImageTest.php
index 808a246f6..8cc6e5644 100755
--- a/core/lib/Thelia/Tests/Action/ImageTest.php
+++ b/core/lib/Thelia/Tests/Action/ImageTest.php
@@ -37,7 +37,7 @@ use Thelia\Tools\URL;
  *
  * @package Thelia\Tests\Action\ImageTest
  */
-class ImageTest extends \PHPUnit_Framework_TestCase
+class ImageTest extends \Thelia\Tests\TestCaseWithURLToolSetup
 {
     protected $request;
 
@@ -49,27 +49,13 @@ class ImageTest extends \PHPUnit_Framework_TestCase
 
         $dispatcher = $this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface");
 
-        $url = new URL($container, 'dev');
-
         $container->set("event_dispatcher", $dispatcher);
-        $container->set("thelia.url.manager", $dispatcher);
 
         $request = new Request();
         $request->setSession($this->session);
 
         $container->set("request", $request);
 
-        $router = $this->getMock("Symfony\Component\Routing\Router");
-        $container->set("router.admin", $router);
-
-        $context = $this->getMock("Symfony\Component\Routing\RequestContext");
-        $context->setHost('localhost');
-        $context->setPort(80);
-        $context->setScheme('http');
-        $context->getBaseUrl('/tagada/tsointsoin/');
-
-        $router->setContext($context);
-
         return $container;
     }
 
diff --git a/core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php b/core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php
index c4b0192bc..7d14fbbc5 100755
--- a/core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php
+++ b/core/lib/Thelia/Tests/Core/Template/Element/BaseLoopTestor.php
@@ -34,7 +34,7 @@ use Thelia\Core\HttpFoundation\Session\Session;
  * @author Etienne Roudeix <eroudeix@openstudio.fr>
  *
  */
-abstract class BaseLoopTestor extends \PHPUnit_Framework_TestCase
+abstract class BaseLoopTestor extends \Thelia\Tests\TestCaseWithURLToolSetup
 {
     protected $request;
     protected $dispatcher;
diff --git a/core/lib/Thelia/Tests/TestCaseWithURLToolSetup.php b/core/lib/Thelia/Tests/TestCaseWithURLToolSetup.php
new file mode 100644
index 000000000..927f7cf62
--- /dev/null
+++ b/core/lib/Thelia/Tests/TestCaseWithURLToolSetup.php
@@ -0,0 +1,64 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	    email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Tests;
+
+/**
+ * This class provides URL Tool class initialisation
+ *
+ * @package Thelia\Tests\TestCaseWithURLSetup
+ */
+class TestCaseWithURLToolSetup extends \PHPUnit_Framework_TestCase {
+
+
+    public function __construct() {
+        $this->setupURLTool();
+    }
+
+    protected function setupURLTool() {
+
+        $container = new \Symfony\Component\DependencyInjection\ContainerBuilder();
+
+        $context = new \Symfony\Component\Routing\RequestContext(
+                '/thelia/index.php',
+                'GET',
+                'localhost',
+                'http',
+                80,
+                443,
+                '/path/to/action'
+        );
+
+        $router = $this->getMockBuilder("Symfony\Component\Routing\Router")
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $router->expects($this->any())
+            ->method('getContext')
+            ->will($this->returnValue($context));
+
+        $container->set("router.admin", $router);
+
+        new \Thelia\Tools\URL($container);
+    }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Tests/Tools/URLTest.php b/core/lib/Thelia/Tests/Tools/URLTest.php
index 0c99651b4..86804f5c0 100755
--- a/core/lib/Thelia/Tests/Tools/URLTest.php
+++ b/core/lib/Thelia/Tests/Tools/URLTest.php
@@ -28,10 +28,208 @@ use Thelia\Tools\URL;
 /**
  *
  * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ * @author Franck Allimant <eroudeix@openstudio.fr>
  *
  */
 class URLTest extends \PHPUnit_Framework_TestCase
 {
+    protected $context;
+
+    public function setUp()
+    {
+        $container = new \Symfony\Component\DependencyInjection\ContainerBuilder();
+
+        $router = $this->getMockBuilder("Symfony\Component\Routing\Router")
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->context = new \Symfony\Component\Routing\RequestContext(
+                '/thelia/index.php',
+                'GET',
+                'localhost',
+                'http',
+                80,
+                443,
+                '/path/to/action'
+        );
+
+        $router->expects($this->any())
+            ->method('getContext')
+            ->will($this->returnValue($this->context));
+
+        $container->set("router.admin", $router);
+
+        new \Thelia\Tools\URL($container);
+    }
+
+    public function testGetIndexPage() {
+
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->getIndexPage();
+        $this->assertEquals('http://localhost/thelia/index.php', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->getIndexPage();
+        $this->assertEquals('http://localhost/thelia/', $url);
+
+        $this->context->setBaseUrl('/thelia');
+        $url = \Thelia\Tools\URL::getInstance()->getIndexPage();
+        $this->assertEquals('http://localhost/thelia', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->getIndexPage();
+        $this->assertEquals('http://localhost/', $url);
+    }
+
+    public function testGetBaseUrl() {
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->getBaseUrl();
+        $this->assertEquals('http://localhost/thelia/index.php', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->getBaseUrl();
+        $this->assertEquals('http://localhost/thelia/', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->getBaseUrl();
+        $this->assertEquals('http://localhost/', $url);
+    }
+
+    public function testAbsoluteUrl() {
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action');
+        $this->assertEquals('http://localhost/path/to/action', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action');
+        $this->assertEquals('http://localhost/thelia/path/to/action', $url);
+
+        $this->context->setBaseUrl('/thelia');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action');
+        $this->assertEquals('http://localhost/thelia/path/to/action', $url);
+
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action');
+        $this->assertEquals('http://localhost/thelia/index.php/path/to/action', $url);
+    }
+
+    public function testAbsoluteUrlOnAbsolutePath() {
+
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action');
+        $this->assertEquals('http://myhost/path/to/action', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action');
+        $this->assertEquals('http://myhost/path/to/action', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action');
+        $this->assertEquals('http://myhost/path/to/action', $url);
+    }
+
+    public function testAbsoluteUrlOnAbsolutePathWithParameters() {
+
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://myhost/path/to/action?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://myhost/path/to/action?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://myhost/path/to/action?p1=v1&p2=v2', $url);
+    }
+
+    public function testAbsoluteUrlOnAbsolutePathWithParametersAddParameters() {
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action?p0=v0', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://myhost/path/to/action?p0=v0&p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action?p0=v0', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://myhost/path/to/action?p0=v0&p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('http://myhost/path/to/action?p0=v0', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://myhost/path/to/action?p0=v0&p1=v1&p2=v2', $url);
+    }
+
+    public function testAbsoluteUrlWithParameters() {
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://localhost/thelia/index.php/path/to/action?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://localhost/thelia/path/to/action?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/thelia');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://localhost/thelia/path/to/action?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/thelia');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('path/to/action', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://localhost/thelia/path/to/action?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://localhost/path/to/action?p1=v1&p2=v2', $url);
+    }
+
+    public function testAbsoluteUrlPathOnly() {
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array(), URL::PATH_TO_FILE);
+        $this->assertEquals('http://localhost/thelia/path/to/action', $url);
+    }
+
+    public function testAbsoluteUrlPathOnlyWithParameters() {
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"), URL::PATH_TO_FILE);
+        $this->assertEquals('http://localhost/thelia/path/to/action?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"), URL::PATH_TO_FILE);
+        $this->assertEquals('http://localhost/thelia/path/to/action?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/path/to/action', array("p1" => "v1", "p2" => "v2"), URL::PATH_TO_FILE);
+        $this->assertEquals('http://localhost/path/to/action?p1=v1&p2=v2', $url);
+
+    }
+
+    public function testAbsoluteUrlFromIndexWithParameters() {
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://localhost/thelia/index.php/?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://localhost/thelia/?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/', array("p1" => "v1", "p2" => "v2"));
+        $this->assertEquals('http://localhost/?p1=v1&p2=v2', $url);
+
+    }
+
+    public function testAbsoluteUrlPathOnlyFromIndexWithParameters() {
+        $this->context->setBaseUrl('/thelia/index.php');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/', array("p1" => "v1", "p2" => "v2"), URL::PATH_TO_FILE);
+        $this->assertEquals('http://localhost/thelia/?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/thelia/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/', array("p1" => "v1", "p2" => "v2"), URL::PATH_TO_FILE);
+        $this->assertEquals('http://localhost/thelia/?p1=v1&p2=v2', $url);
+
+        $this->context->setBaseUrl('/');
+        $url = \Thelia\Tools\URL::getInstance()->absoluteUrl('/', array("p1" => "v1", "p2" => "v2"), URL::PATH_TO_FILE);
+        $this->assertEquals('http://localhost/?p1=v1&p2=v2', $url);
+
+    }
+
     public function testRetrieve()
     {
 
diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php
index 777e4543c..152f82895 100755
--- a/core/lib/Thelia/Tools/URL.php
+++ b/core/lib/Thelia/Tools/URL.php
@@ -27,33 +27,30 @@ use Thelia\Model\ConfigQuery;
 use Thelia\Rewriting\RewritingResolver;
 use Thelia\Rewriting\RewritingRetriever;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Thelia\Core\HttpFoundation\Request;
-use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Routing\RequestContext;
 
 class URL
 {
     protected $resolver = null;
     protected $retriever = null;
 
-    protected $container;
-    protected $environment;
+    protected $requestContext;
 
     const PATH_TO_FILE = true;
     const WITH_INDEX_PAGE = false;
 
-    private static $instance = null;
+    protected static $instance = null;
 
-    public function __construct(ContainerInterface $container, $environment)
+    public function __construct(ContainerInterface $container)
     {
         // Allow singleton style calls once intanciated.
         // For this to work, the URL service has to be instanciated very early. This is done manually
         // in TheliaHttpKernel, by calling $this->container->get('thelia.url.manager');
         self::$instance = $this;
 
-        $this->container = $container;
-        $this->environment = $environment;
+        $this->requestContext = $container->get('router.admin')->getContext();
 
         $this->retriever = new RewritingRetriever();
         $this->resolver = new RewritingResolver();
@@ -79,28 +76,26 @@ class URL
      */
     public function getBaseUrl()
     {
-        $requestContext = $this->container->get('router.admin')->getContext();
+        if ($host = $this->requestContext->getHost()) {
 
-        if ($host = $requestContext->getHost()) {
-
-            $scheme = $requestContext->getScheme();
+            $scheme = $this->requestContext->getScheme();
 
             $port = '';
 
-            if ('http' === $scheme && 80 != $requestContext->getHttpPort()) {
-                $port = ':'.$requestContext->getHttpPort();
-            } elseif ('https' === $scheme && 443 != $requestContext->getHttpsPort()) {
-                $port = ':'.$requestContext->getHttpsPort();
+            if ('http' === $scheme && 80 != $this->requestContext->getHttpPort()) {
+                $port = ':'.$this->requestContext->getHttpPort();
+            } elseif ('https' === $scheme && 443 != $this->requestContext->getHttpsPort()) {
+                $port = ':'.$this->requestContext->getHttpsPort();
             }
 
             $schemeAuthority = "$scheme://$host"."$port";
         }
 
-        return $schemeAuthority.$requestContext->getBaseUrl().'/';
+        return $schemeAuthority.$this->requestContext->getBaseUrl();
     }
 
     /**
-     * @return string the index page, which is basically the base_url in prod environment.
+     * @return string the index page, which is in fact the base URL.
      */
     public function getIndexPage()
     {
@@ -133,7 +128,7 @@ class URL
             }
 
             // Normalize the given path
-            $base = $base_url . ltrim($path, '/');
+            $base = rtrim($base_url, '/') . '/' . ltrim($path, '/');
         } else
             $base = $path;
 

From 89ad332d8895d2830b2a415408c387e7750f9eda Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 6 Sep 2013 08:24:03 +0200
Subject: [PATCH 09/29] use good Request object

---
 core/lib/Thelia/Tests/Controller/DefaultControllerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Tests/Controller/DefaultControllerTest.php b/core/lib/Thelia/Tests/Controller/DefaultControllerTest.php
index 33ea807e3..177802078 100755
--- a/core/lib/Thelia/Tests/Controller/DefaultControllerTest.php
+++ b/core/lib/Thelia/Tests/Controller/DefaultControllerTest.php
@@ -23,7 +23,7 @@
 
 namespace Thelia\Tests\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
+use Thelia\Core\HttpFoundation\Request;
 use Thelia\Controller\Front\DefaultController;
 
 /**

From b95218295db1283b18e8d4fa82c3ad39261efaa2 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Fri, 6 Sep 2013 08:59:06 +0200
Subject: [PATCH 10/29] rewriting router

---
 .../Controller/Front/DefaultController.php    | 20 +++++++++----------
 .../Thelia/Core/Routing/RewritingRouter.php   |  7 ++++---
 .../Template/Smarty/Plugins/UrlGenerator.php  |  2 +-
 .../Thelia/Rewriting/RewritingResolver.php    |  2 ++
 .../Thelia/Rewriting/RewritingRetriever.php   |  2 ++
 core/lib/Thelia/Tools/URL.php                 |  8 ++++----
 6 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/core/lib/Thelia/Controller/Front/DefaultController.php b/core/lib/Thelia/Controller/Front/DefaultController.php
index 58501ebb0..fe7e1aede 100755
--- a/core/lib/Thelia/Controller/Front/DefaultController.php
+++ b/core/lib/Thelia/Controller/Front/DefaultController.php
@@ -46,16 +46,6 @@ class DefaultController extends BaseFrontController
      */
     public function noAction(Request $request)
     {
-        if(ConfigQuery::isRewritingEnable()) {
-
-            /* Does the query GET parameters match a rewritten URL ? */
-            $rewrittenUrl = URL::getInstance()->retrieveCurrent($request);
-            if($rewrittenUrl->rewrittenUrl !== null) {
-                /* 301 redirection to rewritten URL */
-                $this->redirect($rewrittenUrl->rewrittenUrl, 301);
-            }
-        }
-
         $view = null;
 
         if (! $view = $request->query->get('view')) {
@@ -71,5 +61,15 @@ class DefaultController extends BaseFrontController
             $request->attributes->set("_view", "index");
         }
 
+        if(ConfigQuery::isRewritingEnable()) {
+            if($request->attributes->get('_rewritten', false) === false) {
+                /* Does the query GET parameters match a rewritten URL ? */
+                $rewrittenUrl = URL::getInstance()->retrieveCurrent($request);
+                if($rewrittenUrl->rewrittenUrl !== null) {
+                    /* 301 redirection to rewritten URL */
+                    $this->redirect($rewrittenUrl->rewrittenUrl, 301);
+                }
+            }
+        }
     }
 }
diff --git a/core/lib/Thelia/Core/Routing/RewritingRouter.php b/core/lib/Thelia/Core/Routing/RewritingRouter.php
index 570372f60..79d5dc80b 100644
--- a/core/lib/Thelia/Core/Routing/RewritingRouter.php
+++ b/core/lib/Thelia/Core/Routing/RewritingRouter.php
@@ -43,6 +43,7 @@ use Thelia\Tools\URL;
  * Class RewritingRouter
  * @package Thelia\Core\Routing
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
  */
 class RewritingRouter implements RouterInterface, RequestMatcherInterface
 {
@@ -170,7 +171,6 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
         if(ConfigQuery::isRewritingEnable()) {
             try {
                 $rewrittenUrlData = URL::getInstance()->resolve($request->getPathInfo());
-                var_dump($rewrittenUrlData); exit;
             } catch(UrlRewritingException $e) {
                 switch($e->getCode()) {
                     case UrlRewritingException::URL_NOT_FOUND :
@@ -205,13 +205,14 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
 
             return array (
                 '_controller' => 'Thelia\\Controller\\Front\\DefaultController::noAction',
-                '_route' => 'rewrite'
+                '_route' => 'rewrite',
+                '_rewritten' => true,
             );
         }
         throw new ResourceNotFoundException();
     }
 
-    protected function redirect($url, $code = 302)
+    protected function redirect($url, $status = 302)
     {
         Redirect::exec($url, $status);
     }
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
index 72b3b88fb..f6c20ecfb 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
@@ -169,7 +169,7 @@ class UrlGenerator extends AbstractSmartyPlugin
 
     protected function getCurrentUrl()
     {
-        return URL::getInstance()->retrieveCurrent()->toString();
+        return URL::getInstance()->retrieveCurrent($this->request)->toString();
     }
 
     protected function getReturnToUrl()
diff --git a/core/lib/Thelia/Rewriting/RewritingResolver.php b/core/lib/Thelia/Rewriting/RewritingResolver.php
index 900442db9..4c8bcba40 100755
--- a/core/lib/Thelia/Rewriting/RewritingResolver.php
+++ b/core/lib/Thelia/Rewriting/RewritingResolver.php
@@ -58,6 +58,8 @@ class RewritingResolver
 
     public function load($rewrittenUrl)
     {
+        $rewrittenUrl = ltrim($rewrittenUrl, '/');
+
         $this->search = $this->rewritingUrlQuery->getResolverSearch($rewrittenUrl);
 
         if($this->search->count() == 0) {
diff --git a/core/lib/Thelia/Rewriting/RewritingRetriever.php b/core/lib/Thelia/Rewriting/RewritingRetriever.php
index dfbe63517..8289942f2 100755
--- a/core/lib/Thelia/Rewriting/RewritingRetriever.php
+++ b/core/lib/Thelia/Rewriting/RewritingRetriever.php
@@ -66,6 +66,7 @@ class RewritingRetriever
             $allParametersWithoutView[$view . '_id'] = $viewId;
         }
 
+        $this->rewrittenUrl = null;
         $this->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView);
         if($this->search !== null) {
             $this->rewrittenUrl = $this->search->getUrl();
@@ -93,6 +94,7 @@ class RewritingRetriever
             $allParametersWithoutView[$view . '_id'] = $viewId;
         }
 
+        $this->rewrittenUrl = null;
         $this->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView);
         if($this->search !== null) {
             $this->rewrittenUrl = $this->search->getUrl();
diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php
index 152f82895..161175bbf 100755
--- a/core/lib/Thelia/Tools/URL.php
+++ b/core/lib/Thelia/Tools/URL.php
@@ -204,20 +204,20 @@ class URL
      public function retrieveCurrent(Request $request)
      {
          if(ConfigQuery::isRewritingEnable()) {
-             $view = $request->query->get('view', null);
+             $view = $request->attributes->get('_view', null);
              $viewLocale = $request->query->get('locale', null);
              $viewId = $view === null ? null : $request->query->get($view . '_id', null);
 
              $allOtherParameters = $request->query->all();
              if($view !== null) {
                  unset($allOtherParameters['view']);
+                 if($viewId !== null) {
+                     unset($allOtherParameters[$view . '_id']);
+                 }
              }
              if($viewLocale !== null) {
                  unset($allOtherParameters['locale']);
              }
-             if($viewId !== null) {
-                 unset($allOtherParameters[$view . '_id']);
-             }
 
              $this->retriever->loadSpecificUrl($view, $viewLocale, $viewId, $allOtherParameters);
          }

From 9655ce3c72704fc5ccd48104f3f2e6121d57265f Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Fri, 6 Sep 2013 09:56:39 +0200
Subject: [PATCH 11/29] Added a 'development mode' to assetic smarty plugin

---
 core/lib/Thelia/Config/Resources/config.xml    |  1 +
 .../Core/Template/Assets/AsseticHelper.php     | 18 +++++++++---------
 .../Smarty/Assets/SmartyAssetsManager.php      | 13 +++++++++----
 .../Core/Template/Smarty/Plugins/Assetic.php   |  4 ++--
 templates/admin/default/assets/less/main.less  |  4 +---
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 96e5941cd..198c49228 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -129,6 +129,7 @@
 
         <service id="smarty.plugin.assetic" class="Thelia\Core\Template\Smarty\Plugins\Assetic" >
             <tag name="thelia.parser.register_plugin"/>
+            <argument>%kernel.environment%</argument>
         </service>
 
         <service id="smarty.plugin.theliasyntax" class="Thelia\Core\Template\Smarty\Plugins\TheliaSyntax" >
diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
index fbb93440a..cd7f06ac8 100755
--- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
+++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
@@ -43,15 +43,16 @@ class AsseticHelper
      * Generates assets from $asset_path in $output_path, using $filters.
      *
      * @param  string                    $asset_path  the full path to the asset file (or file collection)
-     * @param  unknown                   $output_path the full disk path to the output directory (shoud be visible to web server)
-     * @param  unknown                   $output_url  the URL to the generated asset directory
-     * @param  unknown                   $asset_type  the asset type: css, js, ... The generated files will have this extension. Pass an empty string to use the asset source extension.
-     * @param  unknown                   $filters     a list of filters, as defined below (see switch($filter_name) ...)
-     * @param  unknown                   $debug       true / false
+     * @param  string                    $output_path the full disk path to the output directory (shoud be visible to web server)
+     * @param  string                    $output_url  the URL to the generated asset directory
+     * @param  string                    $asset_type  the asset type: css, js, ... The generated files will have this extension. Pass an empty string to use the asset source extension.
+     * @param  array                     $filters     a list of filters, as defined below (see switch($filter_name) ...)
+     * @param  boolean                   $debug       true / false
+     * @param  boolean                   $dev_mode    true / false. If true, assets are not cached and always compiled.
      * @throws \InvalidArgumentException if an invalid filter name is found
      * @return string                    The URL to the generated asset file.
      */
-    public function asseticize($asset_path, $output_path, $output_url, $asset_type, $filters, $debug)
+    public function asseticize($asset_path, $output_path, $output_url, $asset_type, $filters, $debug, $dev_mode = false)
     {
         $asset_name = basename($asset_path);
         $asset_dir = dirname($asset_path);
@@ -112,6 +113,7 @@ class AsseticHelper
         $asset = $factory->createAsset($asset_name);
 
         $asset_target_path = $asset->getTargetPath();
+
         $target_file = sprintf("%s/%s", $output_path, $asset_target_path);
 
         // As it seems that assetic cannot handle a real file cache, let's do the job ourselves.
@@ -124,7 +126,7 @@ class AsseticHelper
         //
         //     before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files.
         //
-        if (! file_exists($target_file)) {
+        if ($dev_mode == true || ! file_exists($target_file)) {
 
             // Delete previous version of the file
             list($commonPart, $dummy) = explode('-', $asset_target_path);
@@ -143,8 +145,6 @@ class AsseticHelper
                 }
             }
 
-            //$cache = new AssetCache($asset, new FilesystemCache($output_path));
-
             $writer = new AssetWriter($output_path);
 
             $writer->writeAsset($asset);
diff --git a/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php b/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
index 17fe122d3..f19eded95 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
@@ -34,18 +34,22 @@ class SmartyAssetsManager
 
     private $web_root;
     private $path_relative_to_web_root;
+    private $developmentMode;
 
     /**
      * Creates a new SmartyAssetsManager instance
      *
-     * @param string $web_root                  the disk path to the web root
-     * @param string $path_relative_to_web_root the path (relative to web root) where the assets will be generated
+     * @param string    $web_root                    the disk path to the web root
+     * @param string    $path_relative_to_web_root   the path (relative to web root) where the assets will be generated
+     * @param  boolean  $developmentMode             true / false. If true, assets are not cached, and always generated.
      */
-    public function __construct($web_root, $path_relative_to_web_root)
+    public function __construct($web_root, $path_relative_to_web_root, $developmentMode)
     {
         $this->web_root = $web_root;
         $this->path_relative_to_web_root = $path_relative_to_web_root;
 
+        $this->developmentMode = $developmentMode;
+
         $this->assetic_manager = new AsseticHelper();
     }
 
@@ -73,7 +77,8 @@ class SmartyAssetsManager
                     URL::getInstance()->absoluteUrl($this->path_relative_to_web_root, null, URL::PATH_TO_FILE /* path only */),
                     $assetType,
                     $filters,
-                    $debug
+                    $debug,
+                    $this->developmentMode
              );
 
             return $url;
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Assetic.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Assetic.php
index f8ea1c2ef..b7bb95b83 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Assetic.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Assetic.php
@@ -32,13 +32,13 @@ class Assetic extends AbstractSmartyPlugin
 {
     public $assetManager;
 
-    public function __construct()
+    public function __construct($developmentMode)
     {
         $web_root  = THELIA_WEB_DIR;
 
         $asset_dir_from_web_root = ConfigQuery::read('asset_dir_from_web_root', 'assets');
 
-        $this->assetManager = new SmartyAssetsManager($web_root, $asset_dir_from_web_root);
+        $this->assetManager = new SmartyAssetsManager($web_root, $asset_dir_from_web_root, $developmentMode == 'dev');
     }
 
     public function blockJavascripts($params, $content, \Smarty_Internal_Template $template, &$repeat)
diff --git a/templates/admin/default/assets/less/main.less b/templates/admin/default/assets/less/main.less
index 862810f6d..7ad14e013 100644
--- a/templates/admin/default/assets/less/main.less
+++ b/templates/admin/default/assets/less/main.less
@@ -3,6 +3,4 @@
 
 /* Thelia Admin */
 @import "thelia/thelia.less";
-// @import "thelia/responsive.less";
-
-//mmm
\ No newline at end of file
+// @import "thelia/responsive.less";
\ No newline at end of file

From 012432dad01278783cab2d4b16cc64736b33eb86 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 6 Sep 2013 09:58:35 +0200
Subject: [PATCH 12/29] clear asset cache in cache:cler command

---
 core/lib/Thelia/Command/CacheClear.php | 44 ++++++++++++++++++--------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/core/lib/Thelia/Command/CacheClear.php b/core/lib/Thelia/Command/CacheClear.php
index 82a7cbd7f..37e853f05 100755
--- a/core/lib/Thelia/Command/CacheClear.php
+++ b/core/lib/Thelia/Command/CacheClear.php
@@ -24,6 +24,7 @@
 namespace Thelia\Command;
 
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Exception\IOException;
@@ -44,7 +45,14 @@ class CacheClear extends ContainerAwareCommand
     {
         $this
             ->setName("cache:clear")
-            ->setDescription("Invalidate all caches");
+            ->setDescription("Invalidate all caches")
+            ->addOption(
+                "without-assets",
+                null,
+                InputOption::VALUE_NONE,
+                "remove cache assets"
+            )
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -52,20 +60,28 @@ class CacheClear extends ContainerAwareCommand
 
         $cacheDir = $this->getContainer()->getParameter("kernel.cache_dir");
 
-        if (!is_writable($cacheDir)) {
-            throw new \RuntimeException(sprintf('Unable to write in the "%s" directory', $cacheDir));
-        }
-
-        $output->writeln(sprintf("Clearing cache in <info>%s</info> directory", $cacheDir));
-
-        $fs = new Filesystem();
-        try {
-            $fs->remove($cacheDir);
-
-            $output->writeln("<info>cache cleared successfully</info>");
-        } catch (IOException $e) {
-            $output->writeln(sprintf("error during clearing cache : %s", $e->getMessage()));
+        $this->clearCache($cacheDir, $output);
+        if(!$input->getOption("without-assets")) {
+            $this->clearCache(THELIA_WEB_DIR . "/assets", $output);
         }
 
     }
+
+    protected function clearCache($dir, OutputInterface $output)
+    {
+        if (!is_writable($dir)) {
+            throw new \RuntimeException(sprintf('Unable to write in the "%s" directory', $dir));
+        }
+
+        $output->writeln(sprintf("Clearing cache in <info>%s</info> directory", $dir));
+
+        $fs = new Filesystem();
+        try {
+            $fs->remove($dir);
+
+            $output->writeln(sprintf("<info>%s cache dir cleared successfully</info>", $dir));
+        } catch (IOException $e) {
+            $output->writeln(sprintf("error during clearing cache : %s", $e->getMessage()));
+        }
+    }
 }

From 2ef5e8bd0c78ab90ca3bda24992c6fcd675dd863 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 6 Sep 2013 10:08:30 +0200
Subject: [PATCH 13/29] fix test suite

---
 core/lib/Thelia/Tests/Command/CacheClearTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/lib/Thelia/Tests/Command/CacheClearTest.php b/core/lib/Thelia/Tests/Command/CacheClearTest.php
index ed2e512b6..741fad299 100755
--- a/core/lib/Thelia/Tests/Command/CacheClearTest.php
+++ b/core/lib/Thelia/Tests/Command/CacheClearTest.php
@@ -47,6 +47,7 @@ class CacheClearTest extends \PHPUnit_Framework_TestCase
         $fs = new Filesystem();
 
         $fs->mkdir($this->cache_dir);
+        $fs->mkdir(THELIA_WEB_DIR . "/assets");
     }
 
     public function testCacheClear()

From 617b762d8ab8ccdd6b7dc85b5641a6dd49105979 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 10:16:08 +0200
Subject: [PATCH 14/29] Working : Resize countries flag + Add bootstrap-switch

---
 .../admin/default/assets/img/flags/en.gif     | Bin 1256 -> 3098 bytes
 .../admin/default/assets/img/flags/es.gif     | Bin 1262 -> 3059 bytes
 .../admin/default/assets/img/flags/fr.gif     | Bin 1277 -> 3053 bytes
 .../admin/default/assets/img/flags/it.gif     | Bin 1269 -> 3054 bytes
 .../js/bootstrap-switch/bootstrap-switch.js   | 382 ++++++++++++++++++
 .../assets/less/thelia/bootstrap-switch.less  | 160 ++++++++
 .../default/assets/less/thelia/thelia.less    |   1 +
 templates/admin/default/currencies.html       |  10 +-
 .../default/includes/add-category-dialog.html |   6 +-
 9 files changed, 554 insertions(+), 5 deletions(-)
 create mode 100644 templates/admin/default/assets/js/bootstrap-switch/bootstrap-switch.js
 create mode 100644 templates/admin/default/assets/less/thelia/bootstrap-switch.less

diff --git a/templates/admin/default/assets/img/flags/en.gif b/templates/admin/default/assets/img/flags/en.gif
index 3a7661fdbc59f3153a66a613a8c95ccf4dd6c2fe..91b2b009016300632f1547ba2d5be5185fa4851d 100755
GIT binary patch
literal 3098
zcmd5;YgAKL7T(Fd2`U&xt?$wJghfGvScOul;US44VgLuxsxi5cNFeD=0u;f8paV{+
z@=(DCh=76?0R@+cFDleW44^2l3P{nqXa~FKbXI4&X4%ZX2?m_HI)5iwIr*~pxA*z>
zKIfhjfAJc352-!a!#@E+0CoZ#2F`I{eF<Z(0yF@t0Vbrfp@}{I0LSLI?SxWWUbEe#
zE8`~~;7x!D8^4@5xo)DpauT#mdhf{OsSVR-m(84AJ8MqUthx8*Pi$Mb@TsE%IB%(O
zo_l}kpW0lVV%?l-+~(E0Ik&qnx$W_OyQkaXRVz-e`f&HhE0+ql=L%OA2)!10$5gEG
zx*+m)5z{&1)rD(4uC4Q|4EWF?Q12QTeQJZ>2a?#c!Q#qbQFXA$GenmkvMx4s<Mq(>
zZK1xa!;;p9sZzs&ABV3`+8TOvYw(k;!G=#ZY}u|+ZU0mx{Y!~-Q<GHkc<1I~S$GY#
z<36=b7MXM|a%+fUf4)L$R7fxH+Ci%|4eBj7H4*#h=o8u)jec*Ues`fh`nEnQIWD;)
zZdYeq)YaX(xWu&7r1X7Bsq~&>S;<K$d(&D{6SDX3eYk)3H)-mu&$BW!z9`B#P<Jrh
zcrfYfLkXRScK2q+=V#@e&dF)XNo+ct^62oMj3d=gk0hVSEj^ceH1~K>=ke5z6Z_Ac
zEXc_}*Oz~=w4kV~@bmnl(qqN-CyJ|Y78jJ1oIi2qW>M*_s?suJ>G7V@tp3u>{<7@W
zbH^Iamz9*?Jy(9Qy8OJM{Is#W;Ms+f=PR!@SDkIHy3kWq(0=h$-=%_Ys?S`ixzb-#
z+;h3S^2&p%D~8HiV{dKA%i7ZFx~7)8ik`aifx0rowVJ2bs~T@ye}1Fl@y*LGZdKiE
zXzgjd{Jin%t@}MqhGxTqCj&-fYx9%-=Ei4_T7GP8eA3p|+1Az3(cRhE`E74+ci(p}
z`kxQ=cMU#&_Uh$#uU`$Ce)|pnk6-hCCC82fBg`||ihX<}{@(ts0@r0G0Gl$YMx$c$
z0it7cG&=ZUo5T4wUBHGJU<)(BRw~nKgh4?8Omz(R_f`JV4lKs{*yY{+-$#tH*vcub
z41hHTZECqz7L7O_fTNOWXdM9e1=`)?bQ;7qvk_0BQ6ORggCi~2m%%$NILyomk@z5o
z(aMu4q;kZGh@E$ivPXtUOjeRb1X3`OKNUmKN*SMNMi8xzP^u`i!!rC2_bBEc!Dy8p
zi#EUJ;Ap3f3SNibj!f|iS|l09g)*sMFye)1zo*f8Gxo)Z2lY{*Lc~r0>`4*ynotX$
z{ZWD<<j;twqFt`kiSgKDa<UU*b_Q-hjIr#ZDD^rf4{}WGdoryLb`$2KqgO$RnN>zX
z1js30Kg7<6=P2}|;R%Sf+Sp*mZcdb-@CihWi3oa^bZrpgnTXSAwS<`rMH5Ao%Ac7G
z^AmS8x}aeZ#6XNHkeLg`kvvLkE)sJR13E>B$P!Dg(9t2ov1E9Ja*cSHpQurpcOz;e
zOK81>(T4fShf><lA2H@3|4zk(GL1vbnJ$<5GR<9r*b6qXq(FfhuLBB9GKhiKzy}HV
zgExL_fJRpYC_#l53cVCsl&tX(g|>I|g3KIC%m^dW96i89gACryvCQ!OFh@;JBL$=z
zemuzlauw-LdH|pNm|RVIk-lj4AU&-Lf=21&LnM5UN-cRl1wGEp=-33_nKSi{));;Y
zy<I75IW&Z7hO0DTnd%V&CbE`{qSd2Y09tIpoAO*nH|lQU_32g*zm2Tj`q=JnB5W{s
z_zxP)dBGXrwBgvr=^lyaJmqxby9<P<O=VUTjjEL9rO;Y=E+a)C>nr@|K#JqH$Wx=%
zH%i}H(ukPMnIj%-g=vUN3;ZPzQk+N3f)2qeL7U*TphWPuw<Z}$`Bs~V9O5!@gSbl6
z5k}w>^~6`iE#eMQNnEq$eD~^GvRGH&Trgu}%4L?}&3vPqO@WH%&6~wr!1LwJ<t^d`
zSXq4DG@dI@#B)H;EbGFlM*MHpqJ+)ZEXp+8*LP3GJOoMzMJY;%LrFCDmFaN|e1>U9
zKPtmg$vLDeDgLjG>&|TFH!`?>Twksb_*^Hh2iKLmmcefxKCT1$JaF{0%C|f`R>oT;
zP@`Db7Hb|C^S)ztD-#`yx>cx~(oykvg8=xbHJ{PSNQI8SOdzOS$rs{{M)AclvL()Z
zsY=B+`?P$T(o%FRC0_!}b;tw){46nFbF8T?BR1W7fK@-@!S!&&7On><*8)siK4Npk
zgYmsn0JSS*dOFsU4_K@w0BwZZGV^bioi`p(y(ZJocxc&V1H8^Mnf_g5GQBRw{M`Wc
zD&{x_{6lLGFvbMO#?BU1_0`L(Gx9G@31~mN{!;u;LZY;FNrYiwwPC+ghl4Q9>(|Zn
zVotK3F<Ea|@Ym_ClI$Pku8n0jDf7beF0^vq&vceobZ6vcjWr}Y?Ftc8%MG0_p?AkA
z-5<(Z?3QJu=yptXo_0}wcaOceiY0OkDxZ`8)9s9Q2T8>^d)7rMk-lKlp22(esa=bO
zIfIG(2YVa1<G2fb!-neBg<gy7mUjll`>+Yl7`veQ!K2Qr!rRkbH|93xt=Lf!;CeeC
zw`kq5mnC#IpU4tvmw%F-y>IjU<?-9n3#WXY%vqT5QSHBcIBd5-RiItw&p)IQc5d75
z&#0RJ#l(ob#eDZZZ$&1LJ5ABO@gE#vx{I-Y-_WBoetEOlPWOV?#Q|ARFlNdF#}$1;
VcP2Yl)$g0}!4RY`HIO8D{s)#)P#*vQ

literal 1256
zcmV<E1Q+{9Nk%w1VHE%s0Qdg@-90hl!nD&nFTc9E#)@{rr=8-Qh4tm++LwXlKQiUT
zx2Z8F#yBj<I4#t-s^p1o!8a_wHY)%<ZL%{dvte4MFeW5JY0o+?06AxhC?DgppX0!@
z*gP=eJ~G}tG2XA7&^j*OuAAc5(&paU=(eJ=y3VmPDBC?T*E}%RJ22rsGVj*Q^4ieN
zv8C9$t?0+O=iJwyE+puri|gy`w40LSJ~HdLq|D9Foh~G`G%45F-|yqzpsB<2=i%qI
zq2N9-z&0!0zOki`hQP(s*F`j(EhOyV+uA%Z&e7Y^Ixn|0D&IXZ&(YV*IW4uk&c49K
z$j#ZaVp_Ah&d+F2ijJ9tjiJJJU#y#z=c<&ws-vSXB|vJ7ek>u>ePrI=-_(<RueQsY
zoT0BWDDUj+JY9;ln2)KYqtaqYy`z~mQFzy^o6ykFkAZyd<>8xNO_QIwy~5Grzq0DF
zn`CyG*t4YP<>b$-otH&4sEma`XNZhHIBtBKs7*S3hn~GQE6lX3v0+(%IxCSgCfnTK
zKxm4lIxOqg)u}ryXM3R9tC_Brjoho5ud%nPg?KAZdgIvB;MmpV)XcNBxc&3;{QUfp
zm!^VGK(>;HouaP4m4?E+yW!s6n4PJrtFP9cihzQKt*EEDfp3A2uCQxYzrn`lu9@hn
zl&6=G;mN?Ro|yFK;gyz{iHncb*4OIg<C1e|=;r0%xv67ujpx6vZgz^&%gNNu%h%7%
zm4<<kjEj{lBEhbw;K8%dk$cjTeAw33)s%jEhN9oHq047a>9(Tfx21lEp02O4%*e;t
zzO&Q5wbHw>KxKx`Q9a46qPVA_z{1DG#m3^Xo|KS}Y<rn+ex1*vk<O)+n=K<dS%SgF
z)vS1D=il3Wg`Co*l+#2rx4q8KkbAr}Dw&(4ekB}vD<6iBqsGU`dM_tybBA1MgI;Tf
zg(n`((A(#!l4Wy{XLXW#I4P4uGXO+$%w<jAuA915K*cvKy;eb$H7C|oKe{z4xIi$w
zK{2aNJOBUxA^8LW00930EC2ui02Kfg000R80RIUbNU)&6fvyHQDba33oDC2oA(8TC
z+<*fDDJ{EpiwTb*B0_xl5CRoAGPI@zLTBh-9XsCCK+*vPhK8FOl2z*i>P`kOss0W6
zMJJIkZZnMdAW@1Q0aBX$#mI;2(?2InHpP-wtj!J^?wU0SXA7T+LszI+_*a654p_5@
zt>_`+8wd~xzCh@=3)4Id|BwuUGGojNRV;{b;DEwF0AR{)1cSHk-v|*fjO^&a!qf>5
z9soRe!OKO90yKpD+Ymy74;wOwocPh9g9-o~k~9F4V?mMCA2g7VqYnju4ha&}SaL)_
z69`Hc-~cZC3<wU#lP_=nJo<Fj8oJ!YyO3gbZ51AJ@9zEk@}oZvf+)ZO0JLb*rctZb
z1_sfSWy36@KnjaBR?igH+%QKrX|N><Ct2_lfiFQ^kVF!Ac>=*cnK0rAU~qJDN+Dv{
zQ;P!(G@xQHtynR^0*!>R);Vklf(;)7JmHKu5k%kz0nkJ<N({QZ!pc9$l*5iZW^_Xh
z8YWCIfeE4PVazdZWI#?C0^t!)F6l@hiy~T7VCFXONTALtmgs?zKwe0~3?WrK0|*6C
SP;iMkTjWv68k77J5CA)m+=`n3

diff --git a/templates/admin/default/assets/img/flags/es.gif b/templates/admin/default/assets/img/flags/es.gif
index 9ac64ad37977eeeb20925d3a4829a0e0c039c9b9..bdf09f8f77d88353810b35e05acdc2529eba8aca 100755
GIT binary patch
literal 3059
zcmeHJi&Il)7C#|30X7;Iibz1{1w~nw#2~K1_~`PImjw!l)^>I$gbT?M6MB;<xNb*n
zE3C6_X<6MF>q_O}stZ~{8Su3ziqsZS1QbD}A`&naA&9Sm?72xypu=|mfxVf0_m^{i
z=X}3&zVCiF(XnenLM6`N49@}b0d@oY4d4Lq55k<I;QkG8&pNu-JGvj|&8_0iJ<W6f
zs}tv#llwWRIS1Z?a@Tof9)e;|m;GLz6<&e^K2HDg5mfsKYJCKUeLc(l+$say&jbpp
zg`Ss$9*0D5P2^D$9PrPm6~_|d>k^h9{he1$rlc<G?Y6Ac%bUoKkDQum-&UHusafBt
z5w&gkpzlx1zWrExe*4EYyOMA3RyBUHr+NRLj{Q6O_s8BV{;c`yukIh(^`K<=gVJ67
zrGM6y?`}Q3df@2Np`(SJ$9yhV`gfhEXgC@FU6tToRaIlP|GjEO*Xcc1>Jr<|2I$T%
z?!E9q--W&X7mnYp7xmYlZ@!e!b}8U-!&g0*=MP_A-+Co+=t@m*W8i3G(VeSXN3I_1
zYWj8iw~6{|XAIw!_I)pWd|fzl{a}Afi>_tk;}*9kH-6K1Q#jVzU}zH#wTlex8GRjT
zx(-)eC;4ONb^YDNPrBL-T_SyV$nzfY%O2my_jiomFMV~teXLjXy!VdohqB?m;Aef}
z*AEx#`zv4fzx(9T$!Cuq4iD@y3~YEdaAa~oJghrq(CLN;k3Sv!?CIc%(ZRgugTmpV
zqLHEE(V^;Bdi{jnWl|qBsgE`4eT+|pW5f51!`UxJMqZ6nO^g(e8@i2#M-yYU<Ij3u
zycn6BoP_^h(>vhvl5qS5l!K3v7aI|g9337VBo10)1h79M$;naJkpP>N8X6tshW9s;
z_MKn{0^orM@FY@oPFPaXS|%aGot~KaHQoU%=6*{!v!C((*Nc}ysigoc2V|%+)Y46e
za{)LCX%4Lc;66lq$QDfwV*7cBU1=1ESj^xoGmd0%x*2aUaZ-~bki%%@OJ$M_#M=-D
zrcbeFr6wD#B(n&lV4`SBNzrmC$uuL0R%OZ+l*wTp{)c-C^XK3ug%*o8UEVm(QfH^c
z<K3SrUPi|xTkzLXNmL5r1!!-|(S$Shg^2aq>~&#?0|4w?GU+wz%zV3*TV<*15xb#1
zL#~NUwb-{R(-RUAW2{|Cwkn><gB+t>lT;mn-2`8B^vI}KW|dJ88#1WKD8zw?y=B@M
z%LME=_2v}DZc4OO7LkA$6S3((NaB(Zdmt{LRmsd`D4JbDDWaLlFh9F7N0Vd`!PY4i
z3CvtrFu|wPrXn#XTc?qw#+YM?Wg0rw5=(5%l&^`k@VDhCOuG@a5oNSCnbC&%i5n6+
zDjG57Ax0_XI;L@mIqn&fNT#_W#H%5VB>@UlkdC8K3QCv&5|SYr!ttI1G`ccD4hpnT
z=%vsiXU&Few9U**GI7i?Hb#~yTE|3#6lUg_XBf0_RK#3DOa$Y11+kV`MT8KcKoai|
zza>@^k!TGiR#+7zP0>k077U_NbDobti!(Di(jdIhL+fviA$QWhmrGkde~M}>RT{BO
zm5qRjtR<sp)zlV%8e8zDJmJ(vUEOxh-RdFRiP{fu&APe`5=|ZcnFezna&(+_96LGP
zws=k#ryD<=5Qf?mCPkZ2mE5!xYAa7@D*{;;@v8v|jz1tzg<9VzowlTz%0dsD2U}r$
zO64bvC&11?n^}BY{G+&Cd`Mg-emrdwTgqu|Vi&Pbv(K~Z*k{<^1IeyuUu6HA-N-({
zK5NZ6^Xi+kSXbXvFk@rNWtQR1d{diEfr1~-_vFv#NAln1`|;OWStNfhKZqa0UxXe{
z>%u8){%N(y;eBitWwi8l=E<0cKo09riX66}BpUn5^jHabn0D%;Vv$OC6G24mPd07{
zvz_0_;6`yHxnV$Z1Gu5wAZ{Fk-#mQWMd%B~G0H06{P0*A(@LPGu&^!GJVMjHV|FVO
zy%}{YP&cKaa`6oU5TVM+qvcsL4Y@=tKCzq(!#5g5#ww+vKvJSmkS3p+q$xE;Z>BOt
zz`PEbKmbFs={3i4Yq8lh?*goPf(O?Pn{A^Oph68Wcd5<hj|bzNVu0FZQZ2pNoDW#6
zW&m|&@DkH+)~s+mpn8l(10GuTUjj^gVKlxjF&ZaIF@HBey@EN80sqiC12`BVe(#sn
z3wQ7P#GxVbWKelw{i@~4hj(t4mVEBLG-jm(DRurwLFm>OPe&pOoLu>{T*+U8;}O54
zil#B&T|EArz_hZE_tF~|z4Pfp?U3uWTja_uL#G5OevU<nI~NFcx9M*Bt=$*Mc@Uic
ztG$VzdUxj85eelL`&>B3N)N~FODysz-*NN7U&`0YZr8lDdsH+(Qki?szj{#7QTfN$
zOIkniE8zL%f8(8Y?RinjO4)%~b(icbH`XYlUgo_u;I!bBjMXfUk4pLb{N%<$NyFg;
zue%vFOMTMITI^?gh2%omfm(Z~dCO7@B$<)m;OI6lWIJ5caAtEI3g3&%cVr0yKXk6$
W&T7czxrDnqH(faYdYr|A75@Q&U><A$

literal 1262
zcmV<K1QGj3Nk%w1VHE%s0QdX=|Li^c<~;xJJ^$@JzAqmA=sfMWo$=Sp@Z3A{-aGo`
zJow{0$1orH<UIG{Jn`zg@VTG+`R?-Tyy&x<-_1Gp?!WTb%;V8H&M_eR`R)GbJlV)N
z>9m{dww>_ly4<Rh(J~<a>pih79l0(Zp*1MiGa>2LI;|@l<gl3a;XK;TXr?L~-_AM7
zFdx=4A<Ho!%`qVK<{0qZJNo$T>eo8m(P``0I{ESO+{-w&Egj&lmHGGV?Abfs(rNVI
zJLa;Pw=EsGE*|sjz4h(B=(L*W)jGm2AI2~r_TfDI=RC<VAG|Ier79bwDjT~l9<MAM
z>3${EGa=xumBcU~?8r3UySLu5a?!<S|Lr->hbYyIDa3&%<CQD;-LCV=SM$Pa_t>oW
z*s=K8viR}w;Jml?>g4_P#QgdAz`9HF*vt0mX!__hzb_u1DH{6p@%ZSh^3<-*c2)oD
zNaopo$$2-gGa#ovEXheNsWvI|<f-@Ws?>cT-OM@n@aX2lwZJbQ=+!#*xj3^e9qHX&
z?a-_H@}$(nH_EJa@7Bur@9O8&I?cT{{PLdi<#6n+N$b|s`th^y*2?hGt?A9E&@v$Z
z>^S1kIoHc*vn(CGE*|Hynd#xM+ODaoD;&p$f9I_ts45)5FCPEwIs5UY-_vQTLpSZ(
zJJWA&<FA+f=|jUWALX%_|Li>2$2k4+@#mLR?%hS~xrgi8EdJ>|(Z*-xmMgh>Cc<b+
z`}4y4`R(9%RQB6&v|dyG^RM*iVd}M;<kC9R!#A)j9nQWs<G!uz<+$6BD%Q(r;?;HT
z=ehsvHqtU6<<mOy;W6#zxzxl!^wzM{p_=5$rP!{h`RU5`@4xizzTk*-?#(&Oh=23l
zU;O7t)H5OJ%f6~B9J($Z>$RNu^1<ZWg8%F_t}Gn&=wbEOvFqA%@3@}r!9?xJWZ=|D
z#V{Z4s7K|)wDI6Z^WQtqG9dBYJMY!X_3gL8FCXy4N&NJ~-;yihm39B_J^$)G|Ns90
z0000000000A^8LW008^|EC2ui02Kfg000R80Qm__)NNj*0|zW9OoI@SA2O~4@;gK9
zgA`P&eoP?3fdi2VKjPGBLgJA?cOP`1(8K{;2LmuW<hw%v$deT$Zn#N_V#2SN=pYEy
zh2h1KKO=-OiPlHjBtnwlKr<Ic3>ZhXxZpFUCCe6DhjtY6Af#G2T=&fM+Lk21f)p}r
zT-Y#-){JBl=;?tpst_YN`vMnGfJ6o$7KScm@L<i?AaTgn#Q-p10DyfO6!<U&Y=eqi
z4~CS}_GOQ{7|QgizMRAXf+BosM37LS5jH5-tf;{vK!CmhAqp%=V1h!A*%jXGN_Q$2
zwQ;?FhtSX<0Sy+UB0Q+j#f!aH?ebL1iVj@3yy87Fgg!?l5S>qGM5)$yIe=?LIBF~w
z0;}0OS!<-i3IGJ|Q$Pdo@GzGOGdMHH1vVt$KmZy9w$ChsrSKXB!5p*0CePr&3=at)
z(LewwDzJbL2+&|jD~nuF#w{W^p^6e1EE9zbC6wR-Hz2^kKqx?*kj)Ktbb^T!MlkRK
z29$sRLOd`i!44ZiJkbOv{7lmZC?bqNfDuP9&_W9gOi|AgIgrByFA`Nz$_gh462uY&
Y<eAAgIf&p59-fRL(V&DDI%q%uI|R+JuK)l5

diff --git a/templates/admin/default/assets/img/flags/fr.gif b/templates/admin/default/assets/img/flags/fr.gif
index 46f4d122d071eed4e02da9ce6ad2bcc5473a92b6..2f6cf9ea32dbf43af62f2e56683cdd6a408e736f 100755
GIT binary patch
literal 3053
zcmeHJYgAKL7T)1rf;^f+Yr)~=<)K6iG|(;zOWR5a5Rkz%Vzp>j4dFskViIo>9*Ug~
z)u~u<cv)MdJ|IwyIB0zff`X6O(Uyv|f|P2jBORStZE@Mw4lA>75|S`wwSW3^E-NP=
zdw+YMZ|`%?JxR|<OH7jafgk(;_{;%_1IT;@Ko0N*KrO%yfEIxL0EYlN0L}swaiEm<
z2>6NN@zvnJ{LO$M2+V*WIRvZLh6GiF1a1lmDh>^XnI&~ILx9q4p+dJ(A&pdMRT$MA
zKC>+%3?g&4MMiFqoYfK;abR{7MCJKLNsmSGJ^4$I@cAA5IlfQkLUhriu`B)JU*jh!
zYLXM8Me8a=$s*~7D(RxEW!k1!GVAG;`Kqnk)vA0=%XY1Lb#c9^WVOEZEkoIk57!#H
z))uZ?x6AOlY44xbu3!H_$NF_|RyJ;^G@Y%isC;|>#myTkw;b%OuB@s#e5H0%b^X!W
zZ6}AeZK;3HwDrBtFB)pzZ9IOnv996$o*lbSZEHTX(|GKhvAL<G_oG&0>j$Qtdrr3Q
z-PdC3YBilR?b~N+>-nOs&eU!;x9{J3u&eFh#e*MSY(I42(DA>2eBxMF*O}{Ghfj2W
zbh5j@ue-Cq`^dHKu8uQTPxYSb>Fwz~cj>(Os`=u;rOU$~e>!sIN`K$L(C61~eKt6B
zZE$Gh%bUYDZhw92_MJPUqjyGc-@W(GyZ7#X_x;$|*mpntc>m$g{}~@=*X{q$@6my<
zpGZ$H-1A`;?~IfbX}T~yP7oJw0r1!((`r?26u>IAo<Rq-?B!g_V-Vcn58w@f;4PEu
zw8;`l7Au40{!-3^&w#^P`(vi||1!eG;+;?H@I-Q^p-q#oldnQt3gE7iYZ*NN_ZHd{
zOY~aA9>IvGGbj+TfW?J2EMjq<4KK5Da-=E9VYTw)3Rynla>UVjF80D4sl`FEi9iY_
zN~hH{qm)x@GbD_rK&hgw4%_e>ZWrdS!Br{)7Hxe(arDs@EnbM<e71N6BbM6nF1ajq
zG2%$Ho3(l&YoCqyo}p+-GUB-aZjTi(X-jN;xA|)nIZF}yqdi}#&&aXc*QoQd7a_)2
zx27V^LN*U_EN*7GE(N;@;piAq&>8G1qaXtEX;CWTXvCokgV;U+k*O<Q%-XGq)+kc4
z5o02Pc}<onK^%y9BcqYBlc8v$iB_evlVN`1yjCx<iy%hTs%&;HESTicI%|=blNi-2
za>TY+GC|Me*kj4u0%cl;onNk1S$899BaMtf%4);>WS@*lO-GD*$nR<O61H)O-Dl*>
zL~L_o5kC(vab!S)2J&#U$UzO`K!Fs}L5Sa4V9-?nN>HJNMlX#PCFc<+Lfh0liIroE
zaWV?6(W7iMUN}>8Y%_dg=V-_PQb0b9pLt{!`5c)@CILmhKrSGkCq-yYBIh|2NL+MM
zPzc|kQd^$YV8EGK9WQ~fI?%v(#84H?t4jGNfBhEK*sHW)nHnbn6FEvo(HhqlfDT(Q
zQC^H|qb`(p&Tx3B0rL2YexD2Fu*llsUum%WE%#CP0UQV2hn?~6*WHKlZxE7Eo64$a
z6{=ENmqO>@#W;&V)*1ZhL5AZ^<Y`drgwjb%TA;2Dbb7EAmT&2|vL9qaMYPi__+0QW
z!GK`5z$myoX%c73No^wPh$F-);skM$xC9h&nm9vr6X%I`qQjAM>eaVpajd?zVAjT#
z%Pzyje6G!=LB$jDf_M=;5pO1M7B9=eqIdzkIG&gng`ObC!l|78Nwp~9Wo#C0vG;ZA
z$=E}nge53N2_-0r!M?IRRzn%4bv-I}sbnY_M`rxb#!Y0m^Mnj;Dp$l!28uhEo5YRd
zX0mwV@NuKimxN=gL%!|sI2e;kpj}wl7Dt{K>%L=mD;r&mx>cx~*3+eUg8-yxv}KI4
zP@$*d1%mcxsbsv-XevW3kBz2eDivk*=_rQQ(M&O&9}Dbt$OZz8Nv+o$$Nv+jP5(!L
z=l+c^u0E$N*8tF_0|<D=Y2)LI@rj)P#}niRrr4GbIGoD>x`L<Ut^ad;g!qCQu~^3N
zrR7lzFkWM^{M=-*j5lNcVSv*r_H_*SgVqmVngwQg28$2eSddos&iu+N9yPtGx{a3<
zH{?~u7laMb_j}D@;e2l7GU{}S^qpBRwn~2L-P61)%tO3##+=H9k8fQ{CgtU9^sOUj
z&tGAtJhP_HU3%1qsTY45KF3Q`er@G$MZIx3Bn>^><3;$-PFQiE;jl-eSP>zU^$F*4
z_buP7(AFi?`X5!lEiDrgJ%fi!uD@RD{g2A3fZ!3)ke71*rp|)mT^nEIT+U9bGDau*
z3EPZM#-~XhRG6z%qP((v{`T<eKYP!Z-bOaW@I5OY3yFQE+DI<g^n_piy_$&hM|}xO
x|7G=AZu%RZZWWDwDSz3##f>-ZYGSy=_x)J;kN3SJMds{xpDO)I>@^MM{TI@j%h><`

literal 1277
zcmV<Z1Ood<Nk%w1VHE%s0Qdg@05)vVIxoUEEW9-;vNI{LGAN8GAk#Z9#WySfDOZL*
zHvl_xqc0@@L4TvD#`X2}=I7`9{QT+a>Z>s)@9*%OEhOyi?eOvO;Njx_{{FVP&hql}
z?(XiOrNX#0D!?`?;^O0&ow@t_`|9fJpQOR_^z@P|A)cbYrmD$@C?E6l^QWxJ`1$$g
z=jf-a%Auyi(Yd$o@9)YvErcf?l`J9vK6$n@DWEPT054yeEhFXT=j-e2`1ttw`T4Ih
zDEj*P_V)JQ;Nj@#>6a`c07Qe!IWC<pB;4KJ05fKRCLQ<p_nV-+p)Vz-Fec^Y=9DWU
z$2cujY^0#2!>2GNu(Qa*!^Nzx#qHzb03=RLVwT$5+`+=csWB(Cx6ZG#$HT<NeTJ<7
zKYOpa#urVF%{eZep}r6@S){7VzBVh+X;Fxhys)#$nVz?gDj`Z;j{ru7&d|}mU`pDz
zsr2;q>FMe5^7XT}%+=P{;K|3?+S`659o%nK04-erJ$S##)s&gEt*@})aaOgs&a<}5
zsjkh`Yf{$N*kf*%oua?O#nh}<L(<dK;o{<gD<Iy;#=ybC%gxT?<mJiA%;MwZ&CbtM
zYNEqqOesixJ4$r#@$|8@$pA-*061;{NQ(IQ`o6!xuduSTwYR^*+1G4Sj+efuF(%NO
zht1I2&(+<sT1J_kx|*N6m72Dfo42&M&9pNqu!DZFv$Xd1_tmJDRA-u_J1kRZpG8=Q
zsIAMt$kU~%$J^Z9{r&x(P(CqKkGj3oyua7DT}aeBFLfdst+B;=BpbMpjOgj<%x6!F
zDIfqtfw5^+tT88^qrgyQo5?sWKv935E+nh4&)nSIv$VFsHY=*H%>XfC05oUFWliGA
z#~L?hgpH=y+1lyp>U$&{yuH8LZd9c(CZVRpqNl~r(9)ZqytOnbf-)($G%CN!*0Qs;
znk^%(GANaqwY0a*xiu=#(bA|eCf;yWx4O|)YooQf&a$@4<kHTmuFR1tA)KMU@$&Mj
zF(;TTBme*ZA^8LW00930EC2ui02Kfg000R80RIUbNU)$mfpv)eX{E|a5DXwdFv1{b
z*0M$lU<mZYhE)i2W!5->(4qwd9j0nMNtR@o#zgKyEIHAk%ZMEoEJ!evO5Tkj29hZF
z=S60-7Y^ugpm4#0mPK(0Okm*8fS!MvR-HhK;@5@}6eeLfl5N1N2~23D_%~=@2L~u{
z0eisjrUVFS5DXwtszRH8?@o-<wZfVxup3ld;4n&t0C+wa(D)~a1UVG>q@B6&fCmd%
zD)t0`f`-799RD=DbwNl?y*WK1L=d55-T@iaZ1k&;T8e`eq{c)6A|gYE2rL2#D<Z(d
zglN4TxbW2}%7Y)gj`Ij~fO)zJM*i8_BjJD+kxi9UDET3x$AftRo_#pSg|{mbV8SSS
zV=Kmn2SAi?K{#aSML-in{9^|qm-Nv95zYu<K@1ddFhU_vd|(4JH<<9xJ%<3WKn)FK
z5kw?9K;Q%j$b8^|58~utz&})Mg9Ildx^YJy(;Tr&H<ox%z!VkeGs8dJB!B}pBHkhi
zCFR5e2PDC?(}WQwq=3#ps9>Qa5&%F0&LdTPvBf8fFu_ii-xwp17-l5E$2FJ$5(_n<
ntOH6fPZ%&mF|ZJnNiKe<bBYjjNFaeX$Kaz49*$fgP(T1Xik*@j

diff --git a/templates/admin/default/assets/img/flags/it.gif b/templates/admin/default/assets/img/flags/it.gif
index fddb02499e7984012bd28a6ff14913632d4bbcd3..cdd750a54caafd19cd4ce0b9f30b7aeb70a51160 100755
GIT binary patch
literal 3054
zcmeHJeOOcH6+duq0xCvml~0iiB4&sh)G1)42Es=yqb!0|r>h}cNbr)xn*`BPKd^qF
zn}E1V8Cn!jR31K5DxeiAA|G1?OQ}_?n=5npvB~O&_3`1!&P_rBtLvU;fA8kGZ+<!F
zch37e=Y8*c6C;fd36;Bm3p@u{4?qL#1vmmw1aK0d5}*#?5<n}!dyaxaN6<{<X$4Nq
zv?)5bX<BzzowrxEx92Wz&;2vJ3Vfy?ro4Yk%_#Tv+2Kc>^`i=A`5OX!3xxs4gaKy)
zh3Do3HU-T&v^W?-AvZj1k9ZkG0LWmnZ2D`fynWu8GkKj4tQWYf_c^+LHEe*Q4e}|p
zuQ$EOJ>BPQIs+TQl?iZA`+>$|p(gB@Msr$AgC3Ua!z%TgnldvX3);86-?4pr<&N$C
zIdJoXU6Q@azuvpAKR0*V!ENbz1|~0~rQm?#@al};Y~Ft)xBJNMokz3Y`&g4#da$*k
ztoKx5{+ZovXHJ(?7gyKR)z#L2Shv5r?)<)UhT`+bKf3U%!cTS|y_kRF;wQz8#m5@+
zOPUUzYAUa|Tzve~!!=hbnwy&|T0T70T2#||w)$FG{k5vrYi-|LYd+gn@~5^-7q8dV
zwwJfJcU5(iobNnU-&xn#dG2cG?;dp4*LPK2`Ml=xjmE3pP0hVcoxSZ}_VwMq)qnHO
zjov%`{rz`)zxm?Mw_klb@aMlgcsTIr(WA#to<1EK!u#pav+tfg{paw@;o<L}fB*dD
z%aM^0`2Y34cEI-qIbkAheqZAxX=J1<CL$(S6uiI);7}>oY8iV9AVaNZ(Lt?VvzBtW
z4ffyxlfV-u$rU=SI3Xd9o0{YPP{Qz6V8>Z|=f2wi!-z4KNh!2W0bu8dHcg67k%2f1
zfX67btR8?rfcB8hdM#py>4>MYC=juT!)azL;c&7UuQqWKWs%6?v<ehTc?#le#6ihp
z>}iQIqm^V9ffP&>L#t_4rJ%TGB(R!P6@y2I_4+SvEAPia24ldYP1g(@opc*lzJ=dH
zu6QLIE3@EIg*<8{Vt=%EX!Q}CJpl0&!^R{r;y?iV*HYQ&Bs1UsjjhVWcM!XxJw>IL
zCR*%U)yeU1BgR<!6B{*eae0tqwC_;pBC(s`hmLznTFR|53L+qdmP8>ALOerhh_y^W
ztk7ky<m{$ITa}UVh%phtrps3(AofJOkJZSy$xt+Lf@Wg4$uK{0U8_&9h#&^lOguLi
z7EB6govBF7Net?hiLvHba<QIGw8WBYQ&rJY3qM=Sn06y-Bg<KXjMIks$sRcy6@wV_
zkl)ejB(8CYdG0B43D?|th{Iu(og7~U8c4>`r~oyL0EGv244&5%Xn{pnDyV=#3yoeH
zEh@XoctETE124hEF~`_4rJ14!xoA+pt2yQw9$GjW(v1|63-Mk`#*xd&5Hb`f@=bC%
z8BR*j8cHs;Do7ZklY%sOh)T_QHh}?W=5(xrh<s0j&>BPKu<xoA-FZW(#!{sb%hcEi
zn8;c(iq?#60qC#=qvg#V+o<;J%kEYW)kik0>vd|+hPO=}{*ear26%(KJ{)iJ?%Lvc
z{k*&Qxea2}#+VdkpemJVDRfreTw4*y`V4P9$Z@=nJPm3cRXT1-Q`PyNHV?MKI7IJ_
zAC8BdAe&iqOY~P!pXj)#T=aO{B({{}+C&r*^~9${Bhf_s9w?%P_>5>Kt`jxHC2P)C
zuf92pb@fdJb2hGAZW%`B8{2Fe7(s-<OE6O)5%>sZ3F53QO5i347Q_l>qsPm-aE#4A
zt`-%n!Di7$OJ83-8TSyVAPJ?YU^7Z$v9DZ@)vyKAj(t=tQpp))Fe&}FjT^#k=TRB_
zD87U*28tiZ59J5*S8#ar;p5LnUnq`IR{7?K$I2L20zHO>ZL#K=Yub0*ZsnpgQ8$CS
zX+52VZxDb;jdlyGN>l2o1tL++5=xA3G@6pC74w29Im1vUpN?W_9nEIaDf57P9ddyH
z&t#_8oSkd8&8Ghuz_P#L!PR54tu+8t=>Xgo*=#~Q7^i&<(6CrxU^C76z|QV-0A1?B
z1*YG2PWX?Jch6{ihKH8JA%Kwrqw(blqj97R^WOz%VYuTM@DHsEfTI!SPnaHCONqnY
zztJH6a^KI(qIIQDgqvo4F>A@YRm=;&*n*g-I9H((c63#Que$Pqc;(=IzsN;=eUY<o
zOU1%pbd;{yC6tv#?%C!(l(6$b+k9nDt#oSV%$dFp;p<AN`^g>^n~TD7{7*aDJG%$P
zHN>X=x@6w=prjLt6QnuLo+p2KCNf&!?zbiAVf}z>^|~d>F8BM#)8_x-;-;VEXXFsE
z_hJhJy~ROpd51lgWL^0Ci^|8hY8Bo8*dQ<4^HEg%F3HigKkdqO4Nl+SyGWVPV=tM#
zyx~HMWdF4JC%@iFq)nM@?-lUIAGOlliLVRe{cm2a2y?RYa1U{w*>m7^kI-XEr_MvW
Q4+vcRvz;2JI>XX`0hG<ti~s-t

literal 1269
zcmV<R1Pc2{Nk%w1VHE%s0QdR;@bK}TE+oFrw)Xb+u`?*CF(<6Up}{vS{{H^%@9(tB
zsK7QW`1ts%!l3*6`?WMF^78YyG%AxTBKG$8u*apzI4!0yCg|zv_VMwy&8d_tBC5cj
z{QUg8%d@&QD)aR8=;`UsIxc%89IwTrqqv#l<mK=0@bU8U)YaCXw3g-O=efGOrMsKh
zJTUe3_4M@hug0VRZ6v?I!kjH6vNI{p&(Ocmwg6cj%Q-FF-QECuDCp?vslT4uJTR&;
zC#b%i;^X9<E+qH&_qWHe<mKf6QX09+vg_;Y0D~$3ZzbmE=jG+*$T%&t%BQ?FD`}-#
z@bU4j!=lnUFW=wbn=K>i>g%U4CZR7S)H^Q#Xd>zA>X<Ae0CXn%`}~L~9{^z>fva)e
z-{4S!NX9rU&^j*1$jQYwETb<a&e+MCEhE6f!>+`l^Yin(y}zfuoSwRoSeZ?<%&6_{
z?yt$A=I7|MUrE!dn*entw6(X@J1@D(vghdOai?JbU?6@a9DXGo`1$$L)78AqwP2HQ
zz0S1(hbzCo!N%9Tz|ps@GAN2DAH&qTV3<?3x4C1TR+TIwjZ8(OT~@X<DTyc_rD<cb
zv$egyz}ec{0A(RShF7mLC}^WuiKKzctf`GDAc`p<M3q3u*}kdAnvyFasb5%;Dj|I(
z9HlTOu*amPyqvHyD1;{-Nq9n;EF<6G;f+f~pe`k?U|F)rrd*Lw!^Fm;xtZ(i?7O_Z
zr*&|xIV%8xD%;%M#>dIvzOmZk*V8*M0C*>|$)*E}EcyBQ!Z$3xHY);&D*%5f=jZ6i
z$;!Xd#kkL_V2^LC!lBsN+5l-IsC96LCmyRYCjeR=vB;%2b2hxqw78Irk18SGy|9Hd
zDp!k4K!H{OeksQ|Evzyp-QM43p;))Ly88P1xX7^1IWBUOZj31)?CtHiG%BbuCa=J!
z#?!&UHY*)}E`+6b($mz$#>b&ySxkpS&(PAr)wYEv9@wOipS-BKH7fuA{{R3000000
z0000000000A^8LW008;`EC2ui02Kfg000R80QCtRNU)&6fxd?5>A;T89uN?b^~z>P
z-ZcyZ*QFrA;s?1BOH`;>LgZc@Y|%u#!iXkCtyDZ3Si7L*$dM}Ga-EqWVUj6a`i78j
zv%$a!L~;_CFfpaZ15H)}Xz(IJpAi;348V}J2nqxUKyq9vmXCnC0Hapv>+qx5h+uIJ
zy<l@;hmsQB4tOA7A<a2`f;Oz7rXWKo7YP6WNMI`jlXellU6G(qKm!;}GAyeH;KPIo
zE>2)6XT}NNEtL(R$}Eb{2L=wh3>(lwN`(av3Q*B!BMJotb3i>A-~a&v4h(wy!f_yi
zk088#D}W<xc=6-Ou`qWIU4Q`!V2~Kn+w=iY7Y^el)V`g2M&$-?-03P54!{c`LIyy{
z6Jm@L8Wyyo4<Q@O157taI8sFdP@Dh&I%HIEKst$Bp}|`3#K46P$1nnf5;W~V1QW#U
zWd#+USXE6HN!+2sEY9RGg)3p~vVaFP6cB&}_UOaO4PQKy1Q*-X01pZ%1VWD_suTdr
zBZ_FF4?aaq^F<ahh@nP2WhBE3Ez+DK)hB;IBM>u1+|UOmtW?s-3M+_%M*v%t;)NfO
fU?h+-gK(3HIk#9MgA9hW5eq4iP|}G&0RaFzgC=ei

diff --git a/templates/admin/default/assets/js/bootstrap-switch/bootstrap-switch.js b/templates/admin/default/assets/js/bootstrap-switch/bootstrap-switch.js
new file mode 100644
index 000000000..1538f9df1
--- /dev/null
+++ b/templates/admin/default/assets/js/bootstrap-switch/bootstrap-switch.js
@@ -0,0 +1,382 @@
+/*! ============================================================
+ * bootstrapSwitch v1.8 by Larentis Mattia @SpiritualGuru
+ * http://www.larentis.eu/
+ *
+ * Enhanced for radiobuttons by Stein, Peter @BdMdesigN
+ * http://www.bdmdesign.org/
+ *
+ * Project site:
+ * http://www.larentis.eu/switch/
+ * ============================================================
+ * Licensed under the Apache License, Version 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * ============================================================ */
+
+!function ($) {
+  "use strict";
+
+  $.fn['bootstrapSwitch'] = function (method) {
+    var inputSelector = 'input[type!="hidden"]';
+    var methods = {
+      init: function () {
+        return this.each(function () {
+            var $element = $(this)
+              , $div
+              , $switchLeft
+              , $switchRight
+              , $label
+              , $form = $element.closest('form')
+              , myClasses = ""
+              , classes = $element.attr('class')
+              , color
+              , moving
+              , onLabel = "ON"
+              , offLabel = "OFF"
+              , icon = false
+              , textLabel = false;
+
+            $.each(['switch-mini', 'switch-small', 'switch-large'], function (i, el) {
+              if (classes.indexOf(el) >= 0)
+                myClasses = el;
+            });
+
+            $element.addClass('has-switch');
+
+            if ($element.data('on') !== undefined)
+              color = "switch-" + $element.data('on');
+
+            if ($element.data('on-label') !== undefined)
+              onLabel = $element.data('on-label');
+
+            if ($element.data('off-label') !== undefined)
+              offLabel = $element.data('off-label');
+
+            if ($element.data('label-icon') !== undefined)
+              icon = $element.data('label-icon');
+
+            if ($element.data('text-label') !== undefined)
+              textLabel = $element.data('text-label');
+
+            $switchLeft = $('<span>')
+              .addClass("switch-left")
+              .addClass(myClasses)
+              .addClass(color)
+              .html(onLabel);
+
+            color = '';
+            if ($element.data('off') !== undefined)
+              color = "switch-" + $element.data('off');
+
+            $switchRight = $('<span>')
+              .addClass("switch-right")
+              .addClass(myClasses)
+              .addClass(color)
+              .html(offLabel);
+
+            $label = $('<label>')
+              .html("&nbsp;")
+              .addClass(myClasses)
+              .attr('for', $element.find(inputSelector).attr('id'));
+
+            if (icon) {
+              $label.html('<i class="icon ' + icon + '"></i>');
+            }
+
+            if (textLabel) {
+              $label.html('' + textLabel + '');
+            }
+
+            $div = $element.find(inputSelector).wrap($('<div>')).parent().data('animated', false);
+
+            if ($element.data('animated') !== false)
+              $div.addClass('switch-animate').data('animated', true);
+
+            $div
+              .append($switchLeft)
+              .append($label)
+              .append($switchRight);
+
+            $element.find('>div').addClass(
+              $element.find(inputSelector).is(':checked') ? 'switch-on' : 'switch-off'
+            );
+
+            if ($element.find(inputSelector).is(':disabled'))
+              $(this).addClass('deactivate');
+
+            var changeStatus = function ($this) {
+              if ($element.parent('label').is('.label-change-switch')) {
+
+              } else {
+                $this.siblings('label').trigger('mousedown').trigger('mouseup').trigger('click');
+              }
+            };
+
+            $element.on('keydown', function (e) {
+              if (e.keyCode === 32) {
+                e.stopImmediatePropagation();
+                e.preventDefault();
+                changeStatus($(e.target).find('span:first'));
+              }
+            });
+
+            $switchLeft.on('click', function (e) {
+              changeStatus($(this));
+            });
+
+            $switchRight.on('click', function (e) {
+              changeStatus($(this));
+            });
+
+            $element.find(inputSelector).on('change', function (e, skipOnChange) {
+              var $this = $(this)
+                , $element = $this.parent()
+                , thisState = $this.is(':checked')
+                , state = $element.is('.switch-off');
+
+              e.preventDefault();
+
+              $element.css('left', '');
+
+              if (state === thisState) {
+
+                if (thisState)
+                  $element.removeClass('switch-off').addClass('switch-on');
+                else $element.removeClass('switch-on').addClass('switch-off');
+
+                if ($element.data('animated') !== false)
+                  $element.addClass("switch-animate");
+
+                if (typeof skipOnChange === 'boolean' && skipOnChange)
+                  return;
+
+                $element.parent().trigger('switch-change', {'el': $this, 'value': thisState})
+              }
+            });
+
+            $element.find('label').on('mousedown touchstart', function (e) {
+              var $this = $(this);
+              moving = false;
+
+              e.preventDefault();
+              e.stopImmediatePropagation();
+
+              $this.closest('div').removeClass('switch-animate');
+
+              if ($this.closest('.has-switch').is('.deactivate')) {
+                $this.unbind('click');
+              } else if ($this.closest('.switch-on').parent().is('.radio-no-uncheck')) {
+                $this.unbind('click');
+              } else {
+                $this.on('mousemove touchmove', function (e) {
+                  var $element = $(this).closest('.make-switch')
+                    , relativeX = (e.pageX || e.originalEvent.targetTouches[0].pageX) - $element.offset().left
+                    , percent = (relativeX / $element.width()) * 100
+                    , left = 25
+                    , right = 75;
+
+                  moving = true;
+
+                  if (percent < left)
+                    percent = left;
+                  else if (percent > right)
+                    percent = right;
+
+                  $element.find('>div').css('left', (percent - right) + "%")
+                });
+
+                $this.on('click touchend', function (e) {
+                  var $this = $(this)
+                    , $myInputBox = $this.siblings('input');
+
+                  e.stopImmediatePropagation();
+                  e.preventDefault();
+
+                  $this.unbind('mouseleave');
+
+                  if (moving)
+                    $myInputBox.prop('checked', !(parseInt($this.parent().css('left')) < -25));
+                  else
+                    $myInputBox.prop("checked", !$myInputBox.is(":checked"));
+
+                  moving = false;
+                  $myInputBox.trigger('change');
+                });
+
+                $this.on('mouseleave', function (e) {
+                  var $this = $(this)
+                    , $myInputBox = $this.siblings('input');
+
+                  e.preventDefault();
+                  e.stopImmediatePropagation();
+
+                  $this.unbind('mouseleave mousemove');
+                  $this.trigger('mouseup');
+
+                  $myInputBox.prop('checked', !(parseInt($this.parent().css('left')) < -25)).trigger('change');
+                });
+
+                $this.on('mouseup', function (e) {
+                  e.stopImmediatePropagation();
+                  e.preventDefault();
+
+                  $(this).trigger('mouseleave');
+                });
+              }
+            });
+
+            if ($form.data('bootstrapSwitch') !== 'injected') {
+              $form.bind('reset', function () {
+                setTimeout(function () {
+                  $form.find('.make-switch').each(function () {
+                    var $input = $(this).find(inputSelector);
+
+                    $input.prop('checked', $input.is(':checked')).trigger('change');
+                  });
+                }, 1);
+              });
+              $form.data('bootstrapSwitch', 'injected');
+            }
+          }
+        );
+      },
+      toggleActivation: function () {
+        var $this = $(this);
+
+        $this.toggleClass('deactivate');
+        $this.find(inputSelector).prop('disabled', $this.is('.deactivate'));
+      },
+      isActive: function () {
+        return !$(this).hasClass('deactivate');
+      },
+      setActive: function (active) {
+        var $this = $(this);
+
+        if (active) {
+          $this.removeClass('deactivate');
+          $this.find(inputSelector).removeAttr('disabled');
+        }
+        else {
+          $this.addClass('deactivate');
+          $this.find(inputSelector).attr('disabled', 'disabled');
+        }
+      },
+      toggleState: function (skipOnChange) {
+        var $input = $(this).find(':checkbox');
+        $input.prop('checked', !$input.is(':checked')).trigger('change', skipOnChange);
+      },
+      toggleRadioState: function (skipOnChange) {
+        var $radioinput = $(this).find(':radio');
+        $radioinput.not(':checked').prop('checked', !$radioinput.is(':checked')).trigger('change', skipOnChange);
+      },
+      toggleRadioStateAllowUncheck: function (uncheck, skipOnChange) {
+        var $radioinput = $(this).find(':radio');
+        if (uncheck) {
+          $radioinput.not(':checked').trigger('change', skipOnChange);
+        }
+        else {
+          $radioinput.not(':checked').prop('checked', !$radioinput.is(':checked')).trigger('change', skipOnChange);
+        }
+      },
+      setState: function (value, skipOnChange) {
+        $(this).find(inputSelector).prop('checked', value).trigger('change', skipOnChange);
+      },
+      setOnLabel: function (value) {
+        var $switchLeft = $(this).find(".switch-left");
+        $switchLeft.html(value);
+      },
+      setOffLabel: function (value) {
+        var $switchRight = $(this).find(".switch-right");
+        $switchRight.html(value);
+      },
+      setOnClass: function (value) {
+        var $switchLeft = $(this).find(".switch-left");
+        var color = '';
+        if (value !== undefined) {
+          if ($(this).attr('data-on') !== undefined) {
+            color = "switch-" + $(this).attr('data-on')
+          }
+          $switchLeft.removeClass(color);
+          color = "switch-" + value;
+          $switchLeft.addClass(color);
+        }
+      },
+      setOffClass: function (value) {
+        var $switchRight = $(this).find(".switch-right");
+        var color = '';
+        if (value !== undefined) {
+          if ($(this).attr('data-off') !== undefined) {
+            color = "switch-" + $(this).attr('data-off')
+          }
+          $switchRight.removeClass(color);
+          color = "switch-" + value;
+          $switchRight.addClass(color);
+        }
+      },
+      setAnimated: function (value) {
+        var $element = $(this).find(inputSelector).parent();
+        if (value === undefined) value = false;
+        $element.data('animated', value);
+        $element.attr('data-animated', value);
+
+        if ($element.data('animated') !== false) {
+          $element.addClass("switch-animate");
+        } else {
+          $element.removeClass("switch-animate");
+        }
+      },
+      setSizeClass: function (value) {
+        var $element = $(this);
+        var $switchLeft = $element.find(".switch-left");
+        var $switchRight = $element.find(".switch-right");
+        var $label = $element.find("label");
+        $.each(['switch-mini', 'switch-small', 'switch-large'], function (i, el) {
+          if (el !== value) {
+            $switchLeft.removeClass(el);
+            $switchRight.removeClass(el);
+            $label.removeClass(el);
+          } else {
+            $switchLeft.addClass(el);
+            $switchRight.addClass(el);
+            $label.addClass(el);
+          }
+        });
+      },
+      status: function () {
+        return $(this).find(inputSelector).is(':checked');
+      },
+      destroy: function () {
+        var $element = $(this)
+          , $div = $element.find('div')
+          , $form = $element.closest('form')
+          , $inputbox;
+
+        $div.find(':not(input)').remove();
+
+        $inputbox = $div.children();
+        $inputbox.unwrap().unwrap();
+
+        $inputbox.unbind('change');
+
+        if ($form) {
+          $form.unbind('reset');
+          $form.removeData('bootstrapSwitch');
+        }
+
+        return $inputbox;
+      }
+    };
+
+    if (methods[method])
+      return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+    else if (typeof method === 'object' || !method)
+      return methods.init.apply(this, arguments);
+    else
+      $.error('Method ' + method + ' does not exist!');
+  };
+}(jQuery);
+
+(function ($) {
+  $(function () {
+    $('.make-switch')['bootstrapSwitch']();
+  });
+})(jQuery);
\ No newline at end of file
diff --git a/templates/admin/default/assets/less/thelia/bootstrap-switch.less b/templates/admin/default/assets/less/thelia/bootstrap-switch.less
new file mode 100644
index 000000000..84a297f0b
--- /dev/null
+++ b/templates/admin/default/assets/less/thelia/bootstrap-switch.less
@@ -0,0 +1,160 @@
+.has-switch {
+  display: inline-block;
+  cursor: pointer;
+  border-radius: @input-border-radius;
+  border: 1px solid;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  position: relative;
+  text-align: left;
+  overflow: hidden;
+  line-height: 8px;
+  .user-select(none);
+  vertical-align: middle;
+
+  min-width: 100px;
+
+  &.switch-mini {
+    min-width: 72px;
+  }
+  &.switch-mini i.switch-mini-icons {
+    height: 1.20em;
+    line-height: 9px;
+    vertical-align: text-top;
+    text-align: center;
+    transform: scale(0.6);
+    margin-top: -1px;
+    margin-bottom: -1px;
+  }
+  &.switch-small {
+    min-width: 80px;
+  }
+
+  &.switch-large {
+    min-width: 120px;
+  }
+
+  &.deactivate {
+    .opacity(50);
+    cursor: default !important;
+    label, span {
+      cursor: default !important;
+    }
+  }
+  > div {
+    display: inline-block;
+    width: 150%;
+    position: relative;
+    top: 0;
+
+    &.switch-animate {
+      .transition(left 0.5s);
+    }
+    &.switch-off {
+      left: -50%;
+    }
+    &.switch-on {
+      left: 0%;
+    }
+  }
+  input[type=radio],
+  input[type=checkbox] {
+    //debug
+    display: none;
+    //position: absolute;
+    //margin-left: 60%;
+    //z-index: 123;
+  }
+
+  span, label {
+    .box-sizing(border-box);
+
+    cursor: pointer;
+    position: relative;
+    display: inline-block;
+    height: 100%;
+
+    padding-bottom: 4px;
+    padding-top: 4px;
+    font-size: 14px;
+    line-height: 20px;
+
+    &.switch-mini {
+      padding-bottom: 4px;
+      padding-top: 4px;
+      font-size: 10px;
+      line-height: 9px;
+    }
+
+    &.switch-small {
+      padding-bottom: 3px;
+      padding-top: 3px;
+      font-size: 12px;
+      line-height: 18px;
+    }
+
+    &.switch-large {
+      padding-bottom: 9px;
+      padding-top: 9px;
+      font-size: 16px;
+      line-height: normal;
+    }
+  }
+
+  label {
+    text-align: center;
+    margin-top: -1px;
+    margin-bottom: -1px;
+    z-index: 100;
+    width: 34%;
+    border-left: 1px solid @btn-default-border;
+    border-right: 1px solid @btn-default-border;
+  
+    .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border);
+
+    i {
+      color: #000;
+      text-shadow: 0 1px 0 #fff;
+      line-height: 18px;
+      pointer-events: none;
+    }
+  }
+
+  span {
+    text-align: center;
+    z-index: 1;
+    width: 33%;
+
+    &.switch-left {
+      .border-left-radius(@input-border-radius);
+    }
+
+    &.switch-right {
+      .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border);
+      .border-right-radius(@input-border-radius);
+    }
+
+    &.switch-primary, &.switch-left {
+      .button-variant(@btn-primary-color, @btn-primary-bg, @btn-primary-border);
+    }
+
+    &.switch-info {
+      .button-variant(@btn-info-color, @btn-info-bg, @btn-info-border);
+    }
+
+    &.switch-success {
+      .button-variant(@btn-success-color, @btn-success-bg, @btn-success-border);
+    }
+
+    &.switch-warning {
+      .button-variant(@btn-warning-color, @btn-warning-bg, @btn-warning-border);
+    }
+
+    &.switch-danger {
+      .button-variant(@btn-danger-color, @btn-danger-bg, @btn-danger-border);
+    }
+
+    &.switch-default {
+      .button-variant(@btn-default-color, @btn-default-bg, @btn-default-border);
+    }
+  }
+}
\ No newline at end of file
diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less
index 560f78bc1..3883c7067 100644
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -9,6 +9,7 @@
 @import "tables.less";
 @import "tablesorter.less";
 @import "bootstrap-editable.less";
+@import "bootstrap-switch.less";
 
 // -- Base styling ------------------------------------------------------------
 
diff --git a/templates/admin/default/currencies.html b/templates/admin/default/currencies.html
index 7a8eff05d..18c332f18 100644
--- a/templates/admin/default/currencies.html
+++ b/templates/admin/default/currencies.html
@@ -147,7 +147,9 @@
                                             </td>
 
                                             <td class="text-center">
-                                                <input class="change-default" type="radio" name="is_default" value="{$ID}" {if $IS_DEFAULT}checked="checked"{/if}/>
+                                                <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input class="change-default" type="radio" name="is_default" value="{$ID}" {if $IS_DEFAULT}checked="checked"{/if}/>
+                                                </div>
                                             </td>
 
                                             {module_include location='currencies_table_row'}
@@ -310,6 +312,10 @@
 {/block}
 
 {block name="javascript-initialization"}
+    
+    {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 
     {javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'}
         <script src="{$asset_url}"></script>
@@ -368,7 +374,7 @@
 
             {* Change default status *}
 
-            $('.change-default').click(function(ev) {
+            $('.change-default').change(function(ev) {
                 var url = "{url path='/admin/configuration/currencies/set-default' currency_id='__ID__'}";
 
                 // Perform ID subtitutions
diff --git a/templates/admin/default/includes/add-category-dialog.html b/templates/admin/default/includes/add-category-dialog.html
index 520043a77..0e62994f7 100755
--- a/templates/admin/default/includes/add-category-dialog.html
+++ b/templates/admin/default/includes/add-category-dialog.html
@@ -15,17 +15,17 @@
 		    <form method="POST" action="{url path='/admin/catalog/category'}" {form_enctype form=$form}>
 
 		        {* the action processed by the controller *}
-			    <input type="hidden" name="action" value="create" />
+			    	<input type="hidden" name="action" value="create" />
 
 		        {form_hidden_fields form=$form}
 
 		        {form_field form=$form field='parent'}
-		        <input type="hidden" name="{$name}" value="{$current_category_id}" />
+		        	<input type="hidden" name="{$name}" value="{$current_category_id}" />
 		        {/form_field}
 
 		        {form_field form=$form field='success_url'}
 		        {* on success, redirect to category change page. _ID_ is replaced with the ID of the created category (see Thelia\Action\Category.php)  *}
-		        <input type="hidden" name="{$name}" value="{url path='admin/catalog/category' id="_ID_" action='edit'}" />
+		        	<input type="hidden" name="{$name}" value="{url path='admin/catalog/category' id="_ID_" action='edit'}" />
 		        {/form_field}
 
 			    <div class="modal-body">

From bbce082df3ea5ab5d5012dfab6f4e406210564ff Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Fri, 6 Sep 2013 10:41:19 +0200
Subject: [PATCH 15/29] Fixed minor visual glitches

---
 .../Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php  | 2 +-
 templates/admin/default/currencies.html                     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
index 12ac13276..bb9770520 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/AdminUtilities.php
@@ -121,7 +121,7 @@ class AdminUtilities extends AbstractSmartyPlugin
         }
 
         if (! empty($icon))
-            $output = sprintf('<i class="icon icon-chevron-%s"></i> ', $icon);
+            $output = sprintf('<i class="glyphicon glyphicon-chevron-%s"></i> ', $icon);
         else
             $output = '';
 
diff --git a/templates/admin/default/currencies.html b/templates/admin/default/currencies.html
index 18c332f18..29bd582a2 100644
--- a/templates/admin/default/currencies.html
+++ b/templates/admin/default/currencies.html
@@ -51,8 +51,8 @@
                                         <th>
                                             {admin_sortable_header
                                             current_order=$order
-                                            order='alpha'
-                                            reverse_order='alpha_reverse'
+                                            order='name'
+                                            reverse_order='name_reverse'
                                             path='/admin/configuration/currencies'
                                             label="{intl l='Name'}"
                                             }
@@ -312,7 +312,7 @@
 {/block}
 
 {block name="javascript-initialization"}
-    
+
     {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}

From 7b3cd4626108c8f508fbb23e40b1dee89ba00f2e Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 10:44:50 +0200
Subject: [PATCH 16/29] Working :

- Add "Action" label to table head
- Group buttons on "Action" col
- Add bootstrap-switch
---
 templates/admin/default/categories.html | 33 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index e3f3e9fde..49db025ae 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -74,7 +74,7 @@
                                     }
 		                            </th>
 
-		                            <th>&nbsp;</th>
+		                            <th>{intl l='Actions'}</th>
 		                        </tr>
 		                    </thead>
 
@@ -83,7 +83,7 @@
 		                    <tr>
 		                        <td>
 		                        i={$ID} {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
-		                          <a href="{url path='admin/catalog/category' id="$ID" action='browse'}" title="{intl l='Browse this category'}"><img src="#IMAGE_URL" alt="#TITLE" /></a>
+		                          <a href="{url path='admin/catalog/category' id="$ID" action='browse'}" title="{intl l='Browse this category'}"><img class="img-thumbnail" src="#IMAGE_URL" alt="#TITLE" /></a>
 		                        {/loop}
 		                        </td>
 
@@ -97,11 +97,15 @@
 
 		                    	<td>
 		                    	    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.category.edit"}
-		                    		<input type="checkbox" data-id="{$ID}" class="categoryVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
+										<div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+		                    				<input type="checkbox" data-id="{$ID}" class="categoryVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
+		                    			</div>
 		                    		{/loop}
 
 		                    		{elseloop rel="can_change"}
-                                       <input type="checkbox" class="disabled" disabled="disabled" {if $VISIBLE == 1}checked="checked"{/if}>
+		                    			<div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                       		<input type="checkbox" class="disabled" disabled="disabled" {if $VISIBLE == 1}checked="checked"{/if}>
+                                       	</div>
                                     {/elseloop}
 		                    	</td>
 
@@ -117,15 +121,17 @@
 		                    	</td>
 
 		                        <td>
-	                                <a class="btn btn-default btn-xs" title="{intl l='Browse this category'}" href="{url path='admin/catalog/category' id="$ID" action='browse'}"><i class="glyphicon glyphicon-folder-open"></i></a>
+		                        	<div class="btn-group">
+		                                <a class="btn btn-default btn-xs" title="{intl l='Browse this category'}" href="{url path='admin/catalog/category' id="$ID" action='browse'}"><i class="glyphicon glyphicon-folder-open"></i></a>
 
-	                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.category.edit"}
-	                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this category'}" href="{url path='admin/catalog/category' id="$ID" action='edit'}"><i class="glyphicon glyphicon-edit"></i></a>
-	                                {/loop}
+		                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.category.edit"}
+		                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this category'}" href="{url path='admin/catalog/category' id="$ID" action='edit'}"><i class="glyphicon glyphicon-edit"></i></a>
+		                                {/loop}
 
-	                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.category.delete"}
-	                                   <a class="btn btn-default btn-xs category-delete" title="{intl l='Delete this category and all its contents'}"  href="#delete_category_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-	                                {/loop}
+		                                {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.category.delete"}
+		                                   <a class="btn btn-default btn-xs category-delete" title="{intl l='Delete this category and all its contents'}"  href="#delete_category_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+		                                {/loop}
+		                            </div>
 		                         </td>
 		                    </tr>
 		                    {/loop}
@@ -273,6 +279,11 @@
 {/block}
 
 {block name="javascript-initialization"}
+
+	{javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
+	    <script src="{$asset_url}"></script>
+	{/javascripts}
+
 	{javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'}
 	    <script src="{$asset_url}"></script>
 	{/javascripts}

From 7f10926b03b77334a09ab1959c58d4d90ed73169 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 11:07:44 +0200
Subject: [PATCH 17/29] Working :

- Add bootstrap switch
- Add css class to img
- Refactor modal add
- Label information in CategoryCreationForm file
---
 core/lib/Thelia/Form/CategoryCreationForm.php |   4 +
 templates/admin/default/categories.html       | 102 +++++++++---------
 .../default/includes/add-category-dialog.html |  45 ++++----
 3 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/core/lib/Thelia/Form/CategoryCreationForm.php b/core/lib/Thelia/Form/CategoryCreationForm.php
index 9935eec19..a125ad090 100755
--- a/core/lib/Thelia/Form/CategoryCreationForm.php
+++ b/core/lib/Thelia/Form/CategoryCreationForm.php
@@ -32,6 +32,10 @@ class CategoryCreationForm extends BaseForm
             ->add("title", "text", array(
                 "constraints" => array(
                     new NotBlank()
+                ),
+                "label" => "Category title *",
+                "label_attr" => array(
+                    "for" => "title"
                 )
             ))
             ->add("parent", "integer", array(
diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 49db025ae..1de7db1c2 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -261,7 +261,7 @@
 						{elseloop rel="product_list"}
 						<thead>
 							<tr>
-								<td class="message"><div class="alert alert-info">{intl l="This category doesn't have any products. To add a new product, click the + button above."}</div></td>
+								<td class="message"><div class="alert alert-info">{intl l="This category doesn't have any products. To add a new product, <strong>click the + button</strong> above."}</div></td>
 							</tr>
 						</thead>
 						{/elseloop}
@@ -288,68 +288,68 @@
 	    <script src="{$asset_url}"></script>
 	{/javascripts}
 
-<script>
-$(function() {
+	<script>
+		$(function() {
 
-	{* display the form creation dialog if it contains errors *}
+			{* display the form creation dialog if it contains errors *}
 
-    {form name="thelia.admin.category.creation"}
-        {if #form_error}
-			$('#add_category_dialog').modal();
-        {/if}
-	{/form}
+		    {form name="thelia.admin.category.creation"}
+		        {if #form_error}
+					$('#add_category_dialog').modal();
+		        {/if}
+			{/form}
 
-	{* Always reset create dialog on close *}
+			{* Always reset create dialog on close *}
 
-    $('#add_category_dialog').on('hidden',function() {
-        // Hide error message
-        $('#add_category_dialog_error').remove();
+		    $('#add_category_dialog').on('hidden',function() {
+		        // Hide error message
+		        $('#add_category_dialog_error').remove();
 
-        // Clear error status
-        $("#add_category_dialog .error").removeClass('error');
+		        // Clear error status
+		        $("#add_category_dialog .error").removeClass('error');
 
-        // Empty field values
-        $("#add_category_dialog input[type=text]").val('');
-    });
+		        // Empty field values
+		        $("#add_category_dialog input[type=text]").val('');
+		    });
 
-    {* Set the proper category ID in the delete confirmation dialog *}
+		    {* Set the proper category ID in the delete confirmation dialog *}
 
-    $(document).on("click", ".category-delete", function () {
-    	$('#'+'delete-category-id').val($(this).data('id'));
-    });
+		    $(document).on("click", ".category-delete", function () {
+		    	$('#'+'delete-category-id').val($(this).data('id'));
+		    });
 
-    // Toggle category visibility
-    $(".categoryVisibleToggle").click(function() {
-        $.ajax({
-           url : "{url path='admin/catalog/category'}",
-           data : {
-               category_id : $(this).data('id'),
-               action : 'visibilityToggle'
-           }
-        });
-    });
+		    // Toggle category visibility
+		    $(".categoryVisibleToggle").change(function() {
+		        $.ajax({
+		           url : "{url path='admin/catalog/category'}",
+		           data : {
+		               category_id : $(this).data('id'),
+		               action : 'visibilityToggle'
+		           }
+		        });
+		    });
 
-    {* Inline editing of object position using bootstrap-editable *}
+		    {* Inline editing of object position using bootstrap-editable *}
 
-    $('.categoryPositionChange').editable({
-        type        : 'text',
-        title       : '{intl l="Enter new category position"}',
-        mode        : 'popup',
-        inputclass  : 'input-mini',
-        placement   : 'left',
-        success     : function(response, newValue) {
-        	// The URL template
-        	var url = "{url path='admin/catalog/category' action='changePosition' category_id='__ID__' position='__POS__'}";
+		    $('.categoryPositionChange').editable({
+		        type        : 'text',
+		        title       : '{intl l="Enter new category position"}',
+		        mode        : 'popup',
+		        inputclass  : 'input-mini',
+		        placement   : 'left',
+		        success     : function(response, newValue) {
+		        	// The URL template
+		        	var url = "{url path='admin/catalog/category' action='changePosition' category_id='__ID__' position='__POS__'}";
 
-        	// Perform subtitutions
-            url = url.replace('__ID__', $(this).data('id'))
-                     .replace('__POS__', newValue);
+		        	// Perform subtitutions
+		            url = url.replace('__ID__', $(this).data('id'))
+		                     .replace('__POS__', newValue);
 
-        	// Reload the page
-        	location.href = url;
-        }
-    });
+		        	// Reload the page
+		        	location.href = url;
+		        }
+		    });
 
-})
-</script>
+		});
+	</script>
 {/block}
\ No newline at end of file
diff --git a/templates/admin/default/includes/add-category-dialog.html b/templates/admin/default/includes/add-category-dialog.html
index 0e62994f7..631d0c06e 100755
--- a/templates/admin/default/includes/add-category-dialog.html
+++ b/templates/admin/default/includes/add-category-dialog.html
@@ -30,36 +30,35 @@
 
 			    <div class="modal-body">
 
-		            {if #form_error}<div class="alert alert-block alert-error" id="add_category_dialog_error">#form_error_message</div>{/if}
+		            {if #form_error}<div class="alert alert-error" id="add_category_dialog_error">#form_error_message</div>{/if}
+					
+					{form_field form=$form field='title'}
+				        <div class="form-group {if $error}has-error{/if}">
+				            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+				            
+		                    {loop type="lang" name="default-lang" default_only="1"}
+		                        
+			                    <div class="input-group">
+			                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Category title'}" placeholder="{intl l='Category title'}" class="form-control">
+			                        <span class="input-group-addon"><img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+			                    </div>
 
-			        <div class="form-group">
-			            <label class="control-label">
-			               {intl l='Category Title *'}
-			            </label>
-			            
-	                    {loop type="lang" name="default-lang" default_only="1"}
-	                        {form_field form=$form field='locale'}
-	                        <input type="hidden" name="{$name}" value="{$LOCALE}" />
-	                        {/form_field}
+				                <div class="help-block">{intl l="Enter here the category title in the default language ($TITLE)"}</div>
 
-		                    <div class="input-group input-block-level">
-		                        {form_field form=$form field='title'}
-		                        <span {if $error}class="error"{/if}>
-		                           <input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Category title'}" placeholder="{intl l='Category title'}" class="form-control input-block-level">
-		                        </span>
+				                {form_field form=$form field='locale'}
+		                        <input type="hidden" name="{$name}" value="{$LOCALE}" />
 		                        {/form_field}
-		                        <span class="input-group-addon"><img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
-		                    </div>
 
-			                <div class="help-block">{intl l="Enter here the category title in the default language ($TITLE)"}</div>
-		                {/loop}
-			            
-			        </div>
+			                {/loop}
+				            
+				        </div>
+			        {/form_field}
+
 			    </div>
 
 			    <div class="modal-footer">
-			        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button>
-			        <button type="submit" class="btn btn-default btn-primary">{intl l="Create this category"}</button>
+			        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="Cancel"}</button>
+			        <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Create this category"}</button>
 			    </div>
 
 		    </form>

From 86569b01a5a0ebdab27a4ccfd2cd026410a965c2 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 11:13:47 +0200
Subject: [PATCH 18/29] Working :

- Add switch to second table
---
 templates/admin/default/categories.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 1de7db1c2..a3097f722 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -235,7 +235,9 @@
 	 							{module_include location='product_list_row'}
 
 		                    	<td>
-		                    		<input type="checkbox" data-id="{$ID}" class="displayToggle" {if $VISIBLE == 1}checked="checked"{/if}>
+		                    		<div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+		                    			<input type="checkbox" data-id="{$ID}" class="displayToggle" {if $VISIBLE == 1}checked="checked"{/if}>
+		                    		</div>
 		                    	</td>
 
 		                    	<td>

From a82251b4b68e084f81cb3f0a15336daa152ffba7 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 11:15:39 +0200
Subject: [PATCH 19/29] Working :

- Refactor modal
---
 .../includes/delete-category-dialog.html      | 78 ++++++++++---------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/templates/admin/default/includes/delete-category-dialog.html b/templates/admin/default/includes/delete-category-dialog.html
index 91cc8db66..38e93a340 100755
--- a/templates/admin/default/includes/delete-category-dialog.html
+++ b/templates/admin/default/includes/delete-category-dialog.html
@@ -1,42 +1,48 @@
 
 {* Adding a new Category *}
 
-<div class="modal hide fade" id="delete_category_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="delete_category_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+    
+    <div class="modal-dialog">
+        <div class="modal-content">
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>{intl l="Delete a category"}</h3>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3>{intl l="Delete a category"}</h3>
+            </div>
+
+            {form name="thelia.admin.category.deletion"}
+            <form method="POST" action="{url path='/admin/catalog/category'}" {form_enctype form=$form}>
+
+                {* the action processed by the controller *}
+                <input type="hidden" name="action" value="delete" />
+
+                {form_hidden_fields form=$form}
+
+                {form_field form=$form field='category_id'}
+                <input type="hidden" name="{$name}" id="delete-category-id" value="" />
+                {/form_field}
+
+                {form_field form=$form field='success_url'}
+                {* on success, redirect to catalog. _ID_ is replaced with the ID of the deleted category parent id (see Thelia\Action\Category.php)  *}
+                <input type="hidden" name="{$name}" value="{url path='admin/catalog/category' id="_ID_" action='browse'}" />
+                {/form_field}
+
+                <div class="modal-body">
+
+                    {if #form_error}<div class="alert alert-block alert-error" id="add_category_dialog_error">#form_error_message</div>{/if}
+
+                    <p>{intl l="Delete this category and all its contents ?"}</p>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="No"}</button>
+                    <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Yes"}</button>
+                </div>
+
+            </form>
+            {/form}
+
+        </div>
     </div>
-
-    {form name="thelia.admin.category.deletion"}
-    <form method="POST" action="{url path='/admin/catalog/category'}" {form_enctype form=$form}>
-
-        {* the action processed by the controller *}
-        <input type="hidden" name="action" value="delete" />
-
-        {form_hidden_fields form=$form}
-
-        {form_field form=$form field='category_id'}
-        <input type="hidden" name="{$name}" id="delete-category-id" value="" />
-        {/form_field}
-
-        {form_field form=$form field='success_url'}
-        {* on success, redirect to catalog. _ID_ is replaced with the ID of the deleted category parent id (see Thelia\Action\Category.php)  *}
-        <input type="hidden" name="{$name}" value="{url path='admin/catalog/category' id="_ID_" action='browse'}" />
-        {/form_field}
-
-        <div class="modal-body">
-
-            {if #form_error}<div class="alert alert-block alert-error" id="add_category_dialog_error">#form_error_message</div>{/if}
-
-            <p>{intl l="Delete this category and all its contents ?"}</p>
-        </div>
-
-        <div class="modal-footer">
-            <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">{intl l="No"}</button>
-            <button type="submit" class="btn btn-primary">{intl l="Yes"}</button>
-        </div>
-
-    </form>
-    {/form}
 </div>

From 7e28c92b0b3b8362a6b227d145fb4684524a9d30 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 11:48:24 +0200
Subject: [PATCH 20/29] Working :

- Refactor to bootstrap3
---
 core/lib/Thelia/Form/ConfigCreationForm.php |  17 +-
 templates/admin/default/variables.html      | 342 ++++++++++----------
 2 files changed, 182 insertions(+), 177 deletions(-)

diff --git a/core/lib/Thelia/Form/ConfigCreationForm.php b/core/lib/Thelia/Form/ConfigCreationForm.php
index 5594830bc..fc65d3d44 100644
--- a/core/lib/Thelia/Form/ConfigCreationForm.php
+++ b/core/lib/Thelia/Form/ConfigCreationForm.php
@@ -40,11 +40,19 @@ class ConfigCreationForm extends BaseForm
 
         $this->formBuilder
             ->add("name", "text", array(
-                "constraints" => $name_constraints
+                "constraints" => $name_constraints,
+                "label" => "Name *",
+                "label_attr" => array(
+                    "for" => "name"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
+                ),
+                "label" => "Purpose *",
+                "label_attr" => array(
+                    "for" => "purpose"
                 )
             ))
             ->add("locale", "hidden", array(
@@ -52,7 +60,12 @@ class ConfigCreationForm extends BaseForm
                     new Constraints\NotBlank()
                 )
             ))
-            ->add("value", "text", array())
+            ->add("value", "text", array(                
+                "label" => "Value *",
+                "label_attr" => array(
+                    "for" => "value"
+                )
+            ))
             ->add("hidden", "hidden", array())
             ->add("secured", "hidden", array())
         ;
diff --git a/templates/admin/default/variables.html b/templates/admin/default/variables.html
index bbab0ae72..6373618f9 100644
--- a/templates/admin/default/variables.html
+++ b/templates/admin/default/variables.html
@@ -22,99 +22,105 @@
                 <form action="{url path='/admin/configuration/variables/update-values'}" method="post">
 	                <div class="general-block-decorator">
 	                    <table class="table table-striped table-condensed table-left-aligned">
-	                        <caption>
+	                        <caption class="clearfix">
 	                           {intl l='Thelia system variables'}
 	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.variables.create"}
-                                <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new variable'}" href="#add_variable_dialog" data-toggle="modal">
-                                    <span class="glyphicon glyphicon-plus-sign"></span>
-                                </a>
-                                <button class="btn btn-default btn-primary action-btn" title="{intl l='Save chages'}">{intl l='Save changes'} <span class="glyphicon glyphicon-ok"></span></button>
+                               <div class="pull-right">
+                                  <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new variable'}" href="#add_variable_dialog" data-toggle="modal">
+                                      <span class="glyphicon glyphicon-plus-sign"></span>
+                                  </a>
+                                  <button class="btn btn-default btn-primary" title="{intl l='Save chages'}"><span class="glyphicon glyphicon-ok"></span> {intl l='Save changes'}</button>
+                                </div>
                             {/loop}
 
 	                        </caption>
-	                        <tr>
-	                           <th>
-                               {admin_sortable_header
-                                  current_order=$order
-                                  order='title'
-                                  reverse_order='title_reverse'
-                                  path={url path='/admin/configuration/variables'}
-                                  label={intl l='Purpose'}
-                               }
-	                           </th>
 
-                               <th>
-                               {admin_sortable_header
-                                  current_order=$order
-                                  order='name'
-                                  reverse_order='name_reverse'
-                                  path={url path='/admin/configuration/variables'}
-                                  label={intl l='Name'}
-                               }
-                               </th>
+                          <thead>
+  	                        <tr>
+  	                           <th>
+                                 {admin_sortable_header
+                                    current_order=$order
+                                    order='title'
+                                    reverse_order='title_reverse'
+                                    path={url path='/admin/configuration/variables'}
+                                    label={intl l='Purpose'}
+                                 }
+  	                           </th>
 
-                               <th>
-                               {admin_sortable_header
-                                  current_order=$order
-                                  order='value'
-                                  reverse_order='value_reverse'
-                                  path={url path='/admin/configuration/variables'}
-                                  label={intl l='Value'}
-                               }
-                               </th>
+                                 <th>
+                                 {admin_sortable_header
+                                    current_order=$order
+                                    order='name'
+                                    reverse_order='name_reverse'
+                                    path={url path='/admin/configuration/variables'}
+                                    label={intl l='Name'}
+                                 }
+                                 </th>
 
-                               {module_include location='variables_table_header'}
+                                 <th>
+                                 {admin_sortable_header
+                                    current_order=$order
+                                    order='value'
+                                    reverse_order='value_reverse'
+                                    path={url path='/admin/configuration/variables'}
+                                    label={intl l='Value'}
+                                 }
+                                 </th>
 
-                               <th>&nbsp;</th>
-	                        </tr>
+                                 {module_include location='variables_table_header'}
 
-	                        {loop name="config" type="config" hidden="0" secured="*" backend_context="1" lang="$lang_id" order="$order"}
-	                            <tr>
+                                 <th>{intl l='Action'}</th>
+  	                        </tr>
+                          </thead>
+                          <tbody>
+  	                        {loop name="config" type="config" hidden="0" secured="*" backend_context="1" lang="$lang_id" order="$order"}
+  	                            <tr>
 
-	                               <td>{$TITLE}</td>
+  	                               <td>{$TITLE}</td>
 
-                                   <td>
-                                   {if ! $SECURED}
-                                       {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
-                                           <a title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}">{$NAME}</a>
-                                       {/loop}
-                                       {elseloop rel="can_change"}
-                                           {$NAME}
-                                       {/elseloop}
-                                   {else}
-                                       {$NAME}
-                                   {/if}
-                                   </td>
+                                     <td>
+                                     {if ! $SECURED}
+                                         {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
+                                             <a title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}">{$NAME}</a>
+                                         {/loop}
+                                         {elseloop rel="can_change"}
+                                             {$NAME}
+                                         {/elseloop}
+                                     {else}
+                                         {$NAME}
+                                     {/if}
+                                     </td>
 
-	                                <td>
-	                                    {if $SECURED}
-	                                        {$VALUE}
-	                                    {else}
-	                                        <input id="cancelable_edit_{$ID}" class="js-edit" data-id="{$ID}" type="text" name="variable[{$ID}]" value="{$VALUE|htmlspecialchars}" />
-	                                    {/if}
-	                                </td>
+  	                                <td>
+  	                                    {if $SECURED}
+  	                                        {$VALUE}
+  	                                    {else}
+  	                                        <input id="cancelable_edit_{$ID}" class="js-edit form-control" data-id="{$ID}" type="text" name="variable[{$ID}]" value="{$VALUE|htmlspecialchars}" />
+  	                                    {/if}
+  	                                </td>
 
-	                                {module_include location='variables_table_row'}
+  	                                {module_include location='variables_table_row'}
 
-	                                <td class="actions">
-	                                    {if ! $SECURED}
-		                                    <div class="btn-group">
-                                               <a class="btn btn-default btn-xs cancel-edit" id="cancel_edit_btn_{$ID}" data-id="{$ID}" title="{intl l='Cancel changes and revert to original value'}" href="#"><i class="glyphicon glyphicon-remove"></i></a>
+  	                                <td class="actions">
+  	                                    {if ! $SECURED}
+  		                                    <div class="btn-group">
+                                                 <a class="btn btn-default btn-xs cancel-edit" id="cancel_edit_btn_{$ID}" data-id="{$ID}" title="{intl l='Cancel changes and revert to original value'}" href="#"><i class="glyphicon glyphicon-remove"></i></a>
 
-                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
-                                                   <a class="btn btn-default btn-xs config-change" title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                               {/loop}
+                                                 {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
+                                                     <a class="btn btn-default btn-xs config-change" title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                                 {/loop}
 
-                                               {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.variables.delete"}
-                                                   <a class="btn btn-default btn-xs config-delete" title="{intl l='Delete this variable'}" href="#delete_variable_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                               {/loop}
-		                                    </div>
-		                                {else}
-		                                    <i title="{intl l='This variable could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-	                                    {/if}
-	                                </td>
-	                            </tr>
-	                        {/loop}
+                                                 {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.variables.delete"}
+                                                     <a class="btn btn-default btn-xs config-delete" title="{intl l='Delete this variable'}" href="#delete_variable_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                 {/loop}
+  		                                    </div>
+  		                                {else}
+  		                                    <i title="{intl l='This variable could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+  	                                    {/if}
+  	                                </td>
+  	                            </tr>
+  	                        {/loop}
+                          </tbody>
 	                    </table>
 	                </div>
                 </form>
@@ -129,129 +135,115 @@
 
 {* Adding a new variable *}
 
-<div class="modal hide fade" id="add_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="add_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>{intl l="Create a new variable"}</h3>
-    </div>
+      <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h3>{intl l="Create a new variable"}</h3>
+      </div>
 
-    {form name="thelia.admin.config.creation"}
-    <form method="POST" action="{url path='/admin/configuration/variables/create'}" {form_enctype form=$form}>
+      {form name="thelia.admin.config.creation"}
+      <form method="POST" action="{url path='/admin/configuration/variables/create'}" {form_enctype form=$form}>
 
-        {form_hidden_fields form=$form}
+          {form_hidden_fields form=$form}
 
-        {form_field form=$form field='success_url'}
-        {* on success, redirect to the edition page, _ID_ is replaced with the created variable ID, see controller  *}
-        <input type="hidden" name="{$name}" value="{url path='/admin/configuration/variables/update' variable_id='_ID_'}" />
-        {/form_field}
+          {form_field form=$form field='success_url'}
+          {* on success, redirect to the edition page, _ID_ is replaced with the created variable ID, see controller  *}
+          <input type="hidden" name="{$name}" value="{url path='/admin/configuration/variables/update' variable_id='_ID_'}" />
+          {/form_field}
 
-        {* We do not allow users to create hidden or secured variables from here *}
+          {* We do not allow users to create hidden or secured variables from here *}
 
-        {form_field form=$form field='hidden'}
-        <input type="hidden" name="{$name}" value="0" />
-        {/form_field}
+          {form_field form=$form field='hidden'}
+          <input type="hidden" name="{$name}" value="0" />
+          {/form_field}
 
-        {form_field form=$form field='secured'}
-        <input type="hidden" name="{$name}" value="0" />
-        {/form_field}
+          {form_field form=$form field='secured'}
+          <input type="hidden" name="{$name}" value="0" />
+          {/form_field}
 
-        <div class="modal-body">
+          <div class="modal-body">
 
-            {if #form_error}<div class="alert alert-block alert-error" id="add_variable_dialog_error">#form_error_message</div>{/if}
+              {if #form_error}<div class="alert alert-error" id="add_variable_dialog_error">#form_error_message</div>{/if}
+                
+              {form_field form=$form field='name'}
+              <div class="form-group {if $error}has-error{/if}">
+                  <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                  <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Variable name'}" placeholder="{intl l='Variable name'}" class="form-control">    
+              </div>
+              {/form_field}
+              
+              {form_field form=$form field='value'}
+              <div class="form-group {if $error}has-error{/if}">
+                  <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                  <input type="text" id="{$label_attr.for}" name="{$name}" value="{$value}" title="{intl l='Variable value'}" placeholder="{intl l='Variable value'}" class="form-control">                    
+              </div>
+              {/form_field}
+              
+              {form_field form=$form field='title'}
+              <div class="form-group {if $error}has-error{/if}">
+                  <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
 
-            <div class="control-group">
+                  {loop type="lang" name="default-lang" default_only="1"}
 
-                <label class="control-label">
-                   {intl l='Name *'}
-                </label>
+                      {* Switch edition to the current locale *}
+                      <input type="hidden" name="edit_language_id" value="{$ID}" />
 
-                <div class="controls">
-	                {form_field form=$form field='name'}
-	                <span {if $error}class="error"{/if}>
-	                   <input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Variable name'}" placeholder="{intl l='Variable name'}" class="input-block-level">
-	                </span>
-	                {/form_field}
-                </div>
-            </div>
+                      <div class="input-group">
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Variable purpose'}" placeholder="{intl l='Variable purpose'}" class="form-control">
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                      </div>
 
-            <div class="control-group">
+                      <div class="help-block">{intl l="Enter here the variable purpose in the default language ($TITLE)"}</div>
 
-                <label class="control-label">
-                   {intl l='Value'}
-                </label>
-
-                <div class="controls">
-                    {form_field form=$form field='value'}
-                    <span {if $error}class="error"{/if}>
-                       <input type="text" name="{$name}" value="{$value}" title="{intl l='Variable value'}" placeholder="{intl l='Variable value'}" class="input-block-level">
-                    </span>
-                    {/form_field}
-                </div>
-            </div>
-
-            <div class="control-group">
-                <label class="control-label">
-                   {intl l='Purpose *'}
-                </label>
-
-                <div class="controls">
-                    {loop type="lang" name="default-lang" default_only="1"}
-
-                        {* Switch edition to the current locale *}
-                        <input type="hidden" name="edit_language_id" value="{$ID}" />
-
-                        {form_field form=$form field='locale'}
+                      {form_field form=$form field='locale'}
                         <input type="hidden" name="{$name}" value="{$LOCALE}" />
-                        {/form_field}
+                      {/form_field}
+                  {/loop}
+              </div>
+              {/form_field}
 
-                        <div class="input-group input-block-level">
-                            {form_field form=$form field='title'}
-                            <span {if $error}class="error"{/if}>
-                               <input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Variable purpose'}" placeholder="{intl l='Variable purpose'}" class="input-block-level">
-                            </span>
-                            {/form_field}
-                            <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
-                        </div>
+          </div>
+          
+          <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="Cancel"}</button>
+              <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Create this variable"}</button>
+          </div>
 
-                        <div class="help-block">{intl l="Enter here the variable purpose in the default language ($TITLE)"}</div>
-                    {/loop}
-                </div>
-            </div>
-
-        </div>
-
-        <div class="modal-footer">
-            <button type="submit" class="btn btn-default btn-primary">{intl l="Create this variable"}</button>
-            <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button>
-        </div>
-
-    </form>
-    {/form}
+      </form>
+      {/form}
+    </div>
+  </div>
 </div>
 
 
 {* Delete confirmation dialog *}
 
-<div class="modal hide fade" id="delete_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="delete_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>{intl l="Delete a variable"}</h3>
+      <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h3>{intl l="Delete a variable"}</h3>
+      </div>
+
+      <div class="modal-body">
+          <p>{intl l="Do you really want to delete this variable ?"}</p>
+      </div>
+
+      <form method="post" action="{url path='/admin/configuration/variables/delete'}">
+          <input type="hidden" name="variable_id" id="variable_delete_id" value="" />
+
+  	    <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="No"}</button>
+            <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Yes"}</button>
+  	    </div>
+      </form>
     </div>
-
-    <div class="modal-body">
-        <p>{intl l="Do you really want to delete this variable ?"}</p>
-    </div>
-
-    <form method="post" action="{url path='/admin/configuration/variables/delete'}">
-        <input type="hidden" name="variable_id" id="variable_delete_id" value="" />
-
-	    <div class="modal-footer">
-            <button type="submit" class="btn btn-default btn-primary">{intl l="Yes"}</button>
-	        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="No"}</button>
-	    </div>
-    </form>
+  </div>
 </div>
 {/block}
 

From c015bbe8b5269814d6ae0214a1ca5a5a1c8bf01d Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 12:12:27 +0200
Subject: [PATCH 21/29] Working :

- Refactor to bootstrap3
- Label information in Form files
---
 core/lib/Thelia/Form/BaseDescForm.php         | 25 ++++++-
 core/lib/Thelia/Form/ConfigCreationForm.php   |  4 +-
 .../Thelia/Form/ConfigModificationForm.php    | 15 ++++-
 .../default/assets/less/thelia/variables.less |  8 ++-
 .../standard-description-form-fields.html     | 53 +++++----------
 templates/admin/default/variable-edit.html    | 65 ++++++-------------
 6 files changed, 83 insertions(+), 87 deletions(-)

diff --git a/core/lib/Thelia/Form/BaseDescForm.php b/core/lib/Thelia/Form/BaseDescForm.php
index c4f4f90c3..2b35f3e6e 100644
--- a/core/lib/Thelia/Form/BaseDescForm.php
+++ b/core/lib/Thelia/Form/BaseDescForm.php
@@ -43,12 +43,31 @@ abstract class BaseDescForm extends BaseForm
             ->add("title", "text", array(
                     "constraints" => array(
                         new NotBlank()
+                    ),
+                    "label" => "Title",
+                    "label_attr" => array(
+                        "for" => "title"
                     )
                 )
             )
-            ->add("chapo", "text", array())
-            ->add("description", "text", array())
-            ->add("postscriptum", "text", array())
+            ->add("chapo", "text", array(    
+                "label" => "Summary",
+                "label_attr" => array(
+                    "for" => "summary"
+                )
+            ))
+            ->add("description", "text", array(
+                "label" => "Detailed description",
+                "label_attr" => array(
+                    "for" => "detailed_description"
+                )
+            ))
+            ->add("postscriptum", "text", array(
+                "label" => "Conclusion",
+                "label_attr" => array(
+                    "for" => "conclusion"
+                )
+            ))
         ;
      }
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Form/ConfigCreationForm.php b/core/lib/Thelia/Form/ConfigCreationForm.php
index fc65d3d44..b2a0c11bb 100644
--- a/core/lib/Thelia/Form/ConfigCreationForm.php
+++ b/core/lib/Thelia/Form/ConfigCreationForm.php
@@ -67,7 +67,9 @@ class ConfigCreationForm extends BaseForm
                 )
             ))
             ->add("hidden", "hidden", array())
-            ->add("secured", "hidden", array())
+            ->add("secured", "hidden", array(
+                "label" => "Prevent variable modification or deletion, except for super-admin"
+            ))
         ;
     }
 
diff --git a/core/lib/Thelia/Form/ConfigModificationForm.php b/core/lib/Thelia/Form/ConfigModificationForm.php
index dd0a0e42f..295c0403d 100644
--- a/core/lib/Thelia/Form/ConfigModificationForm.php
+++ b/core/lib/Thelia/Form/ConfigModificationForm.php
@@ -44,11 +44,22 @@ class ConfigModificationForm extends BaseDescForm
             ->add("name", "text", array(
                 "constraints" => array(
                     new NotBlank()
+                ),
+                "label" => "Name",
+                "label_attr" => array(
+                    "for" => "name"
+                )
+            ))
+            ->add("value", "text", array(
+                "label" => "Value",
+                "label_attr" => array(
+                    "for" => "value"
                 )
             ))
-            ->add("value", "text", array())
             ->add("hidden", "hidden", array())
-            ->add("secured", "hidden", array())
+            ->add("secured", "hidden", array(
+                "label" => "Prevent variable modification or deletion, except for super-admin"
+            ))
          ;
     }
 
diff --git a/templates/admin/default/assets/less/thelia/variables.less b/templates/admin/default/assets/less/thelia/variables.less
index dec523afc..35bc931b5 100755
--- a/templates/admin/default/assets/less/thelia/variables.less
+++ b/templates/admin/default/assets/less/thelia/variables.less
@@ -44,4 +44,10 @@
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
 
-@zindex-dropdown:          1005;
\ No newline at end of file
+@zindex-dropdown:          1005;
+
+// Forms
+// -------------------------
+
+
+@input-border-focus:             @link-color;
\ No newline at end of file
diff --git a/templates/admin/default/includes/standard-description-form-fields.html b/templates/admin/default/includes/standard-description-form-fields.html
index e70092316..0030af54f 100644
--- a/templates/admin/default/includes/standard-description-form-fields.html
+++ b/templates/admin/default/includes/standard-description-form-fields.html
@@ -1,60 +1,41 @@
 {* The standard description fields, used by many Thelia objects *}
 
 {form_field form=$form field='title'}
-<div class="control-group">
-    <label class="control-label">
-       {intl l='Title *'}
-    </label>
-
-    <div class="controls">
-        <span {if $error}class="error"{/if}>
-            <input type="text" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="input-block-level" value="{$value|htmlspecialchars}">
-        </span>
-    </div>
+<div class="form-group {if $error}has-error{/if}">
+    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+    <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{$value|htmlspecialchars}">
 </div>
 {/form_field}
 
 {form_field form=$form field='chapo'}
-<div class="control-group">
-    <label class="control-label">
-        {intl l='Summary'}
+<div class="form-group {if $error}has-error{/if}">
+    <label for="{$label_attr.for}" class="control-label">
+        {intl l="{$label}"} :
         <span class="label-help-block">{intl l="A short description, used when a summary or an introduction is required"}</span>
     </label>
 
-    <div class="controls">
-        <span {if $error}class="error"{/if}>
-            <textarea name="{$name}" rows="3" title="{intl l='Short description'}" placeholder="{intl l='Short description'}" class="input-block-level">{$value|htmlspecialchars}</textarea>
-        </span>
-    </div>
+    <textarea name="{$name}" id="{$label_attr.for}" rows="3" title="{intl l='Short description'}" placeholder="{intl l='Short description'}" class="form-control">{$value|htmlspecialchars}</textarea>
 </div>
 {/form_field}
 
 {form_field form=$form field='description'}
-<div class="control-group">
-    <label class="control-label">
-      {intl l='Detailed description'}
-      <span class="label-help-block">{intl l="The détailed description."}</span>
+<div class="form-group {if $error}has-error{/if}">
+    <label for="{$label_attr.for}" class="control-label">
+        {intl l="{$label}"} :
+        <span class="label-help-block">{intl l="The détailed description."}</span>
     </label>
 
-    <div class="controls">
-        <span {if $error}class="error"{/if}>
-        <textarea name="{$name}" rows="10" class="input-block-level">{$value|htmlspecialchars}</textarea>
-        </span>
-    </div>
+    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control">{$value|htmlspecialchars}</textarea>
 </div>
 {/form_field}
 
 {form_field form=$form field='postscriptum'}
-<div class="control-group">
-    <label class="control-label">
-      {intl l='Conclusion'}
-      <span class="label-help-block">{intl l="A short post-description information"}</span>
+<div class="form-group {if $error}has-error{/if}">
+    <label for="{$label_attr.for}" class="control-label">
+        {intl l="{$label}"} :
+        <span class="label-help-block">{intl l="A short post-description information"}</span>
     </label>
 
-    <div class="controls">
-        <span {if $error}class="error"{/if}>
-        <textarea name="{$name}" rows="3" title="{intl l='Short conclusion'}" placeholder="{intl l='Short conclusion'}" class="input-block-level">{$value|htmlspecialchars}</textarea>
-        </span>
-    </div>
+    <textarea name="{$name}" id="{$label_attr.for}" rows="3" title="{intl l='Short conclusion'}" placeholder="{intl l='Short conclusion'}" class="form-control">{$value|htmlspecialchars}</textarea>
 </div>
 {/form_field}
\ No newline at end of file
diff --git a/templates/admin/default/variable-edit.html b/templates/admin/default/variable-edit.html
index 80410c444..2cc8197b3 100644
--- a/templates/admin/default/variable-edit.html
+++ b/templates/admin/default/variable-edit.html
@@ -27,7 +27,7 @@
 					</div>
 
                     <div class="form-container">
-                         <div class="form-horizontal col-md-12">
+                         <div class="col-md-12">
 						    {form name="thelia.admin.config.modification"}
 						    <form method="POST" action="{url path='/admin/configuration/variables/save'}" {form_enctype form=$form}>
                                 <fieldset>
@@ -57,52 +57,29 @@
 			                        {/form_field}
 
 						            {if #form_error}<div class="alert alert-block alert-error">#form_error_message</div>{/if}
-
-						            <div class="control-group">
-
-						                <label class="control-label">
-						                   {intl l='Name *'}
-						                </label>
-
-						                <div class="controls">
-						                    {form_field form=$form field='name'}
-						                    <span {if $error}class="error"{/if}>
-						                       <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Variable name'}" placeholder="{intl l='Variable name'}" class="input-block-level">
-						                    </span>
-						                    {/form_field}
-						                </div>
+									
+									{form_field form=$form field='name'}
+						            <div class="form-group {if $error}has-error{/if}">
+    									<label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>				                    
+					                    <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Variable name'}" placeholder="{intl l='Variable name'}" class="form-control">					                   						                
 						            </div>
-
-						            <div class="control-group">
-						                <label class="control-label">
-						                   {intl l='Value'}
-						                </label>
-
-						                <div class="controls">
-						                    {form_field form=$form field='value'}
-						                    <span {if $error}class="error"{/if}>
-						                       <input type="text" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Variable value'}" placeholder="{intl l='Variable value'}" class="input-block-level">
-						                    </span>
-						                    {/form_field}
-						                </div>
+						            {/form_field}
+									
+									{form_field form=$form field='value'}
+						            <div class="form-group {if $error}has-error{/if}">
+    									<label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>	
+						                <input type="text" id="{$label_attr.for}" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Variable value'}" placeholder="{intl l='Variable value'}" class="form-control"> 
 						            </div>
-
-			                        <div class="control-group">
-			                            <label class="control-label">
-			                               {intl l='Secured'}
-			                            </label>
-
-			                            <div class="controls">
-			                                {form_field form=$form field='secured'}
-			                                <span {if $error}class="error"{/if}>
-												<label class="checkbox">
-			                                        <input type="checkbox" name="{$name}" value="1" {if $value == 1}checked="checked"{/if}>
-			                                        {intl l="Prevent variable modification or deletion, except for super-admin"}
-												</label>
-			                                </span>
-			                                {/form_field}
-			                            </div>
+						            {/form_field}
+									
+									{form_field form=$form field='secured'}
+			                        <div class="checkbox {if $error}has-error{/if}">
+										<label>
+	                                        <input type="checkbox" name="{$name}" value="1" {if $value == 1}checked="checked"{/if}>
+	                                        {intl l="{$label}"}
+										</label>			                            
 			                        </div>
+			                        {/form_field}
 
                                     {include file="includes/standard-description-form-fields.html"}
 

From b6a216fd9b4d2b2e0ae23a1c8fc12b3093dc4e14 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Fri, 6 Sep 2013 12:21:36 +0200
Subject: [PATCH 22/29] substitutions : product category folder content

---
 core/lib/Thelia/Config/Resources/config.xml   |   1 +
 .../Smarty/Plugins/DataAccessFunctions.php    | 168 +++++++++++++++---
 .../Core/Template/Smarty/Plugins/Format.php   |  22 +--
 .../Thelia/Model/Tools/ModelCriteriaTools.php |   2 +-
 core/lib/Thelia/Tools/DateTimeFormat.php      |  66 +++++++
 templates/default/debug.html                  |   7 +-
 6 files changed, 222 insertions(+), 44 deletions(-)
 create mode 100755 core/lib/Thelia/Tools/DateTimeFormat.php

diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 96e5941cd..030d0374a 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -184,6 +184,7 @@
 
         <service id="smarty.plugin.dataAccess" class="Thelia\Core\Template\Smarty\Plugins\DataAccessFunctions" scope="request">
             <tag name="thelia.parser.register_plugin"/>
+            <argument type="service" id="request" />
             <argument type="service" id="thelia.securityContext" />
             <argument type="service" id="thelia.parser.context"/>
         </service>
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
index a2fd10c15..1fdb6e4bf 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
@@ -23,10 +23,20 @@
 
 namespace Thelia\Core\Template\Smarty\Plugins;
 
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Symfony\Component\HttpFoundation\Request;
 use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
 use Thelia\Core\Security\SecurityContext;
 use Thelia\Core\Template\ParserContext;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
+use Thelia\Model\CategoryQuery;
+use Thelia\Model\ContentQuery;
+use Thelia\Model\FolderQuery;
+use Thelia\Model\Product;
+use Thelia\Model\ProductQuery;
+use Thelia\Model\Tools\ModelCriteriaTools;
+use Thelia\Tools\DateTimeFormat;
+
 /**
  * Implementation of data access to main Thelia objects (users, cart, etc.)
  *
@@ -37,10 +47,13 @@ class DataAccessFunctions extends AbstractSmartyPlugin
 {
     private $securityContext;
     protected $parserContext;
+    protected $request;
 
-    public function __construct(SecurityContext $securityContext, ParserContext $parserContext)
+    public function __construct(Request $request, SecurityContext $securityContext, ParserContext $parserContext)
     {
         $this->securityContext = $securityContext;
+        $this->parserContext = $parserContext;
+        $this->request = $request;
     }
 
     /**
@@ -52,7 +65,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
      */
     public function adminDataAccess($params, &$smarty)
     {
-         return $this->userDataAccess("Admin User", $this->securityContext->getAdminUser(), $params);
+         return $this->dataAccess("Admin User", $params, $this->securityContext->getAdminUser());
     }
 
      /**
@@ -64,37 +77,146 @@ class DataAccessFunctions extends AbstractSmartyPlugin
       */
      public function customerDataAccess($params, &$smarty)
      {
-         return $this->userDataAccess("Customer User", $this->securityContext->getCustomerUser(), $params);
+         return $this->dataAccess("Customer User", $params, $this->securityContext->getCustomerUser());
      }
 
+    public function productDataAccess($params, &$smarty)
+    {
+        $productId = $this->request->get('product_id');
+
+        if($productId !== null) {
+
+            $search = ProductQuery::create()
+                ->filterById($productId);
+
+            return $this->dataAccessWithI18n("Product",  $params, $search);
+        }
+    }
+
+    public function categoryDataAccess($params, &$smarty)
+    {
+        $categoryId = $this->request->get('category_id');
+
+        if($categoryId !== null) {
+
+            $search = CategoryQuery::create()
+                ->filterById($categoryId);
+
+            return $this->dataAccessWithI18n("Category",  $params, $search);
+        }
+    }
+
+    public function contentDataAccess($params, &$smarty)
+    {
+        $contentId = $this->request->get('content_id');
+
+        if($contentId !== null) {
+
+            $search = ContentQuery::create()
+                ->filterById($contentId);
+
+            return $this->dataAccessWithI18n("Content",  $params, $search);
+        }
+    }
+
+    public function folderDataAccess($params, &$smarty)
+    {
+        $folderId = $this->request->get('folder_id');
+
+        if($folderId !== null) {
+
+            $search = FolderQuery::create()
+                ->filterById($folderId);
+
+            return $this->dataAccessWithI18n("Folder",  $params, $search);
+        }
+    }
+
     /**
-     * @param $objectLabel
-     * @param $user
-     * @param $params
+     * @param               $objectLabel
+     * @param               $params
+     * @param ModelCriteria $search
+     * @param array         $columns
+     * @param null          $foreignTable
+     * @param string        $foreignKey
+     *
+     * @return string
+     */
+    protected function dataAccessWithI18n($objectLabel, $params, ModelCriteria $search, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID')
+    {
+        $lang = $this->getNormalizedParam($params, array('lang'));
+        if($lang === null) {
+            $lang = $this->request->getSession()->getLang()->getId();
+        }
+
+        ModelCriteriaTools::getI18n(
+            false,
+            $lang,
+            $search,
+            $this->request->getSession()->getLang()->getLocale(),
+            $columns,
+            $foreignTable,
+            $foreignKey,
+            true
+        );
+
+        $data = $search->findOne();
+
+        $noGetterData = array();
+        foreach($columns as $column) {
+            $noGetterData[$column] = $data->getVirtualColumn('i18n_' . $column);
+        }
+
+        return $this->dataAccess($objectLabel, $params, $data, $noGetterData);
+    }
+
+    /**
+     * @param       $objectLabel
+     * @param       $params
+     * @param       $data
+     * @param array $noGetterData
      *
      * @return string
      * @throws \InvalidArgumentException
      */
-    protected function userDataAccess($objectLabel, $user, $params)
-     {
-         $attribute = $this->getNormalizedParam($params, array('attribute', 'attrib', 'attr'));
+    protected function dataAccess($objectLabel, $params, $data, $noGetterData = array())
+    {
+        $attribute = $this->getNormalizedParam($params, array('attribute', 'attrib', 'attr'));
 
-         if (! empty($attribute)) {
+        if (! empty($attribute)) {
 
-             if (null != $user) {
-                 $getter = sprintf("get%s", ucfirst($attribute));
+            if (null != $data) {
 
-                 if (method_exists($user, $getter)) {
-                     return $user->$getter();
-                 }
+                $keyAttribute = strtoupper($attribute);
+                if(array_key_exists($keyAttribute, $noGetterData)) {
+                    return $noGetterData[$keyAttribute];
+                }
 
-                 throw new \InvalidArgumentException(sprintf("%s has no '%s' attribute", $objectLabel, $attribute));
+                $getter = sprintf("get%s", ucfirst($attribute));
+                if (method_exists($data, $getter)) {
+                    $return =  $data->$getter();
 
-             }
-         }
+                    if($return instanceof \DateTime) {
+                        if (array_key_exists("format", $params)) {
+                            $format = $params["format"];
+                        } else {
+                            $format = DateTimeFormat::getInstance($this->request)->getFormat(array_key_exists("output", $params) ? $params["output"] : null);
+                        }
+
+                        $return = $return->format($format);
+                    }
+
+                    return $return;
+                }
+
+                throw new \InvalidArgumentException(sprintf("%s has no '%s' attribute", $objectLabel, $attribute));
+
+            }
+        }
+
+        return '';
+    }
 
-         return '';
-     }
     /**
      * Define the various smarty plugins hendled by this class
      *
@@ -104,7 +226,11 @@ class DataAccessFunctions extends AbstractSmartyPlugin
     {
         return array(
             new SmartyPluginDescriptor('function', 'admin', $this, 'adminDataAccess'),
-            new SmartyPluginDescriptor('function', 'customer', $this, 'customerDataAccess')
+            new SmartyPluginDescriptor('function', 'customer', $this, 'customerDataAccess'),
+            new SmartyPluginDescriptor('function', 'product', $this, 'productDataAccess'),
+            new SmartyPluginDescriptor('function', 'category', $this, 'categoryDataAccess'),
+            new SmartyPluginDescriptor('function', 'content', $this, 'contentDataAccess'),
+            new SmartyPluginDescriptor('function', 'folder', $this, 'folderDataAccess'),
         );
     }
 }
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
index a095f214a..daaff3fc1 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
@@ -27,6 +27,7 @@ use Thelia\Core\HttpFoundation\Request;
 use Thelia\Core\Template\Smarty\AbstractSmartyPlugin;
 use Thelia\Core\Template\Smarty\Exception\SmartyPluginException;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
+use Thelia\Tools\DateTimeFormat;
 
 /**
  *
@@ -79,29 +80,10 @@ class Format extends AbstractSmartyPlugin
             return "";
         }
 
-        $format = null;
-        $output = array_key_exists("output", $params) ? $params["output"] : null;
-
         if (array_key_exists("format", $params)) {
             $format = $params["format"];
         } else {
-            $session = $this->request->getSession();
-            $lang = $session->getLang();
-
-            if($lang) {
-                switch ($output) {
-                    case "date" :
-                        $format = $lang->getDateFormat();
-                        break;
-                    case "time" :
-                        $format = $lang->getTimeFormat();
-                        break;
-                    default:
-                    case "datetime" :
-                        $format = $lang->getDateTimeFormat();
-                        break;
-                }
-            }
+            $format = DateTimeFormat::getInstance($this->request)->getFormat(array_key_exists("output", $params) ? $params["output"] : null);
         }
 
         return $date->format($format);
diff --git a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
index 5e22f08e9..5e5dae010 100755
--- a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
+++ b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
@@ -113,7 +113,7 @@ class ModelCriteriaTools
             $localeSearch = LangQuery::create()->findOneById($requestedLangId);
 
             if ($localeSearch === null) {
-                throw new \InvalidArgumentException(sprintf('Incorrect lang argument given in attribute loop: lang ID %d not found', $requestedLangId));
+                throw new \InvalidArgumentException(sprintf('Incorrect lang argument given : lang ID %d not found', $requestedLangId));
             }
 
             $locale = $localeSearch->getLocale();
diff --git a/core/lib/Thelia/Tools/DateTimeFormat.php b/core/lib/Thelia/Tools/DateTimeFormat.php
new file mode 100755
index 000000000..bd6161389
--- /dev/null
+++ b/core/lib/Thelia/Tools/DateTimeFormat.php
@@ -0,0 +1,66 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	    email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Tools;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class DateTimeFormat
+{
+    protected $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public static function getInstance(Request $request)
+    {
+        return new DateTimeFormat($request);
+    }
+
+    public function getFormat($output = null)
+    {
+        $lang = $this->request->getSession()->getLang();
+
+        $format = null;
+
+        if($lang) {
+            switch ($output) {
+                case "date" :
+                    $format = $lang->getDateFormat();
+                    break;
+                case "time" :
+                    $format = $lang->getTimeFormat();
+                    break;
+                default:
+                case "datetime" :
+                    $format = $lang->getDateTimeFormat();
+                    break;
+            }
+        }
+
+        return $format;
+    }
+}
\ No newline at end of file
diff --git a/templates/default/debug.html b/templates/default/debug.html
index 1c54c05a4..5f2d2965d 100755
--- a/templates/default/debug.html
+++ b/templates/default/debug.html
@@ -1,2 +1,5 @@
-::{customer attr="firstname"};;
-::{customer attr="titleId"};;
\ No newline at end of file
+{*loop type="product" name="fsdq"}
+    {format_date date=$CREATE_DATE}
+{/loop*}
+
+::{product attr="createdAt" output="time" format='i'};;<br />
\ No newline at end of file

From a9f2b70ab579d0122b88869642353f151aa83df6 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 12:29:38 +0200
Subject: [PATCH 23/29] Working :

- fix route name in ConfigController
---
 core/lib/Thelia/Controller/Admin/ConfigController.php | 2 +-
 core/lib/Thelia/Controller/BaseController.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/lib/Thelia/Controller/Admin/ConfigController.php b/core/lib/Thelia/Controller/Admin/ConfigController.php
index a67ecbaaa..b84368c2f 100644
--- a/core/lib/Thelia/Controller/Admin/ConfigController.php
+++ b/core/lib/Thelia/Controller/Admin/ConfigController.php
@@ -241,7 +241,7 @@ class ConfigController extends BaseAdminController
             if ($this->getRequest()->get('save_mode') == 'stay') {
 
                 $this->redirectToRoute(
-                        "admin.configuration.variables.change",
+                        "admin.configuration.variables.update",
                         array('variable_id' => $variable_id)
                 );
             }
diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index 853776214..5fbcc56d2 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -215,7 +215,7 @@ class BaseController extends ContainerAware
         $route = $this->container->get($routerName)->getRouteCollection()->get($routeId);
 
         if ($route == null) {
-            throw new InvalidArgumentException(sprintf("Route ID '%s' does not exists.", $routeId));
+            throw new \InvalidArgumentException(sprintf("Route ID '%s' does not exists.", $routeId));
         }
 
         return $route->getPath();

From fed1795e9372ebb3b51e7cc6cd8f169850fc4ef6 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 12:30:40 +0200
Subject: [PATCH 24/29] Working :

- Change alert class
---
 templates/admin/default/variable-edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/admin/default/variable-edit.html b/templates/admin/default/variable-edit.html
index 2cc8197b3..5bccab1cd 100644
--- a/templates/admin/default/variable-edit.html
+++ b/templates/admin/default/variable-edit.html
@@ -56,7 +56,7 @@
 			                        <input type="hidden" name="{$name}" value="{$edit_language_locale}" />
 			                        {/form_field}
 
-						            {if #form_error}<div class="alert alert-block alert-error">#form_error_message</div>{/if}
+						            {if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
 									
 									{form_field form=$form field='name'}
 						            <div class="form-group {if $error}has-error{/if}">

From 56de467362ef7d1ef09c68c755d5800254b7681a Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 12:55:53 +0200
Subject: [PATCH 25/29] Working :

- Add label information in Form file
- Refactor to bootstrap3
---
 core/lib/Thelia/Form/MessageCreationForm.php  |  10 +-
 .../Thelia/Form/MessageModificationForm.php   |  42 ++-
 templates/admin/default/message-edit.html     | 174 +++++-------
 templates/admin/default/messages.html         | 266 +++++++++---------
 4 files changed, 244 insertions(+), 248 deletions(-)

diff --git a/core/lib/Thelia/Form/MessageCreationForm.php b/core/lib/Thelia/Form/MessageCreationForm.php
index a3444c733..6ce84cb06 100644
--- a/core/lib/Thelia/Form/MessageCreationForm.php
+++ b/core/lib/Thelia/Form/MessageCreationForm.php
@@ -40,11 +40,19 @@ class MessageCreationForm extends BaseForm
 
         $this->formBuilder
             ->add("name", "text", array(
-                "constraints" => $name_constraints
+                "constraints" => $name_constraints,
+                "label" => "Name *",
+                "label_attr" => array(
+                    "for" => "name"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
+                ),
+                "label" => "Purpose *",
+                "label_attr" => array(
+                    "for" => "purpose"
                 )
             ))
             ->add("locale", "hidden", array(
diff --git a/core/lib/Thelia/Form/MessageModificationForm.php b/core/lib/Thelia/Form/MessageModificationForm.php
index 539a8babc..a23f66e28 100644
--- a/core/lib/Thelia/Form/MessageModificationForm.php
+++ b/core/lib/Thelia/Form/MessageModificationForm.php
@@ -33,13 +33,43 @@ class MessageModificationForm extends BaseForm
     {
         $this->formBuilder
             ->add("id"           , "hidden", array("constraints" => array(new GreaterThan(array('value' => 0)))))
-            ->add("name"         , "text"  , array("constraints" => array(new NotBlank())))
-            ->add("secured"      , "text"  , array())
+            ->add("name"         , "text"  , array(
+                "constraints" => array(new NotBlank()),
+                "label" => "Name *",
+                "label_attr" => array(
+                    "for" => "name"
+                )
+            ))
+            ->add("secured"      , "text"  , array(
+                "label" => "Prevent mailing template modification or deletion, except for super-admin"                
+            ))
             ->add("locale"       , "text"  , array())
-            ->add("title"        , "text"  , array("constraints" => array(new NotBlank())))
-            ->add("subject"      , "text"  , array("constraints" => array(new NotBlank())))
-            ->add("html_message" , "text"  , array())
-            ->add("text_message" , "text"  , array())
+            ->add("title"        , "text"  , array(
+                "constraints" => array(new NotBlank()),
+                "label" => "Title *",
+                "label_attr" => array(
+                    "for" => "title"
+                )
+            ))
+            ->add("subject"      , "text"  , array(
+                "constraints" => array(new NotBlank()),
+                "label" => "Message subject *",
+                "label_attr" => array(
+                    "for" => "subject"
+                )
+            ))
+            ->add("html_message" , "text"  , array(
+                "label" => "HTML Message",
+                "label_attr" => array(
+                    "for" => "html_message"
+                )
+            ))
+            ->add("text_message" , "text"  , array(
+                "label" => "Text Message",
+                "label_attr" => array(
+                    "for" => "text_message"
+                )
+            ))
             ;
     }
 
diff --git a/templates/admin/default/message-edit.html b/templates/admin/default/message-edit.html
index 92d707b45..a2c524c2e 100644
--- a/templates/admin/default/message-edit.html
+++ b/templates/admin/default/message-edit.html
@@ -27,127 +27,85 @@
 					</div>
 
                     <div class="form-container">
-                         <div class="form-horizontal col-md-12">
+                         <div class="col-md-12">
 						    {form name="thelia.admin.message.modification"}
 						    <form method="POST" action="{url path='/admin/configuration/messages/save'}" {form_enctype form=$form}>
-                                <fieldset>
-                                    {* Be sure to get the message ID, even if the form could not be validated *}
-                                    <input type="hidden" name="message_id" value="{$message_id}" />
+                                
+                                {* Be sure to get the message ID, even if the form could not be validated *}
+                                <input type="hidden" name="message_id" value="{$message_id}" />
 
-                                    {include file="includes/inner-form-toolbar.html"}
+                                {include file="includes/inner-form-toolbar.html"}
 
-							        {form_hidden_fields form=$form}
+						        {form_hidden_fields form=$form}
 
-							        {form_field form=$form field='success_url'}
-							        <input type="hidden" name="{$name}" value="{url path='/admin/configuration/messages'}" />
-							        {/form_field}
+						        {form_field form=$form field='success_url'}
+						        <input type="hidden" name="{$name}" value="{url path='/admin/configuration/messages'}" />
+						        {/form_field}
 
-                                    {form_field form=$form field='id'}
-                                    <input type="hidden" name="{$name}" value="{$value|htmlspecialchars}" />
-                                    {/form_field}
+                                {form_field form=$form field='id'}
+                                <input type="hidden" name="{$name}" value="{$value|htmlspecialchars}" />
+                                {/form_field}
 
-			                        {form_field form=$form field='locale'}
-			                        <input type="hidden" name="{$name}" value="{{$edit_language_locale}}" />
-			                        {/form_field}
+		                        {form_field form=$form field='locale'}
+		                        <input type="hidden" name="{$name}" value="{{$edit_language_locale}}" />
+		                        {/form_field}
 
-						            {if #form_error}<div class="alert alert-block alert-error">#form_error_message</div>{/if}
+					            {if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
+								
+								{form_field form=$form field='name'}
+								<div class="form-group {if $error}has-error{/if}">
+									<label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>						                
+									<input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Variable name'}" placeholder="{intl l='Variable name'}" class="form-control">
+								</div>
+					            {/form_field}
+								
+								{form_field form=$form field='secured'}
+		                        <div class="checkbox {if $error}has-error{/if}">
+		                            <label>
+		                                <input type="checkbox" name="{$name}" value="1" {if $value == 1}checked="checked"{/if}>
+		                                {intl l="{$label}"}
+									</label>			                              
+		                        </div>
+		                        {/form_field}
 
-						            <div class="control-group">
+								{form_field form=$form field='title'}
+								<div class="form-group {if $error}has-error{/if}">
+								    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>	
+									<input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{$value|htmlspecialchars}">
+								</div>
+								{/form_field}
 
-						                <label class="control-label">
-						                   {intl l='Name *'}
-						                </label>
+                                {form_field form=$form field='subject'}
+                                <div class="form-group {if $error}has-error{/if}">
+                                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>	
+									<input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Subject'}" placeholder="{intl l='Subject'}" class="form-control" value="{$value|htmlspecialchars}">
+								</div>
+                                {/form_field}
 
-						                <div class="controls">
-						                    {form_field form=$form field='name'}
-						                    <span {if $error}class="error"{/if}>
-						                       <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Variable name'}" placeholder="{intl l='Variable name'}" class="input-block-level">
-						                    </span>
-						                    {/form_field}
-						                </div>
-						            </div>
+								{form_field form=$form field='html_message'}
+								<div class="form-group {if $error}has-error{/if}">
+								    <label for="{$label_attr.for}" class="control-label">
+								    	{intl l="{$label}"} : 
+								      <span class="label-help-block">{intl l="The mailing template in HTML format."}</span>
+								    </label>
+								    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control">{$value|htmlspecialchars}</textarea>
+								</div>
+								{/form_field}
 
-			                        <div class="control-group">
-			                            <label class="control-label">
-			                               {intl l='Secured'}
-			                            </label>
+                                {form_field form=$form field='text_message'}
+                                <div class="form-group {if $error}has-error{/if}">
+                                    <label for="{$label_attr.for}" class="control-label">
+                                    	{intl l="{$label}"} : 
+                                      <span class="label-help-block">{intl l="The mailing template in text-only format."}</span>
+                                    </label>
+                                    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control">{$value|htmlspecialchars}</textarea>
+                                </div>
+                                {/form_field}
 
-			                            <div class="controls">
-			                                {form_field form=$form field='secured'}
-			                                <span {if $error}class="error"{/if}>
-												<label class="checkbox">
-			                                        <input type="checkbox" name="{$name}" value="1" {if $value == 1}checked="checked"{/if}>
-			                                        {intl l="Prevent mailing template modification or deletion, except for super-admin"}
-												</label>
-			                                </span>
-			                                {/form_field}
-			                            </div>
-			                        </div>
-
-									{form_field form=$form field='title'}
-									<div class="control-group">
-									    <label class="control-label">
-									       {intl l='Title *'}
-									    </label>
-
-									    <div class="controls">
-									        <span {if $error}class="error"{/if}>
-									            <input type="text" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="input-block-level" value="{$value|htmlspecialchars}">
-									        </span>
-									    </div>
-									</div>
-									{/form_field}
-
-                                    {form_field form=$form field='subject'}
-                                    <div class="control-group">
-                                        <label class="control-label">
-                                           {intl l='Message subject *'}
-                                        </label>
-
-                                        <div class="controls">
-                                            <span {if $error}class="error"{/if}>
-                                                <input type="text" name="{$name}" required="required" title="{intl l='Subject'}" placeholder="{intl l='Subject'}" class="input-block-level" value="{$value|htmlspecialchars}">
-                                            </span>
-                                        </div>
-                                    </div>
-                                    {/form_field}
-
-									{form_field form=$form field='html_message'}
-									<div class="control-group">
-									    <label class="control-label">
-									      {intl l='HTML Message'}
-									      <span class="label-help-block">{intl l="The mailing template in HTML format."}</span>
-									    </label>
-
-									    <div class="controls">
-									        <span {if $error}class="error"{/if}>
-									        <textarea name="{$name}" rows="10" class="input-block-level">{$value|htmlspecialchars}</textarea>
-									        </span>
-									    </div>
-									</div>
-									{/form_field}
-
-                                    {form_field form=$form field='text_message'}
-                                    <div class="control-group">
-                                        <label class="control-label">
-                                          {intl l='Text Message'}
-                                          <span class="label-help-block">{intl l="The mailing template in text-only format."}</span>
-                                        </label>
-
-                                        <div class="controls">
-                                            <span {if $error}class="error"{/if}>
-                                            <textarea name="{$name}" rows="10" class="input-block-level">{$value|htmlspecialchars}</textarea>
-                                            </span>
-                                        </div>
-                                    </div>
-                                    {/form_field}
-
-                                    <div class="control-group">
-                                        <div class="controls">
-                                            <p>{intl l='Message created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}}</p>
-                                        </div>
-                                    </div>
-                                </fieldset>
+                                <div class="form-group">                                        
+                                    <p>{intl l='Message created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}}</p>
+                                </div>
+                                
 							</form>
 							{/form}
 						</div>
diff --git a/templates/admin/default/messages.html b/templates/admin/default/messages.html
index 75ee742bf..08031bd3c 100644
--- a/templates/admin/default/messages.html
+++ b/templates/admin/default/messages.html
@@ -31,62 +31,65 @@
                             {/loop}
 
 	                        </caption>
-	                        <tr>
-	                           <th>{intl l="Purpose"}</th>
-                               <th>{intl l="Name"}</th>
+                            <thead>
+    	                        <tr>
+    	                           <th>{intl l="Purpose"}</th>
+                                   <th>{intl l="Name"}</th>
 
-                               {module_include location='messages_table_header'}
+                                   {module_include location='messages_table_header'}
 
-                               <th>&nbsp;</th>
-	                        </tr>
+                                   <th>&nbsp;</th>
+    	                        </tr>
+                            </thead>
+                            
+                            <tbody>
+    	                        {loop name="mailing-templates" type="message" secured="*" backend_context="1" lang="$lang_id"}
+    	                            <tr>
 
-	                        {loop name="mailing-templates" type="message" secured="*" backend_context="1" lang="$lang_id"}
-	                            <tr>
+    	                               <td>{$TITLE}</td>
 
-	                               <td>{$TITLE}</td>
-
-                                   <td>
-                                   {if ! $SECURED}
-                                       {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
-                                           <a title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}">{$NAME}</a>
-                                       {/loop}
-                                       {elseloop rel="can_change"}
+                                       <td>
+                                       {if ! $SECURED}
+                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
+                                               <a title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}">{$NAME}</a>
+                                           {/loop}
+                                           {elseloop rel="can_change"}
+                                               {$NAME}
+                                           {/elseloop}
+                                       {else}
                                            {$NAME}
-                                       {/elseloop}
-                                   {else}
-                                       {$NAME}
-                                   {/if}
-                                   </td>
+                                       {/if}
+                                       </td>
 
-	                                {module_include location='messages_table_row'}
+    	                                {module_include location='messages_table_row'}
 
-	                                <td class="actions">
-	                                    {if ! $SECURED}
-		                                    <div class="btn-group">
-                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
-                                                   <a class="btn btn-default btn-xs message-change" title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                               {/loop}
+    	                                <td class="actions">
+    	                                    {if ! $SECURED}
+    		                                    <div class="btn-group">
+                                                   {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
+                                                       <a class="btn btn-default btn-xs message-change" title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                                   {/loop}
 
-                                               {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.messages.delete"}
-                                                   <a class="btn btn-default btn-xs message-delete" title="{intl l='Delete this mailing template'}" href="#delete_message_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                               {/loop}
-		                                    </div>
-		                                {else}
-		                                    <i title="{intl l='This mailing template could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-	                                    {/if}
-	                                </td>
-	                            </tr>
-	                        {/loop}
-
-	                        {elseloop rel="mailing-templates"}
-	                        <tr>
-	                           <td colspan="3">
-	                               <div class="alert alert-info">
-	                               {intl l="No mailing template has been created yet. Click the + button to create one."}
-	                               </div>
-	                           </td>
-	                        </tr>
-	                        {/elseloop}
+                                                   {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.messages.delete"}
+                                                       <a class="btn btn-default btn-xs message-delete" title="{intl l='Delete this mailing template'}" href="#delete_message_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                   {/loop}
+    		                                    </div>
+    		                                {else}
+    		                                    <i title="{intl l='This mailing template could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+    	                                    {/if}
+    	                                </td>
+    	                            </tr>
+    	                        {/loop}                        
+    	                        {elseloop rel="mailing-templates"}
+    	                        <tr>
+    	                           <td colspan="3">
+    	                               <div class="alert alert-info">
+    	                               {intl l="No mailing template has been created yet. Click the + button to create one."}
+    	                               </div>
+    	                           </td>
+    	                        </tr>
+    	                        {/elseloop}
+                            </tbody>
 	                    </table>
 	                </div>
                 </form>
@@ -101,110 +104,107 @@
 
 {* Adding a new message *}
 
-<div class="modal hide fade" id="add_message_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="add_message_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+    
+    <div class="modal-dialog">
+        <div class="modal-content">
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>{intl l="Create a new mailing template"}</h3>
-    </div>
-
-    {form name="thelia.admin.message.creation"}
-    <form method="POST" action="{url path='/admin/configuration/messages/create'}" {form_enctype form=$form}>
-
-        {form_hidden_fields form=$form}
-
-        {form_field form=$form field='success_url'}
-        {* on success, redirect to the edition page, _ID_ is replaced with the created message ID, see controller  *}
-        <input type="hidden" name="{$name}" value="{url path='/admin/configuration/messages/update' message_id='_ID_'}" />
-        {/form_field}
-
-        {* We do not allow users to create secured messages from here *}
-
-        {form_field form=$form field='secured'}
-        <input type="hidden" name="{$name}" value="0" />
-        {/form_field}
-
-        <div class="modal-body">
-
-            {if #form_error}<div class="alert alert-block alert-error" id="add_message_dialog_error">#form_error_message</div>{/if}
-
-            <div class="control-group">
-
-                <label class="control-label">
-                   {intl l='Name *'}
-                </label>
-
-                <div class="controls">
-	                {form_field form=$form field='name'}
-	                <span {if $error}class="error"{/if}>
-	                   <input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Mailing template name'}" placeholder="{intl l='Mailing template name'}" class="input-block-level">
-	                </span>
-	                {/form_field}
-                </div>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3>{intl l="Create a new mailing template"}</h3>
             </div>
 
-            <div class="control-group">
-                <label class="control-label">
-                   {intl l='Purpose *'}
-                </label>
+            {form name="thelia.admin.message.creation"}
+            <form method="POST" action="{url path='/admin/configuration/messages/create'}" {form_enctype form=$form}>
 
-                <div class="controls">
-                    {loop type="lang" name="default-lang" default_only="1"}
+                {form_hidden_fields form=$form}
 
-                        {* Switch edition to the current locale *}
-                        <input type="hidden" name="edit_language_id" value="{$ID}" />
+                {form_field form=$form field='success_url'}
+                {* on success, redirect to the edition page, _ID_ is replaced with the created message ID, see controller  *}
+                <input type="hidden" name="{$name}" value="{url path='/admin/configuration/messages/update' message_id='_ID_'}" />
+                {/form_field}
 
-                        {form_field form=$form field='locale'}
-                        <input type="hidden" name="{$name}" value="{$LOCALE}" />
-                        {/form_field}
+                {* We do not allow users to create secured messages from here *}
 
-                        <div class="input-group input-block-level">
-                            {form_field form=$form field='title'}
-                            <span {if $error}class="error"{/if}>
-                               <input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Mailing template purpose'}" placeholder="{intl l='Mailing template purpose'}" class="input-block-level">
-                            </span>
+                {form_field form=$form field='secured'}
+                <input type="hidden" name="{$name}" value="0" />
+                {/form_field}
+
+                <div class="modal-body">
+
+                    {if #form_error}<div class="alert alert-danger" id="add_message_dialog_error">#form_error_message</div>{/if}
+                        
+                    {form_field form=$form field='name'}
+                    <div class="form-group {if $error}has-error{/if}">
+                        <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Mailing template name'}" placeholder="{intl l='Mailing template name'}" class="form-control">
+                    </div>
+                    {/form_field}
+                        
+                    {form_field form=$form field='title'}
+                    <div class="form-group {if $error}has-error{/if}">
+                        <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                        
+                        {loop type="lang" name="default-lang" default_only="1"}
+
+                            {* Switch edition to the current locale *}
+                            <input type="hidden" name="edit_language_id" value="{$ID}" />
+
+                            <div class="input-group">
+                                <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Mailing template purpose'}" placeholder="{intl l='Mailing template purpose'}" class="form-control">
+                                <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                            </div>
+
+                            <div class="help-block">{intl l="Enter here the mailing template purpose in the default language ($TITLE)"}</div>
+
+                            {form_field form=$form field='locale'}
+                                <input type="hidden" name="{$name}" value="{$LOCALE}" />
                             {/form_field}
-                            <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
-                        </div>
+                        {/loop}
+                        
+                    </div>
+                    {/form_field}
 
-                        <div class="help-block">{intl l="Enter here the mailing template purpose in the default language ($TITLE)"}</div>
-                    {/loop}
                 </div>
-            </div>
 
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="Cancel"}</button>
+                    <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Create this mailing template"}</button>
+                </div>
+
+            </form>
+            {/form}
         </div>
-
-        <div class="modal-footer">
-            <button type="submit" class="btn btn-default btn-primary">{intl l="Create this mailing template"}</button>
-            <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button>
-        </div>
-
-    </form>
-    {/form}
+    </div>
 </div>
 
 
 {* Delete confirmation dialog *}
 
-<div class="modal hide fade" id="delete_message_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="delete_message_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>{intl l="Delete a mailing template"}</h3>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3>{intl l="Delete a mailing template"}</h3>
+            </div>
+
+            <div class="modal-body">
+                <p>{intl l="Do you really want to delete this mailing template ?"}</p>
+            </div>
+
+            <form method="post" action="{url path='/admin/configuration/messages/delete'}">
+                <input type="hidden" name="message_id" id="message_delete_id" value="" />
+
+        	    <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="No"}</button>
+                    <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Yes"}</button>
+        	    </div>
+            </form>
+
+        </div>
     </div>
-
-    <div class="modal-body">
-        <p>{intl l="Do you really want to delete this mailing template ?"}</p>
-    </div>
-
-    <form method="post" action="{url path='/admin/configuration/messages/delete'}">
-        <input type="hidden" name="message_id" id="message_delete_id" value="" />
-
-	    <div class="modal-footer">
-            <button type="submit" class="btn btn-default btn-primary">{intl l="Yes"}</button>
-	        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="No"}</button>
-	    </div>
-    </form>
 </div>
 {/block}
 

From ebb350111a2c65929f8c61f621c9a8a6dd878984 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Fri, 6 Sep 2013 15:00:52 +0200
Subject: [PATCH 26/29] Working :

- Add attribute and feature routes  management
- Add product attributes view
---
 .../Thelia/Config/Resources/routing/admin.xml | 11 +++-
 .../Controller/Admin/AttributeController.php  | 57 +++++++++++++++++++
 .../admin/default/product_attributes.html     |  0
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 core/lib/Thelia/Controller/Admin/AttributeController.php
 create mode 100644 templates/admin/default/product_attributes.html

diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 313fb3a57..2257a9459 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -113,10 +113,19 @@
         <default key="_controller">Thelia\Controller\Admin\CurrencyController::deleteAction</default>
     </route>
 
-    <route id="admin.configuration.currencies.update-position" path="/admin/configuration/currencies/update-position">
+    <route id="admin.configuration.attribute" path="/admin/configuration/product_attributes">
+        <default key="_controller">Thelia\Controller\Admin\AttributeController::defaultAction</default>
+    </route>
+
+    <!-- attribute and feature routes  management -->
+        
+    <route id="admin.configuration.currencies.update-position" path="/admin/configuration/product_attributes">
         <default key="_controller">Thelia\Controller\Admin\CurrencyController::updatePositionAction</default>
     </route>
 
+
+    <!-- end attribute and feature routes  management -->
+
 	<!-- The default route, to display a template -->
 
     <route id="admin.processTemplate" path="/admin/{template}">
diff --git a/core/lib/Thelia/Controller/Admin/AttributeController.php b/core/lib/Thelia/Controller/Admin/AttributeController.php
new file mode 100644
index 000000000..d2c1ea351
--- /dev/null
+++ b/core/lib/Thelia/Controller/Admin/AttributeController.php
@@ -0,0 +1,57 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Controller\Admin;
+
+use Thelia\Core\Event\MessageDeleteEvent;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Tools\URL;
+use Thelia\Core\Event\MessageUpdateEvent;
+use Thelia\Core\Event\MessageCreateEvent;
+use Thelia\Log\Tlog;
+use Thelia\Form\Exception\FormValidationException;
+use Thelia\Core\Security\Exception\AuthorizationException;
+use Thelia\Model\MessageQuery;
+use Thelia\Form\MessageModificationForm;
+use Thelia\Form\MessageCreationForm;
+
+/**
+ * Manages messages sent by mail
+ *
+ * @author Franck Allimant <franck@cqfdev.fr>
+ */
+class AttributeController extends BaseAdminController
+{
+    /**
+     * The default action is displaying the messages list.
+     *
+     * @return Symfony\Component\HttpFoundation\Response the response
+     */
+    public function defaultAction() {
+
+        if (null !== $response = $this->checkAuth("admin.configuration.attributes.view")) return $response;
+
+        return $this->render('product_attributes');
+    }
+
+}
\ No newline at end of file
diff --git a/templates/admin/default/product_attributes.html b/templates/admin/default/product_attributes.html
new file mode 100644
index 000000000..e69de29bb

From f2aad186f63286156d2f7fe5be7e75bf5618a3d3 Mon Sep 17 00:00:00 2001
From: Etienne Roudeix <etienne.roudeix@gmail.com>
Date: Fri, 6 Sep 2013 16:13:51 +0200
Subject: [PATCH 27/29] position output in loops

---
 core/lib/Thelia/Core/Template/Loop/Attribute.php          | 3 ++-
 .../Thelia/Core/Template/Loop/AttributeAvailability.php   | 3 ++-
 core/lib/Thelia/Core/Template/Loop/Country.php            | 8 ++++----
 core/lib/Thelia/Core/Template/Loop/Feature.php            | 3 ++-
 .../lib/Thelia/Core/Template/Loop/FeatureAvailability.php | 3 ++-
 core/lib/Thelia/Core/Template/Loop/FeatureValue.php       | 3 ++-
 core/lib/Thelia/Core/Template/Loop/Title.php              | 3 ++-
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Attribute.php b/core/lib/Thelia/Core/Template/Loop/Attribute.php
index e967709f3..ecdc551d2 100755
--- a/core/lib/Thelia/Core/Template/Loop/Attribute.php
+++ b/core/lib/Thelia/Core/Template/Loop/Attribute.php
@@ -162,7 +162,8 @@ class Attribute extends BaseI18nLoop
                 ->set("TITLE",$attribute->getVirtualColumn('i18n_TITLE'))
                 ->set("CHAPO", $attribute->getVirtualColumn('i18n_CHAPO'))
                 ->set("DESCRIPTION", $attribute->getVirtualColumn('i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM", $attribute->getVirtualColumn('i18n_POSTSCRIPTUM'));
+                ->set("POSTSCRIPTUM", $attribute->getVirtualColumn('i18n_POSTSCRIPTUM'))
+                ->set("POSITION", $attribute->getPosition());
 
             $loopResult->addRow($loopResultRow);
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
index cd5ad6564..ca4618f53 100755
--- a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
+++ b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
@@ -131,7 +131,8 @@ class AttributeAvailability extends BaseI18nLoop
                 ->set("TITLE",$attributeAv->getVirtualColumn('i18n_TITLE'))
                 ->set("CHAPO", $attributeAv->getVirtualColumn('i18n_CHAPO'))
                 ->set("DESCRIPTION", $attributeAv->getVirtualColumn('i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM", $attributeAv->getVirtualColumn('i18n_POSTSCRIPTUM'));
+                ->set("POSTSCRIPTUM", $attributeAv->getVirtualColumn('i18n_POSTSCRIPTUM'))
+                ->set("POSITION", $attributeAv->getPosition());
 
             $loopResult->addRow($loopResultRow);
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/Country.php b/core/lib/Thelia/Core/Template/Loop/Country.php
index aee6492f7..0aeb62b15 100755
--- a/core/lib/Thelia/Core/Template/Loop/Country.php
+++ b/core/lib/Thelia/Core/Template/Loop/Country.php
@@ -113,10 +113,10 @@ class Country extends BaseI18nLoop
                 ->set("TITLE",$country->getVirtualColumn('i18n_TITLE'))
                 ->set("CHAPO", $country->getVirtualColumn('i18n_CHAPO'))
                 ->set("DESCRIPTION", $country->getVirtualColumn('i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM", $country->getVirtualColumn('i18n_POSTSCRIPTUM'));
-            $loopResultRow->set("ISOCODE", $country->getIsocode());
-            $loopResultRow->set("ISOALPHA2", $country->getIsoalpha2());
-            $loopResultRow->set("ISOALPHA3", $country->getIsoalpha3());
+                ->set("POSTSCRIPTUM", $country->getVirtualColumn('i18n_POSTSCRIPTUM'))
+                ->set("ISOCODE", $country->getIsocode())
+                ->set("ISOALPHA2", $country->getIsoalpha2())
+                ->set("ISOALPHA3", $country->getIsoalpha3());
 
             $loopResult->addRow($loopResultRow);
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/Feature.php b/core/lib/Thelia/Core/Template/Loop/Feature.php
index 6c2401f42..14b7afaf5 100755
--- a/core/lib/Thelia/Core/Template/Loop/Feature.php
+++ b/core/lib/Thelia/Core/Template/Loop/Feature.php
@@ -154,7 +154,8 @@ class Feature extends BaseI18nLoop
                 ->set("TITLE",$feature->getVirtualColumn('i18n_TITLE'))
                 ->set("CHAPO", $feature->getVirtualColumn('i18n_CHAPO'))
                 ->set("DESCRIPTION", $feature->getVirtualColumn('i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM", $feature->getVirtualColumn('i18n_POSTSCRIPTUM'));
+                ->set("POSTSCRIPTUM", $feature->getVirtualColumn('i18n_POSTSCRIPTUM'))
+                ->set("POSITION", $feature->getPosition());
 
             $loopResult->addRow($loopResultRow);
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
index 45eed6dc3..38bee46f0 100755
--- a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
+++ b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
@@ -129,7 +129,8 @@ class FeatureAvailability extends BaseI18nLoop
                 ->set("TITLE",$featureAv->getVirtualColumn('i18n_TITLE'))
                 ->set("CHAPO", $featureAv->getVirtualColumn('i18n_CHAPO'))
                 ->set("DESCRIPTION", $featureAv->getVirtualColumn('i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM", $featureAv->getVirtualColumn('i18n_POSTSCRIPTUM'));
+                ->set("POSTSCRIPTUM", $featureAv->getVirtualColumn('i18n_POSTSCRIPTUM'))
+                ->set("POSITION", $featureAv->getPosition());
 
             $loopResult->addRow($loopResultRow);
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
index 700eff39c..998dfe4e0 100755
--- a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
+++ b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
@@ -149,7 +149,8 @@ class FeatureValue extends BaseI18nLoop
                 ->set("TITLE",$featureValue->getVirtualColumn(FeatureAvTableMap::TABLE_NAME . '_i18n_TITLE'))
                 ->set("CHAPO", $featureValue->getVirtualColumn(FeatureAvTableMap::TABLE_NAME . '_i18n_CHAPO'))
                 ->set("DESCRIPTION", $featureValue->getVirtualColumn(FeatureAvTableMap::TABLE_NAME . '_i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM", $featureValue->getVirtualColumn(FeatureAvTableMap::TABLE_NAME . '_i18n_POSTSCRIPTUM'));
+                ->set("POSTSCRIPTUM", $featureValue->getVirtualColumn(FeatureAvTableMap::TABLE_NAME . '_i18n_POSTSCRIPTUM'))
+                ->set("POSITION", $featureValue->getPosition());
 
             $loopResult->addRow($loopResultRow);
         }
diff --git a/core/lib/Thelia/Core/Template/Loop/Title.php b/core/lib/Thelia/Core/Template/Loop/Title.php
index 38dcb3fe3..4243f83f1 100755
--- a/core/lib/Thelia/Core/Template/Loop/Title.php
+++ b/core/lib/Thelia/Core/Template/Loop/Title.php
@@ -89,7 +89,8 @@ class Title extends BaseI18nLoop
                 ->set("LOCALE",$locale)
                 ->set("DEFAULT", $title->getByDefault())
                 ->set("SHORT", $title->getVirtualColumn('i18n_SHORT'))
-                ->set("LONG", $title->getVirtualColumn('i18n_LONG'));
+                ->set("LONG", $title->getVirtualColumn('i18n_LONG'))
+                ->set("POSITION", $title->getPosition());
 
             $loopResult->addRow($loopResultRow);
         }

From 3ac3224e1cf222295cf98b4d1ccd2e3eff3462c2 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 6 Sep 2013 16:14:35 +0200
Subject: [PATCH 28/29] add help in BaseController for retrieving the
 translator (method getTranslator)

---
 core/lib/Thelia/Controller/BaseController.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index 853776214..04d3d7ba0 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -81,6 +81,17 @@ class BaseController extends ContainerAware
         return $this->container->get('event_dispatcher');
     }
 
+    /**
+     *
+     * return the Translator
+     *
+     * @return mixed \Thelia\Core\Translation\Translator
+     */
+    public function getTranslator()
+    {
+        return $this->getContainer()->get('thelia.translator');
+    }
+
     /**
      * Return the parser context,
      *

From 1c307385cec1f551cff8c727139ffd66f1de3001 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 6 Sep 2013 16:16:48 +0200
Subject: [PATCH 29/29] fix typo

---
 core/lib/Thelia/Controller/BaseController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index 776a1266b..e5b098f02 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -89,7 +89,7 @@ class BaseController extends ContainerAware
      */
     public function getTranslator()
     {
-        return $this->getContainer()->get('thelia.translator');
+        return $this->container->get('thelia.translator');
     }
 
     /**