Commit 0d2ab942a1961a5b13bc8dac7a08fd5a4773c682
1 parent
572e450f
Exists in
master
and in
10 other branches
Fix showing report and suggest at the top of the article page
Showing
1 changed file
with
20 additions
and
9 deletions
Show diff stats
theme.js
1 | function alignBlocks(containerIndex){ | 1 | function alignBlocks(containerIndex){ |
2 | //Needed to save the original reference to jQuery(this) | 2 | //Needed to save the original reference to jQuery(this) |
3 | jt = jQuery(this); | 3 | jt = jQuery(this); |
4 | - longerBlock = 0; | 4 | + longerBlock = 0; |
5 | jt.find(".block-outer").each(function () { | 5 | jt.find(".block-outer").each(function () { |
6 | if(jQuery(this).height() > longerBlock) | 6 | if(jQuery(this).height() > longerBlock) |
7 | longerBlock = jQuery(this).height(); | 7 | longerBlock = jQuery(this).height(); |
8 | }); | 8 | }); |
9 | - | 9 | + |
10 | jt.find("#block-48504 .block-inner-2").height(492); | 10 | jt.find("#block-48504 .block-inner-2").height(492); |
11 | jt.find("#block-55304 .block-inner-2").height(378); | 11 | jt.find("#block-55304 .block-inner-2").height(378); |
12 | - | 12 | + |
13 | //Aligns the blocks in the most common situations | 13 | //Aligns the blocks in the most common situations |
14 | jt.find(".block-outer").height(longerBlock); | 14 | jt.find(".block-outer").height(longerBlock); |
15 | //Only used for blocks with video, since it uses the size of the iframe | 15 | //Only used for blocks with video, since it uses the size of the iframe |
@@ -30,7 +30,7 @@ function alignBlocks(containerIndex){ | @@ -30,7 +30,7 @@ function alignBlocks(containerIndex){ | ||
30 | $( "#siteaction-contraste a" ).click(function() { | 30 | $( "#siteaction-contraste a" ).click(function() { |
31 | $( "body" ).toggleClass( "contraste" ); | 31 | $( "body" ).toggleClass( "contraste" ); |
32 | if($('body').hasClass('contraste')){ | 32 | if($('body').hasClass('contraste')){ |
33 | - $.cookie('high_contrast', 'true', {path: '/'}); | 33 | + $.cookie('high_contrast', 'true', {path: '/'}); |
34 | } else { | 34 | } else { |
35 | $.cookie('high_contrast', null, { path: '/' }); | 35 | $.cookie('high_contrast', null, { path: '/' }); |
36 | } | 36 | } |
@@ -69,7 +69,7 @@ $('#link-buscar').click(function(e) { | @@ -69,7 +69,7 @@ $('#link-buscar').click(function(e) { | ||
69 | 69 | ||
70 | function show_finality() { | 70 | function show_finality() { |
71 | var finality = $(this).children(".software-block-finality"); | 71 | var finality = $(this).children(".software-block-finality"); |
72 | - | 72 | + |
73 | //finality.stop().fadeTo(TRANSITION_TIME,1); | 73 | //finality.stop().fadeTo(TRANSITION_TIME,1); |
74 | finality.stop().fadeTo('fast', 1); | 74 | finality.stop().fadeTo('fast', 1); |
75 | //finality.stop().animate({"top" : "0%"}, TRANSITION_TIME); | 75 | //finality.stop().animate({"top" : "0%"}, TRANSITION_TIME); |
@@ -77,23 +77,34 @@ $('#link-buscar').click(function(e) { | @@ -77,23 +77,34 @@ $('#link-buscar').click(function(e) { | ||
77 | 77 | ||
78 | function hide_finality() { | 78 | function hide_finality() { |
79 | var finality = $(this).children(".software-block-finality"); | 79 | var finality = $(this).children(".software-block-finality"); |
80 | - | 80 | + |
81 | //finality.stop().fadeTo(TRANSITION_TIME,0); | 81 | //finality.stop().fadeTo(TRANSITION_TIME,0); |
82 | - finality.stop().fadeTo('fast', 0); | 82 | + finality.stop().fadeTo('fast', 0); |
83 | //finality.stop().animate({"top" : "100%"}, TRANSITION_TIME); | 83 | //finality.stop().animate({"top" : "100%"}, TRANSITION_TIME); |
84 | } | 84 | } |
85 | 85 | ||
86 | function set_events() { | 86 | function set_events() { |
87 | // Fade css | 87 | // Fade css |
88 | - $('.software-block-finality').css('opacity', 0); | 88 | + $('.software-block-finality').css('opacity', 0); |
89 | $('.software-block-finality').css('top', 0); | 89 | $('.software-block-finality').css('top', 0); |
90 | // End Fade CSS | 90 | // End Fade CSS |
91 | - | 91 | + |
92 | $(".software-block").mouseover(show_finality); | 92 | $(".software-block").mouseover(show_finality); |
93 | $(".software-block").mouseout(hide_finality); | 93 | $(".software-block").mouseout(hide_finality); |
94 | } | 94 | } |
95 | 95 | ||
96 | + function move_article_buttons(){ | ||
97 | + var article_actions = $('#article-actions').clone(); | ||
98 | + var report = $('.report-abuse-action').remove(); | ||
99 | + var suggest = $('.icon-suggest').remove(); | ||
100 | + | ||
101 | + | ||
102 | + $(article_actions).find('.icon-edit, .icon-new, .icon-delete, .icon-locale').remove(); | ||
103 | + $('.article-body').append(article_actions); | ||
104 | + } | ||
105 | + | ||
96 | $(document).ready(function(){ | 106 | $(document).ready(function(){ |
97 | set_events(); | 107 | set_events(); |
108 | + move_article_buttons(); | ||
98 | }); | 109 | }); |
99 | })(jQuery); | 110 | })(jQuery); |