Evolution #414: Navigation en mode non inscrit

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -2720,7 +2720,7 @@ $(document).ready(function(){
 
 $(document).ready(function(){
    
-   $('#registration_link').click(function(){
+   $('#registration_link').live('click', function(){
      $('#registration_box').slideDown("slow");
      $('#login_box').slideUp("slow");
      $(this).hide();
@@ -2728,7 +2728,7 @@ $(document).ready(function(){
      return false;
    });
    
-   $('#login_link').click(function(){
+   $('#login_link').live('click', function(){
      $('#login_box').slideDown("slow");
      $('#registration_box').slideUp("slow");
      $('#registration_link').show();
@@ -2736,7 +2736,6 @@ $(document).ready(function(){
      return false;
    });
    
-   
  });
 
 $(document).ready(function(){
@@ -2944,17 +2943,23 @@ function open_connection_or_subscription_window(open_login_part)
       if (open_login_part)
       {
         $('div#helpbox div#login_box').show();
+        $('a#registration_link').show();
       }
       else
       {
         $('div#helpbox div#registration_box').show();
+        $('a#login_link').show();
       }
       
       $('a#helpbox_close').click(function(){
         window_login_or_subscription_opened = false;
       });
       
+      $('div.login form').submit(function(){
+        $(this).find('img.loader').show();
+      });
       $('div.login form').ajaxForm(function(response) {
+        $('div.login form').find('img.loader').hide();
         if (response.status == 'success')
         {
           $(location).attr('href', url_home);
@@ -2966,8 +2971,19 @@ function open_connection_or_subscription_window(open_login_part)
         }
       });
       
+      $('div.register form.fos_user_registration_register').submit(function(){
+        $(this).find('img.loader').show();
+      });
       $('div.register form.fos_user_registration_register').ajaxForm(function(response) {
-        
+        $('div.register form.fos_user_registration_register').find('img.loader').hide();
+        if (response.status == 'success')
+        {
+          $(location).attr('href', url_home);
+        }
+        else if (response.status == 'error')
+        {
+          $('div.register form').html(response.data.html);
+        }
       });
       
     });

src/Muzich/UserBundle/Controller/UserController.php

@@ -141,7 +141,7 @@ class UserController extends Controller
     if ($process)
     {
       $user = $form->getData();
-
+      
       $authUser = false;
       if ($confirmationEnabled) {
           $this->container->get('session')->set('fos_user_send_confirmation_email/email', $user->getEmail());
@@ -150,13 +150,10 @@ class UserController extends Controller
           $authUser = true;
           $route = 'start';
       }
-
-      $this->setFlash('fos_user_success', 'registration.flash.user_created');
-      $url = $this->container->get('router')->generate($route);
-      $response = new RedirectResponse($url);
-
+      
+      $response = $this->getSuccessRegistrationResponse();
       if ($authUser) {
-          $this->authenticateUser($user, $response);
+        $this->authenticateUser($user, $response);
       }
       
       $formHandler->getToken()->addUseCount();
@@ -167,18 +164,51 @@ class UserController extends Controller
       return $response;
     }
     
-    return $this->container->get('templating')->renderResponse(
-      'MuzichIndexBundle:Index:index.html.twig',
-      array(
-        'form'                     => $form->createView(),
-        'error'                    => null,
-        'registration_errors'      => $form->getErrors(),
-        'registration_errors_pers' => $formHandler->getErrors(),
-        'last_username'            => null,
-        'registration_page'        => true,
-        'presubscription_form'     => $this->getPreSubscriptionForm()->createView()
-      )
+    return $this->getFailureRegistrationResponse($form, $formHandler);
+  }
+  
+  protected function getSuccessRegistrationResponse()
+  {
+    if (!$this->getRequest()->isXmlHttpRequest())
+    {
+      $url = $this->container->get('router')->generate($route);
+      return new RedirectResponse($url);
+    }
+    
+    return $this->jsonResponse(array(
+      'status' => 'success'
+    ));
+  }
+  
+  protected function getFailureRegistrationResponse($form, $formHandler)
+  {
+    $parameters = array(
+      'form'                     => $form->createView(),
+      'error'                    => null,
+      'registration_errors'      => $form->getErrors(),
+      'registration_errors_pers' => $formHandler->getErrors(),
+      'last_username'            => null,
+      'registration_page'        => true,
+      'presubscription_form'     => $this->getPreSubscriptionForm()->createView()
     );
+    
+    if (!$this->getRequest()->isXmlHttpRequest())
+    {
+      return $this->render(
+        'MuzichIndexBundle:Index:index.html.twig',
+        $parameters
+      );
+    }
+    
+    return $this->jsonResponse(array(
+      'status' => 'error',
+      'data'   => array(
+        'html' => $this->render(
+          'MuzichUserBundle:Registration:register_form_content.html.twig',
+          $parameters
+        )->getContent()
+      )
+    ));
   }
   
   /**

src/Muzich/UserBundle/Resources/views/Account/subscribe_or_login.html.twig

@@ -1,3 +1,13 @@
+
+<a href="#" id="registration_link" class="button gradient" style="display: none;">
+  {{ 'registration.display'|trans({}, 'navigationui') }}
+  <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
+</a>
+<a href="#" id="login_link" class="button gradient" style="display: none;">
+  {{ 'login.display'|trans({}, 'navigationui') }}
+  <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
+</a>
+
 <div id="login_box" style="display: none;">
   
   {% include "MuzichUserBundle:Security:login.html.twig" %}

src/Muzich/UserBundle/Resources/views/Registration/register.html.twig

@@ -7,75 +7,8 @@
     method="POST" 
     class="fos_user_registration_register nicelabels"
   >
-        
-    {% form_theme form 'MuzichCoreBundle:Form:errors.html.twig' %}
     
-    {{ form_errors(form) }}
+    {% include 'MuzichUserBundle:Registration:register_form_content.html.twig' %}
     
-    {% if registration_errors_pers|length > 0 %}
-    <ul class="error_list">
-      {% for error in registration_errors_pers %}
-        <li>{{ error }}</li>
-      {% endfor %}
-    </ul>
-    {% endif %}
-    
-    <div class="field">
-      {{ form_errors(form.username) }}
-      {{ form_label(form.username, 'username'|trans({}, 'userform')) }}
-      {{ form_widget(form.username, {'attr':{'class':'niceinput'}}) }}
-    </div>   
-        
-    <div class="field">
-      {{ form_errors(form.email) }}
-      {{ form_label(form.email, 'email'|trans({}, 'userform')) }}
-      {{ form_widget(form.email, {'attr':{'class':'niceinput'}}) }}
-    </div> 
-    
-    <div class="field">
-      {{ form_errors(form.plainPassword.first) }}
-      {{ form_label(form.plainPassword.first, 'password.first'|trans({}, 'userform')) }}
-      {{ form_widget(form.plainPassword.first, {'attr':{'class':'niceinput'}}) }}
-    </div> 
-    
-    <div class="field">
-      {{ form_errors(form.plainPassword.second) }}
-      {{ form_label(form.plainPassword.second, 'password.second'|trans({}, 'userform')) }}
-      {{ form_widget(form.plainPassword.second, {'attr':{'class':'niceinput'}}) }}
-    </div> 
-    
-    <span class="help">{{ 'help.token'|trans({}, 'userform') }}</span>
-    
-    <div class="field">
-      {{ form_errors(form.token) }}
-      {{ form_label(form.token, 'token'|trans({}, 'userform')) }}
-      {{ form_widget(form.token, {'attr':{'class':'niceinput'}}) }}
-    </div>
-    
-    <div class="field">
-      {{ form_errors(form.cgu_accepted) }}
-      {{ form_widget(form.cgu_accepted, {'attr':{}}) }}
-      {% autoescape false %}
-      {{ 'cgu_accepted'|trans({'%url%':path('info_cgu')}, 'userform') }}
-      {% endautoescape %}
-    </div>
-    
-    <div class="field">
-      {{ form_errors(form.mail_newsletter) }}
-      {{ form_widget(form.mail_newsletter, {'attr':{}}) }}
-      {{ 'mail_newsletter'|trans({}, 'userform') }}
-    </div>
-    
-    <div class="field">
-      {{ form_errors(form.mail_partner) }}
-      {{ form_widget(form.mail_partner, {'attr':{}}) }}
-      {{ 'mail_partner'|trans({}, 'userform') }}
-    </div> 
-
-    {{ form_rest(form) }}
-    
-    <div class="alignright">
-        <input type="submit" class="button" value="{{ 'registration.submit'|trans({}, 'userui') }}" />
-    </div>
   </form>
 </div>

src/Muzich/UserBundle/Resources/views/Registration/register_form_content.html.twig

@@ -0,0 +1,74 @@
+{% if registration_errors_pers is not defined %}
+  {% set registration_errors_pers = null %}
+{% endif %}
+
+{% form_theme form 'MuzichCoreBundle:Form:errors.html.twig' %}
+
+{{ form_errors(form) }}
+
+{% if registration_errors_pers|length > 0 %}
+<ul class="error_list">
+  {% for error in registration_errors_pers %}
+    <li>{{ error }}</li>
+  {% endfor %}
+</ul>
+{% endif %}
+
+<div class="field">
+  {{ form_errors(form.username) }}
+  {{ form_label(form.username, 'username'|trans({}, 'userform')) }}
+  {{ form_widget(form.username, {'attr':{'class':'niceinput'}}) }}
+</div>   
+    
+<div class="field">
+  {{ form_errors(form.email) }}
+  {{ form_label(form.email, 'email'|trans({}, 'userform')) }}
+  {{ form_widget(form.email, {'attr':{'class':'niceinput'}}) }}
+</div> 
+
+<div class="field">
+  {{ form_errors(form.plainPassword.first) }}
+  {{ form_label(form.plainPassword.first, 'password.first'|trans({}, 'userform')) }}
+  {{ form_widget(form.plainPassword.first, {'attr':{'class':'niceinput'}}) }}
+</div> 
+
+<div class="field">
+  {{ form_errors(form.plainPassword.second) }}
+  {{ form_label(form.plainPassword.second, 'password.second'|trans({}, 'userform')) }}
+  {{ form_widget(form.plainPassword.second, {'attr':{'class':'niceinput'}}) }}
+</div> 
+
+<span class="help">{{ 'help.token'|trans({}, 'userform') }}</span>
+
+<div class="field">
+  {{ form_errors(form.token) }}
+  {{ form_label(form.token, 'token'|trans({}, 'userform')) }}
+  {{ form_widget(form.token, {'attr':{'class':'niceinput'}}) }}
+</div>
+
+<div class="field">
+  {{ form_errors(form.cgu_accepted) }}
+  {{ form_widget(form.cgu_accepted, {'attr':{}}) }}
+  {% autoescape false %}
+  {{ 'cgu_accepted'|trans({'%url%':path('info_cgu')}, 'userform') }}
+  {% endautoescape %}
+</div>
+
+<div class="field">
+  {{ form_errors(form.mail_newsletter) }}
+  {{ form_widget(form.mail_newsletter, {'attr':{}}) }}
+  {{ 'mail_newsletter'|trans({}, 'userform') }}
+</div>
+
+<div class="field">
+  {{ form_errors(form.mail_partner) }}
+  {{ form_widget(form.mail_partner, {'attr':{}}) }}
+  {{ 'mail_partner'|trans({}, 'userform') }}
+</div> 
+
+{{ form_rest(form) }}
+
+<div class="alignright">
+  <img class="loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+  <input type="submit" class="button" value="{{ 'registration.submit'|trans({}, 'userui') }}" />
+</div>

src/Muzich/UserBundle/Resources/views/Security/login.html.twig

@@ -22,6 +22,8 @@
         placeholder="{{ 'security.login.password'|trans({}, 'userui') }}""
       />
 
+      
+  <img class="loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
       <input type="submit" class="button" id="_submit" name="_submit" value="{{ 'security.login.submit'|trans({}, 'FOSUserBundle') }}" />
       
       <div class="textcenter">