Browse Source

Evolution #75: Message "pas d'element" a ameliorer

bastien 13 years ago
parent
commit
07fa91c6dc

+ 6 - 1
app/Resources/translations/elements.fr.yml View File

1
 
1
 
2
 noelements:
2
 noelements:
3
-  sentence:             Aucun element a afficher
3
+  sentence:             Aucun élément a afficher
4
+  sentence_filter:      |
5
+                         Aucun élément a afficher, ceci est peut-être du a un
6
+                         filtre trop restrictif.
7
+                         <a class="filter_clear_url" href="#" >%link_string%</a> ?
8
+  sentence_filter_link_string: Vider le filtre
4
   
9
   
5
 element:
10
 element:
6
   favorite:
11
   favorite:

+ 1 - 1
app/Resources/translations/userui.fr.yml View File

23
 connexion:
23
 connexion:
24
   password_lost:    Mot de passe perdu ?
24
   password_lost:    Mot de passe perdu ?
25
   
25
   
26
-more:    plus
26
+more:    Afficher plus de résultats
27
 tags:
27
 tags:
28
   help:  |
28
   help:  |
29
            Tapez dans le cadre ci-dessous le mot que vous souhaitez utiliser. 
29
            Tapez dans le cadre ci-dessous le mot que vous souhaitez utiliser. 

+ 13 - 1
src/Muzich/CoreBundle/Resources/views/SearchElement/default.html.twig View File

82
 
82
 
83
 {% else %}
83
 {% else %}
84
 
84
 
85
-  <p class="no-elements">{{ 'noelements.sentence'|trans({}, 'elements') }}</p>
85
+  <div class="no_elements">
86
+    {% if noelements_filter is defined %}
87
+      <p class="no-elements">
88
+        {% autoescape false %}
89
+          {{ 'noelements.sentence_filter'|trans({
90
+            '%link_string%': 'noelements.sentence_filter_link_string'|trans({}, 'elements')
91
+          }, 'elements') }}
92
+        {% endautoescape %}
93
+      </p>
94
+    {% else %}
95
+      <p class="no-elements">{{ 'noelements.sentence'|trans({}, 'elements') }}</p>
96
+    {% endif %}
97
+  </div>
86
 
98
 
87
 {% endif %}
99
 {% endif %}

+ 8 - 6
src/Muzich/HomeBundle/Resources/views/Home/index.html.twig View File

36
     <input class="main" type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>
36
     <input class="main" type="submit" value="{{ 'filter.submit'|trans({}, 'userui') }}"/>
37
   </form>
37
   </form>
38
 
38
 
39
-  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
39
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {'noelements_filter' : true }%}
40
     
40
     
41
   
41
   
42
   {% if more_count is defined %} 
42
   {% if more_count is defined %} 
43
-   <span class="elements_more">
44
-     <a href="{{ path('home_more', {'count': more_count}) }}" >
45
-       {{ 'more'|trans({}, 'userui') }}
46
-     </a>
47
-   </span>
43
+  {% if elements|length %}
44
+     <span class="elements_more">
45
+       <a href="{{ path('home_more', {'count': more_count}) }}" >
46
+         {{ 'more'|trans({}, 'userui') }}
47
+       </a>
48
+     </span>
49
+  {% endif %}
48
   {% endif %}
50
   {% endif %}
49
   
51
   
50
 {% endblock %}
52
 {% endblock %}

+ 2 - 0
src/Muzich/HomeBundle/Resources/views/Show/showGroup.html.twig View File

44
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
44
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
45
     
45
     
46
   {% if more_count is defined %} 
46
   {% if more_count is defined %} 
47
+  {% if elements|length %}
47
    <span class="elements_more">
48
    <span class="elements_more">
48
      <a href="{{ path('show_group_more', {'count': more_count, 'slug': group.slug}) }}" >
49
      <a href="{{ path('show_group_more', {'count': more_count, 'slug': group.slug}) }}" >
49
        {{ 'more'|trans({}, 'userui') }}
50
        {{ 'more'|trans({}, 'userui') }}
50
      </a>
51
      </a>
51
    </span>
52
    </span>
52
   {% endif %}
53
   {% endif %}
54
+  {% endif %}
53
   
55
   
54
 {% endblock %}
56
 {% endblock %}

+ 2 - 0
src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig View File

26
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
26
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
27
     
27
     
28
   {% if more_count is defined %} 
28
   {% if more_count is defined %} 
29
+  {% if elements|length %}
29
    <span class="elements_more">
30
    <span class="elements_more">
30
      <a href="{{ path('show_user_more', {'count': more_count, 'slug': viewed_user.slug}) }}" >
31
      <a href="{{ path('show_user_more', {'count': more_count, 'slug': viewed_user.slug}) }}" >
31
        {{ 'more'|trans({}, 'userui') }}
32
        {{ 'more'|trans({}, 'userui') }}
32
      </a>
33
      </a>
33
    </span>
34
    </span>
34
   {% endif %}
35
   {% endif %}
36
+  {% endif %}
35
   
37
   
36
 {% endblock %}
38
 {% endblock %}

+ 6 - 0
web/bundles/muzichcore/css/main.css View File

508
 .element_name
508
 .element_name
509
 {
509
 {
510
   font-weight: bold;
510
   font-weight: bold;
511
+}
512
+
513
+div.no_elements
514
+{
515
+  text-align: center;
516
+  background-color: #d9f7ff;
511
 }
517
 }

+ 1 - 1
web/bundles/muzichcore/js/muzich.js View File

133
    
133
    
134
    // Bouton de personalisation du filtre
134
    // Bouton de personalisation du filtre
135
    // pour le moment ce ne sotn que des redirection vers des actions
135
    // pour le moment ce ne sotn que des redirection vers des actions
136
-   $('.tags_prompt input.clear').click(function(){
136
+   $('.tags_prompt input.clear, .filter_clear_url').click(function(){
137
      $(location).attr('href', $('input.filter_clear_url').val());
137
      $(location).attr('href', $('input.filter_clear_url').val());
138
    });
138
    });
139
    $('.tags_prompt input.mytags').click(function(){
139
    $('.tags_prompt input.mytags').click(function(){