Merge branch 'stable/v0.8' into feature/v0.8/apisdisco

app/Resources/translations/elements.fr.yml

@@ -38,6 +38,8 @@ element:
         sentence:       Ajouter aux favoris ?
         yes:            Oui
         no:             Non
+    isfav:
+      title:            Le tag "%tagname%" fait partis de vos tags favoris
   comments: 
     add:                Ajouter un commentaire
     thereis:            Afficher le commentaire

app/Resources/translations/navigationui.fr.yml

@@ -5,6 +5,7 @@ container_menu:
   my_favorites:         Mes favoris
   my_feeds:             Mes diffusions
   return:               Retour
+  need_tags:            Demandes
   
 top_bar:
   my_account:           Mon compte (%name%)
@@ -40,6 +41,7 @@ title:
   hello:                Découvrez et partagez la musique !
   element:
     edit:               Modification d'un élément
+  need_tags:            Partages en demande de tags
   
   
 bottom_menu:

app/Resources/translations/userui.fr.yml

@@ -64,6 +64,10 @@ tags:
     has_news_link:  cliquez ici pour les afficher
     has_news_link_one:  cliquez ici pour l'afficher
     has_news_link_more_x:  cliquez ici pour en afficher %x%
+  cloud:
+    display_more:           Des tags ont été cachés, cliquez ici pour les afficher tous
+    filter:
+      text:                 Chercher un tag parmis la liste
            
 filter:
   network: "Résultats de "
@@ -154,4 +158,10 @@ search_tag:
   title:                 Recherche de tag correspondant à \"%string_search%\" ...
   
 global_search:
-  no_results:            Il n'y a aucun résultat a votre recherche.
+  no_results:            Il n'y a aucun résultat a votre recherche.
+  
+need_tags:
+  text_help:             |
+                         Les utilisateurs ayant partagés leurs découvertes ont
+                         demandé de l'aide pour tagger correctement leurs partages.
+                         Gagnez en réputation en leurs proposants les tags qui conviennent !

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -743,6 +743,7 @@ class ElementController extends Controller
       $element->addTag($tag);
     }
     $element->setHasTagProposition(false);
+    $element->setNeedTags(false);
     $this->getDoctrine()->getEntityManager()->persist($element);
     
     $event = new EventElement($this->container);

src/Muzich/CoreBundle/Entity/User.php

@@ -11,6 +11,7 @@ use Muzich\CoreBundle\Entity\UsersTagsFavorites;
 use Symfony\Component\Validator\Constraints as Assert;
 use Muzich\CoreBundle\Validator as MuzichAssert;
 use Muzich\CoreBundle\Entity\ElementTagsProposition;
+use Muzich\CoreBundle\Entity\Tag;
 
 /**
  * Cet entité est l'utilisateur ayant effectué la requête.
@@ -173,6 +174,16 @@ class User extends BaseUser
   protected $live_datas = array();
   
   /**
+   * Tableau contenant les id => name des tags favoris
+   * de l'user. Ces donnée sont faites pour optimiser les calculs.
+   * Ce chamsp est mis ajour a chaque fois qu'un UsersTagsFavorite est manipulé.
+   * 
+   * @ORM\Column(type="text", unique=false, nullable=true)
+   * @var array 
+   */
+  private $tags_favorites_quick;
+  
+  /**
    * 
    */
   public function __construct()
@@ -757,4 +768,69 @@ class User extends BaseUser
     return false;
   }
   
