diff --git a/app/views/repositories/commit_diff.html.erb b/app/views/repositories/commit_diff.html.erb index 9a6000c35..915a5a818 100644 --- a/app/views/repositories/commit_diff.html.erb +++ b/app/views/repositories/commit_diff.html.erb @@ -1,59 +1,57 @@ -
-

<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

-
- - - - - - - -
Commit - <%= @commit_details.id %>
-
  • - <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %> -
  • -
    -
    <%= @commit_details.message %>
    - +
    +
    +

    <%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

    +
    + + + + + + + +
    Commit + <%= @commit_details.id %>
    +
  • + <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %> +
  • +
    +
    <%= @commit_details.message %>
    + - - - + + + - + -<% @commit_diff.each do |cd| %> -
    - - <%= cd.new_path %> - -
    -
    - - - <% line_num = diff_line_num(cd.diff) %> - <% diff_content = diff_content(cd.diff) %> - <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %> - - - <% if line[0,1] == "-" %> - - <% elsif line[0,1] == "+" %> - - <% else%> - - <% end %> - - <% line_num += 1 %> - <% end %> - -
    - <%= line_num %> -
    <%= line.html_safe %>
    <%= line.html_safe %>
    <%= line.html_safe %>
    -
    -<% end %> - - \ No newline at end of file + <% @commit_diff.each do |cd| %> +
    + + <%= cd.new_path %> + +
    +
    + + + <% line_num = diff_line_num(cd.diff) %> + <% diff_content = diff_content(cd.diff) %> + <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %> + + + <% if line[0,1] == "-" %> + + <% elsif line[0,1] == "+" %> + + <% else%> + + <% end %> + + <% line_num += 1 %> + <% end %> + +
    + <%= line_num %> +
    <%= line.html_safe %>
    <%= line.html_safe %>
    <%= line.html_safe %>
    +
    + <% end %> +
    diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 922ac4e8c..4c7ed2910 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -400,8 +400,8 @@ tr.open span.expander {background-image: url(/images/bullet_toggle_minus.png);} /*版本库diff*/ .showing-changes-info {width:710px; padding:10px; padding-top: 0px; background-color:#ffffff; line-height:2;} -.showing-changes-project {width:710px; padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} -.showing-changes-row {width:710px; padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} +.showing-changes-project {padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} +.showing-changes-row {padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} #changed-files-detail {display:none;} #changed-files-detail li {list-style-type:disc; margin-left:15px;} .showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}