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 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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