+  public function getTagsFavoritesQuick()
+  {
+    if ($this->tags_favorites_quick == null)
+    {
+      return array();
+    }
+    
+    return json_decode($this->tags_favorites_quick, true);
+  }
+  
+  /**
+   * 
+   * @param array $tags_favorites_quick (id => name)
+   */
+  public function setTagsFavoritesQuick($tags_favorites_quick)
+  {
+    $this->tags_favorites_quick = json_encode($tags_favorites_quick);
+  }
+  
+  /**
+   * 
+   * @param \Muzich\CoreBundle\Entity\Tag $tag
+   */
+  public function addTagFavoriteQuick(Tag $tag)
+  {
+    $tags_favorites_quick = $this->getTagsFavoritesQuick();
+    if (!array_key_exists($tag->getId(), $tags_favorites_quick))
+    {
+      $tags_favorites_quick[$tag->getId()] = $tag->getName();
+    }
+    $this->setTagsFavoritesQuick($tags_favorites_quick);
+  }
+  
+  /**
+   * 
+   * @param \Muzich\CoreBundle\Entity\Tag $tag
+   */
+  public function removeTagFavoriteQuick(Tag $tag)
+  {
+    $tags_favorites_quick = $this->getTagsFavoritesQuick();
+    if (array_key_exists($tag->getId(), $tags_favorites_quick))
+    {
+      unset($tags_favorites_quick[$tag->getId()]);
+    }
+    $this->setTagsFavoritesQuick($tags_favorites_quick);
+  }
+  
+  /**
+   * Retourne vrai si le tag_id transmis fait partis des tags favoris de 
+   * l'utilisateur
+   * 
+   * @param int $tag_id
+   * @return boolean
+   */
+  public function haveTagsFavorite($tag_id)
+  {
+    $tags_favorites_quick = $this->getTagsFavoritesQuick();
+    if (array_key_exists($tag_id, $tags_favorites_quick))
+    {
+      return true;
+    }
+    
+    return false;
+  }
+  
 }

src/Muzich/CoreBundle/Entity/UsersTagsFavorites.php

@@ -10,6 +10,7 @@ use Doctrine\ORM\Mapping as ORM;
  * 
  * @ORM\Entity
  * @ORM\Table(name="users_tags_favorites")
+ * @ORM\HasLifecycleCallbacks
  */
 class UsersTagsFavorites
 {
@@ -42,7 +43,7 @@ class UsersTagsFavorites
    * L'attribut position permet de connaitre l'ordre de préfèrence de 
    * l'utilisateur.
    * 
-   * @ORM\Column(type="integer")
+   * @ORM\Column(type="integer", nullable=true)
    * @var type int
    */
   protected $position;
@@ -118,4 +119,21 @@ class UsersTagsFavorites
   {
     return $this->tag;
   }
+  
+  /**
+   * @ORM\prePersist
+   */
+  public function prePersist()
+  {
+    $this->getUser()->addTagFavoriteQuick($this->getTag());
+  }
+  
+  /**
+   * @ORM\preRemove
+   */
+  public function preRemove()
+  {
+    $this->getUser()->removeTagFavoriteQuick($this->getTag());
+  }
+  
 }

src/Muzich/CoreBundle/Factory/Elements/Youtube.php

@@ -28,7 +28,7 @@ class Youtube extends Youtubecom
     // Données API
     if ($ref_id)
     {
-      
+      $this->proceedAPIDatas($ref_id);
     }
   }
   

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

@@ -154,11 +154,13 @@ global_search:
 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
+    
+element_show_need_tags:
+  pattern: /need-tags
+  defaults: { _controller: MuzichHomeBundle:Home:needTags }

src/Muzich/CoreBundle/Resources/views/Info/development.html.twig

@@ -9,7 +9,7 @@
   <h1>Muzich est en cours de construction</h1>
 
   <p>
-    Actuellement vous utilisez la version <strong>0.7</strong> de Muzich. De nombreuses 
+    Actuellement vous utilisez la version <strong>0.8</strong> de Muzich. De nombreuses 
     fonctionnalités doivent voir le jours au fur et a mesure du développement.
   </p>
 

src/Muzich/CoreBundle/Resources/views/Menu/containerMenu.html.twig

@@ -12,14 +12,19 @@
         {{ 'container_menu.my_network'|trans({}, 'navigationui') }}
       </a>
     </li>
-    <li {% if active == 'myfeeds' %} class="active" {% endif %}>
-      <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
-        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+    <li {% if active == 'needs-tags' %} class="active" {% endif %}>
+      <a href="{{ path('element_show_need_tags') }}">
+        {{ 'container_menu.need_tags'|trans({}, 'navigationui') }}
       </a>
     </li>
   </ul>
 
   <ul class="top-tabs-right">
+    <li {% if active == 'myfeeds' %} class="active" {% endif %}>
+      <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
+        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+      </a>
+    </li>
     <li class="{% if active == 'mygroups' %}active{% endif %}">
       <a href="{{ path('groups_own_list') }}" >
         {{ 'network.mygroups'|trans({}, 'navigationui') }}

src/Muzich/CoreBundle/Resources/views/SearchElement/element.html.twig

@@ -130,18 +130,29 @@
       <ul class="element_tags">
         {% for tag in element.tags %} 
           <li class="element_tag">
-            <a id="element_tag_{{ tag.id }}" href="#" class="element_tag button">{{ tag.name }}</a>
-            <a 
-              href="{{ path('ajax_tag_add_to_favorites', {
-                'tag_id' : tag.id,
-                'token'  : app.user.getPersonalHash
-              }) }}" 
-              class="tag_to_favorites" 
-              style="display: none;"
-              title="{{ 'element.tag.addtofav.title'|trans({}, 'elements') }}"   
+            <a id="element_tag_{{ tag.id }}" href="#" 
+              class="element_tag button {% if app.user.haveTagsFavorite(tag.id) %}element_tag_large_for_fav_still{% endif %}"
             >
-              <img src="{{ asset('/bundles/muzichcore/img/1331734087_emblem-favorite.png') }}" alt="add-to-favorites"/>
+              {{ tag.name }}
             </a>
+            {% if app.user.haveTagsFavorite(tag.id) %}
+              <img class="tag_to_favorites" src="{{ asset('/bundles/muzichcore/img/1331734087_emblem-favorite.png') }}" 
+                alt="add-to-favorites"
+                title="{{ 'element.tag.isfav.title'|trans({'%tagname%':tag.name}, 'elements') }}"
+              />
+            {% else %}
+              <a 
+                href="{{ path('ajax_tag_add_to_favorites', {
+                  'tag_id' : tag.id,
+                  'token'  : app.user.getPersonalHash
+                }) }}" 
+                class="tag_to_favorites" 
+                style="display: none;"
+                title="{{ 'element.tag.addtofav.title'|trans({}, 'elements') }}"   
+              >
+                <img src="{{ asset('/bundles/muzichcore/img/1331734087_emblem-favorite.png') }}" alt="add-to-favorites"/>
+              </a>
+            {% endif %}
           </li>
         {% endfor %} 
       </ul>

src/Muzich/CoreBundle/Resources/views/Tag/tagsList.favorite.html.twig

@@ -1,11 +1,15 @@
 {% if tags|length %}
+
+  <label for="cloud_tags_filter" >{{ 'tags.cloud.filter.text'|trans({}, 'userui') }}</label>
+  <input type="text" id="cloud_tags_filter" />
+
   <input type="hidden" id="get_elements_url" value="{{ path('favorite_get', {
     'user_id': user_id, 
     'tags_ids_json' : ''
   }) }}" />
   <ul id="favorite_tags">
     {% for tag in tags %}
-      <li>
+      <li {% if loop.index0 > cloud_tags_limit_to_display %}style="display: none;"{% endif %}>
         <a id="filtering_tag_{{ tag.id }}" href="#" class="button tag">
           {{ tag.name }}
         </a>
@@ -13,4 +17,11 @@
     {% endfor %}
   </ul>
   <div class="clearboth" ></div>
+  
+  {% if tags|length > cloud_tags_limit_to_display+1 %}
+    <a href="#" id="display_all_cloud_tag" >
+      {{ 'tags.cloud.display_more'|trans({}, 'userui') }}
+    </a>
+  {% endif %}
+  
 {% endif %}

src/Muzich/CoreBundle/Resources/views/Tag/tagsList.show.html.twig

@@ -1,4 +1,8 @@
 {% if tags|length %}
+
+  <label for="cloud_tags_filter" >{{ 'tags.cloud.filter.text'|trans({}, 'userui') }}</label>
+  <input type="text" id="cloud_tags_filter" />
+
   <input type="hidden" id="get_elements_url" value="{{ path('show_elements_get', {
     'type'          : object_type,
     'object_id'     : object_id, 
@@ -6,7 +10,7 @@
   }) }}" />
   <ul id="favorite_tags">
     {% for tag in tags %}
-      <li>
+      <li {% if loop.index0 > cloud_tags_limit_to_display %}style="display: none;"{% endif %}>
         <a id="filtering_tag_{{ tag.id }}" href="#" class="button tag">
           {{ tag.name }}
         </a>
@@ -14,4 +18,10 @@
     {% endfor %}
   </ul>
   <div class="clearboth" ></div>
+  
+  {% if tags|length > cloud_tags_limit_to_display+1 %}
+    <a href="#" id="display_all_cloud_tag" >
+      {{ 'tags.cloud.display_more'|trans({}, 'userui') }}
+    </a>
+  {% endif %}
 {% endif %}

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -107,11 +107,12 @@ class ElementSearcher extends Searcher implements SearcherInterface
    */
   protected $string = null;
   
-  private $attributes = array(
-    'network', 'tags', 'count', 'user_id', 'group_id', 
-    'favorite', 'id_limit', 'searchnew', 'ids', 'ids_display',
-    'tag_strict', 'string'
-  );
+  /**
+   * Pour la recherche de partage qui demande des tags.
+   * 
+   * @var boolean 
+   */
+  protected $need_tags = false;
   
   /**
    * @see SearcherInterface
@@ -339,4 +340,13 @@ class ElementSearcher extends Searcher implements SearcherInterface
     return $this->searchnew;
   }
   
+  public function isNeedTags()
+  {
+    if ($this->need_tags)
+    {
+      return true;
+    }
+    return false;
+  }
+  
 }

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -264,6 +264,15 @@ class ElementSearcherQueryBuilder
       }
     }
   }
+  
+  private function buildNeedTags()
+  {
+    // Si id_limit est précisé c'est que l'on demande "la suite" ou "les nouveaux"
+    if ($this->es->isNeedTags())
+    {
+      $this->query_ids->andWhere("e.need_tags  = '1'");
+    }
+  }
 
   /**
    *
@@ -299,6 +308,8 @@ class ElementSearcherQueryBuilder
     $this->buildLimits();
     // Si on recherche les tags de manière stricte
     $this->buildStrict();
+    // Si on recherche des partages en demande de tags
+    $this->buildNeedTags();
     
     $this->query_ids->setParameters($this->parameters_ids);
   }

src/Muzich/CoreBundle/Searcher/Searcher.php

@@ -23,15 +23,14 @@ abstract class Searcher
     foreach ($params as $param_id => $param_value)
     {
       // TODO: check existance attribut
-//      if (isset($this->$param_id))
-//      {
+      if (property_exists($this, $param_id))
+      {
         $this->$param_id = $param_value;
-//      }
-//      else
-//      {
-//        die(var_dump($this->$param_id));
-//        throw new \Exception("You're trying access unknow attribute '$param_id'");
-//      }
+      }
+      else
+      {
+        throw new \Exception("You're trying access unknow attribute '$param_id'");
+      }
     }
   }
 

src/Muzich/CoreBundle/Tests/ElementFactory/ElementFactoryTest.php

@@ -285,4 +285,219 @@ class ElementFactoryTest extends UnitTest
     
   }
   
+  public function testDataApiengine()
+  {
+    $r = $this->getDoctrine();
+    $bux = $r->getRepository('MuzichCoreBundle:User')
+      ->findOneByUsername('bux')
+    ;
+    
+    /*
+     *   - youtube.com && youtu.be
+     */
+    
+    $this->assertEquals(array(
+      'data_ref_id' => 'Itfg7UpkcSs',
+      'data_title'  => 'DIDIER SUPER SUR FRANCE O : UN PETIT MALENTENDU ?'
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.youtube.com/watch?v=Itfg7UpkcSs&feature=g-vrec&context=G2e61726RVAAAAAAAAAg'
+    ));
+    
+    $this->assertEquals(array(
+      'data_ref_id' => 'Itfg7UpkcSs',
+      'data_title'  => 'DIDIER SUPER SUR FRANCE O : UN PETIT MALENTENDU ?'
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.youtube.com/watch?feature=player_detailpage&v=Itfg7UpkcSs#t=3s'
+    ));
+    
+    $this->assertEquals(array(
+      'data_ref_id' => 'Itfg7UpkcSs',
+      'data_title'  => 'DIDIER SUPER SUR FRANCE O : UN PETIT MALENTENDU ?'
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://youtu.be/Itfg7UpkcSs'
+    ));
+    
+    $this->assertEquals(array(
+      'data_ref_id' => 'Itfg7UpkcSs',
+      'data_title'  => 'DIDIER SUPER SUR FRANCE O : UN PETIT MALENTENDU ?'
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.youtube.com/watch?v=Itfg7UpkcSs'
+    ));
+    
+    
+    /*
+     *   - dailymotion.com
+     */
+    
+      // 'http://www.dailymotion.com/video/xafj1q_black-bomb-a-tales-from-the-old-sch_music', 
+    
+      // TODO: l'url est pas toujours la même pour le thumb :/
+//    $this->assertEquals(array(
+//      'data_ref_id' => 'xafj1q',
+//      'data_thumb_url'  => 'http://static2.dmcdn.net/static/video/686/025/17520686:jpeg_preview_medium.jpg?20110820212502'
+//    ),$this->proceed_element_datas_api(
+//      $bux, 
+//      'http://www.dailymotion.com/video/xafj1q_black-bomb-a-tales-from-the-old-sch_music'
+//    ));
+    
+    /*
+     * - soundcloud.com
+     */
+    
+    // 'http://soundcloud.com/matas/sets/library-project'
+    
+    $this->assertEquals(array(
+      'data_ref_id' => 3770,
+      'data_title' => 'Library Project',
+      'data_thumb_url' => 'http://i1.sndcdn.com/artworks-000000514203-fsvbcj-large.jpg?04ad178',
+      'data_type' => 'playlist',
+      'data_download' => null,
+      'data_download_url' => 'http://soundcloud.com/matas/sets/library-project/download',
+      'data_artist' => 'matas',
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://soundcloud.com/matas/sets/library-project'
+    ));
+    
+    // 'http://soundcloud.com/matas/above-hyperion-redux'
+    
+    $this->assertEquals(array(
+      'data_ref_id' => 3154252,
+      'data_title' => 'Above Hyperion (redux)',
+      'data_thumb_url' => 'http://i1.sndcdn.com/artworks-000001536693-gb1n5v-large.jpg?04ad178',
+      'data_type' => 'track',
+      'data_download' => false,
+      'data_download_url' => 'http://soundcloud.com/matas/above-hyperion-redux/download',
+      'data_artist' => 'matas',
+      'data_tags' => array(
+        0 => 'Spacestep'
+      )
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://soundcloud.com/matas/above-hyperion-redux'
+    ));
+    
+    // 'http://soundcloud.com/tracks/search?q%5Bfulltext%5D=EEK+A+MOUSSE&q%5Btype%5D=&q%5Bduration%5D='
+    
+    $this->assertEquals(array(
+      
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://soundcloud.com/tracks/search?q%5Bfulltext%5D=EEK+A+MOUSSE&q%5Btype%5D=&q%5Bduration%5D='
+    ));
+    
+    //'http://soundcloud.com/people/search?q%5Bfulltext%5D=EEK+A+MOUSSE&q%5Btype%5D=&q%5Bduration%5D='
+    
+    $this->assertEquals(array(
+      
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://soundcloud.com/people/search?q%5Bfulltext%5D=EEK+A+MOUSSE&q%5Btype%5D=&q%5Bduration%5D='
+    ));
+    
+    // 'http://soundcloud.com/groups/search?q%5Bfulltext%5D=EEK+A+MOUSSE&q%5Btype%5D=&q%5Bduration%5D='
+    
+    $this->assertEquals(array(
+      
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://soundcloud.com/groups/search?q%5Bfulltext%5D=EEK+A+MOUSSE&q%5Btype%5D=&q%5Bduration%5D='
+    ));
+     
+    /*
+     *   - jamendo.com
+     */
+    
+    // 'http://www.jamendo.com/fr/album/30661'
+    
+    $this->assertEquals(array(
+      'data_ref_id' => '30661',
+      'data_title' => 'ZwaNe 01',
+      'data_type' => 'album',
+      'data_thumb_url' => 'http://imgjam.com/albums/s30/30661/covers/1.100.jpg',
+      'data_artist' => 'Ptit lutin',
+      'data_tags' => array(
+        0 => 'Basse',
+        1 => 'Batterie',
+        2 => 'Hardtek',
+        3 => 'Tek',
+        4 => 'Hardtechno',
+      ),
+      'data_download' => true,
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.jamendo.com/fr/album/30661'
+    ));
+    
+    // 'http://www.jamendo.com/fr/track/207079'
+    
+    $this->assertEquals(array(
+      'data_ref_id' => '207079',
+      'data_title' => 'Insanity',
+      'data_type' => 'track',
+      'data_thumb_url' => 'http://imgjam.com/albums/s30/30661/covers/1.100.jpg',
+      'data_artist' => 'Ptit lutin',
+      'data_tags' => array(
+        0 => 'Techno',
+        1 => 'Hardtek'
+      ),
+      'data_download' => true,
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.jamendo.com/fr/track/207079'
+    ));
+    
+    // 'http://www.jamendo.com/fr/search/all/psytrance'
+    
+    $this->assertEquals(array(
+      'data_ref_id' => null,
+      'data_type' => null,
+      'data_download' => true,
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.jamendo.com/fr/search/all/psytrance'
+    ));
+    
+    // 'http://www.jamendo.com/fr/artist/DJ_BETO'
+    
+    $this->assertEquals(array(
+      'data_ref_id' => null,
+      'data_type' => null,
+      'data_download' => true,
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.jamendo.com/fr/artist/DJ_BETO'
+    ));
+    
+    /*/*
+     *   - deezer.com
+     */
+    
+    // 'http://www.deezer.com/fr/music/pantera/far-beyond-driven-80398'
+    
+    $this->assertEquals(array(
+      'data_ref_id' => '80398',
+      'data_type' => 'album',
+      'data_thumb_url' => 'http://api.deezer.com/2.0/album/80398/image'
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.deezer.com/fr/music/pantera/far-beyond-driven-80398'
+    ));
+    
+    // 'http://www.deezer.com/fr/music/playlist/18701350'
+    
+    $this->assertEquals(array(
+      'data_ref_id' => '18701350',
+      'data_type' => 'playlist',
+    ),$this->proceed_element_datas_api(
+      $bux, 
+      'http://www.deezer.com/fr/music/playlist/18701350'
+    ));
+    
+  }
+  
 }

