diff --git a/app/views/common/_diff.rhtml b/app/views/common/_diff.rhtml new file mode 100644 index 000000000..c849b7ff7 --- /dev/null +++ b/app/views/common/_diff.rhtml @@ -0,0 +1,74 @@ +<% Redmine::UnifiedDiff.new(diff, diff_type).each do |table_file| -%> +
+<% if diff_type == 'sbs' -%> + + + +<% unless @rev.nil? -%> + + + + +<% end -%> + + +<% prev_line_left, prev_line_right = nil, nil -%> +<% table_file.keys.sort.each do |key| -%> +<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%> + +<% end -%> + + + + + + +<% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%> +<% end -%> + +
<%= table_file.file_name %>
@<%= format_revision @rev %>@<%= format_revision @rev_to %>
<%= table_file[key].nb_line_left %> +
<%=to_utf8 table_file[key].line_left %>
+
<%= table_file[key].nb_line_right %> +
<%=to_utf8 table_file[key].line_right %>
+
+ +<% else -%> + + + +<% unless @rev.nil? -%> + + + + + +<% end -%> + + +<% prev_line_left, prev_line_right = nil, nil -%> +<% table_file.keys.sort.each do |key, line| %> +<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%> + +<% end -%> + + + + <% if table_file[key].line_left.empty? -%> + + <% else -%> + + <% end -%> + +<% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%> +<% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%> +<% end -%> + +
<%= table_file.file_name %>
@<%= format_revision @rev %>@<%= format_revision @rev_to %>
<%= table_file[key].nb_line_left %><%= table_file[key].nb_line_right %> +
<%=to_utf8 table_file[key].line_right %>
+
+
<%=to_utf8 table_file[key].line_left %>
+
+<% end -%> + +
+<% end -%> diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml index 802082740..52a5d6057 100644 --- a/app/views/repositories/diff.rhtml +++ b/app/views/repositories/diff.rhtml @@ -12,76 +12,7 @@ <% end %> <% cache(@cache_key) do -%> -<% Redmine::UnifiedDiff.new(@diff, @diff_type).each do |table_file| -%> -
-<% if @diff_type == 'sbs' -%> - - - - - - - - - -<% prev_line_left, prev_line_right = nil, nil -%> -<% table_file.keys.sort.each do |key| -%> -<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%> - -<% end -%> - - - - - - -<% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%> -<% end -%> - -
<%= table_file.file_name %>
@<%= format_revision @rev %>@<%= format_revision @rev_to %>
<%= table_file[key].nb_line_left %> -
<%=to_utf8 table_file[key].line_left %>
-
<%= table_file[key].nb_line_right %> -
<%=to_utf8 table_file[key].line_right %>
-
- -<% else -%> - - - - - - - - - - -<% prev_line_left, prev_line_right = nil, nil -%> -<% table_file.keys.sort.each do |key, line| %> -<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%> - -<% end -%> - - - - <% if table_file[key].line_left.empty? -%> - - <% else -%> - - <% end -%> - -<% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%> -<% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%> -<% end -%> - -
<%= table_file.file_name %>
@<%= format_revision @rev %>@<%= format_revision @rev_to %>
<%= table_file[key].nb_line_left %><%= table_file[key].nb_line_right %> -
<%=to_utf8 table_file[key].line_right %>
-
-
<%=to_utf8 table_file[key].line_left %>
-
-<% end -%> - -
-<% end -%> +<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %> <% end -%>