Merge commit 'refs/merge-requests/346' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/346

Merge commit 'refs/merge-requests/346' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/346
Rodrigo Souto
2 parents 8793197c 4d92265e
Showing 20 changed files with 82 additions and 67 deletions Show diff stats
app/views/search/_full_article.html.erb
app/views/search/_full_blog.html.erb
app/views/search/_full_event.html.erb
app/views/search/_full_folder.html.erb
app/views/search/_full_forum.html.erb
app/views/search/_full_gallery.html.erb
app/views/search/_full_text_article.html.erb
app/views/search/_full_uploaded_file.html.erb
plugins/solr/features/.search_products.feature.swp
plugins/solr/lib/.solr_plugin.rb.swp
plugins/solr/lib/solr_plugin.rb
plugins/solr/lib/solr_plugin/.search_helper.rb.swp
plugins/solr/lib/solr_plugin/search_helper.rb
plugins/solr/public/style.css
plugins/solr/test/functional/.search_controller_test.rb.swp
plugins/solr/views/search/.communities.rhtml.swp
plugins/solr/views/search/.people.rhtml.swp
plugins/solr/views/search/_facets.html.erb
plugins/solr/views/search/search_page.html.erb
public/stylesheets/search.css
 <li class="search-article-item article-item">
-  <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  <div>
+    <%= link_to(article.title, article.url, :class => "search-result-title") %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => article %>
   </div>
+
   <table class="noborder search-content-second-column">
     <%= render :partial => 'article_common', :object => article %>
   </table>
 <li class="search-blog article-item">
-  <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => blog %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-blog-items">
       <td class="search-field-label"><%= _("Last posts") %></td>
 <li class="search-event-item article-item">
-<%= link_to(event.title, event.url, :class => "search-result-title") %>
-<div class="search-content-first-column">
-  <%= render :partial => 'image', :object => event %>
-</div>
-<table class="noborder search-content-second-column">
-  <% if event.start_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('Start date') %></td>
-      <td class="article-item-date"><%= event.start_date %></td>
-    </tr>
-  <% end %>
-  <% if event.end_date %>
-    <tr class="search-article-event-date">
-      <td class="search-field-label"><%= _('End date') %></td>
-      <td class="article-item-date"><%= event.end_date %></td>
-    </tr>
-  <% end %>
+  <div>
+    <%= link_to(event.title, event.url, :class => "search-result-title") %>
+  </div>
-  <%= render :partial => 'article_common', :object => event %>
-</table>
-<%= render :partial => 'article_last_change', :object => event %>
+  <div class="search-content-first-column">
+    <%= render :partial => 'image', :object => event %>
+  </div>
-<div style="clear: both"></div>
+  <table class="noborder search-content-second-column">
+    <% if event.start_date %>
+      <tr class="search-article-event-date">
+        <td class="search-field-label"><%= _('Start date') %></td>
+        <td class="article-item-date"><%= event.start_date %></td>
+      </tr>
+    <% end %>
+    <% if event.end_date %>
+      <tr class="search-article-event-date">
+        <td class="search-field-label"><%= _('End date') %></td>
+        <td class="article-item-date"><%= event.end_date %></td>
+      </tr>
+    <% end %>
+
+    <%= render :partial => 'article_common', :object => event %>
+  </table>
+  <%= render :partial => 'article_last_change', :object => event %>
+
+  <div style="clear: both"></div>
 </li>
 <li class="search-folder-item article-item">
-  <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => folder %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-folder-items">
       <td class="search-field-label"><%= _("Last items") %></td>
 <li class="search-forum-item article-item">
-  <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => forum %>
   </div>
+
   <table class="noborder search-content-second-column">
     <tr class="search-forum-items">
       <td class="search-field-label"><%= _("Last topics") %></td>
 <li class="search-gallery article-item">
-  <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %>
+  </div>
+
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => gallery %>
   </div>
+
   <table class="noborder search-content-second-column">
     <%= render :partial => 'article_common', :object => gallery %>
   </table>
 <li class="search-text-article-item article-item">
-  <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+  <div>
+    <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
+  </div>
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => text_article %>
 <li class="search-uploaded-file-item article-item">
-  <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+  <div>
+    <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
+  </div>
   <div class="search-content-first-column">
     <%= render :partial => 'image', :object => uploaded_file %>
@@ -6,8 +6,6 @@ class SolrPlugin &lt; Noosfero::Plugin
   include SolrPlugin::SearchHelper
-  delegate :params, :current_user, :to => :context
-
   def self.plugin_name
     "Solr"
   end
@@ -28,11 +26,18 @@ class SolrPlugin &lt; Noosfero::Plugin
     return if empty_query?(query, category) && klass != Product
     solr_options = solr_options(class_asset(klass), category)
-    user = context.send(:logged_in?) ? context.send(:user) : nil
     solr_options.merge!(products_options(user)) if klass == Product && empty_query?(query, category)
     klass.find_by_contents(query, paginate_options, solr_options.merge(options))
   end
+  def method_missing method, *args, &block
+    if self.context.respond_to? method
+      self.context.send method, *args, &block
+    else
+      super method, *args, &block
+    end
+  end
+
 end
 Dir[File.join(SolrPlugin.root_path, 'lib', 'ext', '*.rb')].each {|file| require_dependency file }
@@ -54,7 +54,7 @@ module SolrPlugin::SearchHelper
   end
   def results_only?
