Revision 1298:4f746d8966dd app/views/common

View differences:

app/views/common/_diff.html.erb
10 10 
<thead>
11 11 
<tr>
12 12 
  <th colspan="4" class="filename">
13 
    <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
13 
    <%= table_file.file_name %>
14 14 
  </th>
15 15 
</tr>
16 16 
</thead>
......
24 24 
<tr>
25 25 
  <th class="line-num"><%= line.nb_line_left %></th>
26 26 
  <td class="line-code <%= line.type_diff_left %>">
27 
    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left).html_safe %></pre>
27 
    <pre><%= line.html_line_left.html_safe %></pre>
28 28 
  </td>
29 29 
  <th class="line-num"><%= line.nb_line_right %></th>
30 30 
  <td class="line-code <%= line.type_diff_right %>">
31 
    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right).html_safe %></pre>
31 
    <pre><%= line.html_line_right.html_safe %></pre>
32 32 
  </td>
33 33 
</tr>
34 34 
<% end -%>
......
40 40 
<thead>
41 41 
  <tr>
42 42 
    <th colspan="3" class="filename">
43 
      <%= h(Redmine::CodesetUtil.to_utf8_by_setting(table_file.file_name)) %>
43 
      <%= table_file.file_name %>
44 44 
    </th>
45 45 
  </tr>
46 46 
</thead>
......
55 55 
  <th class="line-num"><%= line.nb_line_left %></th>
56 56 
  <th class="line-num"><%= line.nb_line_right %></th>
57 57 
  <td class="line-code <%= line.type_diff %>">
58 
    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line).html_safe %></pre>
58 
    <pre><%= line.html_line.html_safe %></pre>
59 59 
  </td>
60 60 
</tr>
61 61 
<% end -%>
app/views/common/_preview.html.erb
1 1 
<fieldset class="preview"><legend><%= l(:label_preview) %></legend>
2 
<%= textilizable @text, :attachments => @attachements, :object => @previewed %>
2 
<%= textilizable @text, :attachments => @attachments, :object => @previewed %>
3 3 
</fieldset>

Also available in: Unified diff