diff --git a/app/views/repositories/_changeset.html.erb b/app/views/repositories/_changeset.html.erb index 3c2c1c0..dbdf171 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 3ab2ecc..d09e1c7 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -432,9 +432,9 @@ div#issue-changesets p { margin-top: 0; margin-bottom: 1em;} .journal ul.details img {margin:0 0 -3px 4px;} 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; }