diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-11-19 08:26:58 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-11-19 08:26:58 +0000 |
| commit | 7ee5e95f1432153008813484e075d7dce238be5f (patch) | |
| tree | 3be2bc239df17a6b534f40f52aaf425158006c9f | |
| parent | c7505aa76b3afc12adab4fc38987138349b7ab83 (diff) | |
| download | redmine-7ee5e95f1432153008813484e075d7dce238be5f.tar.gz redmine-7ee5e95f1432153008813484e075d7dce238be5f.zip | |
Use the regular "icon icon-*" on search results (#24313).
git-svn-id: http://svn.redmine.org/redmine/trunk@15977 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/issue.rb | 2 | ||||
| -rw-r--r-- | app/views/search/index.html.erb | 2 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 3 | ||||
| -rw-r--r-- | test/functional/search_controller_test.rb | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 92cfad395..f1bbe1c78 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -52,7 +52,7 @@ class Issue < ActiveRecord::Base acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"}, :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}, - :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') } + :type => Proc.new {|o| 'issue' + (o.closed? ? '-closed' : '') } acts_as_activity_provider :scope => preload(:project, :author, :tracker, :status), :author_key => :author_id diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index 53ec17a63..1e80d57a7 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -42,7 +42,7 @@ <h3><%= l(:label_result_plural) %> (<%= @result_count %>)</h3> <dl id="search-results"> <% @results.each do |e| %> - <dt class="<%= e.event_type %>"> + <dt class="<%= e.event_type %> icon icon-<%= e.event_type %>"> <%= content_tag('span', e.project, :class => 'project') unless @project == e.project %> <%= link_to(highlight_tokens(e.event_title.truncate(255), @tokens), e.event_url) %> </dt> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 4f60ac304..9613e5eb8 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -422,7 +422,6 @@ div.journal ul.details a:hover, ul.revision-info a:hover {color:#D14848;} div#activity dl, #search-results { margin-left: 2em; } div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; } -#search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; } div#activity dt.me .time { border-bottom: 1px solid #999; } div#activity dt .time { color: #777; font-size: 80%; } div#activity dd .description, #search-results dd .description { font-style: italic; } @@ -438,8 +437,6 @@ div#search-results-counts {float:right;} div#search-results-counts ul { margin-top: 0.5em; } div#search-results-counts li { list-style-type:none; float: left; margin-left: 1em; } -#search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); } - div#roadmap .related-issues { margin-bottom: 1em; } div#roadmap .related-issues td.checkbox { display: none; } div#roadmap .wiki h1:first-child { display: none; } diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 54148a2f4..720d62d4b 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -94,7 +94,7 @@ class SearchControllerTest < Redmine::ControllerTest assert_select '#search-results' do assert_select 'dt.issue a', :text => /Bug #5/ - assert_select 'dt.issue.closed a', :text => /Bug #8 \(Closed\)/ + assert_select 'dt.issue-closed a', :text => /Bug #8 \(Closed\)/ end end |