From b0e5baafaf1dbab945ca35e0e3b8b3f5cbe2d723 Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Thu, 15 Aug 2013 10:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=B8=85=E6=99=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_history.html.erb | 49 +++++++++++++++++++----------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb index 232632dc8..5b6bbeba4 100644 --- a/app/views/issues/_history.html.erb +++ b/app/views/issues/_history.html.erb @@ -1,23 +1,38 @@ <% reply_links = authorize_for('issues', 'edit') -%> <% for journal in journals %> -
-
-

<%= link_to "##{journal.indice}", {:anchor => "note-#{journal.indice}"}, :class => "journal-link" %> - - <%= image_tag url_to_avatar(journal.user), :class => 'avatar' %> - <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>

+
- <% if journal.details.any? %> -
    - <% details_to_strings(journal.details).each do |string| %> -
  • <%= string %>
  • - <% end %> -
- <% end %> - <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %> -
-
- <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %> + + + + + +
<%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %> + + + + + + + + + + + +
<%= link_to journal.user, user_path(journal.user)%> <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>
+

+ <% if journal.details.any? %> + <% details_to_strings(journal.details).each do |string| %> + + <%= string %> + <% end %> + <% end %> + <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %> +

<%= format_time journal.created_on %>
+
+
+ +<%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %> <% end %> <% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %>