Mercurial > hg > soundsoftware-site
diff app/views/repositories/diff.html.erb @ 1115:433d4f72a19b redmine-2.2
Update to Redmine SVN revision 11137 on 2.2-stable branch
author | Chris Cannam |
---|---|
date | Mon, 07 Jan 2013 12:01:42 +0000 |
parents | cbb26bc654de |
children | bb32da3bea34 |
line wrap: on
line diff
--- a/app/views/repositories/diff.html.erb Wed Jun 27 14:54:18 2012 +0100 +++ b/app/views/repositories/diff.html.erb Mon Jan 07 12:01:42 2013 +0000 @@ -1,20 +1,19 @@ <h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2> <!-- Choose view type --> -<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %> - <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %> +<%= form_tag({:action => 'diff', :id => @project, + :repository_id => @repository.identifier_param, + :path => to_path_param(@path), :rev=> @rev}, :method => 'get') do %> <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %> <p> - <label><%= l(:label_view_diff) %></label> - <%= 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()}" %> + <%= l(:label_view_diff) %>: + <label><%= radio_button_tag 'type', 'inline', @diff_type != 'sbs', :onchange => "this.form.submit()" %> <%= l(:label_diff_inline) %></label> + <label><%= radio_button_tag 'type', 'sbs', @diff_type == 'sbs', :onchange => "this.form.submit()" %> <%= l(:label_diff_side_by_side) %></label> </p> <% end %> <% cache(@cache_key) do -%> -<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %> +<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type, :diff_style => @repository.class.scm_name} %> <% end -%> <% other_formats_links do |f| %>