Merge branch 'search_template_filter' into 'next'

Search template filter See merge request !522

Merge branch 'search_template_filter' into 'next'
Search template filter See merge request !522
Victor Costa
2 parents d50ac31c eaaf3e5e
Showing 13 changed files with 407 additions and 8 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/layout_helper.rb
app/helpers/search_helper.rb
app/models/profile.rb
app/views/search/_search_content.html.erb
app/views/search/_search_form.html.erb
lib/noosfero/plugin.rb
public/javascripts/search.js
public/stylesheets/search.css
public/stylesheets/selectordie-theme.css
test/functional/search_controller_test.rb
test/unit/profile_test.rb
test/unit/search_helper_test.rb
@@ -9,6 +9,7 @@ class SearchController &lt; PublicController
   before_filter :load_search_assets, :except => :suggestions
   before_filter :load_query, :except => :suggestions
   before_filter :load_order, :except => :suggestions
+  before_filter :load_templates, :except => :suggestions
  
   # Backwards compatibility with old URLs
   def redirect_asset_param
@@ -210,6 +211,11 @@ class SearchController &lt; PublicController
     end
   end
  
+  def load_templates
+    @templates = {}
+    @templates[@asset] = environment.send(@asset.to_s).templates if [:people, :enterprises, :communities].include?(@asset)
+  end
+
   def limit
     if map_search?(@searches)
       MAP_SEARCH_LIMIT
@@ -230,7 +236,7 @@ class SearchController &lt; PublicController
   end
  
   def full_text_search
-    @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order})
+    @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order, :template_id => params[:template_id]})
   end
  
   private
@@ -49,6 +49,7 @@ module LayoutHelper
       'selectordie',
       'inputosaurus',
       'chat',
+      'selectordie-theme',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
@@ -148,4 +148,11 @@ module SearchHelper
     link_to(@enabled_searches[asset], "/search/#{asset}")
   end
  
+  def assets_submenu(asset)
+    return '' if @templates[asset].blank? || @templates[asset].length == 1
+    options = @templates[asset].map {|template| [template.name, template.id]}
+    options = options_for_select([[_('Choose a template'), nil]] + options, selected: (params[:template_id]))
+    select_tag('template_id', options, :id => 'submenu')
+  end
+
 end
@@ -85,7 +85,15 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  scope :templates, {:conditions => {:is_template => true}}
+  scope :templates, lambda { |template_id = nil|
+    conditions = {:conditions => {:is_template => true}}
+    conditions[:conditions].merge!({:id => template_id}) unless template_id.nil?
+    conditions
+  }
+
+  scope :with_templates, lambda { |templates|
+    {:conditions => {:template_id => templates}}
+  }
   scope :no_templates, {:conditions => {:is_template => false}}
  
   def members
 <div id='search-content'>
+  <div class='total'>
+    <%= _('Total of %s results ') % @searches[@asset][:results].total_entries.inspect %>
+  </div>
+
 <%= display_results(@searches, @asset) %>
 <% if params[:display] != 'map' %>
   <%= pagination_links @searches[@asset][:results] %>
@@ -5,8 +5,12 @@
     <div id='search-header'>
       <%= assets_menu(@asset) %>
       <%= filters(@asset) %>
+      <div class="clear"></div>
     </div>
  
+    <div id='search-subheader'>
+      <%= assets_submenu(@asset) %>
+    </div>
     <div class="search-field">
       <span class="formfield">
         <%= search_input_with_suggestions('query', @asset, @query, {:id => 'search-input', :size => 50, :placeholder => hint}) %>
@@ -556,6 +556,7 @@ class Noosfero::Plugin
   # own use in specific views
   def find_by_contents(asset, scope, query, paginate_options={}, options={})
     scope = scope.like_search(query, options) unless query.blank?
+    scope = scope.with_templates(options[:template_id]) unless options[:template_id].blank?
     scope = scope.send(options[:filter]) unless options[:filter].blank?
     {:results => scope.paginate(paginate_options)}
   end