src/Muzich/CoreBundle/Tests/User/UserTest.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Muzich\CoreBundle\Tests\User;
+
+use Muzich\CoreBundle\lib\UnitTest;
+use Muzich\CoreBundle\Entity\UsersTagsFavorites;
+
+class UserTest extends UnitTest
+{  
+  
+  public function testTagsFavoritesQuick()
+  {
+    // On vérifie en premier lieu que les donnée en base corresponde bien a 
+    // ce que l'on veut avoir en fonction des fixtures (c'est une donnée calculé
+    // lors de la manipulation de UsersTagsFavorite
+    
+    $tribe   = $this->getTag('Tribe');
+    $hardtek   = $this->getTag('Hardtek');
+    $electro = $this->getTag('Electro');
+    $metal   = $this->getTag('Metal');
+    $metalco = $this->getTag('Metalcore');
+    $minimal = $this->getTag('Minimal');
+    $jungle  = $this->getTag('Jungle');
+    $melanco = $this->getTag('Melancolique');
+    $mellow  = $this->getTag('Mellow');
+    $melodiq = $this->getTag('Melodique');
+    
+    $bux = $this->getUser('bux');
+    $this->assertEquals(array(
+      $tribe->getId() => 'Tribe',
+      $electro->getId() => 'Electro',
+      $metal->getId() => 'Metal',
+      $minimal->getId() => 'Minimal',
+      $jungle->getId() => 'Jungle',
+      $hardtek->getId()  => 'Hardtek'
+    ), $bux->getTagsFavoritesQuick());
+    
+    $jean = $this->getUser('jean');
+    $this->assertEquals(array(
+      $melanco->getId() => 'Melancolique',
+      $mellow->getId() => 'Mellow',
+      $melodiq->getId() => 'Melodique',
+      $metal->getId() => 'Metal',
+      $metalco->getId() => 'Metalcore',
+      $minimal->getId() => 'Minimal'
+    ), $jean->getTagsFavoritesQuick());
+    
+    /*
+     * Si on effectue des modifs dans les tags favoris
+     */
+    
+    $bux_melodique = new UsersTagsFavorites();
+    $bux_melodique->setUser($bux);
+    $bux_melodique->setTag($melodiq);
+    $this->persist($bux_melodique);
+    $this->flush();
+    
+    $bux = $this->getUser('bux');
+    $this->assertEquals(array(
+      $tribe->getId() => 'Tribe',
+      $electro->getId() => 'Electro',
+      $metal->getId() => 'Metal',
+      $minimal->getId() => 'Minimal',
+      $jungle->getId() => 'Jungle',
+      $hardtek->getId()  => 'Hardtek',
+      $melodiq->getId()  => 'Melodique'
+    ), $bux->getTagsFavoritesQuick());
+    
+    $this->getDoctrine()->getEntityManager()->remove($bux_melodique);
+    $this->flush();
+    
+    $bux = $this->getUser('bux');
+    $this->assertEquals(array(
+      $tribe->getId() => 'Tribe',
+      $electro->getId() => 'Electro',
+      $metal->getId() => 'Metal',
+      $minimal->getId() => 'Minimal',
+      $jungle->getId() => 'Jungle',
+      $hardtek->getId()  => 'Hardtek'
+    ), $bux->getTagsFavoritesQuick());
+  }
+  
+}

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -213,8 +213,9 @@ class FunctionalTest extends WebTestCase
    * @param string $url
    * @param array $tags
    * @param string $group_slug 
