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