Merge branch 'unstable' into feature/comments

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -80,7 +80,7 @@ class ElementController extends Controller
   /**
    *
    */
-  public function updateAction($element_id)
+  public function updateAction($element_id, $dom_id)
   {
     if (($response = $this->mustBeConnected()))
     {
@@ -142,6 +142,7 @@ class ElementController extends Controller
     {
       return $this->jsonResponse(array(
         'status'  => $status,
+        'dom_id'  => $dom_id,
         'html'    => $html,
         'errors'  => $errors
       ));

src/Muzich/CoreBundle/Resources/config/routing.yml

@@ -74,7 +74,7 @@ element_edit:
   defaults: { _controller: MuzichCoreBundle:Element:edit }
 
 element_update:
-  pattern: /element/{element_id}/update
+  pattern: /element/{element_id}/update/{dom_id}
   defaults: { _controller: MuzichCoreBundle:Element:update }
   
 element_remove:

src/Muzich/CoreBundle/Resources/views/Element/ajax.element.edit.html.twig

@@ -1,5 +1,11 @@
 
-<form novalidate class="edit_element" name="{{ form_name }}" action="{{ path('element_update', {'element_id': element_id}) }}" method="post" {{ form_enctype(form) }}>
+<form 
+  novalidate
+  class="edit_element" 
+  name="{{ form_name }}" 
+  action="{{ path('element_update', {'element_id': element_id, 'dom_id': 'element_' ~ element_id}) }}" 
+  method="post" {{ form_enctype(form) }}
+>
 
   {% include "MuzichCoreBundle:Element:form.edit.html.twig" with { 
     'form'          : form, 

web/bundles/muzichcore/js/muzich.js

@@ -587,6 +587,7 @@ $(document).ready(function(){
       
       // On rend ce formulaire ajaxFormable
       $('form[name="'+response.form_name+'"] input[type="submit"]').live('click', function(){
+        li = $(this).parent('form').parent('li');
         li.prepend(div_loader);
         li.find('img.element_loader').show();
       });
@@ -597,6 +598,8 @@ $(document).ready(function(){
           $(location).attr('href', url_index);
         }
         
+        li = $('li#'+response.dom_id);
+        
         if (response.status == 'success')
         {
           li.html(response.html);