summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-10 19:12:25 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-10 19:12:25 +0300
commitfb36355f2ff6d4c5465158608c60e0d33cb552ee (patch)
tree4cedb90e48c18c0e49550ec13933c24e122717a3 /app
parent01be32043af7ffb6981086f7fc05891bed578c15 (diff)
downloadgitlab-ce-fb36355f2ff6d4c5465158608c60e0d33cb552ee.tar.gz
Different search placeholder depdends on area
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb9
-rw-r--r--app/views/layouts/_search.html.haml2
2 files changed, 10 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e752e9fe65e..0a49892ca0a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -226,4 +226,13 @@ module ApplicationHelper
content_tag :i, nil, class: 'icon-lock cgreen'
end
+ def search_placeholder
+ if @project && @project.persisted?
+ "Search in this project"
+ elsif @group && @group.persisted?
+ "Search in this group"
+ else
+ "Search"
+ end
+ end
end
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index a43a46b8726..9a0db99332a 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -1,6 +1,6 @@
.search
= form_tag search_path, method: :get, class: 'navbar-form pull-left' do |f|
- = text_field_tag "search", nil, placeholder: "Search", class: "search-input"
+ = text_field_tag "search", nil, placeholder: search_placeholder, class: "search-input"
= hidden_field_tag :group_id, @group.try(:id)
- if @project && @project.persisted?
= hidden_field_tag :project_id, @project.id