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

@@ -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>