@@ -15,9 +15,17 @@
     $('form.search_form').submit();
   });
  
+  // Filter submenu
+  $('#search-subheader select').change(function(){
+    $('form.search_form').submit();
+  });
+
   // Custom styled select
   $('#search-filters select').selectOrDie();
  
+  // Custom styled select
+  $('#search-subheader select').selectOrDie();
+
   // Form Ajax submission
   $('form.search_form').submit(function () {
     $.ajax({
@@ -953,7 +953,7 @@ ul#assets-menu {
   text-align: justify;
   text-justify: distribute-all-lines; /* distribute items in IE */
   list-style-type: none;
-  margin: 5px 0 13px;
+  margin: 5px 0px 10px 0px;
   padding: 0;
   width: 500px;
   float: left;
@@ -984,6 +984,15 @@ ul#assets-menu li.selected a {
   color: #EF2929;
   font-weight: bold;
 }
+ul#assets-links li.selected a {
+  border-bottom: 4px solid #dd4b39;
+  padding-bottom: 6px;
+}
+
+ul#assets-links li.selected a {
+  color: #dd4b39;
+  font-weight: bold;
+}
  
 #search-filters {
   float: right;
@@ -1037,3 +1046,13 @@ ul#assets-menu li.selected a {
   border-bottom:1px solid #ccc;
   margin-bottom: 10px;
 }
+
+#search-header{
+  border-bottom: 1px solid #ebebeb;
+}
+
+#search-content .total{
+  color: #808080;
+  line-height: 20px;
+  font-style: oblique;
+}
@@ -0,0 +1,75 @@
+/* Default custom select styles */
+
+#search-subheader div.sod_select {
+  display: inline-block;
+  vertical-align: middle;
+  position: relative;
+  text-align: left;
+  background: #fff;
+  z-index: 100;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background: transparent;
+  max-width: 400px;
+}
+
+#search-subheader div.sod_select:focus {
+  outline: none; /* For better accessibility add a style for this in your skin */
+}
+
+#search-subheader .sod_select select {
+  display: none;
+}
+
+#search-subheader .sod_label::after {
+  font-family: Arial, 'Liberation Sans', sans-serif;
+  font-weight: bold;
+  content: '+';
+  left: 0px;
+  -webkit-transform: translate3d(0,-50%,0) rotate3d(0,0,1,0deg);;
+  transform: translate3d(0,-50%,0) rotate3d(0,0,1,0deg);;
+  -webkit-transition: -webkit-transform 0.5s;
+  transition: transform 0.5s;
+  position: absolute;
+  top: 50%;
+  font-size: 2.1em;
+}
+
+#search-subheader .sod_select.open .sod_label::after {
+  -webkit-transform: translate3d(0,-50%,0) rotate3d(0,0,1,225deg);
+  transform: translate3d(0,-50%,0) rotate3d(0,0,1,225deg);
+}
+
+/* Changes on select or die*/
+#search-subheader .sod_select{
+  border: none;
+  padding-top: 10px;
+  padding-left: 20px;
+  padding-bottom: 10px;
+  width: auto;
+  font-weight: normal;
+  text-transform: none;
+  font-size: 12px;
+}
+
+#search-subheader .sod_select.open{
+}
+
+#search-subheader .sod_select .sod_list{
+  border: 1px solid #ebebeb;
+  margin-left: -1px;
+  width: auto;
+}
+
+#search-subheader .sod_select:before,
+#search-subheader  .sod_select:after {
+  content: "";
+}
+
+#search-subheader .sod_select.focus {
+  box-shadow: none;
+}
@@ -13,14 +13,14 @@ class SearchControllerTest &lt; ActionController::TestCase
     @request.stubs(:ssl?).returns(false)
     @response   = ActionController::TestResponse.new
  
-    @category = Category.create!(:name => 'my-category', :environment => Environment.default)
+    @environment = Environment.default
+    @category = Category.create!(:name => 'my-category', :environment => @environment)
  
-    env = Environment.default
-    domain = env.domains.first
+    domain = @environment.domains.first
     if !domain
       domain = Domain.create!(:name => "127.0.0.1")
-      env.domains = [domain]
-      env.save!
+      @environment.domains = [domain]
+      @environment.save!
     end
     domain.google_maps_key = 'ENVIRONMENT_KEY'
     domain.save!
@@ -37,6 +37,8 @@ class SearchControllerTest &lt; ActionController::TestCase
     Person.any_instance.stubs(:user).returns(user)
   end
  
+  attr_reader :environment
+
   def create_article_with_optional_category(name, profile, category = nil)
     fast_create(Article, {:name => name, :profile_id => profile.id }, :search => true, :category => category)
   end
@@ -651,6 +653,122 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equal [st1,st2].to_json, response.body
   end
  
+  should 'templates variable be an hash in articles asset' do
+    get :articles
+    assert assigns(:templates).kind_of?(Hash)
+  end
+
+  should 'not load people templates in articles asset' do
+    t1 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    get :articles
+    assert_nil assigns(:templates)[:people]
+  end
+
+  should 'not load communities templates in articles asset' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    get :articles
+    assert_nil assigns(:templates)[:communities]
+  end
+
+  should 'not load enterprises templates in articles asset' do
+    t1 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    get :articles
+    assert_nil assigns(:templates)[:enterprises]
+  end
+
+  should 'templates variable be equals to people templates in people assert' do
+    t1 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    get :people
+
+    assert_equivalent [t1,t2], assigns(:templates)[:people]
+  end
+
+  should 'not load communities templates in people asset' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    get :people
+    assert_nil assigns(:templates)[:communities]
+  end
+
+  should 'not load enterprises templates in people asset' do
+    t1 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    get :people
+    assert_nil assigns(:templates)[:enterprises]
+  end
+
+  should 'templates variable be equals to communities templates in communities assert' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    get :communities
+
+    assert_equivalent [t1,t2], assigns(:templates)[:communities]
+  end
+
+  should 'not load people templates in communities asset' do
+    t1 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    get :communities
+    assert_nil assigns(:templates)[:people]
+  end
+
+  should 'not load enterprises templates in communities asset' do
+    t1 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    get :communities
+    assert_nil assigns(:templates)[:enterprises]
+  end
+
+  should 'templates variable be equals to enterprises templates in enterprises assert' do
+    t1 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    get :enterprises
+
+    assert_equivalent [t1,t2], assigns(:templates)[:enterprises]
+  end
+
+  should 'not load communities templates in enterprises asset' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    get :enterprises
+    assert_nil assigns(:templates)[:communities]
+  end
+
+  should 'not load people templates in enterprises asset' do
+    t1 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    get :enterprises
+    assert_nil assigns(:templates)[:people]
+  end
+
+  should 'list all community of on specific template' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    c1 = fast_create(Community, :template_id => t1.id, :name => 'Testing community 1', :created_at => DateTime.now - 2)
+    c2 = fast_create(Community, :template_id => t2.id, :name => 'Testing community 2', :created_at => DateTime.now - 1)
+    c3 = fast_create(Community, :template_id => t1.id, :name => 'Testing community 3')
+    c4 = fast_create(Community, :name => 'Testing community 3')
+
+    get :communities, :template_id => t1.id
+    assert_equivalent [c1,c3] , assigns(:searches)[:communities][:results]
+  end
+
+  should 'list all communities of no template is passed' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    c1 = create(Community, :template_id => t1.id, :name => 'Testing community 1', :created_at => DateTime.now - 2)
+    c2 = create(Community, :template_id => t2.id, :name => 'Testing community 2', :created_at => DateTime.now - 1)
+    c3 = create(Community, :template_id => t1.id, :name => 'Testing community 3')
+    c4 = create(Community, :name => 'Testing community 3')
+
+    get :communities, :template_id => nil
+    assert_equivalent [t1,t2,c1,c2,c3,c4] , assigns(:searches)[:communities][:results]
+  end
+
   protected
  
   def create_event(profile, options)
