Mercurial > hg > soundsoftware-site

comparison app/views/common/.svn/text-base/_diff.rhtml.svn-base @ 119:8661b858af72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Update to Redmine trunk rev 4705
author Chris Cannam
date Thu, 13 Jan 2011 14:12:06 +0000
parents 513646585e45
children cbce1fd3b1b7
comparison
equal deleted inserted replaced
39:150ceac17a8d 119:8661b858af72
2 <% diff.each do |table_file| -%> 2 <% diff.each do |table_file| -%>
3 <div class="autoscroll"> 3 <div class="autoscroll">
4 <% if diff_type == 'sbs' -%> 4 <% if diff_type == 'sbs' -%>
5 <table class="filecontent"> 5 <table class="filecontent">
6 <thead> 6 <thead>
7 <tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr> 7 <tr><th colspan="4" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
8 </thead> 8 </thead>
9 <tbody> 9 <tbody>
10 <% prev_line_left, prev_line_right = nil, nil -%> 10 <% prev_line_left, prev_line_right = nil, nil -%>
11 <% table_file.keys.sort.each do |key| -%> 11 <% table_file.keys.sort.each do |key| -%>
12 <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%> 12 <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
29 </table> 29 </table>
30 30
31 <% else -%> 31 <% else -%>
32 <table class="filecontent syntaxhl"> 32 <table class="filecontent syntaxhl">
33 <thead> 33 <thead>
34 <tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr> 34 <tr><th colspan="3" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
35 </thead> 35 </thead>
36 <tbody> 36 <tbody>
37 <% prev_line_left, prev_line_right = nil, nil -%> 37 <% prev_line_left, prev_line_right = nil, nil -%>
38 <% table_file.keys.sort.each do |key, line| %> 38 <% table_file.keys.sort.each do |key, line| %>
39 <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%> 39 <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>