kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: view: add parents and children on the revision page (#5501) 

Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7721 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-11-03 11:34:09 +00:00
parent e1f3719634
commit cc79b6d04a
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/views/repositories/revision.html.erb
View File

@ -25,8 +25,38 @@
<h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2> <h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
<p><% if @changeset.scmid %>ID: <%= h(@changeset.scmid) %><br /><% end %> <table class="revision-info">
<span class="author"><%= authoring(@changeset.committed_on, @changeset.author) %></span></p> <% if @changeset.scmid %>
<tr>
<td>ID</td><td><%= h(@changeset.scmid) %></td>
</tr>
<% end %>
<% unless @changeset.parents.blank? %>
<tr>
<td><%= l(:label_parent_revision) %></td>
<td>
<%= @changeset.parents.collect{
|p| link_to_revision(p, @project, :text => format_revision(p))
}.join(", ") %><br />
</td>
</tr>
<% end %>
<% unless @changeset.children.blank? %>
<tr>
<td><%= l(:label_child_revision) %></td>
<td>
<%= @changeset.children.collect{
|p| link_to_revision(p, @project, :text => format_revision(p))
}.join(", ") %><br />
</td>
</tr>
<% end %>
</table>
<p>
<span class="author">
<%= authoring(@changeset.committed_on, @changeset.author) %>
</span>
</p>
<%= textilizable @changeset.comments %> <%= textilizable @changeset.comments %>

2
config/locales/en.yml
View File

@ -823,6 +823,8 @@ en:
label_issues_visibility_public: All non private issues label_issues_visibility_public: All non private issues
label_issues_visibility_own: Issues created by or assigned to the user label_issues_visibility_own: Issues created by or assigned to the user
label_git_report_last_commit: Report last commit for files and directories label_git_report_last_commit: Report last commit for files and directories
label_parent_revision: Parent
label_child_revision: Child
button_login: Login button_login: Login
button_submit: Submit button_submit: Submit

5
public/stylesheets/scm.css
View File

@ -1,4 +1,9 @@
table.revision-info td {
margin: 0px;
padding: 0px;
}
div.changeset-changes ul { margin: 0; padding: 0; } div.changeset-changes ul { margin: 0; padding: 0; }
div.changeset-changes ul > ul { margin-left: 18px; padding: 0; } div.changeset-changes ul > ul { margin-left: 18px; padding: 0; }