@@ -1406,6 +1406,71 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_not_includes environment.profiles.templates, profile
   end
  
+  should 'return an specific template when specified' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    profile = fast_create(Profile)
+
+    assert_equal [t1], environment.profiles.templates(t1)
+    assert_equal [t2], environment.profiles.templates(t2)
+  end
+
+  should 'not return a template when and invalid template is specified' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    t3 = fast_create(Profile)
+
+    assert_equal [], environment.profiles.templates(t3)
+  end
+
+  should 'return profiles of specified template passing object' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    p1 = fast_create(Profile, :template_id => t1.id)
+    p2 = fast_create(Profile, :template_id => t2.id)
+    p3 = fast_create(Profile, :template_id => t1.id)
+
+    assert_equivalent [p1,p3], environment.profiles.with_templates(t1)
+  end
+
+  should 'return profiles of specified template passing id' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    p1 = fast_create(Profile, :template_id => t1.id)
+    p2 = fast_create(Profile, :template_id => t2.id)
+    p3 = fast_create(Profile, :template_id => t1.id)
+
+    assert_equivalent [p1,p3], environment.profiles.with_templates(t1.id)
+  end
+
+  should 'return profiles of a list of specified templates' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    t3 = fast_create(Profile, :is_template => true)
+    p1 = fast_create(Profile, :template_id => t1.id)
+    p2 = fast_create(Profile, :template_id => t2.id)
+    p3 = fast_create(Profile, :template_id => t3.id)
+
+    assert_equivalent [p1,p2], environment.profiles.with_templates([t1,t2])
+  end
+
+  should 'return all profiles without any template if nil is passed as parameter' do
+    environment = Environment.default
+    Profile.delete_all
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    p1 = fast_create(Profile, :template_id => t1.id)
+    p2 = fast_create(Profile, :template_id => t2.id)
+    p3 = fast_create(Profile)
+
+    assert_equivalent [t1,t2,p3], environment.profiles.with_templates(nil)
+  end
+
   should 'return a list of profiles that are not templates' do
     environment = Environment.default
     p1 = fast_create(Profile, :is_template => false)
@@ -3,6 +3,9 @@ require_relative &quot;../test_helper&quot;
 class SearchHelperTest < ActiveSupport::TestCase
  
   include SearchHelper
+  include ActionView::Helpers::FormOptionsHelper
+  include ActionView::Helpers::FormTagHelper
+
  
   should 'return whether on a multiple search' do
     stubs(:params).returns({:action => 'index', :display => 'map'})
