Merged trunk r1773.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81

groups/app/views/search/index.rhtml

@@ -4,27 +4,33 @@
 <% form_tag({}, :method => :get) do %>
 <p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
 <%= javascript_tag "Field.focus('search-input')" %>
-
-<% @object_types.each do |t| %>
-<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>
-<% end %>
-<br />
+<%= project_select_tag %>
 <label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label>
 <label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
 </p>
-<%= submit_tag l(:button_submit), :name => 'submit' %>
+<p>
+<% @object_types.each do |t| %>
+<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %></label>
+<% end %>
+</p>
+
+<p><%= submit_tag l(:button_submit), :name => 'submit' %></p>
 <% end %>
 </div>
 
 <% if @results %>
-    <h3><%= l(:label_result_plural) %></h3>
-    <ul>
+    <div id="search-results-counts">
+    <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
+    </div>
+    
+    <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
+    <dl id="search-results">
       <% @results.each do |e| %>
-        <li><p><%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %><br />
-        <%= highlight_tokens(e.event_description, @tokens) %><br />
-        <span class="author"><%= format_time(e.event_datetime) %></span></p></li>
+        <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %></dt>
+        <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
+        <span class="author"><%= format_time(e.event_datetime) %></span></dd>
       <% end %>
-    </ul>
+    </dl>
 <% end %>
 
 <p><center>