Download as
Browse Code »

Commit 02d3946a57223f56509fdad1a4cc57c224d2e4ec

Authored by MoisesMachado
1 parent e8aff3e4
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem25: added icon to denote product in search and made search return products as well 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1010 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 6 additions and 0 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @02d3946
@@ -24,6 +24,10 @@ class SearchController < ApplicationController @@ -24,6 +24,10 @@ class SearchController < ApplicationController
24 Profile.find_by_contents(query) 24 Profile.find_by_contents(query)
25 end 25 end
26 26
  27 + search do |query|
  28 + Product.find_by_contents(query)
  29 + end
  30 +
27 # auxiliary method to search in all defined searches and collect the results 31 # auxiliary method to search in all defined searches and collect the results
28 def search(query) 32 def search(query)
29 SEARCHES.inject([]) do |acc,finder| 33 SEARCHES.inject([]) do |acc,finder|
public/designs/icons/default/README
  Diff comments   View file @02d3946
@@ -16,6 +16,7 @@ gtk-save.png Nuovo stock/ @@ -16,6 +16,7 @@ gtk-save.png Nuovo stock/
16 gtk-go-up.png Nuovo stock/ 16 gtk-go-up.png Nuovo stock/
17 gtk-cancel.png Nuovo stock/ 17 gtk-cancel.png Nuovo stock/
18 user_icon.png Nuovo apps/ 18 user_icon.png Nuovo apps/
  19 +gnome-other.png Nuovo apps/
19 20
20 Licensing of GNOME themes 21 Licensing of GNOME themes
21 ========================= 22 =========================
public/designs/icons/default/gnome-other.png 0 → 100644
View file @02d3946

1.12 KB
public/designs/icons/default/style.css
  Diff comments   View file @02d3946
@@ -8,3 +8,4 @@ @@ -8,3 +8,4 @@
8 .button.up { background-image: url(gtk-go-up.png); } 8 .button.up { background-image: url(gtk-go-up.png); }
9 .button.cancel { background-image: url(gtk-cancel.png); } 9 .button.cancel { background-image: url(gtk-cancel.png); }
10 .button.person { background-image: url(user_icon.png); } 10 .button.person { background-image: url(user_icon.png); }
  11 +.button.product { background-image: url(gnome-other.png); }