@@ -122,4 +125,84 @@ class SearchHelperTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'return an empty string in assets_submenu for articles assets' do
+    @templates = {}
+    assert_equal '', assets_submenu(:articles)
+    @templates = {:articles => nil}
+    assert_equal '', assets_submenu(:articles)
+  end
+
+  should 'return an empty string in assets_submenu for people asset without template' do
+    @templates = {:people => nil}
+    assert_equal '', assets_submenu(:people)
+
+    @templates = {:people => []}
+    assert_equal '', assets_submenu(:people)
+  end
+
+  should 'return an empty string in assets_submenu for people asset with only one template' do
+    t = fast_create(Person, :is_template => true)
+    @templates = {:people => [t]}
+    assert_equal '', assets_submenu(:people)
+  end
+
+  should 'return a select of templates for people asset with more then one template' do
+    t1 = fast_create(Person, :is_template => true)
+    t2 = fast_create(Person, :is_template => true)
+    @templates = {:people => [t1,t2]}
+    SearchHelperTest.any_instance.stubs(:params).returns({})
+    assert_match /select/, assets_submenu(:people)
+    assert_match /#{t1.name}/, assets_submenu(:people)
+    assert_match /#{t2.name}/, assets_submenu(:people)
+  end
+
+  should 'return an empty string in assets_submenu for communities asset without template' do
+    @templates = {:communities => nil}
+    assert_equal '', assets_submenu(:communities)
+
+    @templates = {:communities => []}
+    assert_equal '', assets_submenu(:communities)
+  end
+
+  should 'return an empty string in assets_submenu for communities asset with only one template' do
+    t = fast_create(Community, :is_template => true)
+    @templates = {:communities => [t]}
+    assert_equal '', assets_submenu(:communities)
+  end
+
+  should 'return a select of templates for communities asset with more then one template' do
+    t1 = fast_create(Community, :is_template => true)
+    t2 = fast_create(Community, :is_template => true)
+    @templates = {:communities => [t1,t2]}
+    SearchHelperTest.any_instance.stubs(:params).returns({})
+    assert_match /select/, assets_submenu(:communities)
+    assert_match /#{t1.name}/, assets_submenu(:communities)
+    assert_match /#{t2.name}/, assets_submenu(:communities)
+  end
+
+  should 'return an empty string in assets_submenu for enterprises asset without template' do
+    @templates = {:enterprises => nil}
+    assert_equal '', assets_submenu(:enterprises)
+
+    @templates = {:enterprises => []}
+    assert_equal '', assets_submenu(:enterprises)
+  end
+
+  should 'return an empty string in assets_submenu for enterprises asset with only one template' do
+    t = fast_create(Enterprise, :is_template => true)
+    @templates = {:enterprises => [t]}
+    assert_equal '', assets_submenu(:enterprises)
+  end
+
+  should 'return a select of templates for enterprises asset with more then one template' do
+    t1 = fast_create(Enterprise, :is_template => true)
+    t2 = fast_create(Enterprise, :is_template => true)
+    @templates = {:enterprises => [t1,t2]}
+    SearchHelperTest.any_instance.stubs(:params).returns({})
+    assert_match /select/, assets_submenu(:enterprises)
+    assert_match /#{t1.name}/, assets_submenu(:enterprises)
+    assert_match /#{t2.name}/, assets_submenu(:enterprises)
+  end
+
+
 end
...	...	@@ -9,6 +9,7 @@ class SearchController < PublicController
9	9	before_filter :load_search_assets, :except => :suggestions
10	10	before_filter :load_query, :except => :suggestions
11	11	before_filter :load_order, :except => :suggestions
	12	+ before_filter :load_templates, :except => :suggestions
12	13
13	14	# Backwards compatibility with old URLs
14	15	def redirect_asset_param
...	...	@@ -210,6 +211,11 @@ class SearchController < PublicController
210	211	end
211	212	end
212	213
	214	+ def load_templates
	215	+ @templates = {}
	216	+ @templates[@asset] = environment.send(@asset.to_s).templates if [:people, :enterprises, :communities].include?(@asset)
	217	+ end
	218	+
213	219	def limit
214	220	if map_search?(@searches)
215	221	MAP_SEARCH_LIMIT
...	...	@@ -230,7 +236,7 @@ class SearchController < PublicController
230	236	end
231	237
232	238	def full_text_search
233		- @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order})
	239	+ @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order, :template_id => params[:template_id]})
234	240	end
235	241
236	242	private
...	...
...	...	@@ -49,6 +49,7 @@ module LayoutHelper
49	49	'selectordie',
50	50	'inputosaurus',
51	51	'chat',
	52	+ 'selectordie-theme',
