diff .svn/pristine/8b/8b9ceab6c5d4ae37a6e81486ce8e0705b50e7186.svn-base @ 1295:622f24f53b42 redmine-2.3

Update to Redmine SVN revision 11972 on 2.3-stable branch
author Chris Cannam
date Fri, 14 Jun 2013 09:02:21 +0100
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/8b/8b9ceab6c5d4ae37a6e81486ce8e0705b50e7186.svn-base	Fri Jun 14 09:02:21 2013 +0100
@@ -0,0 +1,27 @@
+<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
+
+<!-- Choose view type -->
+<%= 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>
+    <%= 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, :diff_style => @repository.class.scm_name} %>
+<% end -%>
+
+<% other_formats_links do |f| %>
+  <%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
+<% end %>
+
+<% html_title(with_leading_slash(@path), 'Diff') -%>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>