Ver código fonte

Evolution #688: Propsition de tag: modifs

Sevajol Bastien 11 anos atrás
pai
commit
28b89bae94

+ 21 - 0
src/Muzich/CoreBundle/Resources/public/css/main.css Ver arquivo

2325
   margin: 15px;
2325
   margin: 15px;
2326
 }
2326
 }
2327
 
2327
 
2328
+div.tags_proposition_view
2329
+{
2330
+  padding: 10px;
2331
+  margin: 5px;
2332
+  margin-top: 10px;
2333
+  /*--Les différentes définitions de Box Shadow en CSS3--*/
2334
+  -webkit-box-shadow: 0px 0px 6px #999999;
2335
+  -moz-box-shadow: 0px 0px 6px #999999;
2336
+  box-shadow: 0px 0px 6px #999999;
2337
+  /*--Coins arrondis en CSS3--*/
2338
+  -webkit-border-radius: 5px;
2339
+  -moz-border-radius: 5px;
2340
+  border-radius: 5px;
2341
+}
2342
+
2343
+div.tags_proposition_view a.darkbutton
2344
+{
2345
+  margin: 2px;
2346
+  padding: 6px 6px 4px 4px;
2347
+}
2348
+
2328
 /*
2349
 /*
2329
 *
2350
 *
2330
 *
2351
 *

+ 12 - 2
src/Muzich/CoreBundle/Resources/views/SearchElement/element.html.twig Ver arquivo

16
 {% if tag_ids_json is not defined %}
16
 {% if tag_ids_json is not defined %}
17
   {% set tag_ids_json = '[]' %}
17
   {% set tag_ids_json = '[]' %}
18
 {% endif %}
18
 {% endif %}
19
+{% if display_tags_proposition is not defined %}
20
+  {% set display_tags_proposition = false %}
21
+{% endif %}
19
 
22
 
20
 <table>
23
 <table>
21
   <tr>
24
   <tr>
169
                 <a title="{{ 'element.proposition_tags.link_title'|trans({}, 'userui') }}" 
172
                 <a title="{{ 'element.proposition_tags.link_title'|trans({}, 'userui') }}" 
170
                   class="element_propose_tags" 
173
                   class="element_propose_tags" 
171
                   href="{{ path('ajax_element_propose_tags_open', {'element_id' : element.id}) }}">
174
                   href="{{ path('ajax_element_propose_tags_open', {'element_id' : element.id}) }}">
172
-                  <img src="{{ asset('bundles/muzichcore/img/1333484018_rss-tag.png') }}" alt="tags_proposition" />
175
+                  <img src="{{ asset('img/tag.png') }}" alt="tags_proposition" />
173
                 </a>
176
                 </a>
174
               </li>
177
               </li>
175
   
178
   
202
                   <a title="{{ 'element.view_propositions.link'|trans({}, 'elements') }}" class="element_view_propositions_link" 
205
                   <a title="{{ 'element.view_propositions.link'|trans({}, 'elements') }}" class="element_view_propositions_link" 
203
                     href="{{ path('ajax_element_proposed_tags_view', {'element_id' : element.id})  }}"
206
                     href="{{ path('ajax_element_proposed_tags_view', {'element_id' : element.id})  }}"
204
                   >
207
                   >
205
-                    <img src="{{ asset('bundles/muzichcore/img/1333493527_tag_add.png') }}" alt="tags proposition" />
208
+                    <img src="{{ asset('img/tag_color.png') }}" alt="tags proposition" />
206
                   </a>
209
                   </a>
207
                 </li>
210
                 </li>
208
               {% endif %}
211
               {% endif %}
416
 {% endif %}
419
 {% endif %}
417
 {% endif %}
420
 {% endif %}
418
 
421
 
422
+{% if display_tags_proposition %}
423
+  {% include 'MuzichCoreBundle:Element:tag.propositions.html.twig' with {
424
+    'propositions' : element.tagsProposition,
425
+    'element_id'   : element.id
426
+  } %}
427
+{% endif %}
428
+
419
 {% if display_player %}
429
 {% if display_player %}
420
   <div id="embed_{{ element.id }}" class="element_embed" style="display: none;"></div>
430
   <div id="embed_{{ element.id }}" class="element_embed" style="display: none;"></div>
421
 {% endif %}
431
 {% endif %}

+ 7 - 1
src/Muzich/UserBundle/Resources/views/Event/elements.html.twig Ver arquivo

1
 {% extends "MuzichHomeBundle::layout.html.twig" %}
1
 {% extends "MuzichHomeBundle::layout.html.twig" %}
2
 
2
 
3
+{% set display_tags_proposition = false %}
4
+{% if event.type == event_const('TYPE_TAGS_PROPOSED') %}
5
+  {% set display_tags_proposition = true %}
6
+{% endif %}
7
+
3
 {% block title %}
8
 {% block title %}
4
   {% if event.type == event_const('TYPE_COMMENT_ADDED_ELEMENT') %}
9
   {% if event.type == event_const('TYPE_COMMENT_ADDED_ELEMENT') %}
5
     {{ 'events.view.title.comments'|trans({}, 'userui') }}
10
     {{ 'events.view.title.comments'|trans({}, 'userui') }}
52
   </div>
57
   </div>
53
 
58
 
54
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
59
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
55
-    'noelements_filter' : true 
60
+    'noelements_filter' : true,
61
+    'display_tags_proposition' : display_tags_proposition
56
   }%}
62
   }%}
57
     
63
     
58
   {% if elements|length %}
64
   {% if elements|length %}

BIN
web/img/tag.png Ver arquivo


BIN
web/img/tag_color.png Ver arquivo