Evolution #688: Propsition de tag: modifs

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

@@ -2325,6 +2325,27 @@ p.solop
   margin: 15px;
 }
 
+div.tags_proposition_view
+{
+  padding: 10px;
+  margin: 5px;
+  margin-top: 10px;
+  /*--Les différentes définitions de Box Shadow en CSS3--*/
+  -webkit-box-shadow: 0px 0px 6px #999999;
+  -moz-box-shadow: 0px 0px 6px #999999;
+  box-shadow: 0px 0px 6px #999999;
+  /*--Coins arrondis en CSS3--*/
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+
+div.tags_proposition_view a.darkbutton
+{
+  margin: 2px;
+  padding: 6px 6px 4px 4px;
+}
+
 /*
 *
 *

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

@@ -16,6 +16,9 @@
 {% if tag_ids_json is not defined %}
   {% set tag_ids_json = '[]' %}
 {% endif %}
+{% if display_tags_proposition is not defined %}
+  {% set display_tags_proposition = false %}
+{% endif %}
 
 <table>
   <tr>
@@ -169,7 +172,7 @@
                 <a title="{{ 'element.proposition_tags.link_title'|trans({}, 'userui') }}" 
                   class="element_propose_tags" 
                   href="{{ path('ajax_element_propose_tags_open', {'element_id' : element.id}) }}">
-                  <img src="{{ asset('bundles/muzichcore/img/1333484018_rss-tag.png') }}" alt="tags_proposition" />
+                  <img src="{{ asset('img/tag.png') }}" alt="tags_proposition" />
                 </a>
               </li>
   
@@ -202,7 +205,7 @@
                   <a title="{{ 'element.view_propositions.link'|trans({}, 'elements') }}" class="element_view_propositions_link" 
                     href="{{ path('ajax_element_proposed_tags_view', {'element_id' : element.id})  }}"
                   >
-                    <img src="{{ asset('bundles/muzichcore/img/1333493527_tag_add.png') }}" alt="tags proposition" />
+                    <img src="{{ asset('img/tag_color.png') }}" alt="tags proposition" />
                   </a>
                 </li>
               {% endif %}
@@ -416,6 +419,13 @@
 {% endif %}
 {% endif %}
 
+{% if display_tags_proposition %}
+  {% include 'MuzichCoreBundle:Element:tag.propositions.html.twig' with {
+    'propositions' : element.tagsProposition,
+    'element_id'   : element.id
+  } %}
+{% endif %}
+
 {% if display_player %}
   <div id="embed_{{ element.id }}" class="element_embed" style="display: none;"></div>
 {% endif %}

src/Muzich/UserBundle/Resources/views/Event/elements.html.twig

@@ -1,5 +1,10 @@
 {% extends "MuzichHomeBundle::layout.html.twig" %}
 
+{% set display_tags_proposition = false %}
+{% if event.type == event_const('TYPE_TAGS_PROPOSED') %}
+  {% set display_tags_proposition = true %}
+{% endif %}
+
 {% block title %}
   {% if event.type == event_const('TYPE_COMMENT_ADDED_ELEMENT') %}
     {{ 'events.view.title.comments'|trans({}, 'userui') }}
@@ -52,7 +57,8 @@
   </div>
 
   {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
-    'noelements_filter' : true 
+    'noelements_filter' : true,
+    'display_tags_proposition' : display_tags_proposition
   }%}
     
   {% if elements|length %}