+   * @param boolean $need_tags 
    */
-  protected function procedure_add_element($name, $url, $tags, $group_slug = null)
+  protected function procedure_add_element($name, $url, $tags, $group_slug = null, $need_tags = false)
   {
     if (!$group_slug)
     {
@@ -231,7 +232,16 @@ class FunctionalTest extends WebTestCase
     $form = $this->selectForm('form[action="'.$form_url.'"] input[type="submit"]');
     $form['element_add[name]'] = $name;
     $form['element_add[url]'] = $url;
-    $form['element_add[tags]'] = json_encode($tags);
+    
+    if (count($tags))
+    {
+      $form['element_add[tags]'] = json_encode($tags);
+    }
+    
+    if ($need_tags)
+    {
+      $form['element_add[need_tags]'] = true;
+    }
     
     $this->submit($form);
   }
@@ -519,5 +529,9 @@ class FunctionalTest extends WebTestCase
       ->findOneBy($params);
   }
   
+  protected function goToPage($url)
+  {
+    $this->crawler = $this->client->request('GET', $url);
+  }
   
 }

src/Muzich/CoreBundle/lib/UnitTest.php

@@ -39,9 +39,6 @@ class UnitTest extends \PHPUnit_Framework_TestCase
   
   protected function proceed_elementAndFill($user, $name, $url, $tag_ids, $final_embed)
   {
-    $youtube_width = '590';
-    $youtube_height = '300';
-        
     $element = new Element();
     $element->setName($name);
     $element->setTags(json_encode($tag_ids));
@@ -68,11 +65,42 @@ class UnitTest extends \PHPUnit_Framework_TestCase
     $this->assertEquals($element->getEmbed(), $final_embed);
   }
   
