Adds icons on search results.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1436 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 20 insertions, 18 deletions

diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 0be97a504..44d024b60 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -20,13 +20,13 @@
 

 <% if @results %>

     <h3><%= l(:label_result_plural) %></h3>

-    <ul id="search-results">

+    <dl id="search-results">

       <% @results.each do |e| %>

-        <li><p><%= 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 %><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><br />

+        <span class="author"><%= format_time(e.event_datetime) %></span><dd>

       <% end %>

-    </ul>

+    </dl>

 <% end %>

 

 <p><center>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index bdcf5615c..9a0201378 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -172,22 +172,24 @@ div#issue-changesets .changeset { padding: 4px;}
 div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
 div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 
-div#activity dl { margin-left: 2em; }
+div#activity dl, #search-results { margin-left: 2em; }
 div#activity dd { margin-bottom: 1em; padding-left: 18px; }
-div#activity dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
+div#activity dt, #search-results dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
 div#activity dt .time { color: #777; font-size: 80%; }
-div#activity dd .description { font-style: italic; }
+div#activity dd .description, #search-results dd .description { font-style: italic; }
 div#activity span.project:after, #search-results span.project:after { content: " -"; }
-div#activity dt.issue { background-image: url(../images/ticket.png); }
-div#activity dt.issue-edit { background-image: url(../images/ticket_edit.png); }
-div#activity dt.issue-closed { background-image: url(../images/ticket_checked.png); }
-div#activity dt.changeset { background-image: url(../images/changeset.png); }
-div#activity dt.news { background-image: url(../images/news.png); }
-div#activity dt.message { background-image: url(../images/message.png); }
-div#activity dt.reply { background-image: url(../images/comments.png); }
-div#activity dt.wiki-page { background-image: url(../images/wiki_edit.png); }
-div#activity dt.attachment { background-image: url(../images/attachment.png); }
-div#activity dt.document { background-image: url(../images/document.png); }
+#search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px;}
+
+dt.issue { background-image: url(../images/ticket.png); }
+dt.issue-edit { background-image: url(../images/ticket_edit.png); }
+dt.issue-closed { background-image: url(../images/ticket_checked.png); }
+dt.changeset { background-image: url(../images/changeset.png); }
+dt.news { background-image: url(../images/news.png); }
+dt.message { background-image: url(../images/message.png); }
+dt.reply { background-image: url(../images/comments.png); }
+dt.wiki-page { background-image: url(../images/wiki_edit.png); }
+dt.attachment { background-image: url(../images/attachment.png); }
+dt.document { background-image: url(../images/document.png); }
 
 div#roadmap fieldset.related-issues { margin-bottom: 1em; }
 div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }