Evolution #357: Maj interface d'ajout

app/Resources/translations/navigationui.fr.yml

@@ -23,6 +23,7 @@ home:
   add_element:          Ajouter un élément
   add_element_box:
     close:              Fermer
+  check_url:            Ajouter
   
 group:
   add_element:          Ajouter un élément dans ce groupe

app/Resources/translations/userui.fr.yml

@@ -79,14 +79,14 @@ filter:
   
 element_add:
   url:
-    name:     Lien
+    name:     http://
     help:     |
               Copier ici le lien internet (http://) pointant sur la ressource 
               que vous souhaitez partager.
   need_tags:
     name:     Demander de l'aide pour tagger votre partage
   name:
-    name:     Nom
+    name:     Titre de la piste - Artiste
     
   added_to_group:
     sentence:       |

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -871,4 +871,27 @@ class ElementController extends Controller
     ));
   }
   
+  
+  public function getDatasApiAction(Request $request)
+  {
+    if (($response = $this->mustBeConnected(true)))
+    {
+      return $response;
+    }
+    
+    // On construit l'élèment qui va nous permettre de travailler avec l'api
+    $element = new Element();
+    $element->setUrl($request->get('url'));
+    
+    $factory = new ElementManager($element, $this->getEntityManager(), $this->container);
+    $factory->proceedFill($this->getUser());
+    
+    return $this->jsonResponse(array(
+      'status' => 'success',
+      'name'   => $element->getProposedName(),
+      'tags'   => $element->getProposedTags(),
+      'thumb'  => $element->getThumbnailUrl() 
+    ));
+  }
+  
 }

src/Muzich/CoreBundle/Entity/Element.php

@@ -903,4 +903,25 @@ class Element
     return false;
   }
   
+  public function getProposedName()
+  {
+    if (($title = $this->getData(self::DATA_TITLE)))
+    {
+      if (($artist = $this->getData(self::DATA_ARTIST)))
+      {
+        $artist = ' - '.$artist;
+      }
+      return $title.$artist;
+    }
+    return null;
+  }
+  
+  public function getProposedTags()
+  {
+    if (count($tags = $this->getData(self::DATA_TAGS)))
+    {
+      return $tags;
+    }
+  }
+  
 }

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

@@ -155,4 +155,10 @@ teapot:
   pattern: /what/are/you
   defaults: { _controller: MuzichCoreBundle:Info:teapot }
   
-  
+#
+
+element_retrieve_api_datas:
+  pattern: /ajax/element/get/datas/api
+  defaults: { _controller: MuzichCoreBundle:Element:getDatasApi }
+  requirements:
+    method:  POST

src/Muzich/CoreBundle/Resources/views/Element/form.add.html.twig

@@ -4,28 +4,35 @@
 
 <span class="help">{{ 'element_add.url.help'|trans({}, 'userui') }}</span>
 
-<div class="field">
+<div class="field fom_add_url">
   {{ form_errors(form.url) }}
-  {{ form_label(form.url, 'element_add.url.name'|trans({}, 'userui')) }}
-  {{ form_widget(form.url) }}
+  {{ form_widget(form.url, { 'attr': {
+    'placeholder': 'element_add.url.name'|trans({}, 'userui')},
+    'type': 'URL'
+  }) }}
+    
+  <a href="#" id="form_add_check_url" class="button">
+    {{ 'home.check_url'|trans({}, 'navigationui') }}
+  </a>
 </div>
 
-<div class="field">
-  {{ form_errors(form.name) }}
-  {{ form_label(form.name, 'element_add.name.name'|trans({}, 'userui')) }}
-  {{ form_widget(form.name) }}
-</div>
+<div class="form_add_second_part" style="display: none;">
+  <div class="field fom_add_name">
+    {{ form_errors(form.name) }}
+    {{ form_widget(form.name, { 'attr': {'placeholder': 'element_add.name.name'|trans({}, 'userui')} }) }}
+  </div>
 
-  {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 
-    'form_name'     : form_name
-  } %}
+    {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 
+      'form_name'     : form_name
+    } %}
 
-  {{ form_widget(form.tags, { 'attr': {'class': 'tagBox_tags_ids'} }) }}
+    {{ form_widget(form.tags, { 'attr': {'class': 'tagBox_tags_ids'} }) }}
 
-<div class="field">
-  {{ form_errors(form.need_tags) }}
-  {{ form_widget(form.need_tags) }}
-  {{ form_label(form.need_tags, 'element_add.need_tags.name'|trans({}, 'userui')) }}
+  <div class="field">
+    {{ form_errors(form.need_tags) }}
+    {{ form_widget(form.need_tags) }}
+    {{ form_label(form.need_tags, 'element_add.need_tags.name'|trans({}, 'userui')) }}
+  </div>
 </div>
 
 {{ form_row(form._token) }}

src/Muzich/CoreBundle/Resources/views/layout.html.twig

@@ -63,6 +63,7 @@
     url_element_new_count = "{{ path('element_new_count') }}";
     url_element_new_get = "{{ path('element_new_get') }}";
     url_global_search = "{{ path('global_search') }}";
+    url_datas_api = "{{ path('element_retrieve_api_datas') }}";
     
     url_img_ajax_loader = "{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}";
   </script>

src/Muzich/HomeBundle/Resources/views/Home/index.html.twig

@@ -4,6 +4,7 @@
 
 {% block content %}
 
+  {#
   <div id="element_add_box" style="display: none;">
     
     <a href="#" id="element_add_close_link" class="button">
@@ -21,6 +22,23 @@
       <img class="tag_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
     </form>
   </div>
+  #}
+
+  <div id="element_add_box">    
+    
+    <img class="tag_loader" style="display: none;" 
+      src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" 
+    />
+
+    <form novalidate name="{{ add_form_name }}" action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}>
+
+      {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 
+        'form'          : add_form, 
+        'form_name'     : add_form_name
+      } %}
+
+    </form>
+  </div>
 
   <div id="added_element_to_group" style="display: none;">
     <img class="loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
@@ -35,10 +53,6 @@
     </p>
   </div>
 
-  <a href="#" id="element_add_link" class="button">
-    {{ 'home.add_element'|trans({}, 'navigationui') }} &gt;&gt;
-  </a>
-
   <form name="{{ search_form_name }}" action="{{ path('search_elements') }}" method="post" {{ form_enctype(search_form) }}>
 
     {% include "MuzichCoreBundle:SearchElement:form.html.twig" with { 

web/bundles/muzichcore/js/muzich.js

@@ -1147,6 +1147,34 @@ $(document).ready(function(){
   }
 
   // Ajout d'un element #ajouter
+  
+  // Click sur "ajouter" (l'url)
+  $('a#form_add_check_url').click(function(){
+    
+    $.ajax({
+      type: 'POST',
+      url: url_datas_api,
+      data: {'url':$('input#element_add_url').val()},
+      success: function(response){
+        
+        console.debug(response);
+        
+        if (response.status == 'mustbeconnected')
+        {
+          $(location).attr('href', url_index);
+        }
+
+        if (response.status == 'success')
+        {
+
+        }
+      },
+      dataType: 'json'
+    });
+    
+  });
+  
+  
   $('form[name="add"] input[type="submit"]').live('click', function(){
     $('form[name="add"]').find('img.tag_loader').show();
   });
@@ -1162,8 +1190,6 @@ $(document).ready(function(){
     return false;
   });
   
-  // Check périodique 
-  // TODO.
 
  /////////////////////
  var tags_ids_for_filter = new Array();