+  protected function proceed_element_datas_api($user, $url)
+  {
+    $element = new Element();
+    $element->setUrl($url);
+    
+    $factory = new ElementManager($element, 
+      $this->getDoctrine()->getEntityManager(), $this->_container);
+    $factory->proceedFill($user);
+    
+    return $element->getDatas();
+  }
+
+
   protected function getUser($username)
   {
     return $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
       ->findOneByUsername($username)
     ;
   }
+
+
+  protected function getTag($name)
+  {
+    return $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')
+      ->findOneByName($name)
+    ;
+  }
+  
+  protected function persist($entity)
+  {
+    $this->getDoctrine()->getEntityManager()->persist($entity);
+  }
+  
+  protected function flush()
+  {
+    $this->getDoctrine()->getEntityManager()->flush();
+  }
   
 }

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -4,10 +4,7 @@ namespace Muzich\HomeBundle\Controller;
 
 use Muzich\CoreBundle\lib\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-
-use Doctrine\ORM\Query;
-use Muzich\CoreBundle\Form\Search\ElementSearchForm;
-use Muzich\CoreBundle\Form\Element\ElementAddForm;
+use Muzich\CoreBundle\Searcher\ElementSearcher;
 
 class HomeController extends Controller
 {
@@ -29,12 +26,12 @@ class HomeController extends Controller
     $add_form = $this->getAddForm();
     
     $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
-    $count_elements = count($elements);
+    //$count_elements = count($elements);
     
     return array(
       'search_tags_id'   => $search_object->getTags(),
       'ids_display'      => $search_object->getIdsDisplay(),
-      'user'             => $this->getUser(),
+      'user'             => $user,
       'add_form'         => $add_form->createView(),
       'add_form_name'    => 'add',
       'search_form'      => $search_form->createView(),
@@ -44,4 +41,19 @@ class HomeController extends Controller
       //'display_more_button' => ($count_elements >= $this->container->getParameter('search_default_count'))?true:false
     );
   }
