Merge branch 'admin' into loops

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	templates/smarty-sample/category.html
This commit is contained in:
Etienne Roudeix
2013-07-03 09:52:06 +02:00
35 changed files with 1184 additions and 88 deletions

View File

@@ -1,8 +1,39 @@
{include file="included.html"}
{loop name="category0" type="category" parent="0"}
<h2>1 - CATEGORY : #TITLE</h2>
<hr /><hr />
<h2>Out before - CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h2>
{loop name="category1" type="category" parent="#ID"}
<h3>2 - SUBCATEGORY : #TITLE</h3>
<h3>Inner - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h3>
{/loop}
<h2>1bis - CATEGORY : #TITLE</h2>
{/loop}
{#myid=#ID}
{loop name="category2" type="category" parent="#ID"}
<h3>Inner 2 before - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h3>
{loop name="category3" type="category" parent="#myid"}
<h3>Inner inner 2 - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h3>
{/loop}
<h3>Inner 2 after - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h3>
{/loop}
<h2>Out after - CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h2>
<hr />
{ifloop rel="category2"}
<p>Hey, y'a d'la categorie 2 !</p>
{/ifloop}
{elseloop rel="category2"}
<p>Hey, y'a PAS de categorie 2 !</p>
{/elseloop}
{loop name="category2" type="category" parent="#myid"}
<h3>Exter 2 - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h3>
{/loop}
{/loop}
{loop name="category2" type="category" parent="1"}
<h3>Final Exter 2 - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h3>
{/loop}

View File

@@ -0,0 +1,12 @@
{loop name="included0" type="category" parent="0"}
<h2>Out before - CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h2>
{loop name="category1" type="category" parent="#ID"}
<h3>Inner - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h3>
{/loop}
{loop name="category2" type="category" parent="#ID"}
<h3>Inner 2 - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h3>
{/loop}
<h2>Out after - CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h2>
<hr />
{/loop}

View File

@@ -8,7 +8,7 @@ An image from asset directory :
{intl l='An internationalized string'}
</div>
{form name="thelia.customer.creation"}
<form method="post" action="index_dev.php" {form_enctype form=$form} >
<form method="post" action="index_dev.php?action=createCustomer" {form_enctype form=$form} >
{form_field_hidden form=$form}
{form_field form=$form.email}
@@ -21,6 +21,7 @@ An image from asset directory :
{form_field form=$form.age}
{intl l='age'} : <input type="text" name="{$name}">
{/form_field}
<input type="submit" value="valider">
</form>
{/form}
<div>