upstream/mercurial-mirror Commit - r3366:dca067d7

gitweb: Fixed parent/child links when viewing a file revision.

Thomas Arendsen Hein -

r3366:dca067d7 default

parent child

templates/gitweb/filerevision.tmpl

0 +2 -2

              #header#
              <title>#repo|escape#: File revision</title>
              <link rel="alternate" type="application/rss+xml"
                 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="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / file revision
              </div>
              <div class="page_nav">
              <a href="{url}summary{sessionvars%urlparameter}">summary</a> |
              <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
              <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
              <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
              <a href="{url}file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a> |
              <a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> |
              file |
              <a href="{url}log/{node|short}/#file|urlescape#{sessionvars%urlparameter}">revisions</a> |
              <a href="{url}annotate/{node|short}/#file|urlescape#{sessionvars%urlparameter}">annotate</a> |
              <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
              <a href="{url}raw-file/{node|short}/#file|urlescape#">raw</a><br/>
              </div>
              <div class="title">#file|escape#</div>
              <table>
              <tr>
               <td class="metatag">changeset #rev#:</td>
               <td><a href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
              #rename%filerename#
-             #parent%fileannotateparent#
-             #child%fileannotatechild#
+             #parent%filerevparent#
+             #child%filerevchild#
              <tr>
               <td class="metatag">manifest:</td>
               <td><a href="{url}file/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
              <tr>
               <td class="metatag">author:</td>
               <td>#author|obfuscate#</td></tr>
              <tr>
               <td class="metatag">date:</td>
               <td>#date|date# (#date|age# ago)</td></tr>
              <tr>
               <td class="metatag">permissions:</td>
               <td>#permissions|permissions#</td></tr>
              </table>
              <div class="page_body">
              #text%fileline#
              </div>
              #footer#

templates/gitweb/map

0 +1 -1

              default = 'summary'
              header = header.tmpl
              footer = footer.tmpl
              search = search.tmpl
              changelog = changelog.tmpl
              summary = summary.tmpl
              error = error.tmpl
              naventry = '<a href="#url#log/#rev#{sessionvars%urlparameter}">#label|escape#</a> '
              navshortentry = '<a href="#url#shortlog/#rev#{sessionvars%urlparameter}">#label|escape#</a> '
              filedifflink = '<a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#</a> '
              filenodelink = '<tr class="parity#parity#"><td><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">#file|escape#</a></td><td></td><td class="link"><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> | <a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a> | <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a></td></tr>'
              fileellipses = '...'
              changelogentry = changelogentry.tmpl
              searchentry = changelogentry.tmpl
              changeset = changeset.tmpl
              manifest = manifest.tmpl
              manifestdirentry = '<tr class="parity#parity#"><td style="font-family:monospace">drwxr-xr-x</td><td style="font-family:monospace"></td><td><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">#basename|escape#/</a></td><td class="link"><a href="#url#file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a></td></tr>'
              manifestfileentry = '<tr class="parity#parity#"><td style="font-family:monospace">#permissions|permissions#</td><td style="font-family:monospace" align=right>#size#</td><td class="list"><a class="list" href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#basename|escape#</a></td><td class="link"><a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a> | <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a></td></tr>'
              filerevision = filerevision.tmpl
              fileannotate = fileannotate.tmpl
              filediff = filediff.tmpl
              filelog = filelog.tmpl
              fileline = '<div style="font-family:monospace" class="parity#parity#"><pre><span class="linenr">   #linenumber#</span> #line|escape#</pre></div>'
              annotateline = '<tr style="font-family:monospace" class="parity#parity#"><td class="linenr" style="text-align: right;"><a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>'
              difflineplus = '<div style="color:#008800;">#line|escape#</div>'
              difflineminus = '<div style="color:#cc0000;">#line|escape#</div>'
              difflineat = '<div style="color:#990099;">#line|escape#</div>'
              diffline = '<div>#line|escape#</div>'
              changelogparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              changesetparent = '<tr><td>parent</td><td style="font-family:monospace"><a class="list" href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              filerevparent = '<tr><td class="metatag">parent:</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              filerename = '<tr><td class="metatag">parent:</td><td><a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#file|escape#@#node|short#</a></td></tr>'
              filelogrename = '| <a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">base</a>'
              fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              changelogchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              changesetchild = '<tr><td>child</td><td style="font-family:monospace"><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-             filerevchild = '<tr><td class="metatag">child:</td><td><a href="{url}file/{node|short}#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
+             filerevchild = '<tr><td class="metatag">child:</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              tags = tags.tmpl
              tagentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>#tag|escape#</b></a></td><td class="link"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}log/#node|short#{sessionvars%urlparameter}">changelog</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>'
              diffblock = '<pre>#lines#</pre>'
              changelogtag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>'
              changesettag = '<tr><td>tag</td><td>#tag|escape#</td></tr>'
              filediffparent = '<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              filelogparent = '<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              filediffchild = '<tr><th class="child">child #rev#:</th><td class="child"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              filelogchild = '<tr><td align="right">child #rev#:&nbsp;</td><td><a href="{url}file{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
              shortlog = shortlog.tmpl
              shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>'
              filelogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <!-- FIXME: <a href="{url}diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a> | --> <a href="{url}annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> #rename%filelogrename#</td></tr>'
              archiveentry = ' | <a href="{url}archive/{node|short}{extension}">#type|escape#</a> '
              indexentry = '<tr class="parity#parity#"><td><a class="list" href="#url#{sessionvars%urlparameter}"><b>#name|escape#</b></a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a class="rss_logo" href="#url#rss-log">RSS</a> #archives%archiveentry#</td></tr>'
              index = index.tmpl
              urlparameter = '#separator##name#=#value|urlescape#'
              hiddenformentry = '<input type="hidden" name="#name#" value="#value|escape#" />'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages