Evolution #77: Cacher les "ajouter"

app/Resources/translations/navigationui.fr.yml

@@ -22,6 +22,17 @@ home:
   add_element_box:
     close:              Fermer
   
+group:
+  add_element:          Ajouter un élément dans ce groupe
+  add_group:            Ajouter un groupe
+  add_element_box:
+    close:              Fermer
+  add_group_box:
+    close:              Fermer
+  
+my_groups:
+  title:                Mes groupes
+  
 title:
   hello:                Découvrez et partagez la musique !
   

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

@@ -19,7 +19,7 @@
         </span> 
         
         {% autoescape false %}
-          {% if element.group %}
+          {% if element.group and no_group_name is not defined%}
             {{ 'element.name.whoandgroup'|trans({
               '%owner_url%'  : path('show_user', {'slug': element.owner.slug}),
               '%owner_name%' : element.owner.name,

src/Muzich/CoreBundle/Tests/Controller/HomeControllerTest.php

@@ -145,7 +145,8 @@ class HomeControllerTest extends FunctionalTest
     $this->procedure_add_element(
       'Mon bel element', 
       'http://www.youtube.com/watch?v=WC8qb_of04E', 
-      array($hardtek->getId(), $tribe->getId())
+      array($hardtek->getId(), $tribe->getId()),
+            null, true
     );
     
     $this->isResponseRedirection();

src/Muzich/GroupBundle/Resources/views/Default/myList.html.twig

@@ -1,9 +1,13 @@
 {% extends "MuzichGroupBundle::layout.html.twig" %}
 
-{% block title %}Mes groupes{% endblock %}
+{% block title %}{{ 'my_groups.title'|trans({}, 'navigationui') }}{% endblock %}
 
 {% block content %}
 
+  <a href="#" id="group_add_link">
+    {{ 'group.add_group'|trans({}, 'navigationui') }} >>
+  </a>
+
   {% if groups|length %}
 
     {{ 'havegroups.sentence'|trans({}, 'groups') }}
@@ -22,13 +26,21 @@
 
   {% endif %}
 
-  <h2>Ajouter un groupe</h2>
+  <div id="group_add_box" style="display: none;">
 
-  <form name="{{ form_new_name }}" action="{{ path('group_add') }}" method="post" {{ form_enctype(form_new) }}>
+    <a href="#" id="group_add_close_link">
+      << {{ 'group.add_group_box.close'|trans({}, 'navigationui') }}
+    </a>
     
-    {% include "MuzichGroupBundle:Form:form.html.twig" with { 'form': form_new, 'form_name': form_new_name } %}
+    <h2>{{ 'group.add_group'|trans({}, 'navigationui') }}</h2>
+
+    <form name="{{ form_new_name }}" action="{{ path('group_add') }}" method="post" {{ form_enctype(form_new) }}>
+
+      {% include "MuzichGroupBundle:Form:form.html.twig" with { 'form': form_new, 'form_name': form_new_name } %}
 
-    <input type="submit" />
-  </form>
+      <input type="submit" />
+    </form>
+  
+  </div>
 
 {% endblock %}

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

@@ -3,6 +3,9 @@
 {% block css %}
 	<link href="{{ asset('bundles/muzichgroups/css/groups.css') }}" rel="stylesheet" media="screen" type="text/css" />
 {% endblock %}
+{% block js %}
+  <script src="{{ asset('bundles/muzichgroups/js/groups.js') }}" type="text/javascript"></script>
+{% endblock %}
 
 {% block main_content %}
   

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

@@ -7,7 +7,7 @@
   <div id="element_add_box" style="display: none;">
     
     <a href="#" id="element_add_close_link">
-      {{ 'home.add_element_box.close'|trans({}, 'navigationui') }} >>
+      << {{ 'home.add_element_box.close'|trans({}, 'navigationui') }}
     </a>
     
     <form name="{{ add_form_name }}" action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}>

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

@@ -27,21 +27,29 @@
   
   {% if his_group or group.open %}
   
-    <form name="{{ add_form_name }}" action="{{ path('element_add', {'group_slug' : group.slug}) }}" method="post" {{ form_enctype(add_form) }}>
+    <div id="element_add_box" style="display: none;">
+  
+      <a href="#" id="element_add_close_link">
+        << {{ 'group.add_element_box.close'|trans({}, 'navigationui') }}
+      </a>
+      
+      <form name="{{ add_form_name }}" action="{{ path('element_add', {'group_slug' : group.slug}) }}" method="post" {{ form_enctype(add_form) }}>
 
-      {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 'form': add_form, 'form_name': add_form_name } %}
+        {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 'form': add_form, 'form_name': add_form_name } %}
 
-      <p>
-        <i>
-          {{ 'element.add.group.will_be_in'|trans({}, 'elements') }}
-        </i>
-      </p>
-      <input type="submit" />
-    </form>
+        <input type="submit" />
+      </form>
+      
+    </div>
+  
+    <a href="#" id="element_add_link">
+      {{ 'group.add_element'|trans({}, 'navigationui') }} >>
+    </a>
+    <br />
   
   {% endif %}
   
-  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {'no_group_name' : true} %}
     
   {% if more_count is defined %} 
   {% if elements|length %}

web/bundles/muzichcore/css/main.css

@@ -50,6 +50,11 @@
   color: #00d0de;
 }
 
+#container a:hover
+{
+  text-decoration: underline;
+}
+
 #container #top-tabs, .top-tabs-right
 {
   float: left;

web/bundles/muzichgroups/css/groups.css

@@ -0,0 +1,12 @@
+
+#container #group_add_link, #container #group_add_close_link
+{
+  font-size: 120%;
+  float: right;
+}
+
+#container #group_add_box
+{
+  background-color: #e3f6fd;
+  padding: 20px;
+}

web/bundles/muzichgroups/js/groups.js

@@ -0,0 +1,17 @@
+$(document).ready(function(){
+   
+   // Ouverture de la zone "ajouter un group""
+   $('#group_add_link').click(function(){
+     $('#group_add_box').slideDown("slow");
+     $('#group_add_link').hide();
+     return false;
+   });   
+   
+   // Fermeture de la zone "ajouter un group""
+   $('#group_add_close_link').click(function(){
+     $('#group_add_box').slideUp("slow");
+     $('#group_add_link').show();
+     return false;
+   }); 
+   
+ });