Merge branch 'master' of https://github.com/thelia/thelia

core/lib/Thelia/Controller/Admin/BaseAdminController.php

@@ -25,6 +25,7 @@ namespace Thelia\Controller\Admin;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
+use Symfony\Component\Routing\Router;
 use Thelia\Controller\BaseController;
 use Symfony\Component\HttpFoundation\Response;
 use Thelia\Core\Security\Exception\AuthorizationException;
@@ -227,7 +228,7 @@ class BaseAdminController extends BaseController
      *
      * @see \Thelia\Controller\BaseController::getRouteFromRouter()
      */
-    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+    protected function getRoute($routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
     {
         return $this->getRouteFromRouter(
             'router.admin',

core/lib/Thelia/Controller/BaseController.php

@@ -235,7 +235,7 @@ class BaseController extends ContainerAware
      * @throws \InvalidArgumentException When the router doesn't exist
      * @return string                    The generated URL
      */
-    protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH)
+    protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH)
     {
         /** @var Router $router */
         $router =  $this->container->get($routerName);

templates/admin/default/customers.html

@@ -118,7 +118,8 @@
 
             {pageloop rel="customer_list"}
                 {if $PAGE != $CURRENT}
-                    <li><a href="{url path="/admin/customers" page="$PAGE"}">{$PAGE}</a></li>
+                    <li><a href="{url path="/admin/customers" page="{$PAGE}"}">{$PAGE}</a></li>
+
                 {else}
                     <li class="active"><a href="#">{$PAGE}</a></li>
                 {/if}

templates/default/register.html

@@ -17,8 +17,8 @@
         <article class="col-main" role="main" aria-labelledby="main-label">
 
             <h1 id="main-label" class="page-header">{intl l="Create New Account"}</h1>
-            {form name=""}
+            {form name="thelia.customer.creation"}
-            <form id="form-register" class="form-horizontal" action="" method="post" role="form">
+            <form id="form-register" class="form-horizontal" action="{url path="/customer/create"}" method="post" role="form">
 
                 <fieldset id="register-info" class="panel panel">
                     <div class="panel-heading">
@@ -26,48 +26,78 @@
                     </div>
 
                     <div class="panel-body">
-                        <div class="form-group group-firstname has-success">
+                        {form_field form=$form field="firstname"}
-                            <label class="control-label" for="firstname">First Name: <span class="required">*</span></label>
+                        <div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
                             <div class="control-input">
-                                <input type="text" name="firstname" id="firstname" class="form-control" placeholder="John" autofocus required>
+                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
-                                <span class="help-block"><span class="icon-ok"></span> Available input!</span>
+                                {if $error }
+                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                {elseif $value != "" && !$error}
+                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                {/if}
                             </div>
                         </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="lastname"}
+                            <div class="form-group group-lastname {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="email"}
+                        <div class="form-group group-email {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
 
-                        <div class="form-group group-lastname has-error">
-                            <label class="control-label " for="lastname">Last Name: <span class="required">*</span></label>
                             <div class="control-input">
-                                <input type="text" name="lastname" id="lastname" class="form-control" placeholder="Doe" required>
+                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" required value="{$smarty.get.email|default:$value}">
-                                <span class="help-block"><span class="icon-remove"></span> Invalid input!</span>
+                                {if $error }
-                            </div>
+                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                        </div><!--/.form-group-->
+                                {elseif $value != "" && !$error}
-
+                                    <span class="help-block"><i class="icon-ok"></i></span>
-                        <div class="form-group group-email">
+                                {/if}
-                            <label class="control-label" for="email">Email Address: <span class="required">*</span></label>
-                            <div class="control-input">
-                                <input type="email" name="email" id="email" class="form-control" placeholder="johndoe@domain.com" required>
-                            </div>
-                        </div><!--/.form-group-->
-
-                        <div class="form-group group-phone">
-                            <label class="control-label" for="phone">Telephone: <span class="required">*</span></label>
-                            <div class="control-input">
-                                <input type="tel" name="phone" id="phone" class="form-control" placeholder="(01) 02 03 04 05 " required>
-                            </div>
-                        </div><!--/.form-group-->
-
-                        <div class="form-group group-fax">
-                            <label class="control-label" for="fax">Fax: </label>
-                            <div class="control-input">
-                                <input type="tel" name="fax" id="fax" class="form-control" placeholder="(01) 02 03 04 05 ">
                             </div>
                         </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="phone"}
+                            <div class="form-group group-phone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label}</label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
+                        {form_field form=$form field="cellphone"}
+                            <div class="form-group group-cellphone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
+                                <label class="control-label" for="{$label_attr.for}">{$label}</label>
+                                <div class="control-input">
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
+                                    {if $error }
+                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {elseif $value != "" && !$error}
+                                        <span class="help-block"><i class="icon-ok"></i></span>
+                                    {/if}
+                                </div>
+                            </div><!--/.form-group-->
+                        {/form_field}
                     </div>
                 </fieldset>
 
                 <fieldset id="register-delivery" class="panel">
                     <div class="panel-heading">
-                        2. Delivery Informations
+                        2. {intl l="Delivery Informations"}
                     </div>
 
                     <div class="panel-body">