From 40b524e9d6391af26787385b50d7fc96fce8873e Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 5 Sep 2013 14:22:28 +0200
Subject: [PATCH 1/3] add label_attr attribute to form smarty plugin

---
 core/lib/Thelia/Core/Template/Loop/Cart.php           | 6 ++++--
 core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php | 1 +
 core/lib/Thelia/Form/CartAdd.php                      | 4 ++++
 templates/default/cart.html                           | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Cart.php b/core/lib/Thelia/Core/Template/Loop/Cart.php
index f9e5c00aa..8e4d78683 100755
--- a/core/lib/Thelia/Core/Template/Loop/Cart.php
+++ b/core/lib/Thelia/Core/Template/Loop/Cart.php
@@ -71,10 +71,12 @@ class Cart extends BaseLoop
      */
     public function exec(&$pagination)
     {
-        $cartItems = $cart->getCartItems();
 
-        $result = new LoopResult($cartItems);
+
+
         $cart = $this->getCart($this->request);
+        $cartItems = $cart->getCartItems();
+        $result = new LoopResult($cartItems);
 
         if ($cart === null) {
             return $result;
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
index 554d3f9de..0b22111cd 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
@@ -123,6 +123,7 @@ class Form extends AbstractSmartyPlugin
             $template->assign("name", $formFieldView->vars["full_name"]);
             $template->assign("value", $formFieldView->vars["value"]);
             $template->assign("label", $formFieldView->vars["label"]);
+            $template->assign("label_attr", $formFieldView->vars["label_attr"]);
 
             $errors = $formFieldView->vars["errors"];
 
diff --git a/core/lib/Thelia/Form/CartAdd.php b/core/lib/Thelia/Form/CartAdd.php
index fb6347cd9..25bde3cdc 100755
--- a/core/lib/Thelia/Form/CartAdd.php
+++ b/core/lib/Thelia/Form/CartAdd.php
@@ -67,6 +67,10 @@ class CartAdd extends BaseForm
                     new Constraints\Callback(array("methods" => array(
                             array($this, "checkProduct")
                     )))
+                ),
+                "label" => "product",
+                "label_attr" => array(
+                    "for" => "cart_product"
                 )
             ))
             ->add("product_sale_elements_id", "text", array(
diff --git a/templates/default/cart.html b/templates/default/cart.html
index 5597d28ad..a503e3bd4 100755
--- a/templates/default/cart.html
+++ b/templates/default/cart.html
@@ -24,7 +24,7 @@
         {form_error form=$form field="product"}
         {$message}
         {/form_error}
-            <label>{intl l="product"}: </label><input type="text" name="{$name}" value="{$value}" {$attr} ><br />
+            <label for="{$label_attr.for}">{intl l="{$label}"}: </label><input id="{$label_attr.for}" type="text" name="{$name}" value="{$value}" {$attr} ><br />
         {/form_field}
 
         {form_field form=$form field='product_sale_elements_id'}

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

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

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

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

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

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