+  
+  public function needTagsAction()
+  {
+    $es = new ElementSearcher();
+    $es->init(array(
+      'count'     => $this->container->getParameter('search_default_count'),
+      'need_tags' => true
+    ));
+    
+    return $this->render('MuzichHomeBundle:Home:need_tags.html.twig', array(
+      'elements' => $es->getElements($this->getDoctrine(), $this->getUserId()),
+      'topmenu_active' => 'needs-tags'
+    ));
+  }
+  
 }

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -65,7 +65,9 @@ class ShowController extends Controller
       'count_owned'     => count($element_ids_owned),
       'count_favorited' => $count_favorited,
       'count_favorited_users' => $count_favorited_users,
-      'count_followers' => $count_followers
+      'count_followers' => $count_followers,
+      'add_form'        => ($this->getUserId() == $viewed_user->getId())?$this->getAddForm()->createView():null,
+      'add_form_name'   => 'add'
     );
   }
   

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

@@ -0,0 +1,27 @@
+{% extends "MuzichHomeBundle::layout.html.twig" %}
+
+{% block title %}{{ 'title.need_tags'|trans({}, 'navigationui') }}{% endblock %}
+
+{% block content %}
+
+  <h1>{{ 'title.need_tags'|trans({}, 'navigationui') }}</h1>
+
+  <p>{{ 'need_tags.text_help'|trans({}, 'userui') }}</p>
+  
+  <div class="display_more_elements" style="display: none;">
+    <span></span>
+  </div>
+
+  <div class="elements_loader_div">
+    <img class="elements_new_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+  </div>
+
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
+    
+  {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+    'display_more_button' : true,
+    'elements_length'     : elements|length,
+    'more_path'           : 'search_elements'
+  }%}
+  
+{% endblock %}

src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig

@@ -25,6 +25,28 @@
   
 
   <h2>{{ 'user.show.title'|trans({'%name%' : viewed_user.name}, 'users') }}</h2>
+
+  {% if app.user.id == viewed_user.id %}
+    <div id="element_add_box" style="display: none;">    
+    
+      <a href="#" id="element_add_close_link" class="button">
+        &lt;&lt; {{ 'home.add_element_box.close'|trans({}, 'navigationui') }}
+      </a>
+
+      <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>
+
+    <a href="#" id="element_add_link" class="button">
+      {{ 'home.add_element'|trans({}, 'navigationui') }} &gt;&gt;
+    </a>
+  {% endif %}
   
   <div class="reputation">
     {{ 'user.reputation.name'|trans({}, 'users') }}: 

web/bundles/muzichcore/css/main.css

@@ -1068,7 +1068,7 @@ div.comments_loader
 
 /* Ajouter tag d'élément a ses tags favoris */
 
-li.element a.tag_to_favorites
+li.element a.tag_to_favorites, li.element img.tag_to_favorites
 {
   margin-left: -15px;
   margin-right: 4px;
@@ -1079,6 +1079,11 @@ li.element a.element_tag_large_for_fav
   padding-right: 15px;
 }
 
+li.element a.element_tag_large_for_fav_still
+{
+  padding-right: 15px;
+}
+
 /* END Ajouter tag d'élément a ses tags favoris */
 
 div#added_element_to_group
@@ -1277,4 +1282,9 @@ li.element.shadows
    -moz-box-shadow: 3px 3px 3px #4F4F4F;
    -webkit-box-shadow: 3px 3px 3px #4F4F4F;
    box-shadow: 3px 3px 3px #4F4F4F;
+}
+
+ul#favorite_tags a.button.highlight
+{
+  color: blue;
 }

web/bundles/muzichcore/js/muzich.js

@@ -2224,4 +2224,33 @@ $(document).ready(function(){
     }
   });
 
+  /*
+   * Cloud tags
+   */
+  
+  $('a#display_all_cloud_tag').click(function(){
+    $('ul#favorite_tags li').show();
+    $(this).hide();
+  });
+  
+  $('input#cloud_tags_filter').keyup(function(){
+    var search_string = $(this).val();
+    
+    $('ul#favorite_tags li a').removeClass('highlight');
+    
+    if (search_string.length > 1)
+    {
+      $('ul#favorite_tags li a').each(function(){
+
+        if ($(this).text().toUpperCase().search(search_string.toUpperCase()) != -1)
+        {
+          $(this).addClass('highlight')
+        }
+
+      });
+    }
+    
+  });
+
+
 });