integration suite

app/Resources/translations/userui.fr.yml

@@ -73,7 +73,7 @@ filter:
   network: "Résultats de "
   submit:  Filtrer
   clear:   Aucun filtre
-  mytags:  Tous mes tags
+  mytags:  Filtrer avec Tags
   network_all:   Réseau global
   network_my:    Mon réseau
   new_comments:     Nvx commentaires

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

@@ -6,13 +6,6 @@
       {{ form_errors(search_form.network) }}
       {{ form_widget(search_form.network, { 'attr': {'style': 'display: none;'} }) }}
     </div>
-    
-    <a href="#" class="button all_network {% if network_public and not ids_display %}active{% endif %}">
-      {{ 'filter.network_all'|trans({}, 'userui') }}
-    </a>
-    <a href="#" class="button my_network {% if not network_public and not ids_display %}active{% endif %}">
-      {{ 'filter.network_my'|trans({}, 'userui') }}
-    </a>
       
   </div>
 

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

@@ -1,7 +1,10 @@
 
 
 <div class="tags_prompt" id="tags_prompt_{{ form_name }}">
-
+   
+  
+  <ul class="tagbox"></ul>
+  
   <input
     class="tag_prompt"
     value=""
@@ -9,7 +12,7 @@
   />
   <img id="tag_prompt_loader_{{ form_name }}" class="tag_loader" style="display: none;"
     src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading"/>
-   
+  
   <div id="search_tag_{{ form_name }}" class="search_tag_list" style="display: none;">
     <span class="info"></span>
     <div class="tag_loader_div">
@@ -22,8 +25,6 @@
     </a>
   </div>
   
-  <ul class="tagbox"></ul>
-  
 </div>
 
 <script language="javascript" type="text/javascript">

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

@@ -129,15 +129,20 @@
           </li>
         </ul>
         <ul id="header_menu">
-          <li class="selected">
-            <a href="">
-              Réseau global
+          
+          {% if network_public is not defined %}
+            {% set network_public = '' %}
+          {% endif %}
+          
+          <li class="{% if network_public == '1' and not ids_display %}selected{% endif %}">
+            <a href="{{ path('home') }}" class="all_network">
+              {{ 'filter.network_all'|trans({}, 'userui') }}
             </a>
           </li>
           <li class="separator"></li>
-          <li>
-            <a href="" >
-              Mon réseau
+          <li class="{% if network_public == '0' and not ids_display %}selected{% endif %}">
+            <a href="{{ path('home') }}" class="my_network" >
+              {{ 'filter.network_my'|trans({}, 'userui') }}
             </a>
           </li>
           <li class="separator"></li>

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

@@ -4,6 +4,10 @@
 
 {% block content %}
 
+  <a href="#" id="element_add_link" class="button gradient">
+    {{ 'home.add_element'|trans({}, 'navigationui') }} &gt;&gt;
+  </a>
+
   <ul id="tabs_tag_search_buttons">
     <li class="selected gradient">
       <a id="tabs_tag_search_no_tags" href="#" >
@@ -22,79 +26,78 @@
   <input type="hidden" class="filter_clear_url" value="{{ path('filter_clear') }}" />
   <input type="hidden" class="filter_mytags_url" value="{{ path('filter_mytags') }}" />
 
-  <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 }}" 
-      {% if  app.environment != 'test' %}
-        action="{{ path('element_retrieve_api_datas') }}" method="post" {{ form_enctype(add_form) }}
-      {% else %}
-        action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}
-      {% endif %}
-    >
-
-      {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 
-        'form'          : add_form, 
-        'form_name'     : add_form_name
-      } %}
-            
-    {% if from_url is defined %}
-    {% if from_url %}
-      <script type="text/javascript">
-        $(document).ready(function(){
-          $('#element_add_box').slideDown("slow");
-          $('#element_add_link').hide();
-          $('form[name="search"]').slideUp();
-          $('img#form_add_loader').show();
-          $('input#element_add_url').val("{{ from_url }}");
-          $('form[name="add"]').submit();
-        });
-      </script>
-    {% endif %}
-    {% endif %}
+  <div id="home_top_tools">
+  
+    <div id="element_add_box" style="display: none;">    
 
