diff.rhtml
93 lines
| 2.8 KiB
| text/html+ruby
|
RhtmlLexer
|
r341 | <h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2> | ||
|
r330 | |||
|
r387 | <!-- Choose view type --> | ||
<% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %> | ||||
<% params.each do |k, p| %> | ||||
<% if k != "type" %> | ||||
<%= hidden_field_tag(k,p) %> | ||||
<% end %> | ||||
<% end %> | ||||
<p><label><%= l(:label_view_diff) %></label> | ||||
|
r880 | <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p> | ||
|
r387 | <% end %> | ||
|
r496 | |||
<% cache(@cache_key) do %> | ||||
|
r387 | <% @diff.each do |table_file| %> | ||
|
r1002 | <div class="autoscroll"> | ||
|
r496 | <% if @diff_type == 'sbs' %> | ||
|
r736 | <table class="filecontent CodeRay"> | ||
|
r387 | <thead> | ||
<tr> | ||||
|
r736 | <th colspan="4" class="filename"> | ||
|
r496 | <%= table_file.file_name %> | ||
|
r387 | </th> | ||
</tr> | ||||
<tr> | ||||
|
r496 | <th colspan="2">@<%= @rev %></th> | ||
<th colspan="2">@<%= @rev_to %></th> | ||||
|
r387 | </tr> | ||
</thead> | ||||
<tbody> | ||||
<% table_file.keys.sort.each do |key| %> | ||||
<tr> | ||||
<th class="line-num"> | ||||
<%= table_file[key].nb_line_left %> | ||||
</th> | ||||
<td class="line-code <%= table_file[key].type_diff_left %>"> | ||||
|
r803 | <pre><%=to_utf8 table_file[key].line_left %></pre> | ||
|
r387 | </td> | ||
<th class="line-num"> | ||||
<%= table_file[key].nb_line_right %> | ||||
</th> | ||||
<td class="line-code <%= table_file[key].type_diff_right %>"> | ||||
|
r803 | <pre><%=to_utf8 table_file[key].line_right %></pre> | ||
|
r387 | </td> | ||
</tr> | ||||
<% end %> | ||||
</tbody> | ||||
</table> | ||||
|
r330 | |||
|
r387 | <% else %> | ||
|
r736 | <table class="filecontent CodeRay"> | ||
|
r387 | <thead> | ||
<tr> | ||||
|
r736 | <th colspan="3" class="filename"> | ||
|
r496 | <%= table_file.file_name %> | ||
|
r387 | </th> | ||
</tr> | ||||
<tr> | ||||
<th>@<%= @rev %></th> | ||||
<th>@<%= @rev_to %></th> | ||||
<th></th> | ||||
</tr> | ||||
</thead> | ||||
<tbody> | ||||
<% table_file.keys.sort.each do |key, line| %> | ||||
<tr> | ||||
<th class="line-num"> | ||||
<%= table_file[key].nb_line_left %> | ||||
</th> | ||||
<th class="line-num"> | ||||
<%= table_file[key].nb_line_right %> | ||||
</th> | ||||
<% if table_file[key].line_left.empty? %> | ||||
<td class="line-code <%= table_file[key].type_diff_right %>"> | ||||
|
r803 | <pre><%=to_utf8 table_file[key].line_right %></pre> | ||
|
r387 | </td> | ||
<% else %> | ||||
<td class="line-code <%= table_file[key].type_diff_left %>"> | ||||
|
r803 | <pre><%=to_utf8 table_file[key].line_left %></pre> | ||
|
r387 | </td> | ||
<% end %> | ||||
</tr> | ||||
<% end %> | ||||
</tbody> | ||||
</table> | ||||
<% end %> | ||||
|
r1002 | </div> | ||
|
r330 | <% end %> | ||
|
r496 | <% end %> | ||
|
r330 | |||
<% content_for :header_tags do %> | ||||
<%= stylesheet_link_tag "scm" %> | ||||
<% end %> | ||||