jro_apps/redmine Commit - r6240:f742cef0f157

1

<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>

1

<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>

2

3

<% diff.each do |table_file| -%>

3

<% diff.each do |table_file| -%>

4

4

5

<% if diff.diff_type == 'sbs' -%>

5

<% if diff.diff_type == 'sbs' -%>

6

6

7

<thead>

7

<thead>

8

8

9

</thead>

9

</thead>

10

<tbody>

10

<tbody>

11

<% table_file.each_line do |spacing, line| -%>

11

<% table_file.each_line do |spacing, line| -%>

12

<% if spacing -%>

12

<% if spacing -%>

13

13

14

14

15

</tr>

15

</tr>

16

<% end -%>

16

<% end -%>

17

<tr>

17

<tr>

18

18

19

19

20

20

21

</td>

21

</td>

22

22

23

23

24

24

25

</td>

25

</td>

26

</tr>

26

</tr>

27

<% end -%>

27

<% end -%>

28

</tbody>

28

</tbody>

29

</table>

29

</table>

30

31

<% else -%>

31

<% else -%>

32

32

33

<thead>

33

<thead>

34

34

35

</thead>

35

</thead>

36

<tbody>

36

<tbody>

37

<% table_file.each_line do |spacing, line| %>

37

<% table_file.each_line do |spacing, line| %>

38

<% if spacing -%>

38

<% if spacing -%>

39

39

40

40

41

</tr>

41

</tr>

42

<% end -%>

42

<% end -%>

43

<tr>

43

<tr>

44

44

45

45

46

46

47

47

48

</td>

48

</td>

49

</tr>

49

</tr>

50

<% end -%>

50

<% end -%>

51

</tbody>

51

</tbody>

52

</table>

52

</table>

53

<% end -%>

53

<% end -%>

54

</div>

54

</div>

55

<% end -%>

55

<% end -%>

56

57

<%= l(:text_diff_truncated) if diff.truncated? %>

57

<%= l(:text_diff_truncated) if diff.truncated? %>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             <% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
             <% diff.each do |table_file| -%>
             <div class="autoscroll">
             <% if diff.diff_type == 'sbs' -%>
             <table class="filecontent">
             <thead>
-            <tr><th colspan="4" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
+            <tr><th colspan="4" class="filename"><%=h(to_utf8(table_file.file_name)) %></th></tr>
             </thead>
             <tbody>
             <% table_file.each_line do |spacing, line| -%>
             <% if spacing -%>
             <tr class="spacing">
               <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
             </tr>
             <% end -%>
             <tr>
               <th class="line-num"><%= line.nb_line_left %></th>
               <td class="line-code <%= line.type_diff_left %>">
                 <pre><%=to_utf8 line.html_line_left %></pre>
               </td>
               <th class="line-num"><%= line.nb_line_right %></th>
               <td class="line-code <%= line.type_diff_right %>">
                 <pre><%=to_utf8 line.html_line_right %></pre>
               </td>
             </tr>
             <% end -%>
             </tbody>
             </table>
             <% else -%>
             <table class="filecontent">
             <thead>
-            <tr><th colspan="3" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
+            <tr><th colspan="3" class="filename"><%=h(to_utf8(table_file.file_name)) %></th></tr>
             </thead>
             <tbody>
             <% table_file.each_line do |spacing, line| %>
             <% if spacing -%>
             <tr class="spacing">
               <th class="line-num">...</th><th class="line-num">...</th><td></td>
             </tr>
             <% end -%>
             <tr>
               <th class="line-num"><%= line.nb_line_left %></th>
               <th class="line-num"><%= line.nb_line_right %></th>
               <td class="line-code <%= line.type_diff %>">
                 <pre><%=to_utf8 line.html_line %></pre>
               </td>
             </tr>
             <% end -%>
             </tbody>
             </table>
             <% end -%>
             </div>
             <% end -%>
             <%= l(:text_diff_truncated) if diff.truncated? %>