Contents of /trunk/viewvc/magellan-template/diff.ezt
Parent Directory | Revision Log
Revision 4 -
(show annotations)
(download)
Tue Oct 30 22:18:26 2012 UTC (11 years, 7 months ago) by niro
File size: 8270 byte(s)
Tue Oct 30 22:18:26 2012 UTC (11 years, 7 months ago) by niro
File size: 8270 byte(s)
-initial viewvc theme for cvs.magellan-linux.de/svn.magellan-linux.de
1 | [# setup page definitions] |
2 | [define page_title]Diff of /[where][end] |
3 | [define help_href][docroot]/help_rootview.html[end] |
4 | [# end] |
5 | |
6 | [include "include/header.ezt" "diff"] |
7 | [include "include/file_header.ezt"] |
8 | |
9 | <h3 style="text-align:center;"></h3> |
10 | |
11 | [if-any raw_diff] |
12 | <pre class="vc_raw_diff">[raw_diff]</pre> |
13 | [end] |
14 | |
15 | [if-any changes] |
16 | <table cellspacing="0" cellpadding="0"> |
17 | <tr class="vc_diff_header"> |
18 | <th style="width:6%;"></th> |
19 | <th style="width:47%; vertical-align:top;"> |
20 | [is path_left path_right][else][path_left][end] |
21 | revision [rev_left], [date_left] |
22 | [if-any tag_left]<br />Tag: [tag_left][end] |
23 | </th> |
24 | <th style="width:47%; vertical-align:top;"> |
25 | [is path_left path_right][else][path_right][end] |
26 | revision [rev_right], [date_right] |
27 | [if-any tag_right]<br />Tag: [tag_right][end] |
28 | </th> |
29 | </tr> |
30 | |
31 | [for changes] |
32 | [is changes.type "header"] |
33 | <tr class="vc_diff_chunk_header" id="h[changes.line_info_right]"> |
34 | <td style="width:6%;"><strong>#</strong></td> |
35 | <td style="width:47%;"> |
36 | <strong>Line [changes.line_info_left]</strong> |
37 | <span class="vc_diff_chunk_extra">[changes.line_info_extra]</span> |
38 | </td> |
39 | <td style="width:47%;"> |
40 | <strong>Line [changes.line_info_right]</strong> |
41 | <span class="vc_diff_chunk_extra">[changes.line_info_extra]</span> |
42 | </td> |
43 | </tr> |
44 | [else] |
45 | [is changes.type "add"] |
46 | <tr> |
47 | <td id="l[changes.line_number]">[if-any annotate_href]<a href="[annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td> |
48 | <td class="vc_diff_empty"> </td> |
49 | <td class="vc_diff_add"> [changes.right]</td> |
50 | </tr> |
51 | [else] |
52 | [is changes.type "remove"] |
53 | <tr> |
54 | <td></td> |
55 | <td class="vc_diff_remove"> [changes.left]</td> |
56 | <td class="vc_diff_empty"> </td> |
57 | </tr> |
58 | [else] |
59 | [is changes.type "change"] |
60 | <tr> |
61 | [if-any changes.have_right] |
62 | <td id="l[changes.line_number]">[if-any annotate_href]<a href="[annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td> |
63 | [else] |
64 | <td></td> |
65 | [end] |
66 | [if-any changes.have_left] |
67 | <td class="vc_diff_change"> [changes.left]</td> |
68 | [else] |
69 | <td class="vc_diff_change_empty"> </td> |
70 | [end] |
71 | [if-any changes.have_right] |
72 | <td class="vc_diff_change"> [changes.right]</td> |
73 | [else] |
74 | <td class="vc_diff_change_empty"> </td> |
75 | [end] |
76 | </tr> |
77 | [else] |
78 | [is changes.type "no-changes"] |
79 | <tr> |
80 | <td colspan="3"> </td> |
81 | </tr> |
82 | <tr class="vc_diff_empty"> |
83 | <td colspan="3" style="text-align:center;"><br /> |
84 | <strong>- No changes -</strong><br /> </td> |
85 | </tr> |
86 | [else] |
87 | [is changes.type "binary-diff"] |
88 | <tr> |
89 | <td colspan="3"> </td> |
90 | </tr> |
91 | <tr class="vc_diff_empty"> |
92 | <td colspan="3" style="text-align:center;"><br /> |
93 | <strong>- Binary file revisions differ -</strong><br /> </td> |
94 | </tr> |
95 | [else] |
96 | [is changes.type "error"] |
97 | <tr> |
98 | <td colspan="3"> </td> |
99 | </tr> |
100 | <tr class="vc_diff_empty"> |
101 | <td colspan="3" style="text-align:center;"> <br /> |
102 | <strong>- ViewVC depends on rcsdiff and GNU diff to create |
103 | this page. ViewVC cannot find GNU diff. Even if you |
104 | have GNU diff installed, the rcsdiff program must be |
105 | configured and compiled with the GNU diff location. |
106 | -</strong> <br /> </td> |
107 | </tr> |
108 | [else] |
109 | <tr> |
110 | <td id="l[changes.line_number]">[if-any annotate_href]<a href="[annotate_href]#l[changes.line_number]">[changes.line_number]</a>[else][changes.line_number][end]</td> |
111 | <td class="vc_diff_nochange"> [changes.left]</td> |
112 | <td class="vc_diff_nochange"> [changes.right]</td> |
113 | </tr> |
114 | [end] |
115 | [end] |
116 | [end] |
117 | [end] |
118 | [end] |
119 | [end] |
120 | [end] |
121 | [end] |
122 | </table> |
123 | [end] |
124 | |
125 | [if-any sidebyside] |
126 | <table class="vc_idiff"> |
127 | <colgroup><col /><col class="content" /></colgroup> |
128 | <colgroup><col /><col class="content" /></colgroup> |
129 | <thead> |
130 | <tr> |
131 | <th colspan="2"> |
132 | [is path_left path_right][else][path_left][end] |
133 | Revision [rev_left] |
134 | </th> |
135 | <th colspan="2"> |
136 | [is path_left path_right][else][path_right][end] |
137 | Revision [rev_right] |
138 | </th> |
139 | </tr> |
140 | </thead> |
141 | <tbody> |
142 | [for sidebyside] |
143 | [if-any sidebyside.gap] |
144 | <tr> |
145 | <th>…</th><th></th> |
146 | <th>…</th><th></th> |
147 | </tr> |
148 | [end] |
149 | <tr> |
150 | [for sidebyside.columns] |
151 | <th>[sidebyside.columns.line_number]</th><td[if-any sidebyside.columns.line_number][else] class="vc_idiff_empty"[end]>[for sidebyside.columns.segments][if-any sidebyside.columns.segments.type]<span class="vc_idiff_[sidebyside.columns.segments.type]">[sidebyside.columns.segments.text]</span>[else][sidebyside.columns.segments.text][end][end]</td> |
152 | [end] |
153 | </tr> |
154 | [end] |
155 | </tbody> |
156 | </table> |
157 | [end] |
158 | |
159 | [if-any unified] |
160 | <table class="vc_idiff"> |
161 | <thead> |
162 | <tr> |
163 | <th>r[rev_left]</th> |
164 | <th>r[rev_right]</th> |
165 | <th></th> |
166 | </tr> |
167 | </thead> |
168 | <tbody> |
169 | [for unified] |
170 | [if-any unified.gap] |
171 | <tr> |
172 | <th>…</th> |
173 | <th>…</th> |
174 | <th></th> |
175 | </tr> |
176 | [end] |
177 | <tr> |
178 | <th>[unified.left_number]</th> |
179 | <th>[unified.right_number]</th> |
180 | <td[if-any unified.type] class="vc_idiff_[unified.type]"[end]>[for unified.segments][if-any unified.segments.type]<span class="vc_idiff_[unified.segments.type]">[unified.segments.text]</span>[else][unified.segments.text][end][end]</td> |
181 | </tr> |
182 | [end] |
183 | </tbody> |
184 | </table> |
185 | [end] |
186 | |
187 | <hr style="margin-top:1em;" /> |
188 | |
189 | <table cellpadding="10" class="auto"> |
190 | <tr> |
191 | <td> |
192 | <form method="get" action="[diff_format_action]"> |
193 | <div> |
194 | [diff_format_hidden_values] |
195 | <select name="diff_format" onchange="submit()"> |
196 | <option value="h" [is diff_format "h"]selected="selected"[end]>Colored Diff</option> |
197 | <option value="l" [is diff_format "l"]selected="selected"[end]>Long Colored Diff</option> |
198 | <option value="u" [is diff_format "u"]selected="selected"[end]>Unidiff</option> |
199 | <option value="c" [is diff_format "c"]selected="selected"[end]>Context Diff</option> |
200 | <option value="s" [is diff_format "s"]selected="selected"[end]>Side by Side</option> |
201 | </select> |
202 | <input type="submit" value="Show" /> |
203 | </div> |
204 | </form> |
205 | </td> |
206 | <td> |
207 | [if-any raw_diff] |
208 | |
209 | [else] |
210 | <table style="border:solid gray 1px;" class="auto"> |
211 | <tr> |
212 | <td>Legend:<br /> |
213 | <table cellspacing="0" cellpadding="1"> |
214 | <tr> |
215 | <td style="text-align:center;" class="vc_diff_remove">Removed from v.[rev_left]</td> |
216 | <td class="vc_diff_empty"> </td> |
217 | </tr> |
218 | <tr> |
219 | <td style="text-align:center;" colspan="2" class="vc_diff_change">changed lines</td> |
220 | </tr> |
221 | <tr> |
222 | <td class="vc_diff_empty"> </td> |
223 | <td style="text-align:center;" class="vc_diff_add">Added in v.[rev_right]</td> |
224 | </tr> |
225 | </table> |
226 | </td> |
227 | </tr> |
228 | </table> |
229 | [end] |
230 | </td> |
231 | </tr> |
232 | </table> |
233 | |
234 | [include "include/footer.ezt"] |