Browse Source

Logiciel: Evolution #833: Tag: coeur: bouton séparé

Bastien Sevajol 11 years ago
parent
commit
f411de99f6

+ 9 - 1
src/Muzich/CoreBundle/Resources/public/css/main.css View File

@@ -517,7 +517,7 @@ ul.element_tags .button
517 517
 
518 518
 }
519 519
 
520
-a.button.element_tag, ul.tagbox li.tag, ul.search_tag_list li, ul#favorite_tags li, ul.tags_cloud li
520
+a.button.element_tag, ul.tagbox li.tag, ul.search_tag_list li, ul#favorite_tags li, ul.tags_cloud li, a.button.tag_to_favorites
521 521
 {
522 522
   padding: 6px;
523 523
   border: none;
@@ -557,6 +557,14 @@ li.element a.tag_to_favorites, li.element img.tag_to_favorites
557 557
   margin-right: 4px;
558 558
 }
559 559
 
560
+li.element a.tag_to_favorites.out
561
+{
562
+  margin-left: -3px;
563
+  margin-left: 0px;
564
+  margin-bottom: -5px;
565
+  padding: 5px;
566
+}
567
+
560 568
 img.tag_to_favorites
561 569
 {
562 570
   margin-bottom: -1px;

+ 0 - 5
src/Muzich/CoreBundle/Resources/public/css/old.css View File

@@ -1099,11 +1099,6 @@ div.comments_loader
1099 1099
   margin-right: 4px;
1100 1100
 }*/
1101 1101
 
1102
-li.element a.element_tag_large_for_fav
1103
-{
1104
-  padding-right: 15px;
1105
-}
1106
-
1107 1102
 /*li.element a.element_tag_large_for_fav_still
1108 1103
 {
1109 1104
   padding-right: 15px;

+ 2 - 4
src/Muzich/CoreBundle/Resources/public/js/muzich.js View File

@@ -2204,6 +2204,7 @@ $(document).ready(function(){
2204 2204
       });
2205 2205
       
2206 2206
       $('div.question').fadeOut();
2207
+      $('a.tag_to_favorites').removeClass('mustBeDisplayed');
2207 2208
       return false;
2208 2209
     },
2209 2210
     onOpen: function(link){
@@ -2211,10 +2212,7 @@ $(document).ready(function(){
2211 2212
       li.find('a.tag_to_favorites').addClass('mustBeDisplayed');
2212 2213
     },
2213 2214
     onClose: function(link){
2214
-      var li = link.parents('li.element_tag');
2215
-      li.find('a.tag_to_favorites').removeClass('mustBeDisplayed');
2216
-      li.find('a.element_tag').removeClass('element_tag_large_for_fav');
2217
-      li.find('a.tag_to_favorites').hide();
2215
+      $('a.tag_to_favorites').removeClass('mustBeDisplayed');
2218 2216
     }
2219 2217
   });
2220 2218
   

+ 3 - 3
src/Muzich/CoreBundle/Resources/views/SearchElement/element.html.twig View File

@@ -360,11 +360,11 @@
360 360
                     'tag_id' : tag.id,
361 361
                     'token'  : app.user.getPersonalHash(tag.id)
362 362
                   }) }}" 
363
-                  class="tag_to_favorites" 
363
+                  class="tag_to_favorites out button" 
364 364
                   style="display: none;"
365 365
                   title="{{ 'element.tag.addtofav.title'|trans({}, 'elements') }}"   
366 366
                 >
367
-                  <img class="tag_add_to_favorites"  src="{{ asset('/img/icon_heart.png') }}" alt="add-to-favorites"/>
367
+                  <img class="tag_add_to_favorites"  src="{{ asset('/img/icon_heart_add.png') }}" alt="add-to-favorites"/>
368 368
                 </a>
369 369
               {% endif %}
370 370
             {% else %}
@@ -412,7 +412,7 @@
412 412
       
413 413
       {% endif %}
414 414
       
415
-      {% if display_social_buttons %}
415
+      {% if display_social_buttons and app.environment == 'prod' %}
416 416
         <div class="social_buttons">
417 417
           <ul>
418 418
             <li class="facebook">

BIN
web/img/icon_heart_add.png View File