diff options
| -rw-r--r-- | app/views/repositories/revision.html.erb | 34 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | public/stylesheets/scm.css | 5 |
3 files changed, 39 insertions, 2 deletions
diff --git a/app/views/repositories/revision.html.erb b/app/views/repositories/revision.html.erb index 85b11d441..000666e85 100644 --- 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 8a792d478..ee8717057 100644 --- 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 689d92277..0f4cc626f 100644 --- 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; } |