Commit 74ecb37b authored by Jean-Philippe Lang's avatar Jean-Philippe Lang

Search engine:

* results are now displayed using different colors for tokens highlighting
* added label tag around "all words" checkbox

git-svn-id: http://redmine.rubyforge.org/svn/trunk@841 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 7d54215c
......@@ -26,7 +26,12 @@ module SearchHelper
result << '...'
break
end
result << (i.even? ? h(words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', h(words), :class => 'highlight'))
if i.even?
result << h(words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words)
else
t = (tokens.index(words.downcase) || 0) % 4
result << content_tag('span', h(words), :class => "highlight token-#{t}")
end
end
result
end
......
......@@ -9,7 +9,7 @@
<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>
<% end %>
<br />
<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>
<label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label></p>
<%= submit_tag l(:button_submit), :name => 'submit' %>
<% end %>
</div>
......
......@@ -83,6 +83,9 @@ table p {margin:0;}
.even {background-color: #fff;}
.highlight { background-color: #FCFD8D;}
.highlight.token-1 { background-color: #faa;}
.highlight.token-2 { background-color: #afa;}
.highlight.token-3 { background-color: #aaf;}
.box{
padding:6px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment