Commit 28a22dbcbf16512c48277b15b9f4527e10d9aae8

Authored by Arthur Sturzbecher
Committed by Álvaro Fernando Matos de Souza
1 parent fd89c27d
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

Removing general bad smells in catalog html pages

removed class search-form from input
removed class formfield from span
removed useless divs
restructured filter options to ul li tags

Signed-off-by: ArthurJahn <stutrzbecher@gmail.com>
Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
views/search/_catalog_filter.html.erb
... ... @@ -9,22 +9,20 @@
9 9  
10 10 <div id="filter-categories-catalog"><h4> <%= _("Categories") %> </h4></div>
11 11 <div id="group-categories">
12   - <div id="group-catalog-01">
  12 + <ul>
13 13 <% @categories_groupe_one.each do |category| %>
14   - <label>
  14 + <li>
15 15 <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
16 16 <span><%= _("#{category.name}") %></span>
17   - </label> <br>
  17 + </li>
18 18 <% end %>
19   - </div>
20   - <div id="group-catalog-02">
21 19 <% @categories_groupe_two.each do |category| %>
22   - <label>
  20 + <li>
23 21 <%= check_box_tag("selected_categories_id[]", category.id, @selected_categories_id.include?(category.id), :class => "categories-catalog", @enabled_check_box[category] => "true") %>
24 22 <%= _("#{category.name}") %>
25   - </label> <br>
  23 + </li>
26 24 <% end %>
27   - </div>
  25 + </ul>
28 26 </div>
29 27  
30 28 <div class="project-software"> <%= _("Software Projects:") %>
... ... @@ -34,9 +32,6 @@
34 32 </label>
35 33 <span class="doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">?</span>
36 34 </div>
37   -
38   - <br />
39   -
40 35 <%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
41 36 <%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
42 37 </div>
... ...
views/search/_software_search_form.html.erb
... ... @@ -3,7 +3,7 @@
3 3 <h3> <%= _("Search Public Software Catalog") %> </h3>
4 4  
5 5 <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
6   - :method => 'get', :class => 'search_form' ) do %>
  6 + :method => 'get') do %>
7 7  
8 8 <div style="margin:0;padding:0;display:inline">
9 9 <input name="utf8" type="hidden" value="&#x2713;" />
... ...
views/search/software_infos.html.erb
... ... @@ -5,8 +5,6 @@
5 5  
6 6 <%= render :partial => 'software_search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
7 7  
8   - <div style="clear: both"></div>
9   -
10 8 <% if @asset == :product %>
11 9 <%= javascript_tag do %>
12 10 jQuery('.search-product-price-details').altBeautify();
... ... @@ -20,4 +18,4 @@
20 18 <% if params[:display] != 'map' %>
21 19 <%= pagination_links @searches[@asset][:results] %>
22 20 <% end %>
23   -</div>
24 21 \ No newline at end of file
  22 +</div>
... ...