52	53	pngfix_stylesheet_path,
53	54	] + tokeninput_stylesheets
54	55	plugins_stylesheets = @plugins.select(&:stylesheet?).map { \|plugin\| plugin.class.public_path('style.css') }
...	...
...	...	@@ -148,4 +148,11 @@ module SearchHelper
148	148	link_to(@enabled_searches[asset], "/search/#{asset}")
149	149	end
150	150
	151	+ def assets_submenu(asset)
	152	+ return '' if @templates[asset].blank? \|\| @templates[asset].length == 1
	153	+ options = @templates[asset].map {\|template\| [template.name, template.id]}
	154	+ options = options_for_select([[_('Choose a template'), nil]] + options, selected: (params[:template_id]))
	155	+ select_tag('template_id', options, :id => 'submenu')
	156	+ end
	157	+
151	158	end
...	...
...	...	@@ -85,7 +85,15 @@ class Profile < ActiveRecord::Base
85	85	#FIXME: these will work only if the subclass is already loaded
86	86	scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { \|klass\| "profiles.type = '#{klass}'"}.join(" OR ")} }
87	87	scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { \|klass\| "profiles.type = '#{klass}'"}.join(" OR ")} }
88		- scope :templates, {:conditions => {:is_template => true}}
	88	+ scope :templates, lambda { \|template_id = nil\|
	89	+ conditions = {:conditions => {:is_template => true}}
	90	+ conditions[:conditions].merge!({:id => template_id}) unless template_id.nil?
	91	+ conditions
	92	+ }
	93	+
	94	+ scope :with_templates, lambda { \|templates\|
	95	+ {:conditions => {:template_id => templates}}
	96	+ }
89	97	scope :no_templates, {:conditions => {:is_template => false}}
90	98
91	99	def members
...	...
1	1	<div id='search-content'>
	2	+ <div class='total'>
	3	+ <%= _('Total of %s results ') % @searches[@asset][:results].total_entries.inspect %>
	4	+ </div>
	5	+
2	6	<%= display_results(@searches, @asset) %>
3	7	<% if params[:display] != 'map' %>
4	8	<%= pagination_links @searches[@asset][:results] %>
...	...
...	...	@@ -5,8 +5,12 @@
5	5	<div id='search-header'>
6	6	<%= assets_menu(@asset) %>
7	7	<%= filters(@asset) %>
	8	+ <div class="clear"></div>
8	9	</div>
9	10
	11	+ <div id='search-subheader'>
	12	+ <%= assets_submenu(@asset) %>
	13	+ </div>
10	14	<div class="search-field">
11	15	<span class="formfield">
12	16	<%= search_input_with_suggestions('query', @asset, @query, {:id => 'search-input', :size => 50, :placeholder => hint}) %>
...	...
...	...	@@ -556,6 +556,7 @@ class Noosfero::Plugin
556	556	# own use in specific views
557	557	def find_by_contents(asset, scope, query, paginate_options={}, options={})
558	558	scope = scope.like_search(query, options) unless query.blank?
	559	+ scope = scope.with_templates(options[:template_id]) unless options[:template_id].blank?
559	560	scope = scope.send(options[:filter]) unless options[:filter].blank?
560	561	{:results => scope.paginate(paginate_options)}
561	562	end
...	...
...	...	@@ -15,9 +15,17 @@
15	15	$('form.search_form').submit();
16	16	});
17	17
	18	+ // Filter submenu
	19	+ $('#search-subheader select').change(function(){
	20	+ $('form.search_form').submit();
	21	+ });
	22	+
18	23	// Custom styled select
19	24	$('#search-filters select').selectOrDie();
20	25
	26	+ // Custom styled select
	27	+ $('#search-subheader select').selectOrDie();
	28	+
