##// END OF EJS Templates
jro_apps » redmine
RSS
Added the ability to view a file diff with free to/from revision selection....
Jean-Philippe Lang -
r522:599e49e4d033
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,20 +1,29
1 <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project}, :method => :get) do %>
1 <table class="list">
2 <table class="list">
2 <thead><tr>
3 <thead><tr>
3 <th>#</th>
4 <th>#</th>
5 <th></th>
6 <th></th>
4 <th><%= l(:label_date) %></th>
7 <th><%= l(:label_date) %></th>
5 <th><%= l(:field_author) %></th>
8 <th><%= l(:field_author) %></th>
6 <th><%= l(:field_comments) %></th>
9 <th><%= l(:field_comments) %></th>
7 <th></th>
8 </tr></thead>
10 </tr></thead>
9 <tbody>
11 <tbody>
12 <% show_diff = entry && entry.is_file? && changesets.size > 1 %>
13 <% line_num = 1 %>
10 <% changesets.each do |changeset| %>
14 <% changesets.each do |changeset| %>
11 <tr class="<%= cycle 'odd', 'even' %>">
15 <tr class="<%= cycle 'odd', 'even' %>">
12 <th align="center" style="width:5%"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></th>
16 <th align="center" style="width:3em;"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></th>
17 <td align="center" style="width:1em;"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < changesets.size) %></td>
18 <td align="center" style="width:1em;"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
13 <td align="center" style="width:15%"><%= format_time(changeset.committed_on) %></td>
19 <td align="center" style="width:15%"><%= format_time(changeset.committed_on) %></td>
14 <td align="center" style="width:15%"><em><%=h changeset.committer %></em></td>
20 <td align="center" style="width:15%"><em><%=h changeset.committer %></em></td>
15 <td align="left"><%= textilizable(changeset.comments) %></td>
21 <td align="left"><%= textilizable(changeset.comments) %></td>
16 <td align="center"><%= link_to l(:label_view_diff), :action => 'diff', :id => project, :path => path, :rev => changeset.revision if entry && entry.is_file? && changeset != changesets.last %></td>
17 </tr>
22 </tr>
23 <% line_num += 1 %>
18 <% end %>
24 <% end %>
19 </tbody>
25 </tbody>
20 </table> No newline at end of file
26 </table>
27 <%= hidden_field_tag 'path', path %>
28 <%= submit_tag(l(:label_view_diff), :class => 'small', :name => nil) if show_diff %>
29 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now