Move some logic that really UI-ish from the core code into the
templates. * viewcvs/lib/viewcvs.py (view_log): Lose 'tr1' and 'tr2' dictionary items. * viewcvs/templates/log.ezt, * viewcvs/templates/log_table.ezt Calculate first and last revisions using EZT magic. * viewcvs/templates/include/diff_form.ezt Choose default diff form values based on the 'rev_selected' dictionary item as well as the EZT-calculated first and last revisions. * viewcvs/website/upgrading.html, * viewcvs/website/template-authoring-guide.html Track removed variables, and add some missing punctuation. git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1135 8cb11bc2-c004-0410-86c3-e597b4017df7remotes/tags/1.0.0-rc1
parent
2d37af8286
commit
8f79165d0c
|
@ -2027,9 +2027,6 @@ def view_log(request):
|
||||||
if rev.co_rev:
|
if rev.co_rev:
|
||||||
tags.append(_item(rev=rev.co_rev.string, name=tag))
|
tags.append(_item(rev=rev.co_rev.string, name=tag))
|
||||||
|
|
||||||
data['tr1'] = request.query_dict.get('r1') or show_revs[-1].string
|
|
||||||
data['tr2'] = request.query_dict.get('r2') or show_revs[0].string
|
|
||||||
|
|
||||||
branch_names = []
|
branch_names = []
|
||||||
for tag in taginfo.values():
|
for tag in taginfo.values():
|
||||||
if tag.is_branch:
|
if tag.is_branch:
|
||||||
|
|
|
@ -19,10 +19,12 @@
|
||||||
<option value="[tags.rev]:[tags.name]">[tags.name]</option>
|
<option value="[tags.rev]:[tags.name]">[tags.name]</option>
|
||||||
[end]
|
[end]
|
||||||
</select>
|
</select>
|
||||||
<input type="text" size="12" name="tr1" value="[tr1]"
|
<input type="text" size="12" name="tr1"
|
||||||
onchange="document.diff_select.r1.selectedIndex=0" />
|
value="[if-any rev_selected][rev_selected][else][first_revision][end]"
|
||||||
|
onchange="document.diff_select.r1.selectedIndex=0" />
|
||||||
[else]
|
[else]
|
||||||
<input type="text" size="12" name="r1" value="[tr1]" />
|
<input type="text" size="12" name="r1"
|
||||||
|
value="[if-any rev_selected][rev_selected][else][first_revision][end]" />
|
||||||
[end]
|
[end]
|
||||||
|
|
||||||
and
|
and
|
||||||
|
@ -33,10 +35,11 @@
|
||||||
<option value="[tags.rev]:[tags.name]">[tags.name]</option>
|
<option value="[tags.rev]:[tags.name]">[tags.name]</option>
|
||||||
[end]
|
[end]
|
||||||
</select>
|
</select>
|
||||||
<input type="text" size="12" name="tr2" value="[tr2]"
|
<input type="text" size="12" name="tr2"
|
||||||
onchange="document.diff_select.r1.selectedIndex=0" />
|
value="[last_revision]"
|
||||||
|
onchange="document.diff_select.r1.selectedIndex=0" />
|
||||||
[else]
|
[else]
|
||||||
<input type="text" size="12" name="r2" value="[tr1]" />
|
<input type="text" size="12" name="r2" value="[last_revision]" />
|
||||||
[end]
|
[end]
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -12,7 +12,12 @@
|
||||||
[include "include/view_tag.ezt"]
|
[include "include/view_tag.ezt"]
|
||||||
[include "include/paging.ezt"]
|
[include "include/paging.ezt"]
|
||||||
|
|
||||||
|
[define first_revision][end]
|
||||||
|
[define last_revision][end]
|
||||||
|
|
||||||
[for entries]
|
[for entries]
|
||||||
|
[if-index entries first][define first_revision][entries.rev][end][end]
|
||||||
|
[if-index entries last][define last_revision][entries.rev][end][end]
|
||||||
<div>
|
<div>
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,13 @@
|
||||||
<th class="vc_header">Author</th>
|
<th class="vc_header">Author</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
||||||
|
[define first_revision][end]
|
||||||
|
[define last_revision][end]
|
||||||
|
|
||||||
[for entries]
|
[for entries]
|
||||||
|
[if-index entries first][define first_revision][entries.rev][end][end]
|
||||||
|
[if-index entries last][define last_revision][entries.rev][end][end]
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr style="vertical-align: top;" class="vc_row_[if-index entries even]even[else]odd[end]">
|
<tr style="vertical-align: top;" class="vc_row_[if-index entries even]even[else]odd[end]">
|
||||||
|
|
||||||
|
|
|
@ -1239,16 +1239,6 @@ th { background: rgb(60%,70%,90%); }
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="varlevel1">
|
|
||||||
<td class="varname">tr1</td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
<tr class="varlevel1">
|
|
||||||
<td class="varname">tr2</td>
|
|
||||||
<td></td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
<tr class="varlevel1">
|
<tr class="varlevel1">
|
||||||
<td class="varname">view_href</td>
|
<td class="varname">view_href</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
|
|
|
@ -197,7 +197,7 @@
|
||||||
<var>rows.cvs</var>
|
<var>rows.cvs</var>
|
||||||
</dt>
|
</dt>
|
||||||
<dd>
|
<dd>
|
||||||
Replaced by <var>entries.errors</var>
|
Replaced by <var>entries.errors</var>.
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
<dl>
|
||||||
|
@ -206,7 +206,8 @@
|
||||||
<var>rows.href</var> and <var>rows.rev_href</var>
|
<var>rows.href</var> and <var>rows.rev_href</var>
|
||||||
</dt>
|
</dt>
|
||||||
<dd>
|
<dd>
|
||||||
Replaced by <var>entries.log_href</var> and <var>entries.view_href</var>
|
Replaced by <var>entries.log_href</var>
|
||||||
|
and <var>entries.view_href</var>.
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
<dl>
|
||||||
|
@ -215,7 +216,7 @@
|
||||||
<var>no_match</var>
|
<var>no_match</var>
|
||||||
</dt>
|
</dt>
|
||||||
<dd>
|
<dd>
|
||||||
Replaced by <var>num_dead</var>
|
Replaced by <var>num_dead</var>.
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
<dl>
|
||||||
|
@ -232,7 +233,7 @@
|
||||||
</dt>
|
</dt>
|
||||||
<dd>
|
<dd>
|
||||||
Removed because <var>sortby_*_href</var> variables now set
|
Removed because <var>sortby_*_href</var> variables now set
|
||||||
sort directions
|
sort directions.
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
<dl>
|
||||||
|
@ -269,7 +270,7 @@
|
||||||
<dl>
|
<dl>
|
||||||
<dt><code>markup.ezt</code>: <var>path</var>,
|
<dt><code>markup.ezt</code>: <var>path</var>,
|
||||||
<var>filename</var>, and <var>tag</var></dt>
|
<var>filename</var>, and <var>tag</var></dt>
|
||||||
<dd>Deemed unneccessary</dd>
|
<dd>Deemed unneccessary</dd>.
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
<dl>
|
||||||
<dt><code>markup.ezt</code>: <var>file_url</var></dt>
|
<dt><code>markup.ezt</code>: <var>file_url</var></dt>
|
||||||
|
@ -314,7 +315,8 @@
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
<dl>
|
||||||
<dt><code>log.ezt</code> and <code>log_table.ezt</code>:
|
<dt><code>log.ezt</code> and <code>log_table.ezt</code>:
|
||||||
<var>viewable</var> and <var>is_text</var></dt>
|
<var>viewable</var>, <var>tr1</var>, <var>tr2</var>,
|
||||||
|
and <var>is_text</var></dt>
|
||||||
<dd>
|
<dd>
|
||||||
Deemed unnecessary.
|
Deemed unnecessary.
|
||||||
</dd>
|
</dd>
|
||||||
|
|
Loading…
Reference in New Issue