Commit 4be88df75bb3f7e416efaac54fbaeec77b0458c5
Exists in
master
and in
28 other branches
Merge commit 'refs/merge-requests/346' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/346
Showing
20 changed files
with
82 additions
and
67 deletions
Show diff stats
app/views/search/_full_article.html.erb
| 1 | 1 | <li class="search-article-item article-item"> |
| 2 | - <%= link_to(article.title, article.url, :class => "search-result-title") %> | |
| 2 | + <div> | |
| 3 | + <%= link_to(article.title, article.url, :class => "search-result-title") %> | |
| 4 | + </div> | |
| 5 | + | |
| 3 | 6 | <div class="search-content-first-column"> |
| 4 | 7 | <%= render :partial => 'image', :object => article %> |
| 5 | 8 | </div> |
| 9 | + | |
| 6 | 10 | <table class="noborder search-content-second-column"> |
| 7 | 11 | <%= render :partial => 'article_common', :object => article %> |
| 8 | 12 | </table> | ... | ... |
app/views/search/_full_blog.html.erb
| 1 | 1 | <li class="search-blog article-item"> |
| 2 | - <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %> | |
| 2 | + <div> | |
| 3 | + <%= link_to blog.title, blog.view_url, :class => 'search-result-title' %> | |
| 4 | + </div> | |
| 5 | + | |
| 3 | 6 | <div class="search-content-first-column"> |
| 4 | 7 | <%= render :partial => 'image', :object => blog %> |
| 5 | 8 | </div> |
| 9 | + | |
| 6 | 10 | <table class="noborder search-content-second-column"> |
| 7 | 11 | <tr class="search-blog-items"> |
| 8 | 12 | <td class="search-field-label"><%= _("Last posts") %></td> | ... | ... |
app/views/search/_full_event.html.erb
| 1 | 1 | <li class="search-event-item article-item"> |
| 2 | -<%= link_to(event.title, event.url, :class => "search-result-title") %> | |
| 3 | -<div class="search-content-first-column"> | |
| 4 | - <%= render :partial => 'image', :object => event %> | |
| 5 | -</div> | |
| 6 | -<table class="noborder search-content-second-column"> | |
| 7 | - <% if event.start_date %> | |
| 8 | - <tr class="search-article-event-date"> | |
| 9 | - <td class="search-field-label"><%= _('Start date') %></td> | |
| 10 | - <td class="article-item-date"><%= event.start_date %></td> | |
| 11 | - </tr> | |
| 12 | - <% end %> | |
| 13 | - <% if event.end_date %> | |
| 14 | - <tr class="search-article-event-date"> | |
| 15 | - <td class="search-field-label"><%= _('End date') %></td> | |
| 16 | - <td class="article-item-date"><%= event.end_date %></td> | |
| 17 | - </tr> | |
| 18 | - <% end %> | |
| 2 | + <div> | |
| 3 | + <%= link_to(event.title, event.url, :class => "search-result-title") %> | |
| 4 | + </div> | |
| 19 | 5 | |
| 20 | - <%= render :partial => 'article_common', :object => event %> | |
| 21 | -</table> | |
| 22 | -<%= render :partial => 'article_last_change', :object => event %> | |
| 6 | + <div class="search-content-first-column"> | |
| 7 | + <%= render :partial => 'image', :object => event %> | |
| 8 | + </div> | |
| 23 | 9 | |
| 24 | -<div style="clear: both"></div> | |
| 10 | + <table class="noborder search-content-second-column"> | |
| 11 | + <% if event.start_date %> | |
| 12 | + <tr class="search-article-event-date"> | |
| 13 | + <td class="search-field-label"><%= _('Start date') %></td> | |
| 14 | + <td class="article-item-date"><%= event.start_date %></td> | |
| 15 | + </tr> | |
| 16 | + <% end %> | |
| 17 | + <% if event.end_date %> | |
| 18 | + <tr class="search-article-event-date"> | |
| 19 | + <td class="search-field-label"><%= _('End date') %></td> | |
| 20 | + <td class="article-item-date"><%= event.end_date %></td> | |
| 21 | + </tr> | |
| 22 | + <% end %> | |
| 23 | + | |
| 24 | + <%= render :partial => 'article_common', :object => event %> | |
| 25 | + </table> | |
| 26 | + <%= render :partial => 'article_last_change', :object => event %> | |
| 27 | + | |
| 28 | + <div style="clear: both"></div> | |
| 25 | 29 | </li> | ... | ... |
app/views/search/_full_folder.html.erb
| 1 | 1 | <li class="search-folder-item article-item"> |
| 2 | - <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %> | |
| 2 | + <div> | |
| 3 | + <%= link_to folder.title, folder.view_url, :class => 'search-result-title' %> | |
| 4 | + </div> | |
| 5 | + | |
| 3 | 6 | <div class="search-content-first-column"> |
| 4 | 7 | <%= render :partial => 'image', :object => folder %> |
| 5 | 8 | </div> |
| 9 | + | |
| 6 | 10 | <table class="noborder search-content-second-column"> |
| 7 | 11 | <tr class="search-folder-items"> |
| 8 | 12 | <td class="search-field-label"><%= _("Last items") %></td> | ... | ... |
app/views/search/_full_forum.html.erb
| 1 | 1 | <li class="search-forum-item article-item"> |
| 2 | - <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %> | |
| 2 | + <div> | |
| 3 | + <%= link_to forum.title, forum.view_url, :class => 'search-result-title' %> | |
| 4 | + </div> | |
| 5 | + | |
| 3 | 6 | <div class="search-content-first-column"> |
| 4 | 7 | <%= render :partial => 'image', :object => forum %> |
| 5 | 8 | </div> |
| 9 | + | |
| 6 | 10 | <table class="noborder search-content-second-column"> |
| 7 | 11 | <tr class="search-forum-items"> |
| 8 | 12 | <td class="search-field-label"><%= _("Last topics") %></td> | ... | ... |
app/views/search/_full_gallery.html.erb
| 1 | 1 | <li class="search-gallery article-item"> |
| 2 | - <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %> | |
| 2 | + <div> | |
| 3 | + <%= link_to gallery.title, gallery.view_url, :class => 'search-result-title' %> | |
| 4 | + </div> | |
| 5 | + | |
| 3 | 6 | <div class="search-content-first-column"> |
| 4 | 7 | <%= render :partial => 'image', :object => gallery %> |
| 5 | 8 | </div> |
| 9 | + | |
| 6 | 10 | <table class="noborder search-content-second-column"> |
| 7 | 11 | <%= render :partial => 'article_common', :object => gallery %> |
| 8 | 12 | </table> | ... | ... |
app/views/search/_full_text_article.html.erb
| 1 | 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 | 6 | <div class="search-content-first-column"> |
| 5 | 7 | <%= render :partial => 'image', :object => text_article %> | ... | ... |
app/views/search/_full_uploaded_file.html.erb
| 1 | 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 | 6 | <div class="search-content-first-column"> |
| 5 | 7 | <%= render :partial => 'image', :object => uploaded_file %> | ... | ... |
plugins/solr/features/.search_products.feature.swp
No preview for this file type
plugins/solr/lib/.solr_plugin.rb.swp
No preview for this file type
plugins/solr/lib/solr_plugin.rb
| ... | ... | @@ -6,8 +6,6 @@ class SolrPlugin < Noosfero::Plugin |
| 6 | 6 | |
| 7 | 7 | include SolrPlugin::SearchHelper |
| 8 | 8 | |
| 9 | - delegate :params, :current_user, :to => :context | |
| 10 | - | |
| 11 | 9 | def self.plugin_name |
| 12 | 10 | "Solr" |
| 13 | 11 | end |
| ... | ... | @@ -28,11 +26,18 @@ class SolrPlugin < Noosfero::Plugin |
| 28 | 26 | return if empty_query?(query, category) && klass != Product |
| 29 | 27 | |
| 30 | 28 | solr_options = solr_options(class_asset(klass), category) |
| 31 | - user = context.send(:logged_in?) ? context.send(:user) : nil | |
| 32 | 29 | solr_options.merge!(products_options(user)) if klass == Product && empty_query?(query, category) |
| 33 | 30 | klass.find_by_contents(query, paginate_options, solr_options.merge(options)) |
| 34 | 31 | end |
| 35 | 32 | |
| 33 | + def method_missing method, *args, &block | |
| 34 | + if self.context.respond_to? method | |
| 35 | + self.context.send method, *args, &block | |
| 36 | + else | |
| 37 | + super method, *args, &block | |
| 38 | + end | |
| 39 | + end | |
| 40 | + | |
| 36 | 41 | end |
| 37 | 42 | |
| 38 | 43 | Dir[File.join(SolrPlugin.root_path, 'lib', 'ext', '*.rb')].each {|file| require_dependency file } | ... | ... |
plugins/solr/lib/solr_plugin/.search_helper.rb.swp
No preview for this file type
plugins/solr/lib/solr_plugin/search_helper.rb
| ... | ... | @@ -54,7 +54,7 @@ module SolrPlugin::SearchHelper |
| 54 | 54 | end |
| 55 | 55 | |
| 56 | 56 | def results_only? |
| 57 | - context.params[:action] == 'index' | |
| 57 | + params[:action] == 'index' | |
| 58 | 58 | end |
| 59 | 59 | |
| 60 | 60 | def empty_query?(query, category) |
| ... | ... | @@ -84,18 +84,18 @@ module SolrPlugin::SearchHelper |
| 84 | 84 | solr_options = {} |
| 85 | 85 | if !multiple_search? |
| 86 | 86 | if !results_only? and asset_class.respond_to? :facets |
| 87 | - solr_options.merge! asset_class.facets_find_options(context.params[:facet]) | |
| 87 | + solr_options.merge! asset_class.facets_find_options(params[:facet]) | |
| 88 | 88 | solr_options[:all_facets] = true |
| 89 | 89 | end |
| 90 | 90 | solr_options[:filter_queries] ||= [] |
| 91 | 91 | solr_options[:filter_queries] += filters(asset) |
| 92 | - solr_options[:filter_queries] << "environment_id:#{context.environment.id}" | |
| 92 | + solr_options[:filter_queries] << "environment_id:#{environment.id}" | |
| 93 | 93 | solr_options[:filter_queries] << asset_class.facet_category_query.call(category) if category |
| 94 | 94 | |
| 95 | 95 | solr_options[:boost_functions] ||= [] |
| 96 | - context.params[:order_by] = nil if context.params[:order_by] == 'none' | |
| 97 | - if context.params[:order_by] | |
| 98 | - order = SortOptions[asset][context.params[:order_by].to_sym] | |
| 96 | + params[:order_by] = nil if params[:order_by] == 'none' | |
| 97 | + if params[:order_by] | |
| 98 | + order = SortOptions[asset][params[:order_by].to_sym] | |
| 99 | 99 | raise "Unknown order by" if order.nil? |
| 100 | 100 | order[:solr_opts].each do |opt, value| |
| 101 | 101 | solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value | ... | ... |
plugins/solr/public/style.css
| 1 | 1 | .controller-search #search-column-right .search-field .formfield { |
| 2 | 2 | width: 594px; |
| 3 | - display: inline-block; | |
| 3 | + display: inline; | |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | #search-column-right .search-customize-options { |
| 7 | - position: absolute; | |
| 8 | 7 | margin: 0; |
| 9 | 8 | padding: 5px 0; |
| 10 | - bottom: 0; | |
| 11 | - left: 0; | |
| 12 | 9 | } |
| 13 | 10 | |
| 14 | 11 | #search-column-right .search-results-box .vcard { | ... | ... |
plugins/solr/test/functional/.search_controller_test.rb.swp
No preview for this file type
plugins/solr/views/search/.communities.rhtml.swp
No preview for this file type
plugins/solr/views/search/.people.rhtml.swp
No preview for this file type
plugins/solr/views/search/_facets.html.erb
| 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 | 1 | <% if !@empty_query %> |
| 9 | 2 | <%= facets_menu(@asset, @facets) %> |
| 10 | 3 | <% end %> |
| 4 | + | ... | ... |
plugins/solr/views/search/search_page.html.erb
| ... | ... | @@ -3,17 +3,13 @@ |
| 3 | 3 | |
| 4 | 4 | <%= search_page_title( @titles[@asset], @category ) %> |
| 5 | 5 | |
| 6 | -<% if !@empty_query %> | |
| 7 | - <div id='search-column-left'> | |
| 8 | - <%= render :partial => 'facets' %> | |
| 9 | - </div> | |
| 6 | +<div id='search-column-left'> | |
| 7 | + <%= render :partial => 'facets' if !@empty_query %> | |
| 8 | +</div> | |
| 10 | 9 | |
| 11 | - <div id='search-column-right'> | |
| 12 | - <%= render :partial => 'results' %> | |
| 13 | - </div> | |
| 14 | -<% else %> | |
| 10 | +<div id='search-column-right'> | |
| 15 | 11 | <%= render :partial => 'results' %> |
| 16 | -<% end %> | |
| 12 | +</div> | |
| 17 | 13 | |
| 18 | 14 | <div style="clear: both"></div> |
| 19 | 15 | ... | ... |
public/stylesheets/search.css
| ... | ... | @@ -753,19 +753,13 @@ li.search-product-item hr { |
| 753 | 753 | .search-content-first-column { |
| 754 | 754 | width: 130px; |
| 755 | 755 | min-height: 98px; |
| 756 | - position: absolute; | |
| 757 | -} | |
| 758 | -.search-gallery .search-content-first-column { | |
| 759 | - width: 190px; | |
| 756 | + float: left; | |
| 760 | 757 | } |
| 761 | 758 | |
| 762 | 759 | .search-content-second-column { |
| 763 | 760 | margin-left: 140px; |
| 764 | 761 | width: auto; |
| 765 | 762 | } |
| 766 | -.search-gallery .search-content-second-column { | |
| 767 | - margin-left: 200px; | |
| 768 | -} | |
| 769 | 763 | |
| 770 | 764 | .search-content-second-column tr:hover { |
| 771 | 765 | background-color: none; |
| ... | ... | @@ -789,7 +783,7 @@ ul.clean-list .search-content-second-column { |
| 789 | 783 | width:795px; |
| 790 | 784 | } |
| 791 | 785 | ul.clean-list .search-gallery-content { |
| 792 | - width:655px | |
| 786 | + width:655px; | |
| 793 | 787 | } |
| 794 | 788 | a.search-image-pic { |
| 795 | 789 | border: 1px solid #F2F2F2; |
| ... | ... | @@ -819,7 +813,7 @@ a.search-image-pic { |
| 819 | 813 | font-weight: bold; |
| 820 | 814 | text-transform: uppercase; |
| 821 | 815 | letter-spacing: 1px; |
| 822 | - user-select: none; | |
| 816 | + user-select: none; | |
| 823 | 817 | border-radius: 5px; |
| 824 | 818 | -moz-user-select: none; |
| 825 | 819 | -khtml-user-select: none; |
| ... | ... | @@ -844,8 +838,9 @@ a.search-image-pic { |
| 844 | 838 | .search-gallery .search-gallery-items { |
| 845 | 839 | float: left; |
| 846 | 840 | margin: 0; |
| 847 | - min-width: 130px; | |
| 841 | + width: 130px; | |
| 848 | 842 | position: relative; |
| 843 | + overflow: hidden; | |
| 849 | 844 | } |
| 850 | 845 | |
| 851 | 846 | .search-gallery .search-gallery-items a.search-image-pic { | ... | ... |