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

diff --git a/app/views/repositories/revision.html.erb b/app/views/repositories/revision.html.erb
index 85b11d44129f2d823f02472e760b3940fa834f64..000666e85634d2993d44f9aa9f095ed4f41a674f 100644 (file)
--- a/app/views/repositories/revision.html.erb
+++ b/app/views/repositories/revision.html.erb
@@ -25,8 +25,38 @@
 
 <h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
 
-<p><% if @changeset.scmid %>ID: <%= h(@changeset.scmid) %><br /><% end %>
-<span class="author"><%= authoring(@changeset.committed_on, @changeset.author) %></span></p>
+<table class="revision-info">
+  <% 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 %>
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8a792d478ac8a1ad22968f21b9c2084144c96f03..ee87170570eaf5b73c98cbe21a7fe6468236b13b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -823,6 +823,8 @@ en:
   label_issues_visibility_public: All non private issues
   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_parent_revision: Parent
+  label_child_revision: Child
 
   button_login: Login
   button_submit: Submit

diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index 689d9227763b2161f47a7b85d8303f83200cad80..0f4cc626f78ab3d70dba8728be7ab62bd74b8486 100644 (file)
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -1,4 +1,9 @@
 
+table.revision-info td {
+    margin:  0px;
+    padding: 0px;
+}
+
 div.changeset-changes ul { margin: 0; padding: 0; }
 div.changeset-changes ul > ul { margin-left: 18px; padding: 0; }