Download as
Browse Code »

Commit e6e03e0f8c0d8351139af36fbcb28a094711cef6

Authored by Gabriela Navarro
Committed by Álvaro Fernando Matos de Souza
1 parent 9a90ceb9
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 catalog classes 

Signed-off-bu: Alexandre Torres <alexandrekry@gmail.com>
Signed-off-bu: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-bu: Gabriela Navarro <navarro1703@gmail.com>
Showing 2 changed files with 43 additions and 47 deletions   Show diff stats
views/search/_catalog_filter.html.erb
  Diff comments   View file @e6e03e0
1   -<div id="main-content-wrapper-8"> <!-- id do Noosfero -->
2   -
3   - <div id="filter-catalog-software">
4   -
5   - <div id="filter-option-catalog-software"><%= _("More options") %></div>
6   - <!--Quando tiver filtros(categorias)selecionados mostrar esta opção: Opções selecionadas-->
7   -
8   - <div id="filter-categories-select-catalog"><%= @message_selected_options %></div>
9   -
10   - <div id="filter-categories-option">
11   -
12   - <div id="filter-categories-catalog"><h4> <%= _("Categories") %> </h4></div>
13   - <div id="group-categories">
14   - <div id="gruop-catalog-01">
15   - <% @categories_groupe_one.each do |category| %>
16   - <label>
17   - <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
18   - <span><%= _("#{category.name}") %></span>
19   - </label> <br>
20   - <% end %>
21   - </div>
22   - <div id="group-catalog-02">
23   - <% @categories_groupe_two.each do |category| %>
24   - <label>
25   - <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
26   - <%= _("#{category.name}") %>
27   - </label> <br>
28   - <% end %>
29   - <br />
30   - </div>
31   - </div>
  1 +<div id="filter-catalog-software">
32 2  
33   - <div class="project-software"> <%= _("Software Projects:") %>
34   - <label>
35   - <%= check_box_tag("include_non_public", true, @include_non_public) %>
36   - <%= _("Include in results") %>
37   - </label>
38   - <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
39   - </div>
  3 + <div id="filter-option-catalog-software"><%= _("More options") %></div>
  4 + <!--Quando tiver filtros(categorias)selecionados mostrar esta opção: Opções selecionadas-->
  5 +
  6 + <div id="filter-categories-select-catalog"><%= @message_selected_options %></div>
40 7  
41   - <br />
  8 + <div id="filter-categories-option">
42 9  
43   - <%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
44   - <%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
  10 + <div id="filter-categories-catalog"><h4> <%= _("Categories") %> </h4></div>
  11 + <div id="group-categories">
  12 + <div id="group-catalog-01">
  13 + <% @categories_groupe_one.each do |category| %>
  14 + <label>
  15 + <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
  16 + <span><%= _("#{category.name}") %></span>
  17 + </label> <br>
  18 + <% end %>
  19 + </div>
  20 + <div id="group-catalog-02">
  21 + <% @categories_groupe_two.each do |category| %>
  22 + <label>
  23 + <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
  24 + <%= _("#{category.name}") %>
  25 + </label> <br>
  26 + <% end %>
  27 + </div>
  28 + </div>
  29 +
  30 + <div class="project-software"> <%= _("Software Projects:") %>
  31 + <label>
  32 + <%= check_box_tag("include_non_public", true, @include_non_public) %>
  33 + <%= _("Include in results") %>
  34 + </label>
  35 + <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">?</span>
45 36 </div>
46 37  
47   -</div>
  38 + <br />
  39 +
  40 + <%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
  41 + <%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
  42 + </div>
  43 +
... ...
views/search/_full_community.html.erb
  Diff comments   View file @e6e03e0
1 1 <% software = community.software_info %>
2 2 <li class="search-profile-item">
3   - <div class="search-enterprise-item">
4   - <div class="search-enterprise-item-column-left">
  3 + <div class="search-software-item">
  4 + <div class="search-software-item-column-left">
5 5 <%= profile_image_link community, :portrait, 'div', community.send(@order + '_label') + show_date(community.created_at) %>
6 6 </div>
7 7  
8   - <div class="search-enterprise-item-column-right">
  8 + <div class="search-software-item-column-right">
9 9  
10   - <div class="search-community-content-block">
  10 + <div class="search-software-content-block">
11 11 <span>
12 12 <% link_name = software.acronym.blank? ? community.name : "#{software.acronym} - #{community.name}" %>
13 13 <h4>
... ... @@ -22,7 +22,7 @@
22 22  
23 23 <br />
24 24  
25   - <div class="search-community-content-block">
  25 + <div class="search-software-content-block">
26 26 <span>
27 27 <b>
28 28 <%= _("Software Categories") %>:
... ...