Evolution #802: Page ad'accueil plus claire

app/Resources/translations/text.fr.yml

@@ -199,10 +199,8 @@ help_tour:
       tour:           |
                       "<h1>Filtres</h1>"+
                       "<p>Vous pouvez filtrer les partages à l'aide de tags.</p>"
-      notags:         |
-                      "<p>Sans tags, comme maintenant.</p>"
-      withtags:       |
-                      "<p>Ou avec tags !</p>"
+      tags:           |
+                      "<p>Vous pouvez saisir vos genres/styles musicaux préférés dans le filtre afin d'afficher les musiques correspondantes.</p>"
     
     network:
       tour:           |

app/Resources/translations/userui.en.yml

@@ -155,6 +155,7 @@ filter:
   submit:  Filtrer
   clear:   Aucun filtre
   mytags:  Avec filtre
+  network_generic: Réseau
   network_all:   Réseau global
   network_my:    Mon réseau
   new_comments:     Nvx commentaires

app/Resources/translations/userui.fr.yml

@@ -174,12 +174,17 @@ filter:
   submit:  Filtrer
   clear:   Aucun filtre
   mytags:  Avec filtre
+  network_generic: Réseau
   network_all:   Réseau global
   network_my:    Mon réseau
   new_comments:     Nvx commentaires
   new_favoriteds:   Nvx favoris
   new_tags:         Propositions de tags
   tag_strict:       Chaque tag doit être trouvé
+  help_text:        |
+                    Entrez ci-dessous les genre/styles de musiques que vous appréciez,
+                    une fois ces genres ajoutés en tant que "tags" vous pourrez filtrer les
+                    musiques partagés selon vos gouts !
   
 element_add:
   prop_tags:

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -80,6 +80,11 @@ class SearchController extends Controller
         // On met a jour l'objet avec les nouveaux paramétres saisie dans le form
         $data = $search_form->getData();
         
+        if ($data['network'] == ElementSearcher::NETWORK_PERSONAL && $this->isVisitor())
+        {
+          return $this->mustBeConnectedAjaxResponse();
+        }
+        
         // Le formulaire nous permet de récupérer uniquement les ids.
         // On va donc chercher les name en base pour le passer a l'objet
         // ElementSearch

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -870,7 +870,10 @@ ul.submenu
   list-style-type: none;
   display: inline;
   float: left;
-  padding: 20px;
+  padding-left: 15px;
+  padding-top: 20px;
+  padding-right: 20px;
+  padding-bottom: 20px;
   
   background: #dddddd; /* Old browsers */
   /* IE9 SVG, needs conditional override of 'filter' to 'none' */
@@ -1119,7 +1122,7 @@ div#form_add_first_part #element_add_url
 
 #tabs_tag_search_buttons a
 {
-  padding-left: 5px;
+  padding-left: 10px;
 }
 
 #tabs_tag_search_buttons img
@@ -2431,6 +2434,31 @@ div.playlists_prompt
   z-index: 100001;
 }
 
