2004-07-17 10:03:33 +04:00
|
|
|
[# setup page definitions]
|
2005-01-14 06:40:55 +03:00
|
|
|
[define page_title]Query results on /[where][end]
|
2004-07-17 10:03:33 +04:00
|
|
|
[define help_href][docroot]/help_rootview.html[end]
|
|
|
|
[# end]
|
|
|
|
|
|
|
|
[include "include/header.ezt"]
|
|
|
|
|
2005-09-28 21:06:16 +04:00
|
|
|
<p><strong>[english_query]</strong></p>
|
2004-07-17 10:03:33 +04:00
|
|
|
[# <!-- {sql} --> ]
|
|
|
|
<p><a href="[queryform_href]">Modify query</a></p>
|
2004-07-22 06:10:51 +04:00
|
|
|
<p><a href="[backout_href]">Show commands which could be used to back out these changes</a></p>
|
2004-07-17 10:03:33 +04:00
|
|
|
|
2005-09-28 21:06:16 +04:00
|
|
|
<p><strong>+[plus_count]/-[minus_count]</strong> lines changed.</p>
|
2004-07-17 10:03:33 +04:00
|
|
|
|
|
|
|
[if-any commits]
|
2005-09-28 21:06:16 +04:00
|
|
|
<table cellspacing="1" cellpadding="2">
|
2004-07-17 10:03:33 +04:00
|
|
|
<thead>
|
|
|
|
<tr>
|
2005-12-17 18:42:01 +03:00
|
|
|
<th class="vc_header">Revision</th>
|
2005-09-28 21:06:16 +04:00
|
|
|
<th class="vc_header[is querysort "file"]_sort[end]">File</th>
|
2004-07-17 10:03:33 +04:00
|
|
|
[if-any show_branch]
|
2005-09-28 21:06:16 +04:00
|
|
|
<th class="vc_header">Branch</th>
|
2004-07-17 10:03:33 +04:00
|
|
|
[end]
|
2005-09-28 21:06:16 +04:00
|
|
|
<th class="vc_header">+/-</th>
|
|
|
|
<th class="vc_header[is querysort "date"]_sort[end]">Date</th>
|
|
|
|
<th class="vc_header[is querysort "author"]_sort[end]">Author</th>
|
2004-07-17 10:03:33 +04:00
|
|
|
[# uncommment, if you want a separate Description column: (also see below)
|
2005-09-28 21:06:16 +04:00
|
|
|
<th class="vc_header">Description</th>
|
2004-07-17 10:03:33 +04:00
|
|
|
]
|
|
|
|
</tr>
|
|
|
|
</thead>
|
|
|
|
[for commits]
|
|
|
|
[for commits.files]
|
|
|
|
<tbody>
|
|
|
|
<tr class="vc_row_[if-index commits even]even[else]odd[end]">
|
2005-09-28 21:06:16 +04:00
|
|
|
<td style="vertical-align: top;">
|
Unify the allowable views configury, and all support for disabling the
checkout view. The former is for sanity, the latter for security.
* viewvc.conf.dist
(allow_tar, allow_annotate, allow_markup): Removed.
(allowed_views): New.
* lib/config.py
(Config._force_multi_value): Add 'allowed_views'.
(Config.set_defaults): Set default for 'allowed_views'; no longer set
defaults for 'allow_tar', 'allow_annotate', 'allow_markup'.
* lib/viewvc.py
(default_view, view_directory, download_tarball, get_file_view_info,
view_annotate, view_diff, build_commit, view_revision, view_markup,
view_checkout): Track changes, adding code to prevent checkout view
URL generation when the view is disabled, and doing the same for
markup views (which should have already been done, since we already
had an allow_markup option!)
* templates/query_results.ezt
* templates/markup.ezt
* templates/directory.ezt
* templates/log.ezt
* templates/log_table.ezt
* templates/annotate.ezt
Don't assume checkout and markup views are present.
* docs/upgrading-howto.html
Update to show the configuration changes.
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1544 8cb11bc2-c004-0410-86c3-e597b4017df7
2007-03-27 23:03:37 +04:00
|
|
|
[define rev_href][if-any commits.files.prefer_markup][commits.files.view_href][else][if-any commits.files.download_href][commits.files.download_href][end][end][end]
|
|
|
|
[if-any commits.files.rev][if-any rev_href]<a href="[rev_href]">[end][commits.files.rev][if-any rev_href]</a>[end][else] [end]
|
2004-07-17 10:03:33 +04:00
|
|
|
</td>
|
2005-09-28 21:06:16 +04:00
|
|
|
<td style="vertical-align: top;">
|
2004-07-17 10:03:33 +04:00
|
|
|
<a href="[commits.files.dir_href]">[commits.files.dir]/</a>
|
|
|
|
<a href="[commits.files.log_href]">[commits.files.file]</a>
|
|
|
|
</td>
|
|
|
|
[if-any show_branch]
|
2005-09-28 21:06:16 +04:00
|
|
|
<td style="vertical-align: top;">
|
2004-07-17 10:03:33 +04:00
|
|
|
[if-any commits.files.branch][commits.files.branch][else] [end]
|
|
|
|
</td>
|
|
|
|
[end]
|
2005-09-28 21:06:16 +04:00
|
|
|
<td style="vertical-align: top;">
|
2004-07-17 10:03:33 +04:00
|
|
|
[# only show a diff link for changes ]
|
|
|
|
[is commits.files.type "Add"]<ins>[end]
|
|
|
|
[is commits.files.type "Change"]<a href="[commits.files.diff_href]">[end]
|
|
|
|
[is commits.files.type "Remove"]<del>[end]
|
|
|
|
[commits.files.plus]/[commits.files.minus]
|
|
|
|
[is commits.files.type "Add"]</ins>[end]
|
|
|
|
[is commits.files.type "Change"]</a>[end]
|
|
|
|
[is commits.files.type "Remove"]</del>[end]
|
|
|
|
</td>
|
2005-09-28 21:06:16 +04:00
|
|
|
<td style="vertical-align: top;">
|
2004-07-17 10:03:33 +04:00
|
|
|
[if-any commits.files.date][commits.files.date][else] [end]
|
|
|
|
</td>
|
2005-09-28 21:06:16 +04:00
|
|
|
<td style="vertical-align: top;">
|
2004-07-17 10:03:33 +04:00
|
|
|
[if-any commits.files.author][commits.files.author][else] [end]
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
[end]
|
2005-12-23 16:24:26 +03:00
|
|
|
[if-any commits.limited_files]
|
|
|
|
<tr class="vc_row_[if-index commits even]even[else]odd[end]">
|
|
|
|
<td> </td>
|
|
|
|
<td colspan="5">
|
|
|
|
<strong><em><small>Only first [commits.num_files] files shown.
|
|
|
|
<a href="[limit_changes_href]">Show all files</a> or
|
|
|
|
<a href="[queryform_href]">adjust limit</a>.</small></em></strong>
|
|
|
|
</tr>
|
|
|
|
[end]
|
2004-07-17 10:03:33 +04:00
|
|
|
<tr class="vc_row_[if-index commits even]even[else]odd[end]">
|
|
|
|
<td> </td>
|
2005-09-28 21:06:16 +04:00
|
|
|
<td colspan="5"><strong>Log:</strong><br />
|
2005-12-08 21:18:08 +03:00
|
|
|
<pre class="vc_log">[commits.log]</pre></td>
|
2004-07-17 10:03:33 +04:00
|
|
|
</tr>
|
|
|
|
</tbody>
|
|
|
|
[end]
|
|
|
|
</table>
|
|
|
|
[end]
|
|
|
|
|
|
|
|
[include "include/footer.ezt"]
|