Commit ca9d8d802cb9e2a02d43050cb2b04889ae4338cd

Authored by Fabio Teixeira
Committed by Gabriela Navarro
1 parent b0f53e17
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

Adjust show and sort position on software catalog

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
public/style.css
@@ -354,11 +354,6 @@ input.button.with-text.icon-search.submit{ @@ -354,11 +354,6 @@ input.button.with-text.icon-search.submit{
354 padding: 15px 10px; 354 padding: 15px 10px;
355 } 355 }
356 356
357 -/*#filter-categories{  
358 - margin:10px 5px;  
359 - color:#ffffff;  
360 -}*/  
361 -  
362 #filter-categories-catalog h4{ 357 #filter-categories-catalog h4{
363 margin:10px 5px; 358 margin:10px 5px;
364 color:#000; 359 color:#000;
@@ -424,38 +419,29 @@ input.button.with-text.icon-search.submit{ @@ -424,38 +419,29 @@ input.button.with-text.icon-search.submit{
424 padding: 5px; 419 padding: 5px;
425 420
426 } 421 }
427 -/*  
428 -#close-filter-catalog:hover{  
429 - background:#2B65CD;  
430 - border-radius: 4px;  
431 - margin-top: 5px;  
432 - color: #FFF;  
433 - text-transform: uppercase;  
434 - border-radius: 4px;  
435 - border: 1px solid #2B65CD;  
436 - padding: 5px;  
437 -}  
438 -  
439 -#close-filter-catalog:after{  
440 - content:"︿";  
441 - padding-left: 7px;  
442 - padding-right: 4px;  
443 - color: #172857;  
444 - background: none repeat scroll 0% 0% #EEE;  
445 - border-radius: 4px;  
446 - font-size: 15px;  
447 - line-height: 20px;  
448 - text-align: center;  
449 - position: relative;  
450 - margin-left: 5px;  
451 - top: 2px;  
452 - margin-right: 15px;  
453 -}  
454 -*/  
455 422
456 input[type=checkbox] { 423 input[type=checkbox] {
457 border:1px solid #000; 424 border:1px solid #000;
458 margin:8px; 425 margin:8px;
459 cursor:pointer; 426 cursor:pointer;
460 } 427 }
  428 +
  429 +#catalog-display-options {
  430 + position: relative;
  431 + width: 100%;
  432 +}
  433 +
  434 +#catalog-display-options-count, #catalog-display-options-show-and-sort {
  435 + position: relative;
  436 + float: left;
  437 + width: 50%;
  438 +}
  439 +
  440 +#catalog-display-options-show, #catalog-display-options-sort {
  441 + position: relative;
  442 + float: left;
  443 + width: 50%;
  444 + text-align: right;
  445 +}
  446 +
461 /* End software catalog definitions */ 447 /* End software catalog definitions */
462 \ No newline at end of file 448 \ No newline at end of file
views/search/_mpog_search_form.html.erb
@@ -18,20 +18,20 @@ @@ -18,20 +18,20 @@
18 <%= render :partial => 'catalog_filter' %> 18 <%= render :partial => 'catalog_filter' %>
19 19
20 <!-- #display-options sera substituido pelo html passado pela equipe de design --> 20 <!-- #display-options sera substituido pelo html passado pela equipe de design -->
21 - <div id="display-options" class="">  
22 - <div id="software-count"> 21 + <div id="catalog-display-options">
  22 + <div id="catalog-display-options-count">
23 <strong><%= "#{@software_count} Software(s)" %> </strong> 23 <strong><%= "#{@software_count} Software(s)" %> </strong>
24 </div> 24 </div>
25 25
26 - <div>  
27 - <div> 26 + <div id="catalog-display-options-show-and-sort">
  27 + <div id="catalog-display-options-show">
28 Show: 28 Show:
29 <%= select_tag("software_display", 29 <%= select_tag("software_display",
30 options_for_select(['15', '30', '90', 'All'], :selected=>params[:display]) 30 options_for_select(['15', '30', '90', 'All'], :selected=>params[:display])
31 ) %> 31 ) %>
32 </div> 32 </div>
33 33
34 - <div> 34 + <div id="catalog-display-options-sort">
35 Sort by: 35 Sort by:
36 <%= select_tag("sort", 36 <%= select_tag("sort",
37 options_for_select( 37 options_for_select(