-    </form>
-  </div>
+      <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 }}" 
+        {% if  app.environment != 'test' %}
+          action="{{ path('element_retrieve_api_datas') }}" method="post" {{ form_enctype(add_form) }}
+        {% else %}
+          action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}
+        {% endif %}
+      >
+
+        {% include "MuzichCoreBundle:Element:form.add.html.twig" with { 
+          'form'          : add_form, 
+          'form_name'     : add_form_name
+        } %}
+
+      {% if from_url is defined %}
+      {% if from_url %}
+        <script type="text/javascript">
+          $(document).ready(function(){
+            $('#element_add_box').slideDown("slow");
+            $('#element_add_link').hide();
+            $('form[name="search"]').slideUp();
+            $('img#form_add_loader').show();
+            $('input#element_add_url').val("{{ from_url }}");
+            $('form[name="add"]').submit();
+          });
+        </script>
+      {% endif %}
+      {% endif %}
 
-  <a href="#" id="element_add_link" class="button">
-    {{ 'home.add_element'|trans({}, 'navigationui') }} &gt;&gt;
-  </a>
+      </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" />
+      <p class="help">
+        {{ 'element_add.added_to_group.sentence'|trans({}, 'userui') }}
+      </p>
+      <ul id="groups_to_add_element"></ul>
+      <p class="cancel">
+        <a href="" class="cancel">
+          {{ 'element_add.added_to_group.nothanks'|trans({}, 'userui') }}
+        </a>
+      </p>
+    </div>
+
+    <form name="{{ search_form_name }}" action="{{ path('search_elements') }}" method="post" {{ form_enctype(search_form) }}>
+
+      {% include "MuzichCoreBundle:SearchElement:form.html.twig" with { 
+        'form_name'               : search_form_name,
+        'search_tags'             : search_tags_id
+      } %}
 
-  <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" />
-    <p class="help">
-      {{ 'element_add.added_to_group.sentence'|trans({}, 'userui') }}
-    </p>
-    <ul id="groups_to_add_element"></ul>
-    <p class="cancel">
-      <a href="" class="cancel">
-        {{ 'element_add.added_to_group.nothanks'|trans({}, 'userui') }}
-      </a>
-    </p>
-  </div>
+      <input class="main button" type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>
 
-  <form name="{{ search_form_name }}" action="{{ path('search_elements') }}" method="post" {{ form_enctype(search_form) }}>
+    </form>
 
-    {% include "MuzichCoreBundle:SearchElement:form.html.twig" with { 
-      'form_name'               : search_form_name,
-      'search_tags'             : search_tags_id
-    } %}
-    
-    <input class="main button" type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>
-        
-  </form>
 
+    <a href="{{ path('elements_get_filter_data_autoplay', {
+      'type' : 'filter'
+    }) }}" class="button" id="autoplay_launch" 
+       title="{{ 'elements.autoplay.launch'|trans({}, 'elements') }}" >
+      <img src="{{ asset('/bundles/muzichcore/img/1353494305_player_play.png') }}" alt="" />
+    </a>
   
-  <a href="{{ path('elements_get_filter_data_autoplay', {
-    'type' : 'filter'
-  }) }}" class="button" id="autoplay_launch" 
-     title="{{ 'elements.autoplay.launch'|trans({}, 'elements') }}" >
-    <img src="{{ asset('/bundles/muzichcore/img/1353494305_player_play.png') }}" alt="" />
-  </a>
+  </div>
 
   <div class="display_more_elements" style="display: none;">
     <span></span>

web/bundles/muzichcore/css/old.css

@@ -468,7 +468,7 @@ ul.tagbox li {
 margin:0;
 }
 
