Revision 441:cbce1fd3b1b7 app/views/common/.svn

View differences:

app/views/common/.svn/all-wcprops
1 1
K 25
2 2
svn:wc:ra_dav:version-url
3
V 41
4
/svn/!svn/ver/4604/trunk/app/views/common
3
V 55
4
/svn/!svn/ver/5878/branches/1.2-stable/app/views/common
5 5
END
6
_file.rhtml
7
K 25
8
svn:wc:ra_dav:version-url
9
V 53
10
/svn/!svn/ver/3585/trunk/app/views/common/_file.rhtml
11
END
12
error.html.erb
13
K 25
14
svn:wc:ra_dav:version-url
15
V 56
16
/svn/!svn/ver/4286/trunk/app/views/common/error.html.erb
17
END
18
feed.atom.rxml
19
K 25
20
svn:wc:ra_dav:version-url
21
V 56
22
/svn/!svn/ver/2768/trunk/app/views/common/feed.atom.rxml
23
END
24
_preview.rhtml
25
K 25
26
svn:wc:ra_dav:version-url
27
V 56
28
/svn/!svn/ver/1699/trunk/app/views/common/_preview.rhtml
29
END
30
_diff.rhtml
31
K 25
32
svn:wc:ra_dav:version-url
33
V 53
34
/svn/!svn/ver/4604/trunk/app/views/common/_diff.rhtml
35
END
36
_calendar.rhtml
37
K 25
38
svn:wc:ra_dav:version-url
39
V 57
40
/svn/!svn/ver/3790/trunk/app/views/common/_calendar.rhtml
41
END
42
_tabs.rhtml
43
K 25
44
svn:wc:ra_dav:version-url
45
V 53
46
/svn/!svn/ver/3174/trunk/app/views/common/_tabs.rhtml
47
END
app/views/common/.svn/entries
1 1
10
2 2

  
3 3
dir
4
4993
5
http://redmine.rubyforge.org/svn/trunk/app/views/common
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views/common
6 6
http://redmine.rubyforge.org/svn
7 7

  
8 8

  
9 9

  
10
2011-01-01T13:40:36.520874Z
11
4604
12
jplang
10
2011-05-21T04:26:15.661225Z
11
5872
12
tmaruyama
13 13

  
14 14

  
15 15

  
......
32 32

  
33 33

  
34 34

  
35
2011-03-03T11:05:11.000000Z
35
2011-06-06T13:14:59.000000Z
36 36
f95c4268a6ac374ab617da665e57a3ad
37 37
2010-03-14T13:22:50.317701Z
38 38
3585
......
66 66

  
67 67

  
68 68

  
69
2011-03-03T11:05:11.000000Z
70
882dace2c9ea129616067a2052cebef4
71
2010-10-23T11:07:04.019894Z
72
4286
73
jplang
69
2011-06-06T13:18:33.000000Z
70
df19ed70179aa9f6d4ffc2403ac593bc
71
2011-05-21T04:26:15.661225Z
72
5872
73
tmaruyama
74
has-props
74 75

  
75 76

  
76 77

  
......
91 92

  
92 93

  
93 94

  
94

  
95
156
95
150
96 96

97 97
feed.atom.rxml
98 98
file
......
100 100

  
101 101

  
102 102

  
103
2011-03-03T11:05:11.000000Z
103
2011-06-06T13:14:59.000000Z
104 104
e2b0309f637e9a49ef39f8401f3190c5
105 105
2009-05-26T08:28:36.964305Z
106 106
2768
......
134 134

  
135 135

  
136 136

  
137
2011-03-03T11:05:11.000000Z
137
2011-06-06T13:14:59.000000Z
138 138
d03b1c3719bd49af7d930d210a8e8328
139 139
2008-07-26T12:54:54.604420Z
140 140
1699
......
168 168

  
169 169

  
170 170

  
171
2011-03-03T11:05:11.000000Z
172
1938ad8ac1793e75074891018e795398
173
2011-01-01T13:40:36.520874Z
174
4604
171
2011-06-06T13:18:33.000000Z
172
358b5f24bf743ee83c21cf15289b0a60
173
2011-03-11T20:23:29.177962Z
174
5094
175 175
jplang
176 176
has-props
177 177

  
......
194 194

  
195 195

  
196 196

  
197
2520
197
1541
198 198