+a.all_network
+{
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+div#tags_prompt_search p.help_notags
+{
+  font-weight: bold;
+  margin-top: -10px;
+}
+
+div#tags_prompt_search p.help_notags img
+{
+  float: right;
+  margin: -16px 15px -10px 0;
+}
+
+div#tags_prompt_search p.help_notags span
+{
+  float: left;
+  margin-bottom: 10px;
+  width: 480px;
+}
+
 /*
 *
 *

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

@@ -341,12 +341,28 @@ function TagPromptConnector(input, output, proposition_list, tag_box, prompt_loa
   var _tag_box_manager = new TagBoxManager(tag_box, this);
   var _prompt_loader = prompt_loader;
   
+  var updateHelpDisplay = function()
+  {
+    if (_tag_prompt.getSelectedTags())
+    {
+      if (_tag_prompt.getSelectedTags().length)
+      {
+        $('#tags_prompt_search p.help_notags').hide();
+      }
+      else
+      {
+        $('#tags_prompt_search p.help_notags').show();
+      }
+    }
+  }
+  
   this.updateOutput = function(tags)
   {
     _output.val(array2json(tagsToArrayIds(tags)));
     _tag_proposition_list.hide();
     _tag_box_manager.update(tags);
     cleanInput();
+    updateHelpDisplay();
   }
   
   var _tag_prompt = new TagPrompt(this.updateOutput, this);

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

@@ -335,10 +335,10 @@ $(document).ready(function(){
       $(this).parent('li').addClass('selected');
     }
     
-    if ($('div.top_tools:visible').length)
-    {
-      $('div.top_tools').slideUp();
-    }
+//    if ($('div.top_tools:visible').length)
+//    {
+//      $('div.top_tools').slideUp();
+//    }
     
     // On initialise la liste de tags déjà ajouté
     window.search_tag_prompt_connector.initializeTags([]);
@@ -357,10 +357,10 @@ $(document).ready(function(){
     $(this).parents('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
     $(this).parent('li').addClass('selected');
     
-    if ($('div.top_tools:visible').length == 0)
-    {
-      $('div.top_tools').slideDown();
-    }
+//    if ($('div.top_tools:visible').length == 0)
+//    {
+//      $('div.top_tools').slideDown();
+//    }
     
     var form = $('form[name="search"]');
     
@@ -401,13 +401,14 @@ $(document).ready(function(){
       {
         $('ul#tabs_tag_search_buttons').find('li').removeClass('selected');
         $('li#tab_li_tag_search_with_tags').addClass('selected');
+        
+        // Ne devrais plus servir puisque on l'affiche toujours maintenant
         if (!$('div.top_tools:visible').length)
         {
           $('div.top_tools').slideDown();
         }
       }
       
-      
       $('img.elements_more_loader').show();
       $('ul.elements').html('');
       
@@ -678,7 +679,9 @@ $(document).ready(function(){
     window.ResponseController.execute(
         response,
         function(){},
-        function(){}
+        function(){
+          $('img.elements_more_loader').hide();
+        }
       );
     
     $('ul.elements').html(response.html);
@@ -1283,10 +1286,7 @@ $(document).ready(function(){
       
       if ($('form[name="search"]').length)
       {
-        if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
-        {
-          $('div.top_tools').slideDown();
-        }
+        $('div.top_tools').slideDown();
       }
       remove_tags('add');
       recolorize_element_list();
@@ -2753,10 +2753,8 @@ $(document).ready(function(){
      $('#element_add_box').slideDown("slow");
      $('#element_add_link').hide();
      $('#element_add_close_link').show();
-     if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
-     {
-       $('div.top_tools').slideUp();
-     }
+     $('div.top_tools').slideUp();
+     
      // Au cas ou firefox garde la valeur step 2:
         $('input#form_add_step').val('1');
     $('form[name="add"]').attr('action', url_datas_api);
@@ -2768,11 +2766,7 @@ $(document).ready(function(){
      $('#element_add_box').slideUp("slow");
      $('#element_add_link').show();
      $('#element_add_close_link').hide();
-     
-     if ($('a#tabs_tag_search_with_tags').parent('li').hasClass('selected'))
-     {
-       $('div.top_tools').slideDown();
-     }
+     $('div.top_tools').slideDown();
      
      //form_add_reinit();
      // copie du contenu de la fonction ci dessus, arrive pas a l'appeler ... huh
@@ -3052,6 +3046,7 @@ $(document).ready(function(){
    
    $('a.tags_prompt_remove_all').click(function(){
      window.search_tag_prompt_connector.initializeTags([]);
+     $('form[name="search"] input[type="submit"]').trigger('click');
    });
    
    $('a.tags_prompt_favorites').click(function(){
@@ -3107,6 +3102,7 @@ $(document).ready(function(){
         });
       }
       
+      $('form[name="search"] input[type="submit"]').trigger('click');
     });
     
     return false;

src/Muzich/CoreBundle/Resources/views/HelpTour/home.html.twig

@@ -33,26 +33,19 @@
               position : 'R'
             },
             { 
-              element: '#tabs_tag_search_no_tags',
+              element: 'div#tags_prompt_search',
               text : {{ 'help_tour.home.filters.tour'|trans({}, 'text') }},
-              tooltip: {{ 'help_tour.home.filters.notags'|trans({}, 'text') }},
-              position : 'B'
-            },
-            { 
-              element: '#tabs_tag_search_with_tags',
-              text : {{ 'help_tour.home.filters.tour'|trans({}, 'text') }},
-              tooltip: {{ 'help_tour.home.filters.withtags'|trans({}, 'text') }},
-              position : 'T',
-              tooltipCallback : function(){ $('#tabs_tag_search_with_tags').trigger('click'); }
+              tooltip: {{ 'help_tour.home.filters.tags'|trans({}, 'text') }},
+              position : 'T'
             },
             { 
-              element: '#header_menu li a.all_network',
+              element: 'a#link_all_network',
               text : {{ 'help_tour.home.network.tour'|trans({}, 'text') }},
               tooltip: {{ 'help_tour.home.network.public'|trans({}, 'text') }},
               position : 'B'
             },
             { 
-              element: '#header_menu li a#link_my_network',
+              element: 'a#link_my_network',
               text : {{ 'help_tour.home.network.tour'|trans({}, 'text') }},
               tooltip: {{ 'help_tour.home.network.private'|trans({}, 'text') }},
               position : 'B'

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

@@ -7,16 +7,17 @@
   {% if app.user %}
     <li class="{% if network_public == '1' and not ids_display %}selected{% endif %}">
       <a id="link_all_network" href="{{ path('home') }}" class="all_network">
-        {{ 'filter.network_all'|trans({}, 'userui') }}
+        {{ 'filter.network_generic'|trans({}, 'userui') }}
       </a>
     </li>
   {% else %}
     <li class="{% if network_public == '1' and not ids_display %}selected{% endif %}">
       <a href="{{ path('home') }}" class="all_network">
-        {{ 'filter.network_all'|trans({}, 'userui') }}
+        {{ 'filter.network_generic'|trans({}, 'userui') }}
       </a>
     </li>
   {% endif %}
+  {#
   <li class="separator"></li>
   {% if app.user %}
     <li class="{% if network_public == '0' and not ids_display %}selected{% endif %}">
@@ -30,7 +31,7 @@
         {{ 'filter.network_my'|trans({}, 'userui') }}
       </a>
     </li>
-  {% endif %}
+  {% endif %}#}
   <li class="separator"></li>
   {% if app.user %}
     <li class="{% if app.request.get('topmenu') == 'playlists' and app.request.get('user_slug') == app.user.slug %}selected{% endif %}">

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

@@ -1,3 +1,6 @@
+{% if display_help_notags is not defined %}
+  {% set display_help_notags = false %}
+{% endif %}
 
   {{ form_errors(search_form) }}
 
@@ -35,8 +38,9 @@
   </div>
   
   {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 
-    'form_name'     : form_name,
-    'display_tools' : true
+    'form_name'           : form_name,
+    'display_tools'       : true,
+    'display_help_notags' : display_help_notags
   } %}
   
   <div>

src/Muzich/CoreBundle/Resources/views/Tag/tagsPrompt.html.twig

@@ -1,7 +1,9 @@
 {% if display_tools is not defined %}
   {% set display_tools = false %}
 {% endif %}
-
+{% if display_help_notags is not defined %}
+  {% set display_help_notags = false %}
+{% endif %}
 
 <a title="{{ 'tags.prompt.help_box_title'|trans({}, 'userui') }}" href="{{ path('helpbox_bootstrap', {'ressource_id':'tags_prompt'}) }}" class="helpbox tag_prompt_tool tags_prompt_helpbox">
   <img alt="help ?" src="{{ asset('img/1362157855_help.png') }}" />
@@ -22,6 +24,13 @@
 <div class="tags_prompt" id="tags_prompt_{{ form_name }}">
    
   <ul class="tagbox"></ul>
+  
+  {% if display_help_notags %}
+    <p class="help_notags" {% if search_tags is defined %}{% if search_tags|length %}style="display: none;"{% endif %}{% endif %}>
+      <img src="{{ asset('/img/1372956700_gnome-dev-symlink.png') }}" alt="here" />
+      <span>{{ 'filter.help_text'|trans({}, 'userui') }}</span>
+    </p>
+  {% endif %}
   <div style="clear: both;"></div>
   
   <input

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

@@ -8,7 +8,9 @@
   </head>
   <body>
     
-    {% include 'MuzichCoreBundle:Component:facebook.html.twig' %}
+    {% if  app.environment == 'prod' %}
+      {% include 'MuzichCoreBundle:Component:facebook.html.twig' %}
+    {% endif %}
     {% include 'MuzichCoreBundle:Layout:noscript.html.twig' %}
     {% include 'MuzichCoreBundle:Autoplay:autoplay.html.twig' %}
   

src/Muzich/CoreBundle/lib/Controller.php

@@ -495,9 +495,7 @@ class Controller extends BaseController
       
       if ($this->getRequest()->isXmlHttpRequest())
       {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
+        return $this->mustBeConnectedResponse();
       }
       else
       {
@@ -506,6 +504,13 @@ class Controller extends BaseController
     }
   }
   
+  protected function mustBeConnectedAjaxResponse()
+  {
+    return $this->jsonResponse(array(
+      'status' => 'mustbeconnected'
+    ));
+  }
+  
   /**
    *
    * @return \Doctrine\ORM\EntityManager 

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -15,13 +15,18 @@ class HomeController extends Controller
    * 
    * @Template()
    */
-  public function indexAction($count = null, $network = 'public', $login = false)
+  public function indexAction($count = null, $network = null, $login = false)
   {
     $search_object = $this->getElementSearcher($count);
     $user = $this->getUser(true, array('join' => array(
       'groups_owned'
     )), true);
-    $search_object->setNetwork($network);
+    
+    if (!$network && !$search_object->getNetwork())
+    {
+      $search_object->setNetwork(ElementSearcher::NETWORK_PUBLIC);
+    }
+    
     $search_form = $this->getSearchForm($search_object);
     $add_form = $this->getAddForm();
     

src/Muzich/HomeBundle/Resources/views/Component/filter_menu.html.twig

@@ -1,15 +1,15 @@
 <ul id="tabs_tag_search_buttons">
-  <li id="tab_li_tag_search_no_tags" class="{% if search_tags_id|length == 0 %}selected{% endif %} gradient">
-    <a id="tabs_tag_search_no_tags" href="#" >
-      <img src="{{ asset('/img/icon_close.png') }}" alt="nofilters" />
-      {{ 'filter.clear'|trans({}, 'userui') }}
+  <li id="tab_li_tag_search_no_tags" class="{% if network_public == '1' %}selected{% endif %} gradient">
+    <a id="link_all_network" href="#"  class="all_network">
+      <img src="{{ asset('/img/1372949806_web-hosting-px-png.png') }}" alt="network" />
+      {{ 'filter.network_all'|trans({}, 'userui') }}
     </a>
     <div class="dart"></div>
   </li>
-  <li id="tab_li_tag_search_with_tags" class="{% if search_tags_id|length %}selected{% endif %} gradient">
-    <a id="tabs_tag_search_with_tags" href="#" >
-      <img src="{{ asset('/img/icon_minilogo_2.png') }}" alt="nofilters" />
-      {{ 'filter.mytags'|trans({}, 'userui') }}
+  <li id="tab_li_tag_search_with_tags" class="{% if network_public == '0' and not ids_display %}selected{% endif %} gradient">
+    <a id="link_my_network" href="#" class="my_network" >
+      <img src="{{ asset('/img/icon_friends_little.png') }}" alt="my network" />
+      {{ 'filter.network_my'|trans({}, 'userui') }}
     </a>
     <div class="dart"></div>
   </li>

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

@@ -52,14 +52,15 @@
     </script>
   {% endif %}
 
-  <div class="top_tools" {% if search_tags_id|length == 0 %}style="display: none;"{% endif %}>
+  <div class="top_tools">
   
     <div class="search_tools">
       <form name="{{ search_form_name }}" action="{{ path('search_elements', {'context':'home'}) }}" method="post" {{ form_enctype(search_form) }}>
         
         {% include "MuzichCoreBundle:SearchElement:form.html.twig" with { 
           'form_name'               : search_form_name,
-          'search_tags'             : search_tags_id
+          'search_tags'             : search_tags_id,
+          'display_help_notags'     : true
         } %}
         
         <input class="main button" type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>