meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-20 15:59:53 +00:00
Code Issues Releases Wiki Activity

Make issue tabs DOM more consistent (#36429).

Browse Source 
Patch by Felix Schäfer.


git-svn-id: http://svn.redmine.org/redmine/trunk@21367 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2022-01-17 13:53:35 +00:00
parent 41c8d8a7f6
commit 8cc4cff362
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/issues/tabs/_changesets.html.erb
View File

@ -1,6 +1,7 @@
<% @changesets.each do |changeset| %> <% @changesets.each do |changeset| %>
<div id="changeset-<%= changeset.id %>" class="changeset journal"> <div id="changeset-<%= changeset.id %>" class="changeset journal">
<h4> <div class="note">
<h4 class='note-header'>
<%= avatar(changeset.user, :size => "24") %> <%= avatar(changeset.user, :size => "24") %>
<%= authoring changeset.committed_on, changeset.author, :label => :label_added_time_by %> <%= authoring changeset.committed_on, changeset.author, :label => :label_added_time_by %>
</h4> </h4>
@ -19,6 +20,7 @@
<div class="wiki changeset-comments"> <div class="wiki changeset-comments">
<%= format_changeset_comments changeset %> <%= format_changeset_comments changeset %>
</div> </div>
</div>
</div> </div>
<%= call_hook(:view_issues_history_changeset_bottom, { :changeset => changeset }) %> <%= call_hook(:view_issues_history_changeset_bottom, { :changeset => changeset }) %>
<% end %> <% end %>

2
app/views/issues/tabs/_history.html.erb
View File

@ -6,7 +6,7 @@
<% reply_links = issue.notes_addable? -%> <% reply_links = issue.notes_addable? -%>
<% for journal in journals %> <% for journal in journals %>
<div id="change-<%= journal.id %>" class="<%= journal.css_classes %>"> <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
<div id="note-<%= journal.indice %>"> <div id="note-<%= journal.indice %>" class="note">
<div class="contextual"> <div class="contextual">
<span class="journal-actions"><%= render_journal_actions(issue, journal, :reply_links => reply_links) %></span> <span class="journal-actions"><%= render_journal_actions(issue, journal, :reply_links => reply_links) %></span>
<a href="#note-<%= journal.indice %>" class="journal-link">#<%= journal.indice %></a> <a href="#note-<%= journal.indice %>" class="journal-link">#<%= journal.indice %></a>

6
app/views/issues/tabs/_time_entries.html.erb
View File

@ -1,7 +1,9 @@
<% for time_entry in time_entries%> <% for time_entry in time_entries%>
<div id="time-entry-<%= time_entry.id %>" class="time_entry journal"> <div id="time-entry-<%= time_entry.id %>" class="time_entry journal">
<div class="note">
<% if time_entry.editable_by?(User.current) -%> <% if time_entry.editable_by?(User.current) -%>
<div class="contextual"> <div class="contextual">
<span class="journal-actions">
<%= link_to l(:button_edit), edit_time_entry_path(time_entry), <%= link_to l(:button_edit), edit_time_entry_path(time_entry),
:title => l(:button_edit), :title => l(:button_edit),
:class => 'icon-only icon-edit' %> :class => 'icon-only icon-edit' %>
@ -10,9 +12,10 @@
:method => :delete, :method => :delete,
:title => l(:button_delete), :title => l(:button_delete),
:class => 'icon-only icon-del' %> :class => 'icon-only icon-del' %>
</span>
</div> </div>
<% end -%> <% end -%>
<h4> <h4 class='note-header'>
<%= avatar(time_entry.user, :size => "24") %> <%= avatar(time_entry.user, :size => "24") %>
<%= authoring time_entry.created_on, time_entry.user, :label => :label_added_time_by %> <%= authoring time_entry.created_on, time_entry.user, :label => :label_added_time_by %>
</h4> </h4>
@ -23,6 +26,7 @@
</li> </li>
</ul> </ul>
<p><%= time_entry.comments %></p> <p><%= time_entry.comments %></p>
</div>
</div> </div>
<%= call_hook(:view_issues_history_time_entry_bottom, { :time_entry => time_entry }) %> <%= call_hook(:view_issues_history_time_entry_bottom, { :time_entry => time_entry }) %>
<% end %> <% end %>