Merge branch 'loops'

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

templates/default/category.html

@@ -47,9 +47,35 @@
 {/loop*}
 
 {loop name="product" type="product" order="ref"}
-    <h3>PRODUCT : #REF / #TITLE</h3>
+    <h3>PRODUCT #ID : #REF / #TITLE</h3>
+
     <h4>Accessories</h4>
-    {loop name="acc" type="accessory" product="#ID" order="accessory,max_price"}
-        #REF -
+        <ul>
+    {loop name="acc" type="accessory" product="#ID" order="accessory"}
+        <li>#REF</li>
     {/loop}
-{/loop}
+        </ul>
+
+    <h4>Features</h4>
+    <ul>
+        {loop name="ft" type="feature" order="manual" product="#ID"}
+        <li>#TITLE</li>
+        {/loop}
+    </ul>
+
+{/loop}
+
+<h2>ALL FEATURES AND THEIR AVAILABILITY</h2>
+
+<ul>
+    {loop name="ft" type="feature" order="manual"}
+    <li>
+        #TITLE
+        <ul>
+            {loop name="ftav" type="feature_available" order="manual" feature="#ID"}
+                <li>#TITLE</li>
+            {/loop}
+        </ul>
+    </li>
+    {/loop}
+</ul>

templates/default/customer.html

@@ -17,7 +17,7 @@
             <td>Title</td>
             <td>
                 {loop name="title" type="title" id="#TITLE"}
-                    #LONG (#SHORT)
+                #LONG (#SHORT)
                 {/loop}
             </td>
         </tr>
@@ -65,9 +65,14 @@
     <tr>
         <td>Title</td>
         <td>
-            {loop name="title" type="title"}
-            #LONG (#SHORT)
-            {/loop}
+            <ul>
+                {assign var=current_title value=#TITLE}
+                {loop name="title" type="title"}
+                <li {if $current_title==#ID}style="background-color: yellow"{/if}>
+                #LONG (#SHORT)
+                </li>
+                {/loop}
+            </ul>
         </td>
     </tr>
     <tr>
@@ -94,6 +99,19 @@
         <td>City</td>
         <td>#CITY</td>
     </tr>
+    <tr>
+        <td>Country</td>
+        <td>
+            <select>
+                {assign var=current_country value=#COUNTRY}
+                {loop name="country" type="country"}
+                <option {if $current_country==#ID}selected="selected"{/if}>
+                    #TITLE (#ID - #ISOCODE - #ISOALPHA2 - #ISOALPHA3)
+                </option>
+                {/loop}
+            </select>
+        </td>
+    </tr>
     <tr>
         <td>Phone</td>
         <td>#PHONE</td>