From 942b85e441767b7bb66c33d341ca5f12b2df0a7b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 30 Aug 2016 21:11:57 +0000 Subject: [PATCH] Show revision details using the same structure and look from the journals details (#23146). Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@15761 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/repositories/_changeset.html.erb | 37 ++++++++++------------ public/stylesheets/application.css | 6 ++-- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/app/views/repositories/_changeset.html.erb b/app/views/repositories/_changeset.html.erb index 3c2c1c09d..dbdf17160 100644 --- a/app/views/repositories/_changeset.html.erb +++ b/app/views/repositories/_changeset.html.erb @@ -1,41 +1,36 @@ -

<%= avatar(@changeset.user, :size => "24") %><%= l(:label_revision) %> <%= format_revision(@changeset) %>

+

<%= l(:label_revision) %> <%= format_revision(@changeset) %>

+

+ <%= avatar(@changeset.user, :size => "24") %> + <%= authoring(@changeset.committed_on, @changeset.author) %> +

<% if @changeset.scmid.present? || @changeset.parents.present? || @changeset.children.present? %> - + - - +
  • + ID <%= @changeset.scmid %> +
  • <% end %> <% if @changeset.parents.present? %> - - - - + <% end %> <% if @changeset.children.present? %> - - - - + <% end %> -
    ID<%= @changeset.scmid %>
    <%= l(:label_parent_revision) %> +
  • + <%= l(:label_parent_revision) %> <%= @changeset.parents.collect{ |p| link_to_revision(p, @repository, :text => format_revision(p)) }.join(", ").html_safe %> -
  • <%= l(:label_child_revision) %> +
  • + <%= l(:label_child_revision) %> <%= @changeset.children.collect{ |p| link_to_revision(p, @repository, :text => format_revision(p)) }.join(", ").html_safe %> -
  • + <% end %> -

    - - <%= authoring(@changeset.committed_on, @changeset.author) %> - -

    <%= textilizable @changeset.comments %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index bbc32992e..6786cb950 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -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; }