##// END OF EJS Templates
Merged r10490 from trunk to 1.4-stable (#11966)...
Toshi MARUYAMA -
r10297:ad238abd0cbd
parent child
Show More
@@ -1,28 +1,29
1 1 <h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
2 2
3 3 <!-- Choose view type -->
4 <% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
5 <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
4 <% form_tag({:action => 'diff', :id => @project,
5 :repository_id => @repository.identifier_param,
6 :path => to_path_param(@path), :rev => @rev}, :method => 'get') do %>
6 7 <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
7 8 <p>
8 9 <label><%= l(:label_view_diff) %></label>
9 10 <%= select_tag 'type',
10 11 options_for_select(
11 12 [[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type),
12 13 :onchange => "if (this.value != '') {this.form.submit()}" %>
13 14 </p>
14 15 <% end %>
15 16
16 17 <% cache(@cache_key) do -%>
17 18 <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
18 19 <% end -%>
19 20
20 21 <% other_formats_links do |f| %>
21 22 <%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
22 23 <% end %>
23 24
24 25 <% html_title(with_leading_slash(@path), 'Diff') -%>
25 26
26 27 <% content_for :header_tags do %>
27 28 <%= stylesheet_link_tag "scm" %>
28 29 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now