diff --git a/src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css b/src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css index e607bf9..432630a 100644 --- a/src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css +++ b/src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css @@ -347,13 +347,6 @@ margin-top: 35px; } -.action-search-software_infos #search-results .search-software-item-column-left .vcard img { - max-width: 90px; - max-height: 130px; - height: auto; - margin-left:170px; -} - .action-search-software_infos #search-results .search-software-item-column-left .org { display: none; } @@ -395,12 +388,32 @@ .action-search-software_infos #search-results .search-software-item-column-right { width: 65%; float: left; - margin-left: 140px; + margin-left: 20px; padding: 0 0 0 8px; font-size: 15px; font-family: Arial; } +.action-search-software_infos #search-results .search-software-item-column-right .search-software-profile-img { + position: relative; + float: left; + width: 20%; + margin-top: 8px; +} + +.action-search-software_infos #search-results .search-software-item-column-right .search-software-profile-img img { + max-width: 90px; + max-height: 130px; + height: auto; +} + +.action-search-software_infos #search-results .search-software-item-column-right .search-software-content-block { + position: relative; + float: left; + width: 79%; + margin-top: 8px; +} + .action-search-software_infos #search-results .search-software-item-column-right .search-software-content-block h4{ margin-top: 0; } @@ -410,22 +423,15 @@ font-size: 19px; } -.action-search-software_infos #search-results .search-software-item-column-right .search-software-content-block:last-child { - margin-top: 30px; -} - -.action-search-software_infos #search-results .search-software-item-column-right span{ - width: 100%; -} - -.action-search-software_infos #search-results .search-software-item-column-right span b{ +.action-search-software_infos #search-results .search-software-item-column-right .search-software-categories span { + width: auto; + float: left; font-weight: normal; font-size: 13px; } -.action-search-software_infos #search-results .search-software-item-column-right .search-software-content-block:last-child span{ - width: auto; - float: left; +.action-search-software_infos #search-results .search-software-item-column-right .search-software-categories { + margin-top: 30px; } .action-search-software_infos #search-results .search-software-content-block #categories-list li { diff --git a/src/noosfero-spb/software_communities/lib/ext/search_controller.rb b/src/noosfero-spb/software_communities/lib/ext/search_controller.rb index db4f8d7..8d0c7bc 100644 --- a/src/noosfero-spb/software_communities/lib/ext/search_controller.rb +++ b/src/noosfero-spb/software_communities/lib/ext/search_controller.rb @@ -4,6 +4,8 @@ require_dependency 'search_controller' class SearchController + DEFAULT_SOFTWARE_SORT = 'rating' + def self.catalog_list { :public_software => ["Software Público", "software_infos"], :sisp_software => ["SISP", "sisp"] } @@ -144,6 +146,8 @@ class SearchController def prepare_software_infos_params title @titles[title.to_sym] = _("Result Search") + params[:sort] ||= DEFAULT_SOFTWARE_SORT + @selected_categories_id = params[:selected_categories_id] @selected_categories_id ||= [] @selected_categories_id = @selected_categories_id.map(&:to_i) diff --git a/src/noosfero-spb/software_communities/views/search/_full_community.html.erb b/src/noosfero-spb/software_communities/views/search/_full_community.html.erb index 47a5475..b08f730 100644 --- a/src/noosfero-spb/software_communities/views/search/_full_community.html.erb +++ b/src/noosfero-spb/software_communities/views/search/_full_community.html.erb @@ -1,59 +1,56 @@ <% software = community.software_info %>