21	29	// Form Ajax submission
22	30	$('form.search_form').submit(function () {
23	31	$.ajax({
...	...
...	...	@@ -953,7 +953,7 @@ ul#assets-menu {
953	953	text-align: justify;
954	954	text-justify: distribute-all-lines; /* distribute items in IE */
955	955	list-style-type: none;
956		- margin: 5px 0 13px;
	956	+ margin: 5px 0px 10px 0px;
957	957	padding: 0;
958	958	width: 500px;
959	959	float: left;
...	...	@@ -984,6 +984,15 @@ ul#assets-menu li.selected a {
984	984	color: #EF2929;
985	985	font-weight: bold;
986	986	}
	987	+ul#assets-links li.selected a {
	988	+ border-bottom: 4px solid #dd4b39;
	989	+ padding-bottom: 6px;
	990	+}
	991	+
	992	+ul#assets-links li.selected a {
	993	+ color: #dd4b39;
	994	+ font-weight: bold;
	995	+}
987	996
988	997	#search-filters {
989	998	float: right;
...	...	@@ -1037,3 +1046,13 @@ ul#assets-menu li.selected a {
1037	1046	border-bottom:1px solid #ccc;
1038	1047	margin-bottom: 10px;
1039	1048	}
	1049	+
	1050	+#search-header{
	1051	+ border-bottom: 1px solid #ebebeb;
	1052	+}
	1053	+
	1054	+#search-content .total{
	1055	+ color: #808080;
	1056	+ line-height: 20px;
	1057	+ font-style: oblique;
	1058	+}
...	...
...	...	@@ -0,0 +1,75 @@
	1	+/* Default custom select styles */
	2	+
	3	+#search-subheader div.sod_select {
	4	+ display: inline-block;
	5	+ vertical-align: middle;
	6	+ position: relative;
	7	+ text-align: left;
	8	+ background: #fff;
	9	+ z-index: 100;
	10	+ -webkit-touch-callout: none;
	11	+ -webkit-user-select: none;
	12	+ -khtml-user-select: none;
	13	+ -moz-user-select: none;
	14	+ -ms-user-select: none;
	15	+ user-select: none;
	16	+ background: transparent;
	17	+ max-width: 400px;
	18	+}
	19	+
	20	+#search-subheader div.sod_select:focus {
	21	+ outline: none; /* For better accessibility add a style for this in your skin */
	22	+}
	23	+
	24	+#search-subheader .sod_select select {
	25	+ display: none;
	26	+}
	27	+
	28	+#search-subheader .sod_label::after {
	29	+ font-family: Arial, 'Liberation Sans', sans-serif;
	30	+ font-weight: bold;
	31	+ content: '+';
	32	+ left: 0px;
	33	+ -webkit-transform: translate3d(0,-50%,0) rotate3d(0,0,1,0deg);;
	34	+ transform: translate3d(0,-50%,0) rotate3d(0,0,1,0deg);;
	35	+ -webkit-transition: -webkit-transform 0.5s;
	36	+ transition: transform 0.5s;
	37	+ position: absolute;
	38	+ top: 50%;
	39	+ font-size: 2.1em;
	40	+}
	41	+
	42	+#search-subheader .sod_select.open .sod_label::after {
	43	+ -webkit-transform: translate3d(0,-50%,0) rotate3d(0,0,1,225deg);
	44	+ transform: translate3d(0,-50%,0) rotate3d(0,0,1,225deg);
	45	+}
	46	+
	47	+/* Changes on select or die*/
	48	+#search-subheader .sod_select{
	49	+ border: none;
	50	+ padding-top: 10px;
	51	+ padding-left: 20px;
	52	+ padding-bottom: 10px;
	53	+ width: auto;
	54	+ font-weight: normal;
	55	+ text-transform: none;
	56	+ font-size: 12px;
	57	+}
	58	+
	59	+#search-subheader .sod_select.open{
	60	+}
	61	+
	62	+#search-subheader .sod_select .sod_list{
	63	+ border: 1px solid #ebebeb;
	64	+ margin-left: -1px;
	65	+ width: auto;
	66	+}
	67	+
	68	+#search-subheader .sod_select:before,
	69	+#search-subheader .sod_select:after {
	70	+ content: "";
	71	+}
	72	+
	73	+#search-subheader .sod_select.focus {
	74	+ box-shadow: none;
	75	+}
...	...