-ul.tagbox li.tag {
+/*ul.tagbox li.tag {
   
 float: left;
 line-height: 1;
@@ -510,7 +510,7 @@ outline: 0;
 line-height:1.2;
 padding: 3px 0;
 font-size: 105%;
-}
+}*/
 /*ul.tagbox a.close {
 position: absolute;
 right: 4px; top: 5px;

web/bundles/muzichcore/js/muzich.js

@@ -1102,20 +1102,24 @@ $(document).ready(function(){
   });
   
   // Selection Réseau global / Mon réseau
-  $('div.select_network a').live('click', function(){
-    var divSelect = $(this).parent('div');
+  $('a.all_network, a.my_network').live('click', function(){
+    
+    $(this).parent('li').parent('ul').find('li').removeClass('selected')
+    
     if ($(this).hasClass('all_network'))
     {
-      divSelect.find('a.all_network').addClass('active');
-      divSelect.find('a.my_network').removeClass('active');
-      divSelect.find('select').val('network_public');
+      $(this).parent('li').addClass('selected');
+      $('#element_search_form_network').val('network_public');
     }
     else
     {
-      divSelect.find('a.my_network').addClass('active');
-      divSelect.find('a.all_network').removeClass('active');
-      divSelect.find('select').val('network_personal');
+      $(this).parent('li').addClass('selected');
+      $('#element_search_form_network').val('network_personal');
     }
+    
+    $('form[name="search"] input[type="submit"]').trigger('click');
+    
+    return false;
   });
   
   function element_add_proceed_json_response(response)

web/css/main.css

@@ -583,6 +583,10 @@ div.seachboxcontainer
   -webkit-box-shadow: inset 0px 0px 2px 3px #c8c8c8;
   box-shadow: inset 0px 0px 2px 3px #c8c8c8; 
   height: 34px;
+  -moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
 }
 
 div.seachboxcontainer input
@@ -717,7 +721,8 @@ div#secondarymenu ul.secondarymenu li.top_menu_element.open ul.submenu
   border-top: 1px solid #d3d3d3;
   border-right: 1px solid #d3d3d3;
   float: left;
-  margin-top: -60px;
+  margin-left: -1px;
+  margin-top: -61px;
   font-weight: bold;
   
   -webkit-border-top-left-radius: 3px;
@@ -775,6 +780,20 @@ div#secondarymenu ul.secondarymenu li.top_menu_element.open ul.submenu
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f3f3f3', endColorstr='#e2e2e2',GradientType=0 ); /* IE6-8 */
 }
 
+#tabs_tag_search_buttons li:first-child
+{
+  -webkit-box-shadow: -1px -1px 1px 1px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow:    -1px -1px 1px 1px rgba(0, 0, 0, 0.1);
+  box-shadow:         -1px -1px 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+#tabs_tag_search_buttons li:last-child
+{
+  -webkit-box-shadow: 1px 1px 1px 1px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow:    1px 1px 1px 1px rgba(0, 0, 0, 0.1);
+  box-shadow:         1px -1px 1px 1px rgba(0, 0, 0, 0.1);
+}
+
 #tabs_tag_search_buttons li div.dart
 {
   display: none;
@@ -803,4 +822,92 @@ ul.tagbox a.close
 ul.tagbox li.tag
 {
   padding-right: 18px;
+}
+
+ul.tagbox li.tag {
+  
+  border-radius: 3px 3px 3px 3px;
+  display: inline-block;
+  font-size: 13px;
+  font-weight: bold;
+  line-height: 1;
+  margin-bottom: 1px;
+  margin-right: 3px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
+}
+ul.tagbox li.input {display:block; float:left;}
+ul.tagbox input:focus {
+border-color: #fff;
+}
+ul.tagbox input {
+width: 50px;
+margin: 0;
+border: 0;
+outline: 0;
+line-height:1.2;
+padding: 3px 0;
+font-size: 105%;
+}
+
+#element_add_link
+{
+  float: right;
+  margin-top: -58px;
+  padding: 15px;
+  color: white;
+  border: none;
+  
+  background: #f6282d; /* Old browsers */
+  /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+  background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y2MjgyZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjZjYyODJkIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2M1MDYxNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNjNTA2MTciIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+  background: -moz-linear-gradient(top,  #f6282d 0%, #f6282d 0%, #c50617 100%, #c50617 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6282d), color-stop(0%,#f6282d), color-stop(100%,#c50617), color-stop(100%,#c50617)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  #f6282d 0%,#f6282d 0%,#c50617 100%,#c50617 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  #f6282d 0%,#f6282d 0%,#c50617 100%,#c50617 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  #f6282d 0%,#f6282d 0%,#c50617 100%,#c50617 100%); /* IE10+ */
+  background: linear-gradient(to bottom,  #f6282d 0%,#f6282d 0%,#c50617 100%,#c50617 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f6282d', endColorstr='#c50617',GradientType=0 ); /* IE6-8 */
+
+}
+
+#home_top_tools
+{
+  padding: 10px;
+}
+
+form[name="search"]
+{
+  margin-top: -5px;
+}
+
+form[name="search"] input[type="submit"]
+{
+  float: right;
+  margin-top: -52px;
+}
+
+#home_top_tools input.tag_prompt
+{
+  -webkit-box-shadow: inset 0px 0px 2px 3px #c8c8c8;
+  box-shadow: inset 0px 0px 2px 3px #c8c8c8; 
+  height: 34px;
+  -moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
+  border: medium none;
+  padding-left: 10px;
+  padding-right: 10px;
+  text-align: center;
+  width: 518px;
+}
+
+input:-moz-placeholder, textarea:-moz-placeholder {
+    color: black;
+}
+input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
+    color: black;
 }