--- a/templates/gitweb/fileannotate.tmpl
+++ b/templates/gitweb/fileannotate.tmpl
@@ -1,16 +1,24 @@
#header#
<title>#repo|escape#: Annotate</title>
<link rel="alternate" type="application/rss+xml"
- href="?cmd=changelog;style=rss" title="RSS feed for #repo|escape#">
+ href="{url}rss-log" title="RSS feed for #repo|escape#">
</head>
<body>
<div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="?cmd=summary;style=gitweb">#repo|escape#</a> / annotate
+<a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="{url}summary{getentries}">#repo|escape#</a> / annotate
</div>
<div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=shortlog;style=gitweb">shortlog</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#node|short#;path=#path|urlescape#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#node|short#;style=gitweb">file</a> | <a href="?cmd=filelog;file=#file|urlescape#;filenode=#node|short#;style=gitweb">revisions</a> | annotate | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#node|short#;style=raw">raw</a><br/>
+<a href="{url}summary{getentries}">summary</a> |
+<a href="{url}shortlog{getentries}">shortlog</a> |
+<a href="{url}log{getentries}">changelog</a> |
+<a href="{url}tags{getentries}">tags</a> |
+<a href="{url}file/#node|short##path|urlescape#{getentries}">manifest</a> |
+<a href="{url}rev/#node|short#{getentries}">changeset</a> |
+<a href="{url}file/{node|short}/#file|urlescape#{getentries}">file</a> |
+<a href="{url}log/{node|short}/#file|urlescape#{getentries}">revisions</a> |
+annotate | <a href="{url}raw-annotate/{node|short}/#file|urlescape#">raw</a><br/>
</div>
<div class="title">#file|escape#</div>
@@ -18,13 +26,13 @@
<table>
<tr>
<td class="metatag">changeset #rev#:</td>
- <td><a href="?cs=#node|short#;style=gitweb">#node|short#</a></td></tr>
+ <td><a href="{url}rev/#node|short#{getentries}">#node|short#</a></td></tr>
#rename%filerename#
#parent%fileannotateparent#
#child%fileannotatechild#
<tr>
<td class="metatag">manifest:</td>
- <td><a href="?mf=#node|short#;path=/;style=gitweb">#node|short#</a></td></tr>
+ <td><a href="{url}file/#node|short#{getentries}">#node|short#</a></td></tr>
<tr>
<td class="metatag">author:</td>
<td>#author|obfuscate#</td></tr>