diff .svn/pristine/1f/1f78c9cd9879f6fcb3d4c7ae2bf80de5b578d42c.svn-base @ 940:9fda6880be81 cannam

Merge from the default branch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/1f/1f78c9cd9879f6fcb3d4c7ae2bf80de5b578d42c.svn-base	Wed Jul 11 14:35:59 2012 +0100
@@ -0,0 +1,56 @@
+<% show_revision_graph = ( @repository.supports_revision_graph? && path.blank? ) %>
+<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => to_path_param(path)}, :method => :get) do %>
+<table class="list changesets">
+<thead><tr>
+<% if show_revision_graph %>
+  <th></th>
+<% end %>
+<th>#</th>
+<th></th>
+<th></th>
+<th><%= l(:label_date) %></th>
+<th><%= l(:field_author) %></th>
+<th><%= l(:field_comments) %></th>
+</tr></thead>
+<tbody>
+<% show_diff = revisions.size > 1 %>
+<% line_num = 1 %>
+<% revisions.each do |changeset| %>
+<tr class="changeset <%= cycle 'odd', 'even' %>">
+<% if show_revision_graph %>
+  <% if line_num == 1 %>
+    <td class="revision_graph" rowspan="<%= revisions.size %>">
+      <% href_base = Proc.new {|x| url_for(:controller => 'repositories',
+                                           :action => 'revision',
+                                           :id => project,
+                                           :rev => x) } %>
+      <%= render :partial => 'revision_graph',
+                 :locals => {
+                    :commits => index_commits(
+                                         revisions,
+                                         @repository.branches,
+                                         href_base
+                                            )
+                    } %>
+    </td>
+  <% end %>
+<% end %>
+<td class="id"><%= link_to_revision(changeset, project) %></td>
+<td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
+<td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
+<td class="committed_on"><%= format_time(changeset.committed_on) %></td>
+<td class="author"><%= h truncate(changeset.author.to_s, :length => 30) %></td>
+<% if show_revision_graph %>
+  <td class="comments_nowrap">
+    <%= textilizable(truncate(truncate_at_line_break(changeset.comments, 0), :length => 90)) %>
+  </td>
+<% else %>
+  <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
+<% end %>
+</tr>
+<% line_num += 1 %>
+<% end %>
+</tbody>
+</table>
+<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
+<% end %>