# HG changeset patch # User olivier # Date 1420626361 -3600 # Wed Jan 07 11:26:01 2015 +0100 # Node ID 3069fb9e37e6c67801001d84d52c6822d98c03ed # Parent 6433fb0650326cd73296f7fe9a1b1f135bbea320 #42140: add code to make History and Description collapsable/expandable in the same way as grouped issue lists diff -r 6433fb065032 -r 3069fb9e37e6 app/views/issues/_history.html.erb --- a/app/views/issues/_history.html.erb Fri Dec 12 09:20:05 2014 +0100 +++ b/app/views/issues/_history.html.erb Wed Jan 07 11:26:01 2015 +0100 @@ -1,12 +1,22 @@ <% reply_links = authorize_for('issues', 'edit') -%> + + <% for journal in journals %> -
+
+ <% end %> + +
+

<%= link_to "##{journal.indice}", {:anchor => "note-#{journal.indice}"}, :class => "journal-link" %> <%= avatar(journal.user, :size => "24") %> + +   <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %> + <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", + "toggleAllRowGroups(this)", :class => 'toggle-all') %> + <%= content_tag('span', l(:field_is_private), :class => 'private') if journal.private_notes? %>

+
<% if journal.details.any? %>
    <% details_to_strings(journal.visible_details).each do |string| %> @@ -18,6 +28,9 @@ <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %> +
<% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %> diff -r 6433fb065032 -r 3069fb9e37e6 app/views/issues/show.html.erb --- a/app/views/issues/show.html.erb Fri Dec 12 09:20:05 2014 +0100 +++ b/app/views/issues/show.html.erb Wed Jan 07 11:26:01 2015 +0100 @@ -71,16 +71,27 @@ <% if @issue.description? || @issue.attachments.any? -%>
<% if @issue.description? %> -
-
- <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> + + + + - -

<%=l(:field_description)%>

-
- <%= textilizable @issue, :description, :attachments => @issue.attachments %> -
- + +
+
+
+ <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> +
+ +

+   + <%=l(:field_description)%> +

+
+
+ <%= textilizable @issue, :description, :attachments => @issue.attachments %> +
+
<% end %> <%= link_to_attachments @issue, :thumbnails => true %> <% end -%>