diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-06-23 05:38:30 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-06-23 05:38:30 +0000 |
| commit | 7dbd9e8c3b6e730121f10828f4ebc1c73e0a9bab (patch) | |
| tree | 858df14aaf5cbc65a050bb5ba050d6bd72392836 /app/views/issues | |
| parent | d8a202471586677cf1863de390389058b1f0a0c0 (diff) | |
| download | redmine-7dbd9e8c3b6e730121f10828f4ebc1c73e0a9bab.tar.gz redmine-7dbd9e8c3b6e730121f10828f4ebc1c73e0a9bab.zip | |
Move action links and edit form above the history when displaying comments in reverse order (#23518).
git-svn-id: http://svn.redmine.org/redmine/trunk@17412 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_action_menu_edit.html.erb | 10 | ||||
| -rw-r--r-- | app/views/issues/show.html.erb | 14 |
2 files changed, 13 insertions, 11 deletions
diff --git a/app/views/issues/_action_menu_edit.html.erb b/app/views/issues/_action_menu_edit.html.erb new file mode 100644 index 000000000..a189d7c45 --- /dev/null +++ b/app/views/issues/_action_menu_edit.html.erb @@ -0,0 +1,10 @@ +<div style="clear: both;"></div> +<%= render :partial => 'action_menu' %> + +<div style="clear: both;"></div> +<% if @issue.editable? %> + <div id="update" style="display:none;"> + <h3><%= l(:button_edit) %></h3> + <%= render :partial => 'edit' %> + </div> +<% end %> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index f1f279170..97a2448d6 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -125,6 +125,8 @@ end %> </div> <% end %> +<%= render partial: 'action_menu_edit' if User.current.wants_comments_in_reverse_order? %> + <% if @journals.present? %> <div id="history"> <h3><%=l(:label_history)%></h3> @@ -132,17 +134,7 @@ end %> </div> <% end %> - -<div style="clear: both;"></div> -<%= render :partial => 'action_menu' %> - -<div style="clear: both;"></div> -<% if @issue.editable? %> - <div id="update" style="display:none;"> - <h3><%= l(:button_edit) %></h3> - <%= render :partial => 'edit' %> - </div> -<% end %> +<%= render partial: 'action_menu_edit' unless User.current.wants_comments_in_reverse_order? %> <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> |