meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Show revision details using the same structure and look from the journals details (#23146).

Browse Source 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@15761 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-08-30 21:11:57 +00:00
parent b2171c8dfd
commit 942b85e441
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/repositories/_changeset.html.erb
View File

@ -1,41 +1,36 @@
<h2><%= avatar(@changeset.user, :size => "24") %><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
<h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
<div class="details">
<h4>
<%= avatar(@changeset.user, :size => "24") %>
<%= authoring(@changeset.committed_on, @changeset.author) %>
</h4>
<% if @changeset.scmid.present? || @changeset.parents.present? || @changeset.children.present? %>
<table class="revision-info">
<ul class="revision-info">
<% if @changeset.scmid.present? %>
<tr>
<td>ID</td><td><%= @changeset.scmid %></td>
</tr>
<li>
<strong>ID </strong><%= @changeset.scmid %>
</li>
<% end %>
<% if @changeset.parents.present? %>
<tr>
<td><%= l(:label_parent_revision) %></td>
<td>
<li>
<strong><%= l(:label_parent_revision) %></strong>
<%= @changeset.parents.collect{
|p| link_to_revision(p, @repository, :text => format_revision(p))
}.join(", ").html_safe %>
</td>
</tr>
</li>
<% end %>
<% if @changeset.children.present? %>
<tr>
<td><%= l(:label_child_revision) %></td>
<td>
<li>
<strong><%= l(:label_child_revision) %></strong>
<%= @changeset.children.collect{
|p| link_to_revision(p, @repository, :text => format_revision(p))
}.join(", ").html_safe %>
</td>
</tr>
</li>
<% end %>
</table>
</ul>
<% end %>
<p>
<span class="author">
<%= authoring(@changeset.committed_on, @changeset.author) %>
</span>
</p>
</div>
<%= textilizable @changeset.comments %>

6
public/stylesheets/application.css
View File

@ -433,9 +433,9 @@ div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
div.journal {overflow:auto;}
div.journal.private-notes {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;}
div.journal ul.details {color:#959595; margin-bottom: 1.5em;}
div.journal ul.details a {color:#70A7CD;}
div.journal ul.details a:hover {color:#D14848;}
div.journal ul.details, ul.revision-info {color:#959595; margin-bottom: 1.5em;}
div.journal ul.details a, ul.revision-info a {color:#70A7CD;}
div.journal ul.details a:hover, ul.revision-info a:hover {color:#D14848;}
div#activity dl, #search-results { margin-left: 2em; }
div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }