Add a bunch of links between different views. Some of these links
were present in ViewCVS 0.9.2, but seem to have been inadvertently
removed since then.
* lib/viewcvs.py
(common_template_data):
set "up_href, "log_href," and "graph_href" template variables
for files
(view_markup):
set "annotate_href"
(view_directory):
stop setting "up_href" here
(view_log):
stop setting "graph_href" and "back_url" here
set "annotate_href" here
(view_queryform):
set "dir_href" here
* templates/annotate.ezt
* templates/diff.ezt
* templates/graph.ezt
* templates/log.ezt
* templates/log_table.ezt
* templates/markup.ezt
* templates/query_form.ezt
* templates/include/branch.ezt
add links
* website/upgrading.html
document changed variables
git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1003 8cb11bc2-c004-0410-86c3-e597b4017df7
remotes/tags/1.0.0-rc1
rey4
parent
ee9b309d4c
commit
99818c7cf0
|
|
@ -882,6 +882,9 @@ def common_template_data(request):
|
|||
'rootname' : request.server.escape(request.rootname),
|
||||
'pathtype' : request.pathtype == vclib.DIR and 'dir' or 'file',
|
||||
'nav_path' : nav_path(request),
|
||||
'up_href' : None,
|
||||
'log_href' : None,
|
||||
'graph_href': None,
|
||||
}
|
||||
url, params = request.get_link(view_func=view_directory,
|
||||
where='',
|
||||
|
|
@ -899,6 +902,23 @@ def common_template_data(request):
|
|||
roots.append(_item(name=request.server.escape(rootname),
|
||||
type=allroots[rootname][1]))
|
||||
data['roots'] = roots
|
||||
|
||||
if request.path_parts:
|
||||
dir = string.join(request.path_parts[:-1], '/')
|
||||
data['up_href'] = request.get_url(view_func=view_directory,
|
||||
where=dir, pathtype=vclib.DIR,
|
||||
params={}, escape=1)
|
||||
|
||||
if request.pathtype == vclib.FILE:
|
||||
if (request.view_func is not view_log):
|
||||
data['log_href'] = request.get_url(view_func=view_log, params={},
|
||||
escape=1)
|
||||
|
||||
if (request.roottype == 'cvs' and cfg.options.use_cvsgraph
|
||||
and request.view_func is not view_cvsgraph):
|
||||
data['graph_href'] = request.get_url(view_func=view_cvsgraph, params={},
|
||||
escape=1)
|
||||
|
||||
return data
|
||||
|
||||
def nav_header_data(request, rev):
|
||||
|
|
@ -1264,6 +1284,10 @@ def view_markup(request):
|
|||
else:
|
||||
data['download_text_href'] = None
|
||||
|
||||
if request.roottype == 'cvs':
|
||||
data['annotate_href'] = request.get_url(view_func=view_annotate,
|
||||
params={'annotate': rev},
|
||||
escape=1)
|
||||
|
||||
if cfg.options.show_log_in_markup:
|
||||
options = {}
|
||||
|
|
@ -1549,14 +1573,6 @@ def view_directory(request):
|
|||
'num_dead' : num_dead,
|
||||
})
|
||||
|
||||
if request.path_parts:
|
||||
dir = string.join(request.path_parts[:-1], '/')
|
||||
data['up_href'] = request.get_url(view_func=view_directory,
|
||||
where=dir, pathtype=vclib.DIR,
|
||||
params={}, escape=1)
|
||||
else:
|
||||
data['up_href'] = None
|
||||
|
||||
# clicking on sort column reverses sort order
|
||||
if sortdir == 'down':
|
||||
revsortdir = None # 'up'
|
||||
|
|
@ -1905,11 +1921,11 @@ def view_log(request):
|
|||
'logsort' : logsort,
|
||||
'human_readable' : ezt.boolean(diff_format in ('h', 'l')),
|
||||
'log_pagestart' : None,
|
||||
'graph_href' : None,
|
||||
'entries': entries,
|
||||
'view_href' : None,
|
||||
'download_href': None,
|
||||
'download_text_href': None,
|
||||
'annotate_href': None,
|
||||
})
|
||||
|
||||
if cfg.options.use_pagesize:
|
||||
|
|
@ -1927,16 +1943,9 @@ def view_log(request):
|
|||
data['logsort_hidden_values'] = prepare_hidden_values(params)
|
||||
|
||||
data.update({
|
||||
'back_url' : request.get_url(view_func=view_directory, pathtype=vclib.DIR,
|
||||
where=up_where, params={},
|
||||
escape=1),
|
||||
'view_tag' : view_tag,
|
||||
})
|
||||
|
||||
if request.roottype == 'cvs' and cfg.options.use_cvsgraph:
|
||||
data['graph_href'] = request.get_url(view_func=view_cvsgraph, params={},
|
||||
escape=1)
|
||||
|
||||
if pathtype is vclib.FILE:
|
||||
data['view_href'] = request.get_url(view_func=view_markup, params={},
|
||||
escape=1)
|
||||
|
|
@ -1947,6 +1956,9 @@ def view_log(request):
|
|||
request.get_url(view_func=view_checkout,
|
||||
params={'content-type': 'text/plain'},
|
||||
escape=1)
|
||||
if request.roottype == 'cvs':
|
||||
data['annotate_href'] = request.get_url(view_func=view_annotate,
|
||||
params={}, escape=1)
|
||||
else:
|
||||
data['view_href'] = request.get_url(view_func=view_directory, params={},
|
||||
escape=1)
|
||||
|
|
@ -2893,6 +2905,9 @@ def view_queryform(request):
|
|||
data['mindate'] = request.query_dict.get('mindate', '')
|
||||
data['maxdate'] = request.query_dict.get('maxdate', '')
|
||||
|
||||
data['dir_href'] = request.get_url(view_func=view_directory, params={},
|
||||
escape=1)
|
||||
|
||||
request.server.header()
|
||||
generate_page(request, cfg.templates.query_form, data)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
[# end]
|
||||
|
||||
[include "include/header.ezt" "annotate"]
|
||||
[include "include/file_header.ezt"]
|
||||
|
||||
<hr noshade>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
[# end]
|
||||
|
||||
[include "include/header.ezt" "diff"]
|
||||
[include "include/file_header.ezt"]
|
||||
|
||||
<h3 align=center></h3>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@
|
|||
[# end]
|
||||
|
||||
[include "include/header.ezt" "graph"]
|
||||
[include "include/file_header.ezt"]
|
||||
|
||||
<hr>
|
||||
|
||||
<center>
|
||||
[imagemap]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ Bookmark a link to HEAD:
|
|||
(<a href="[view_href]">view</a>)
|
||||
[if-any download_href](<a href="[download_href]">download</a>)[end]
|
||||
[if-any download_text_href](<a href="[download_text_href]">as text</a>)[end]
|
||||
[if-any annotate_href](<a href="[annotate_href]">annotate</a>)[end]
|
||||
</p>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<a href="[up_href]"><img src="[docroot]/images/back_small.png" width=16 height=16 border=0> Parent Directory</a>
|
||||
[if-any log_href]
|
||||
| <a href="[log_href]"><img src="[docroot]/images/text.png" border=0> Revision Log</a>
|
||||
[end]
|
||||
[if-any graph_href]
|
||||
| <a href="[graph_href]"><img src="[docroot]/images/cvsgraph_16x16.png" border=0> Revision Graph</a>
|
||||
[end]
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
[# end]
|
||||
|
||||
[include "include/header.ezt" "log"]
|
||||
[include "include/file_header.ezt"]
|
||||
|
||||
<hr noshade>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
[# end]
|
||||
|
||||
[include "include/header.ezt" "logtable"]
|
||||
[include "include/file_header.ezt"]
|
||||
|
||||
<hr noshade>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,13 @@
|
|||
[# end]
|
||||
|
||||
[include "include/header.ezt" "markup"]
|
||||
|
||||
[include "include/file_header.ezt"]
|
||||
<hr>
|
||||
<div class="vc_summary">
|
||||
Revision: <b>[rev]</b> -
|
||||
(<a href="[file_url]"><b>log</b></a>)
|
||||
(<a href="[download_href]"><b>download</b></a>)
|
||||
[if-any download_text_href](<a href="[download_text_href]"><b>as text</b></a>)[end]
|
||||
[if-any annotate_href](<a href="[annotate_href]"><b>annotate</b></a>)[end]
|
||||
|
||||
[if-any log]
|
||||
[if-any vendor_branch] <i>(vendor branch)</i>[end]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,10 @@
|
|||
|
||||
[include "include/header.ezt" "query"]
|
||||
|
||||
<p><a href=[dir_href]>
|
||||
<img src="[docroot]/images/dir.png" width=16 height=16 border=0>
|
||||
Browse Directory</a></p>
|
||||
|
||||
<form action="[query_action]" method="get">
|
||||
[query_hidden_values]
|
||||
|
||||
|
|
|
|||
|
|
@ -246,18 +246,20 @@
|
|||
<dt><code>log.ezt</code> and <code>log_table.ezt</code>:
|
||||
<var>href</var>, <var>query</var>, <var>qquery</var>,
|
||||
<var>head_href</var>, <var>head_abs_href</var>,
|
||||
<var>entries.href</var>, and
|
||||
<var>back_url</var>,
|
||||
<var>entries.href</var>, and
|
||||
<var>entries.text_href</var></dt>
|
||||
<dd>
|
||||
Replaced with new <var>entries.annotate_href</var>,
|
||||
Replaced with new
|
||||
<var>diff_url</var>, <var>diff_params</var>,
|
||||
<var>diff_select_action</var>,
|
||||
<var>branch_select_action</var>,
|
||||
<var>logsort_action</var>,
|
||||
<var>view_href</var>, <var>download_href</var>,
|
||||
<var>download_text_href</var>,
|
||||
<var>entries.download_href</var>, and
|
||||
<var>entries.download_text_href</var> variables.
|
||||
<var>download_text_href</var>, <var>up_href</var>,
|
||||
<var>entries.download_href</var>,
|
||||
<var>entries.download_text_href</var>, and
|
||||
<var>entries.annotate_href</var> variables.
|
||||
</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
|
|
@ -291,6 +293,12 @@
|
|||
inside a [for] loop.
|
||||
</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt>
|
||||
<dt>All files: <var>up_href</var></dt>
|
||||
</dt>
|
||||
<dd>Link to parent directory.</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt>All files: <var>roots</var></dt>
|
||||
<dd>
|
||||
|
|
@ -306,11 +314,25 @@
|
|||
Web path to directory containing ViewCVS static files
|
||||
(files in <code><VIEWCVS_INSTALLATION_DIRECTORY>/templates/docroot</code>)
|
||||
</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt>All files: <var>log_href</var> and <var>graph_href</var></dt>
|
||||
<dd>
|
||||
Links to the log and graph pages of the current file,
|
||||
if there is one.
|
||||
</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt><code>graph.ezt</code>: <var>imagesrc</var></dt>
|
||||
<dd>String contain URL for graph image.</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt><code>markup.ezt</code>: <var>annotate_href</var></dt>
|
||||
<dd>
|
||||
Link to the annotation page for the current revision,
|
||||
if available.
|
||||
</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt><code>markup.ezt</code>: <var>date_str</var></dt>
|
||||
<dd>String representing checkin date</dd>
|
||||
|
|
@ -355,13 +377,6 @@
|
|||
</dt>
|
||||
<dd>List of error messages pertaining to an entry.</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt>
|
||||
<code>directory.ezt</code> and <code>dir_alternate.ezt</code>:
|
||||
<var>up_href</var>
|
||||
</dt>
|
||||
<dd>Link to parent directory.</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt>
|
||||
<code>directory.ezt</code> and <code>dir_alternate.ezt</code>:
|
||||
|
|
|
|||
Loading…
Reference in New Issue