diff .svn/pristine/54/549c0979db66eee16f159587f161c81dea52c794.svn-base @ 926:b73a59a6acbd luisf

Merge from cannam_integration

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/54/549c0979db66eee16f159587f161c81dea52c794.svn-base	Fri May 11 16:10:11 2012 +0100
@@ -0,0 +1,28 @@
+<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] %>
+  <%= 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()}" %>
+  </p>
+<% end %>
+
+<% cache(@cache_key) do -%>
+<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
+<% 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 %>