##// END OF EJS Templates
jro_apps » redmine
RSS
Added wiki annotate view. It's accessible for each version from the page history view. ...
Added wiki annotate view. It's accessible for each version from the page history view. Slight style change: pre-wrap added on file/diff contents. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1020 e93f8b46-1217-0410-a6f0-8f06a7374b81
Jean-Philippe Lang - - Load All Authors

File last commit:

r1002:49bdf62243dc
r1007:31c6ebb31046
Show More
diff.rhtml
93 lines | 2.8 KiB | text/html+ruby | RhtmlLexer
/ app / views / repositories / diff.rhtml
History | Source | Raw |Copy content |Copy permalink
Jean-Philippe Lang
fixed problems when svn path doesn't point to the root directory of the repository....
 r341 <h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2>
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 <!-- Choose view type -->
<% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
<% params.each do |k, p| %>
<% if k != "type" %>
<%= hidden_field_tag(k,p) %>
<% end %>
<% end %>
<p><label><%= l(:label_view_diff) %></label>
Jean-Philippe Lang
Diff style (inline or side by side) automatically saved as a user preference....
 r880 <%= 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>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 <% end %>
Jean-Philippe Lang
Added fragment caching for svn diffs....
 r496
<% cache(@cache_key) do %>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 <% @diff.each do |table_file| %>
Jean-Philippe Lang
Add autoscroll div for each file diff....
 r1002 <div class="autoscroll">
Jean-Philippe Lang
Added fragment caching for svn diffs....
 r496 <% if @diff_type == 'sbs' %>
Jean-Philippe Lang
Application layout refactored....
 r736 <table class="filecontent CodeRay">
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 <thead>
<tr>
Jean-Philippe Lang
Application layout refactored....
 r736 <th colspan="4" class="filename">
Jean-Philippe Lang
Added fragment caching for svn diffs....
 r496 <%= table_file.file_name %>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 </th>
</tr>
<tr>
Jean-Philippe Lang
Added fragment caching for svn diffs....
 r496 <th colspan="2">@<%= @rev %></th>
<th colspan="2">@<%= @rev_to %></th>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 </tr>
</thead>
<tbody>
<% table_file.keys.sort.each do |key| %>
<tr>
<th class="line-num">
<%= table_file[key].nb_line_left %>
</th>
<td class="line-code <%= table_file[key].type_diff_left %>">
Jean-Philippe Lang
Default encodings for repository files can now be set in application settings (Admin -> Settings -> Repositories encodings)....
 r803 <pre><%=to_utf8 table_file[key].line_left %></pre>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 </td>
<th class="line-num">
<%= table_file[key].nb_line_right %>
</th>
<td class="line-code <%= table_file[key].type_diff_right %>">
Jean-Philippe Lang
Default encodings for repository files can now be set in application settings (Admin -> Settings -> Repositories encodings)....
 r803 <pre><%=to_utf8 table_file[key].line_right %></pre>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 </td>
</tr>
<% end %>
</tbody>
</table>
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 <% else %>
Jean-Philippe Lang
Application layout refactored....
 r736 <table class="filecontent CodeRay">
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 <thead>
<tr>
Jean-Philippe Lang
Application layout refactored....
 r736 <th colspan="3" class="filename">
Jean-Philippe Lang
Added fragment caching for svn diffs....
 r496 <%= table_file.file_name %>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 </th>
</tr>
<tr>
<th>@<%= @rev %></th>
<th>@<%= @rev_to %></th>
<th></th>
</tr>
</thead>
<tbody>
<% table_file.keys.sort.each do |key, line| %>
<tr>
<th class="line-num">
<%= table_file[key].nb_line_left %>
</th>
<th class="line-num">
<%= table_file[key].nb_line_right %>
</th>
<% if table_file[key].line_left.empty? %>
<td class="line-code <%= table_file[key].type_diff_right %>">
Jean-Philippe Lang
Default encodings for repository files can now be set in application settings (Admin -> Settings -> Repositories encodings)....
 r803 <pre><%=to_utf8 table_file[key].line_right %></pre>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 </td>
<% else %>
<td class="line-code <%= table_file[key].type_diff_left %>">
Jean-Philippe Lang
Default encodings for repository files can now be set in application settings (Admin -> Settings -> Repositories encodings)....
 r803 <pre><%=to_utf8 table_file[key].line_left %></pre>
Jean-Philippe Lang
patch #9627 Add Side by Side in Diff view (Cyril Mougel)...
 r387 </td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
<% end %>
Jean-Philippe Lang
Add autoscroll div for each file diff....
 r1002 </div>
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330 <% end %>
Jean-Philippe Lang
Added fragment caching for svn diffs....
 r496 <% end %>
Jean-Philippe Lang
added svn:eol-style native property on /app files...
 r330
<% content_for :header_tags do %>
<%= stylesheet_link_tag "scm" %>
<% end %>