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