Software catalog bug fixes

Signed-off-by: ArthurJahn <stutrzbecher@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Closes #561

Software catalog bug fixes
Signed-off-by: ArthurJahn <stutrzbecher@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Closes #561
Fabio Teixeira · Daniela Feitosa
1 parent 5014ab2a
Showing 4 changed files with 68 additions and 61 deletions Show diff stats
src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css
src/noosfero-spb/software_communities/lib/ext/search_controller.rb
src/noosfero-spb/software_communities/views/search/_full_community.html.erb
src/noosfero-spb/software_communities/views/search/_software_search_form.html.erb
@@ -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 {
@@ -4,6 +4,8 @@ require_dependency &#39;search_controller&#39;
 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)
 <% software = community.software_info %>
 <li class="search-software-item">
-  <% organization_average_rating = '' %>
-  <% unless community.organization_ratings.empty?%>
-    <% organization_average_rating = render :partial => 'shared/organization_average_rating_block', :locals => {:community => community}%>
-  <% end %>
-
-  <% software_publish_date = render :partial => 'shared/software_publish_date', :locals => {:community => community, :order => @order} %>
-
   <div class="search-software-item-column-left">
-    <%= profile_image_link community, :portrait, 'div', organization_average_rating + software_publish_date %>
+    <div class="vcard">
+      <% unless community.organization_ratings.empty?%>
+        <%= render :partial => 'shared/organization_average_rating_block', :locals => {:community => community}%>
+      <% end %>
+
+      <%=render :partial => 'shared/software_publish_date', :locals => {:community => community, :order => @order} %>
+    </div>
   </div>
   <div class="search-software-item-column-right">
+    <div class="search-software-profile-img">
+      <%= link_to_homepage(profile_image(community, :portrait), community.identifier) %>
+    </div>
     <div class="search-software-content-block">
-      <span>
         <% link_name = software.acronym.blank? ? community.name : "#{software.acronym} - #{community.name}" %>
         <h4>
           <%= link_to_homepage(link_name, community.identifier) %>
         </h4>
-      </span>
-      <span class="search-content-result">
-        <% body_stripped = strip_tags(software.finality) %>
-        <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
-      </span>
-    </div>
-    <br />
+        <div class="search-content-description">
+          <% body_stripped = strip_tags(software.finality) %>
+          <%= link_to_homepage(excerpt(body_stripped, body_stripped.first(3), 200),  community.identifier)  if body_stripped %>
+        </div>
-    <div class="search-software-content-block">
-      <span>
-        <b>
-          <%= _("Software Categories") %>:
-        </b>
-      </span>
-
-      <% if !community.categories.empty? %>
-        <ul id="categories-list">
-          <% community.categories.each do |category| %>
-            <li>
-            <%= link_to _("#{category.name}"), {
-              :controller => :search,
-              :action => :software_infos,
-              :selected_categories_id => [category.id],
-              :software_type => params[:software_type]
-            } %>
-            </li>
-          <% end %>
-        </ul>
-      <% else %>
+      <div class="search-software-categories">
         <span>
-          <%= _("This software doesn't have categories") %>
+          <%= _("Software Categories") %>:
         </span>
-      <% end %>
-    </div>
+
+        <% if !community.categories.empty? %>
+          <ul id="categories-list">
+            <% community.categories.each do |category| %>
+              <li>
+              <%= link_to _("#{category.name}"), {
+                :controller => :search,
+                :action => :software_infos,
+                :selected_categories_id => [category.id],
+                :software_type => params[:software_type]
+              } %>
+              </li>
+            <% end %>
+          </ul>
+        <% else %>
+          <span>
+            <%= _("This software doesn't have categories") %>
+          </span>
+        <% end %>
+      </div>
+    </div><!-- /.content-block -->
   </div>
   <hr class="clearfix" />
@@ -54,7 +54,7 @@
               [_("Name A-Z"), 'asc'],
               [_("Name Z-A"), 'desc'],
               [_("Relevance"), 'relevance'],
-              [_("Favorites"), 'rating']
+              [_("Rating"), 'rating']
               ], :selected=>params[:sort])
               ) %>
       </div>
	@@ -54,7 +54,7 @@		@@ -54,7 +54,7 @@
54	[_("Name A-Z"), 'asc'],	54	[_("Name A-Z"), 'asc'],
55	[_("Name Z-A"), 'desc'],	55	[_("Name Z-A"), 'desc'],
56	[_("Relevance"), 'relevance'],	56	[_("Relevance"), 'relevance'],
57	- [_("Favorites"), 'rating']	57	+ [_("Rating"), 'rating']
58	], :selected=>params[:sort])	58	], :selected=>params[:sort])
59	) %>	59	) %>
60	</div>	60	</div>