Commit 8577d3f56b661bc76d6c7e6575dc6c5192e17ff2

Authored by Daniela Feitosa
1 parent 634dc3b5

Design enhancements

(ActionItem1734)
app/controllers/public/profile_search_controller.rb
@@ -6,12 +6,14 @@ class ProfileSearchController < PublicController @@ -6,12 +6,14 @@ class ProfileSearchController < PublicController
6 before_filter :check_access_to_profile 6 before_filter :check_access_to_profile
7 7
8 def index 8 def index
9 - @q = params[:q].blank? ? '' : params[:q]  
10 - @filtered_query = remove_stop_words(@q)  
11 - if params[:where] == 'environment'  
12 - redirect_to :controller => 'search', :query => @q  
13 - else  
14 - @results = profile.articles.published.find_by_contents(@filtered_query).paginate(:per_page => 10, :page => params[:page]) 9 + @q = params[:q]
  10 + unless @q.blank?
  11 + @filtered_query = remove_stop_words(@q)
  12 + if params[:where] == 'environment'
  13 + redirect_to :controller => 'search', :query => @q
  14 + else
  15 + @results = profile.articles.published.find_by_contents(@filtered_query).paginate(:per_page => 10, :page => params[:page])
  16 + end
15 end 17 end
16 end 18 end
17 19
app/views/profile_search/_article.rhtml
1 -<li>  
2 - <%= link_to article.title, article.view_url, :class => 'result-title ' + icon_for_article(article) %> 1 +<li class='<%= icon_for_article(article) %>'>
  2 + <%= link_to article.title, article.view_url, :class => 'result-title' %>
3 <p><%= link_to article.short_lead, article.url, {:class => 'article-details'} %></p> 3 <p><%= link_to article.short_lead, article.url, {:class => 'article-details'} %></p>
4 <div><%= link_to url_for(article.url), article.url, :class => 'article-url' %></div> 4 <div><%= link_to url_for(article.url), article.url, :class => 'article-url' %></div>
5 </li> 5 </li>
app/views/profile_search/_folder.rhtml
1 -<li>  
2 - <%= link_to article.title, article.view_url, :class => 'result-title ' + icon_for_article(article) %> 1 +<li class='<%= icon_for_article(article) %>'>
  2 + <%= link_to article.title, article.view_url, :class => 'result-title' %>
3 <p><%= link_to article.body.to_s, article.url, {:class => 'article-details'} %></p> 3 <p><%= link_to article.body.to_s, article.url, {:class => 'article-details'} %></p>
4 <div><%= link_to url_for(article.url), article.url, :class => 'article-url' %></div> 4 <div><%= link_to url_for(article.url), article.url, :class => 'article-url' %></div>
5 </li> 5 </li>
app/views/profile_search/_uploaded_file.rhtml
1 <% if article.image? %> 1 <% if article.image? %>
2 <li class='result-image'> 2 <li class='result-image'>
3 - <%= link_to image_tag(article.public_filename(:thumb), :alt => article.display_title), article.view_url, :class => 'article-details' %> 3 + <%= link_to image_tag(article.public_filename(:thumb), :alt => article.abstract, :title => article.abstract), article.view_url, :class => 'article-details' %>
4 </li> 4 </li>
5 <% else %> 5 <% else %>
6 - <li>  
7 - <%= link_to article.title, article.view_url, :class => 'result-title ' + icon_for_article(article) %> 6 + <li class="<%= icon_for_article(article) %>">
  7 + <%= link_to article.title, article.view_url, :class => 'result-title' %>
8 <p><%= link_to article.title, article.short_lead, :class => 'article-details' %></p> 8 <p><%= link_to article.title, article.short_lead, :class => 'article-details' %></p>
9 <div><%= link_to url_for(article.url), article.url, :class => 'article-url' %></div> 9 <div><%= link_to url_for(article.url), article.url, :class => 'article-url' %></div>
10 </li> 10 </li>
app/views/profile_search/index.rhtml
1 <div id='profile-search-results'> 1 <div id='profile-search-results'>
2 - <h1><%= _("Search results on %s's profile") % profile.short_name %></h1> 2 + <h1><%= _("Search on %s's profile") % profile.short_name %></h1>
3 3
4 <%= render :partial => 'shared/profile_search_form' %> 4 <%= render :partial => 'shared/profile_search_form' %>
5 5
6 - <div class='results-found-message'>  
7 - <%= _("%s results found") % @results.total_entries %>  
8 - </div> 6 + <% if @results %>
  7 + <div class='results-found-message'>
  8 + <%= _("%s results found") % @results.total_entries %>
  9 + </div>
9 10
10 - <ul class='results-list'>  
11 - <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>  
12 - <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>  
13 - <% end %>  
14 - </ul>  
15 -  
16 - <%= pagination_links @results %> 11 + <ul class='results-list'>
  12 + <% @results.sort_by { |r| r.is_image? ? 0 : 1}.each do |result| %>
  13 + <%= render :partial => partial_for_class(result.class), :locals => { :article => result } %>
  14 + <% end %>
  15 + </ul>
17 16
  17 + <%= pagination_links @results %>
  18 + <% end %>
18 </div> 19 </div>
public/stylesheets/application.css
@@ -4396,6 +4396,7 @@ h1#agenda-title { @@ -4396,6 +4396,7 @@ h1#agenda-title {
4396 4396
4397 #profile-search-results ul { 4397 #profile-search-results ul {
4398 padding-left: 0px; 4398 padding-left: 0px;
  4399 + margin-left: 0px;
4399 } 4400 }
4400 4401
4401 #profile-search-results form .formfield input { 4402 #profile-search-results form .formfield input {
@@ -4415,9 +4416,8 @@ h1#agenda-title { @@ -4415,9 +4416,8 @@ h1#agenda-title {
4415 #profile-search-results li.result-image { 4416 #profile-search-results li.result-image {
4416 float: left; 4417 float: left;
4417 clear: none; 4418 clear: none;
4418 - height: 150px;  
4419 - margin-right: 10px;  
4420 - margin-left: 10px; 4419 + height: 130px;
  4420 + margin-right: 20px;
4421 } 4421 }
4422 4422
4423 #profile-search-results .result-title { 4423 #profile-search-results .result-title {
@@ -4445,7 +4445,7 @@ h1#agenda-title { @@ -4445,7 +4445,7 @@ h1#agenda-title {
4445 4445
4446 #profile-search-results .results-list .icon { 4446 #profile-search-results .results-list .icon {
4447 background-repeat: no-repeat; 4447 background-repeat: no-repeat;
4448 - background-position: left; 4448 + background-position: left 5px;
4449 padding: 0px 0px 3px 20px; 4449 padding: 0px 0px 3px 20px;
4450 border: none; 4450 border: none;
4451 } 4451 }