diff options
author | Go MAEDA <maeda@farend.jp> | 2022-01-17 13:53:35 +0000 |
---|---|---|
committer | Go MAEDA <maeda@farend.jp> | 2022-01-17 13:53:35 +0000 |
commit | 8cc4cff362b6c5ff76c6bf18b4e6778dd08bc81f (patch) | |
tree | 18bc6a66cff39294e03448a575126def129633d2 /app/views | |
parent | 41c8d8a7f60839b19b1ed202b7664d2c8ed401e3 (diff) | |
download | redmine-8cc4cff362b6c5ff76c6bf18b4e6778dd08bc81f.tar.gz redmine-8cc4cff362b6c5ff76c6bf18b4e6778dd08bc81f.zip |
Make issue tabs DOM more consistent (#36429).
Patch by Felix Schäfer.
git-svn-id: http://svn.redmine.org/redmine/trunk@21367 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/issues/tabs/_changesets.html.erb | 4 | ||||
-rw-r--r-- | app/views/issues/tabs/_history.html.erb | 2 | ||||
-rw-r--r-- | app/views/issues/tabs/_time_entries.html.erb | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/app/views/issues/tabs/_changesets.html.erb b/app/views/issues/tabs/_changesets.html.erb index f869a5da2..b06fd4b7e 100644 --- a/app/views/issues/tabs/_changesets.html.erb +++ b/app/views/issues/tabs/_changesets.html.erb @@ -1,6 +1,7 @@ <% @changesets.each do |changeset| %> <div id="changeset-<%= changeset.id %>" class="changeset journal"> - <h4> + <div class="note"> + <h4 class='note-header'> <%= avatar(changeset.user, :size => "24") %> <%= authoring changeset.committed_on, changeset.author, :label => :label_added_time_by %> </h4> @@ -19,6 +20,7 @@ <div class="wiki changeset-comments"> <%= format_changeset_comments changeset %> </div> + </div> </div> <%= call_hook(:view_issues_history_changeset_bottom, { :changeset => changeset }) %> <% end %> diff --git a/app/views/issues/tabs/_history.html.erb b/app/views/issues/tabs/_history.html.erb index 0769f5725..4b908acb5 100644 --- a/app/views/issues/tabs/_history.html.erb +++ b/app/views/issues/tabs/_history.html.erb @@ -6,7 +6,7 @@ <% reply_links = issue.notes_addable? -%> <% for journal in journals %> <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>"> - <div id="note-<%= journal.indice %>"> + <div id="note-<%= journal.indice %>" class="note"> <div class="contextual"> <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> diff --git a/app/views/issues/tabs/_time_entries.html.erb b/app/views/issues/tabs/_time_entries.html.erb index c34edc074..1807475bd 100644 --- a/app/views/issues/tabs/_time_entries.html.erb +++ b/app/views/issues/tabs/_time_entries.html.erb @@ -1,7 +1,9 @@ <% for time_entry in time_entries%> <div id="time-entry-<%= time_entry.id %>" class="time_entry journal"> + <div class="note"> <% if time_entry.editable_by?(User.current) -%> <div class="contextual"> + <span class="journal-actions"> <%= link_to l(:button_edit), edit_time_entry_path(time_entry), :title => l(:button_edit), :class => 'icon-only icon-edit' %> @@ -10,9 +12,10 @@ :method => :delete, :title => l(:button_delete), :class => 'icon-only icon-del' %> + </span> </div> <% end -%> - <h4> + <h4 class='note-header'> <%= avatar(time_entry.user, :size => "24") %> <%= authoring time_entry.created_on, time_entry.user, :label => :label_added_time_by %> </h4> @@ -23,6 +26,7 @@ </li> </ul> <p><%= time_entry.comments %></p> + </div> </div> <%= call_hook(:view_issues_history_time_entry_bottom, { :time_entry => time_entry }) %> <% end %>
\ No newline at end of file |