Download as
Browse Code »

Commit 0d2ab942a1961a5b13bc8dac7a08fd5a4773c682

Authored by Gabriela Navarro
1 parent 572e450f
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

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
  Diff comments   View file @0d2ab94
1 1 function alignBlocks(containerIndex){
2 2 //Needed to save the original reference to jQuery(this)
3 3 jt = jQuery(this);
4   - longerBlock = 0;
  4 + longerBlock = 0;
5 5 jt.find(".block-outer").each(function () {
6 6 if(jQuery(this).height() > longerBlock)
7 7 longerBlock = jQuery(this).height();
8 8 });
9   -
  9 +
10 10 jt.find("#block-48504 .block-inner-2").height(492);
11 11 jt.find("#block-55304 .block-inner-2").height(378);
12   -
  12 +
13 13 //Aligns the blocks in the most common situations
14 14 jt.find(".block-outer").height(longerBlock);
15 15 //Only used for blocks with video, since it uses the size of the iframe
... ... @@ -30,7 +30,7 @@ function alignBlocks(containerIndex){
30 30 $( "#siteaction-contraste a" ).click(function() {
31 31 $( "body" ).toggleClass( "contraste" );
32 32 if($('body').hasClass('contraste')){
33   - $.cookie('high_contrast', 'true', {path: '/'});
  33 + $.cookie('high_contrast', 'true', {path: '/'});
34 34 } else {
35 35 $.cookie('high_contrast', null, { path: '/' });
36 36 }
... ... @@ -69,7 +69,7 @@ $('#link-buscar').click(function(e) {
69 69  
70 70 function show_finality() {
71 71 var finality = $(this).children(".software-block-finality");
72   -
  72 +
73 73 //finality.stop().fadeTo(TRANSITION_TIME,1);
74 74 finality.stop().fadeTo('fast', 1);
75 75 //finality.stop().animate({"top" : "0%"}, TRANSITION_TIME);
... ... @@ -77,23 +77,34 @@ $('#link-buscar').click(function(e) {
77 77  
78 78 function hide_finality() {
79 79 var finality = $(this).children(".software-block-finality");
80   -
  80 +
81 81 //finality.stop().fadeTo(TRANSITION_TIME,0);
82   - finality.stop().fadeTo('fast', 0);
  82 + finality.stop().fadeTo('fast', 0);
83 83 //finality.stop().animate({"top" : "100%"}, TRANSITION_TIME);
84 84 }
85 85  
86 86 function set_events() {
87 87 // Fade css
88   - $('.software-block-finality').css('opacity', 0);
  88 + $('.software-block-finality').css('opacity', 0);
89 89 $('.software-block-finality').css('top', 0);
90 90 // End Fade CSS
91   -
  91 +
92 92 $(".software-block").mouseover(show_finality);
93 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 106 $(document).ready(function(){
97 107 set_events();
  108 + move_article_buttons();
98 109 });
99 110 })(jQuery);
... ...