Download as
Browse Code »

Commit 567f4aabe10e6ad1dd832c17fb584de1f5b3fc14

Authored by Fabio Teixeira
Committed by Álvaro Fernando Matos de Souza
1 parent 86320e27
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

Add tooltop span and fix javascript show/hide method 

Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Showing 3 changed files with 18 additions and 11 deletions   Show diff stats
public/style.css
  Diff comments   View file @567f4aa
... ... @@ -164,7 +164,7 @@
164 164 }
165 165  
166 166 /*===== Communities rate hotspot extra fields =====*/
167   -.comments-software-extra-fields span {
  167 +#comments-additional-information {
168 168 cursor: pointer;
169 169 }
170 170  
... ...
public/views/comments-software-extra-fields.js
  Diff comments   View file @567f4aa
... ... @@ -5,26 +5,26 @@ modulejs.define(&#39;CommentsSoftwareExtraFields&#39;, [&#39;jquery&#39;], function($) {
5 5 information_display_state: "hidden"
6 6 }
7 7  
8   - function set_show_aditional_information() {
9   - $(".comments-software-extra-fields span").on("click", function() {
  8 + function set_show_additional_information() {
  9 + $("#comments-additional-information").on("click", function() {
10 10 if (DATA.information_display_state === "hidden") {
11 11 DATA.information_display_state = "show";
12   - $(this).parent().children("div").show();
  12 + $(".comments-software-extra-fields div").show();
13 13 } else {
14 14 DATA.information_display_state = "hidden";
15   - $(this).parent().children("div").hide();
  15 + $(".comments-software-extra-fields div").hide();
16 16 }
17 17 });
18 18 }
19 19  
20 20 return {
21 21 isCurrentPage: function() {
22   - return $(".comments-software-extra-fields span").length === 1;
  22 + return $(".star-rate-form").length === 1;
23 23 },
24 24  
25 25  
26 26 init: function() {
27   - set_show_aditional_information();
  27 + set_show_additional_information();
28 28 }
29 29 }
30 30 });
... ...
views/comments_extra_fields.html.erb
  Diff comments   View file @567f4aa
1   -<div class="comments-software-extra-fields">
2   - <span>
3   - <%= _("Aditional informations") %>
  1 +<div class="comments-display-fields">
  2 + <span id="comments-additional-information">
  3 + <%= _("Additional informations") %>
4 4 </span>
5 5  
  6 + <span class="comments-arrow-down"></span>
  7 +</div>
  8 +
  9 +<div class="comments-software-extra-fields">
6 10 <div class="comments-software-people-benefited">
7 11 <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%>
  12 + <span class="star-tooltip"></span>
8 13 <%= text_field_tag "comments[people_benefited]", "" %>
9 14 </div>
  15 +
10 16 <div class="comments-software-saved-values">
11 17 <%= label_tag "comments_saved_value", _("Saved resources")%>
12   - <%= text_field_tag "comments[saved_value]", ""%>
  18 + <span class="star-tooltip"></span>
  19 + <%= text_field_tag "comments[saved_value]", "", :placeholder=>"R$"%>
13 20 </div>
14 21 </div>
... ...