diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-05-10 17:28:18 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-05-10 17:28:18 +0000 |
| commit | 599e49e4d0339595db5b8f3695b83d8565973702 (patch) | |
| tree | 6b2c8ea8655c7c0134ca3106439d84bd82c325f9 /app/views/repositories/_revisions.rhtml | |
| parent | cff3950e6bda624c70d09cdda40e098e4b81736a (diff) | |
| download | redmine-599e49e4d0339595db5b8f3695b83d8565973702.tar.gz redmine-599e49e4d0339595db5b8f3695b83d8565973702.zip | |
Added the ability to view a file diff with free to/from revision selection.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@525 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/repositories/_revisions.rhtml')
| -rw-r--r-- | app/views/repositories/_revisions.rhtml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml index c297b5d03..6972828b5 100644 --- a/app/views/repositories/_revisions.rhtml +++ b/app/views/repositories/_revisions.rhtml @@ -1,20 +1,29 @@ +<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project}, :method => :get) do %> <table class="list"> <thead><tr> <th>#</th> +<th></th> +<th></th> <th><%= l(:label_date) %></th> <th><%= l(:field_author) %></th> <th><%= l(:field_comments) %></th> -<th></th> </tr></thead> <tbody> +<% show_diff = entry && entry.is_file? && changesets.size > 1 %> +<% line_num = 1 %> <% changesets.each do |changeset| %> <tr class="<%= cycle 'odd', 'even' %>"> -<th align="center" style="width:5%"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></th> +<th align="center" style="width:3em;"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></th> +<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> +<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> <td align="center" style="width:15%"><%= format_time(changeset.committed_on) %></td> <td align="center" style="width:15%"><em><%=h changeset.committer %></em></td> <td align="left"><%= textilizable(changeset.comments) %></td> -<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> </tr> +<% line_num += 1 %> <% end %> </tbody> -</table>
\ No newline at end of file +</table> +<%= hidden_field_tag 'path', path %> +<%= submit_tag(l(:label_view_diff), :class => 'small', :name => nil) if show_diff %> +<% end %> |