Browse Source

Mieux intégrer la proposition de tags (dans les deux sens)

Bastien Sevajol 12 years ago
parent
commit
b0006cffed

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

71
     description_one:    Un utilisateur vous propose cette configuration de tags
71
     description_one:    Un utilisateur vous propose cette configuration de tags
72
     description_x:      Des utilisateurs vous propose ces configurations de tags
72
     description_x:      Des utilisateurs vous propose ces configurations de tags
73
     link_accept:        Accepter cette proposition
73
     link_accept:        Accepter cette proposition
74
-    link_refuse_one:    Refuser les propositions
74
+    link_refuse_one:    Refuser la proposition
75
     link_refuse_x:      Refuser les propositions
75
     link_refuse_x:      Refuser les propositions
76
   
76
   
77
 comment:
77
 comment:

+ 1 - 1
src/Muzich/CoreBundle/Resources/views/Element/tag.proposition.html.twig View File

15
 
15
 
16
     <input type="submit" value="{{ 'element.tag_proposition.form.submit'|trans({}, 'elements') }}" class="button" />
16
     <input type="submit" value="{{ 'element.tag_proposition.form.submit'|trans({}, 'elements') }}" class="button" />
17
     <input type="button" value="{{ 'element.tag_proposition.form.cancel'|trans({}, 'elements') }}" class="button cancel" />
17
     <input type="button" value="{{ 'element.tag_proposition.form.cancel'|trans({}, 'elements') }}" class="button cancel" />
18
-
18
+    <div style="clear:both;"></div>
19
   </form>
19
   </form>
20
 </div>
20
 </div>

+ 3 - 3
src/Muzich/CoreBundle/Resources/views/Element/tag.propositions.html.twig View File

19
           <span class="button">{{ tag.name }}</span>
19
           <span class="button">{{ tag.name }}</span>
20
         {% endfor %}
20
         {% endfor %}
21
           
21
           
22
-          <a class="accept_tag_propotision button button_green" href="{{ path('ajax_element_proposed_tags_accept', {'proposition_id':proposition.id,'token':app.user.getPersonalHash}) }}">
22
+          <a class="accept_tag_propotision button darkbutton" href="{{ path('ajax_element_proposed_tags_accept', {'proposition_id':proposition.id,'token':app.user.getPersonalHash}) }}">
23
             {{ 'element.view_propositions.link_accept'|trans({}, 'elements') }}
23
             {{ 'element.view_propositions.link_accept'|trans({}, 'elements') }}
24
           </a>
24
           </a>
25
           
25
           
28
   </ul>
28
   </ul>
29
   
29
   
30
   {% if propositions|length > 1 %}
30
   {% if propositions|length > 1 %}
31
-    <a class="refuse_tag_propositions button" href="{{ path('ajax_element_proposed_tags_refuse', {'element_id':element_id,'token':app.user.getPersonalHash}) }}" >
31
+    <a class="refuse_tag_propositions button darkbutton" href="{{ path('ajax_element_proposed_tags_refuse', {'element_id':element_id,'token':app.user.getPersonalHash}) }}" >
32
       {{ 'element.view_propositions.link_refuse_x'|trans({}, 'elements') }}
32
       {{ 'element.view_propositions.link_refuse_x'|trans({}, 'elements') }}
33
     </a>
33
     </a>
34
   {% else %}
34
   {% else %}
35
-    <a class="refuse_tag_propositions button" href="{{ path('ajax_element_proposed_tags_refuse', {'element_id':element_id,'token':app.user.getPersonalHash}) }}" >
35
+    <a class="refuse_tag_propositions button darkbutton" href="{{ path('ajax_element_proposed_tags_refuse', {'element_id':element_id,'token':app.user.getPersonalHash}) }}" >
36
       {{ 'element.view_propositions.link_refuse_one'|trans({}, 'elements') }}
36
       {{ 'element.view_propositions.link_refuse_one'|trans({}, 'elements') }}
37
     </a>
37
     </a>
38
   {% endif %}
38
   {% endif %}

+ 1 - 1
web/bundles/muzichcore/css/old.css View File

1284
 
1284
 
1285
 li.tag_proposition:hover
1285
 li.tag_proposition:hover
1286
 {
1286
 {
1287
-  background-color: #c0f2ff;
1287
+  background-color: #D5D5D5;
1288
 }
1288
 }
1289
 
1289
 
1290
 
1290
 

+ 19 - 0
web/css/main.css View File

1605
 div#myaccount h2:hover
1605
 div#myaccount h2:hover
1606
 {
1606
 {
1607
   text-decoration: underline;
1607
   text-decoration: underline;
1608
+}
1609
+
1610
+div.tag_proposition input.tag_prompt
1611
+{
1612
+  width: 605px;
1613
+}
1614
+
1615
+div.tag_proposition input.button
1616
+{
1617
+  float: right;
1618
+  margin-top: 5px;
1619
+  margin-left: 5px;
1620
+}
1621
+
1622
+li.element_view_propositions_link
1623
+{
1624
+  padding-left: 2px;
1625
+  padding-right: 2px;
1626
+  padding-top: 1px;
1608
 }
1627
 }