Mercurial > hg
comparison mercurial/templates/gitweb/map @ 29522:9c37df347485
hgweb: add link to parents of annotated revision in annotate view
The link is embedded into a div with class="annotate-info" that only shows up
upon hover of the annotate column. To avoid duplicate hover-overs (this new
one and the one coming from link's title), drop "title" attribute from a
element and put it in the annotate-info element.
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Tue, 28 Jun 2016 11:42:42 +0200 |
parents | f694e20193f2 |
children | 4b6afd1b445a |
comparison
equal
deleted
inserted
replaced
29521:83147ff53112 | 29522:9c37df347485 |
---|---|
94 filelog = filelog.tmpl | 94 filelog = filelog.tmpl |
95 fileline = ' | 95 fileline = ' |
96 <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>' | 96 <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>' |
97 annotateline = ' | 97 annotateline = ' |
98 <tr id="{lineid}" style="font-family:monospace" class="parity{parity}{ifeq(node, originalnode, ' thisrev')}"> | 98 <tr id="{lineid}" style="font-family:monospace" class="parity{parity}{ifeq(node, originalnode, ' thisrev')}"> |
99 <td class="linenr" style="text-align: right;"> | 99 <td class="annotate linenr" style="text-align: right;"> |
100 {if(blockhead, | 100 {if(blockhead, |
101 '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" | 101 '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}"> |
102 title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>', | 102 {author|user}@{rev} |
103 '')} | 103 </a>')} |
104 <div class="annotate-info"> | |
105 <div>{node|short}: {desc|escape|firstline}</div> | |
106 <div>parents: {parents%annotateparent}</div> | |
107 </div> | |
104 </td> | 108 </td> |
105 <td><pre><a class="linenr" href="#{lineid}">{linenumber}</a></pre></td> | 109 <td><pre><a class="linenr" href="#{lineid}">{linenumber}</a></pre></td> |
106 <td><pre>{line|escape}</pre></td> | 110 <td><pre>{line|escape}</pre></td> |
107 </tr>' | 111 </tr>' |
112 annotateparent = ' | |
113 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}</a>' | |
108 difflineplus = ' | 114 difflineplus = ' |
109 <a href="#{lineid}"></a><span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span>' | 115 <a href="#{lineid}"></a><span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span>' |
110 difflineminus = ' | 116 difflineminus = ' |
111 <a href="#{lineid}"></a><span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span>' | 117 <a href="#{lineid}"></a><span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span>' |
112 difflineat = ' | 118 difflineat = ' |