Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 7 by niro, Tue Oct 30 22:18:26 2012 UTC revision 8 by niro, Fri May 13 08:48:34 2016 UTC
    # Line 12  Line 12 
    12    <pre class="vc_raw_diff">[raw_diff]</pre>    <pre class="vc_raw_diff">[raw_diff]</pre>
    13  [end]  [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]  [if-any changes]
    19  <table cellspacing="0" cellpadding="0">  <table cellspacing="0" cellpadding="0">
    20    <tr class="vc_diff_header">    <tr class="vc_diff_header">
    21      <th style="width:6%;"></th>      <th style="width:6%;"></th>
    22      <th style="width:47%; vertical-align:top;">      <th style="width:47%; vertical-align:top;">
    23        [is path_left path_right][else][path_left][end]        [is left.path right.path][else][left.path][end]
    24        revision [rev_left], [date_left]        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        [if-any tag_left]<br />Tag: [tag_left][end]        [left.date]
    26          [if-any left.tag]<br />Tag: [left.tag][end]
    27      </th>      </th>
    28      <th style="width:47%; vertical-align:top;">      <th style="width:47%; vertical-align:top;">
    29        [is path_left path_right][else][path_right][end]        [is left.path right.path][else][right.path][end]
    30        revision [rev_right], [date_right]        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        [if-any tag_right]<br />Tag: [tag_right][end]        [right.date]
    32          [if-any right.tag]<br />Tag: [right.tag][end]
    33      </th>      </th>
    34    </tr>    </tr>
    35    
    # Line 44  Line 49 
    49      [else]      [else]
    50        [is changes.type "add"]        [is changes.type "add"]
    51          <tr>          <tr>
    52            <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>            <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>            <td class="vc_diff_empty">&nbsp;</td>
    54            <td class="vc_diff_add">&nbsp;[changes.right]</td>            <td class="vc_diff_add">&nbsp;[changes.right]</td>
    55          </tr>          </tr>
    # Line 59  Line 64 
    64            [is changes.type "change"]            [is changes.type "change"]
    65              <tr>              <tr>
    66                [if-any changes.have_right]                [if-any changes.have_right]
    67                  <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>                  <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]                [else]
    69                  <td></td>                  <td></td>
    70                [end]                [end]
    # Line 107  Line 112 
    112                    </tr>                    </tr>
    113                  [else]                  [else]
    114                    <tr>                    <tr>
    115                      <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>                      <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>                      <td class="vc_diff_nochange">&nbsp;[changes.left]</td>
    117                      <td class="vc_diff_nochange">&nbsp;[changes.right]</td>                      <td class="vc_diff_nochange">&nbsp;[changes.right]</td>
    118                    </tr>                    </tr>
    # Line 129  Line 134 
    134      <thead>      <thead>
    135        <tr>        <tr>
    136          <th colspan="2">              <th colspan="2">    
    137            [is path_left path_right][else][path_left][end]            [is left.path right.path][else][left.path][end]
    138            Revision [rev_left]            Revision [left.rev]
    139          </th>          </th>
    140          <th colspan="2">          <th colspan="2">
    141            [is path_left path_right][else][path_right][end]            [is left.path right.path][else][right.path][end]
    142            Revision [rev_right]            Revision [right.rev]
    143          </th>          </th>
    144        </tr>        </tr>
    145      </thead>      </thead>
    # Line 160  Line 165 
    165    <table class="vc_idiff">    <table class="vc_idiff">
    166      <thead>      <thead>
    167        <tr>        <tr>
    168          <th>r[rev_left]</th>          <th>r[left.rev]</th>
    169          <th>r[rev_right]</th>          <th>r[right.rev]</th>
    170          <th></th>          <th></th>
    171        </tr>        </tr>
    172      </thead>      </thead>
    # Line 191  Line 196 
    196      <td>      <td>
    197        <form method="get" action="[diff_format_action]">        <form method="get" action="[diff_format_action]">
    198          <div>          <div>
    199            [diff_format_hidden_values]            [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()">            <select name="diff_format" onchange="submit()">
    201              <option value="h" [is diff_format "h"]selected="selected"[end]>Colored Diff</option>              <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>              <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>              <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>              <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>              <option value="s" [is diff_format "s"]selected="selected"[end]>Side by Side</option>
    # Line 212  Line 218 
    218            <td>Legend:<br />            <td>Legend:<br />
    219              <table cellspacing="0" cellpadding="1">              <table cellspacing="0" cellpadding="1">
    220                <tr>                <tr>
    221                  <td style="text-align:center;" class="vc_diff_remove">Removed from v.[rev_left]</td>                  <td style="text-align:center;" class="vc_diff_remove">Removed from v.[left.rev]</td>
    222                  <td class="vc_diff_empty">&nbsp;</td>                  <td class="vc_diff_empty">&nbsp;</td>
    223                </tr>                </tr>
    224                <tr>                <tr>
    # Line 220  Line 226 
    226                </tr>                </tr>
    227                <tr>                <tr>
    228                  <td class="vc_diff_empty">&nbsp;</td>                  <td class="vc_diff_empty">&nbsp;</td>
    229                  <td style="text-align:center;" class="vc_diff_add">Added in v.[rev_right]</td>                  <td style="text-align:center;" class="vc_diff_add">Added in v.[right.rev]</td>
    230                </tr>                </tr>
    231              </table>              </table>
    232            </td>            </td>
    Legend:
    Removed from v.7  
    changed lines
      Added in v.8