annotate .svn/pristine/85/8534b116ae7f41fef90f037f082cd7b45b00f974.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 <% show_revision_graph = ( @repository.supports_revision_graph? && path.blank? ) %>
Chris@1295 2 <%= if show_revision_graph && revisions && revisions.any?
Chris@1295 3 indexed_commits, graph_space = index_commits(revisions, @repository.branches) do |scmid|
Chris@1295 4 url_for(
Chris@1295 5 :controller => 'repositories',
Chris@1295 6 :action => 'revision',
Chris@1295 7 :id => project,
Chris@1295 8 :repository_id => @repository.identifier_param,
Chris@1295 9 :rev => scmid)
Chris@1295 10 end
Chris@1295 11 render :partial => 'revision_graph',
Chris@1295 12 :locals => {
Chris@1295 13 :commits => indexed_commits,
Chris@1295 14 :space => graph_space
Chris@1295 15 }
Chris@1295 16 end %>
Chris@1295 17 <%= form_tag(
Chris@1295 18 {:controller => 'repositories', :action => 'diff', :id => project,
Chris@1295 19 :repository_id => @repository.identifier_param, :path => to_path_param(path)},
Chris@1295 20 :method => :get
Chris@1295 21 ) do %>
Chris@1295 22 <table class="list changesets">
Chris@1295 23 <thead><tr>
Chris@1295 24 <th>#</th>
Chris@1295 25 <th></th>
Chris@1295 26 <th></th>
Chris@1295 27 <th><%= l(:label_date) %></th>
Chris@1295 28 <th><%= l(:field_author) %></th>
Chris@1295 29 <th><%= l(:field_comments) %></th>
Chris@1295 30 </tr></thead>
Chris@1295 31 <tbody>
Chris@1295 32 <% show_diff = revisions.size > 1 %>
Chris@1295 33 <% line_num = 1 %>
Chris@1295 34 <% revisions.each do |changeset| %>
Chris@1295 35 <tr class="changeset <%= cycle 'odd', 'even' %>">
Chris@1295 36 <% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 20}px" : nil) %>
Chris@1295 37 <%= content_tag(:td, :class => 'id', :style => id_style) do %>
Chris@1295 38 <%= link_to_revision(changeset, @repository) %>
Chris@1295 39 <% end %>
Chris@1295 40 <td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').attr('checked',true);") if show_diff && (line_num < revisions.size) %></td>
Chris@1295 41 <td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('#cb-#{line_num}').attr('checked')) {$('#cb-#{line_num-1}').attr('checked',true);}") if show_diff && (line_num > 1) %></td>
Chris@1295 42 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
Chris@1295 43 <td class="author"><%= h truncate(changeset.author.to_s, :length => 30) %></td>
Chris@1295 44 <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
Chris@1295 45 </tr>
Chris@1295 46 <% line_num += 1 %>
Chris@1295 47 <% end %>
Chris@1295 48 </tbody>
Chris@1295 49 </table>
Chris@1295 50 <%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
Chris@1295 51 <% end %>