-    context.params[:action] == 'index'
+    params[:action] == 'index'
   end
   def empty_query?(query, category)
@@ -84,18 +84,18 @@ module SolrPlugin::SearchHelper
     solr_options = {}
     if !multiple_search?
       if !results_only? and asset_class.respond_to? :facets
-        solr_options.merge! asset_class.facets_find_options(context.params[:facet])
+        solr_options.merge! asset_class.facets_find_options(params[:facet])
         solr_options[:all_facets] = true
       end
       solr_options[:filter_queries] ||= []
       solr_options[:filter_queries] += filters(asset)
-      solr_options[:filter_queries] << "environment_id:#{context.environment.id}"
+      solr_options[:filter_queries] << "environment_id:#{environment.id}"
       solr_options[:filter_queries] << asset_class.facet_category_query.call(category) if category
       solr_options[:boost_functions] ||= []
-      context.params[:order_by] = nil if context.params[:order_by] == 'none'
-      if context.params[:order_by]
-        order = SortOptions[asset][context.params[:order_by].to_sym]
+      params[:order_by] = nil if params[:order_by] == 'none'
+      if params[:order_by]
+        order = SortOptions[asset][params[:order_by].to_sym]
         raise "Unknown order by" if order.nil?
         order[:solr_opts].each do |opt, value|
           solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
 .controller-search #search-column-right .search-field .formfield {
   width: 594px;
-  display: inline-block;
+  display: inline;
 }
 #search-column-right .search-customize-options {
-  position: absolute;
   margin: 0;
   padding: 5px 0;
-  bottom: 0;
-  left: 0;
 }
 #search-column-right .search-results-box .vcard {
-<% if logged_in? %>
-  <% button_bar do %>
-    <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
-    <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) if @asset == :communities %>
-    <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) if @asset == :enterprises && environment.enabled?('enterprise_registration') %>
-  <% end %>
-<% end %>
 <% if !@empty_query %>
   <%= facets_menu(@asset, @facets) %>
 <% end %>
+
@@ -3,17 +3,13 @@
 <%= search_page_title( @titles[@asset], @category ) %>
-<% if !@empty_query %>
-  <div id='search-column-left'>
-    <%= render :partial => 'facets' %>
-  </div>
+<div id='search-column-left'>
+  <%= render :partial => 'facets' if !@empty_query %>
+</div>
-  <div id='search-column-right'>
-    <%= render :partial => 'results' %>
-  </div>
-<% else %>
+<div id='search-column-right'>
   <%= render :partial => 'results' %>
-<% end %>
+</div>
 <div style="clear: both"></div>
@@ -753,19 +753,13 @@ li.search-product-item hr {
 .search-content-first-column {
   width: 130px;
   min-height: 98px;
-  position: absolute;
-}
-.search-gallery .search-content-first-column {
-  width: 190px;
+  float: left;
 }
 .search-content-second-column {
   margin-left: 140px;
   width: auto;
 }
-.search-gallery .search-content-second-column {
-  margin-left: 200px;
-}
 .search-content-second-column tr:hover {
   background-color: none;
@@ -789,7 +783,7 @@ ul.clean-list .search-content-second-column {
   width:795px;
 }
 ul.clean-list .search-gallery-content {
-  width:655px
+  width:655px;
 }
 a.search-image-pic {
   border: 1px solid #F2F2F2;
@@ -819,7 +813,7 @@ a.search-image-pic {
   font-weight: bold;
   text-transform: uppercase;
   letter-spacing: 1px;
-  user-select: none;       
+  user-select: none;
   border-radius: 5px;
   -moz-user-select: none;
   -khtml-user-select: none;
@@ -844,8 +838,9 @@ a.search-image-pic {
 .search-gallery .search-gallery-items {
   float: left;
   margin: 0;
-  min-width: 130px;
+  width: 130px;
   position: relative;
+  overflow: hidden;
 }
 .search-gallery .search-gallery-items a.search-image-pic {
1	<li class="search-text-article-item article-item">	1	<li class="search-text-article-item article-item">
2	- <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>	2	+ <div>
		3	+ <%= link_to(text_article.title, text_article.url, :class => "search-result-title") %>
		4	+ </div>
3		5
4	<div class="search-content-first-column">	6	<div class="search-content-first-column">
5	<%= render :partial => 'image', :object => text_article %>	7	<%= render :partial => 'image', :object => text_article %>
1	<li class="search-uploaded-file-item article-item">	1	<li class="search-uploaded-file-item article-item">
2	- <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>	2	+ <div>
		3	+ <%= link_to uploaded_file.filename, uploaded_file.view_url, :class => 'search-result-title' %>
		4	+ </div>
3		5
4	<div class="search-content-first-column">	6	<div class="search-content-first-column">
5	<%= render :partial => 'image', :object => uploaded_file %>	7	<%= render :partial => 'image', :object => uploaded_file %>
1	-<% if logged_in? %>
2	- <% button_bar do %>
3	- <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
4	- <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) if @asset == :communities %>
5	- <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) if @asset == :enterprises && environment.enabled?('enterprise_registration') %>
6	- <% end %>
7	-<% end %>
8	<% if !@empty_query %>	1	<% if !@empty_query %>
9	<%= facets_menu(@asset, @facets) %>	2	<%= facets_menu(@asset, @facets) %>
10	<% end %>	3	<% end %>
		4	+