Magellan Linux

  • Back to homepage
    • /[www]/trunk/viewvc/magellan-template/diff.ezt

    Contents of /trunk/viewvc/magellan-template/diff.ezt

    Parent Directory Parent Directory | Revision Log Revision Log

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