199 199
_calendar.rhtml
200 200
file
......
202 202

  
203 203

  
204 204

  
205
2011-03-03T11:05:11.000000Z
205
2011-06-06T13:14:59.000000Z
206 206
18b2d631fabd5720aa07d369da11d0de
207 207
2010-06-19T22:52:15.523619Z
208 208
3790
......
236 236

  
237 237

  
238 238

  
239
2011-03-03T11:05:11.000000Z
239
2011-06-06T13:14:59.000000Z
240 240
6e7716818f87ed1ad9839c6e9a92ed1b
241 241
2009-12-14T20:13:29.438642Z
242 242
3174
app/views/common/.svn/text-base/_diff.rhtml.svn-base
1 1
<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
2

  
2 3
<% diff.each do |table_file| -%>
3 4
<div class="autoscroll">
4
<% if diff_type == 'sbs' -%>
5
<% if diff.diff_type == 'sbs' -%>
5 6
<table class="filecontent">
6 7
<thead>
7 8
<tr><th colspan="4" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
8 9
</thead>
9 10
<tbody>
10
<% prev_line_left, prev_line_right = nil, nil -%>
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) -%>
11
<% table_file.each_line do |spacing, line| -%>
12
<% if spacing -%>
13 13
<tr class="spacing">
14
<th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
14
  <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
15
</tr>
15 16
<% end -%>
16 17
<tr>
17
  <th class="line-num"><%= table_file[key].nb_line_left %></th>
18
  <td class="line-code <%= table_file[key].type_diff_left %>">
19
    <pre><%=to_utf8 table_file[key].line_left %></pre>
18
  <th class="line-num"><%= line.nb_line_left %></th>
19
  <td class="line-code <%= line.type_diff_left %>">
20
    <pre><%=to_utf8 line.html_line_left %></pre>
20 21
  </td>
21
  <th class="line-num"><%= table_file[key].nb_line_right %></th>
22
  <td class="line-code <%= table_file[key].type_diff_right %>">
23
    <pre><%=to_utf8 table_file[key].line_right %></pre>
22
  <th class="line-num"><%= line.nb_line_right %></th>
23
  <td class="line-code <%= line.type_diff_right %>">
24
    <pre><%=to_utf8 line.html_line_right %></pre>
24 25
  </td>
25 26
</tr>
26
<% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%>
27 27
<% end -%>
28 28
</tbody>
29 29
</table>
30 30

  
31 31
<% else -%>
32
<table class="filecontent syntaxhl">
32
<table class="filecontent">
33 33
<thead>
34 34
<tr><th colspan="3" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
35 35
</thead>
36 36
<tbody>
37
<% prev_line_left, prev_line_right = nil, nil -%>
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) -%>
37
<% table_file.each_line do |spacing, line| %>
38
<% if spacing -%>
40 39
<tr class="spacing">
41
<th class="line-num">...</th><th class="line-num">...</th><td></td>
40
  <th class="line-num">...</th><th class="line-num">...</th><td></td>
42 41
</tr>
43 42
<% end -%>
44 43
<tr>
45
  <th class="line-num"><%= table_file[key].nb_line_left %></th>
46
  <th class="line-num"><%= table_file[key].nb_line_right %></th>
47
  <% if table_file[key].line_left.empty? -%>
48
  <td class="line-code <%= table_file[key].type_diff_right %>">
49
    <pre><%=to_utf8 table_file[key].line_right %></pre>
44
  <th class="line-num"><%= line.nb_line_left %></th>
45
  <th class="line-num"><%= line.nb_line_right %></th>
46
  <td class="line-code <%= line.type_diff %>">
47
    <pre><%=to_utf8 line.html_line %></pre>
50 48
  </td>
51
  <% else -%>
52
  <td class="line-code <%= table_file[key].type_diff_left %>">
53
    <pre><%=to_utf8 table_file[key].line_left %></pre>
54
  </td>
55
  <% end -%>
56 49
</tr>
57
<% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%>
58
<% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%>
59 50
<% end -%>
60 51
</tbody>
61 52
</table>
62 53
<% end -%>
63

  
64 54
</div>
65 55
<% end -%>
66 56

  
app/views/common/.svn/text-base/error.html.erb.svn-base
1
<h2><%=h @status %></h2>
2

  
3
<p id="errorExplanation"><%=h @message %></p>
4
<p><a href="javascript:history.back()">Back</a></p>
5

  
6
<% html_title @status %>
1
<h2><%=h @status %></h2>
2

  
3
<p id="errorExplanation"><%=h @message %></p>
4
<p><a href="javascript:history.back()">Back</a></p>
5

  
6
<% html_title @status %>

Also available in: Unified diff