Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Manuel Raynaud (19) and others # Via Manuel Raynaud (8) and others * 'master' of https://github.com/thelia/thelia: (47 commits) tax engine tax engine - Add orders view route - Add view & action for orders index Removed a redondant "use" Add tooltip - Add creation address form - Add addresses list - Add update address form Added process_assets config variable Change breadcrumb separator color Add breadcrumb to customers view - Change boolean type to integer type for update_logged_in_user field - Create view for customer modification syntax use ROUTER::ABSOLUTE_URL by default PSE loop todo currency management in PSE loop Add customer view finish Add modal for create/delete customer Update body background fixed typo searching route return relative path pse loop currency ... Conflicts: core/lib/Thelia/Controller/Admin/CouponController.php core/lib/Thelia/Core/Event/TheliaEvents.php web/index_dev.php
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
{form name="thelia.admin.login"}
|
||||
<form action="{url path='/admin/checklogin'}" method="post" class="well form-inline" {form_enctype form=$form}>
|
||||
|
||||
{if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
|
||||
{if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
|
||||
|
||||
{form_hidden_fields form=$form}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user