Mercurial > hg
comparison mercurial/templates/monoblue/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 |
---|---|
90 filelog = filelog.tmpl | 90 filelog = filelog.tmpl |
91 fileline = ' | 91 fileline = ' |
92 <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>' | 92 <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>' |
93 annotateline = ' | 93 annotateline = ' |
94 <tr id="{lineid}" class="parity{parity}{ifeq(node, originalnode, ' thisrev')}"> | 94 <tr id="{lineid}" class="parity{parity}{ifeq(node, originalnode, ' thisrev')}"> |
95 <td class="linenr"> | 95 <td class="annotate linenr"> |
96 {if(blockhead, | 96 {if(blockhead, |
97 '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" | 97 '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}"> |
98 title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>', | 98 {author|user}@{rev} |
99 '')} | 99 </a>')} |
100 <div class="annotate-info"> | |
101 <div>{node|short}: {desc|escape|firstline}</div> | |
102 <div>parents: {parents%annotateparent}</div> | |
103 </div> | |
100 </td> | 104 </td> |
101 <td class="lineno"> | 105 <td class="lineno"> |
102 <a href="#{lineid}">{linenumber}</a> | 106 <a href="#{lineid}">{linenumber}</a> |
103 </td> | 107 </td> |
104 <td class="source">{line|escape}</td> | 108 <td class="source">{line|escape}</td> |
105 </tr>' | 109 </tr>' |
110 annotateparent = ' | |
111 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}</a>' | |
106 difflineplus = ' | 112 difflineplus = ' |
107 <a href="#{lineid}"></a><span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span>' | 113 <a href="#{lineid}"></a><span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span>' |
108 difflineminus = ' | 114 difflineminus = ' |
109 <a href="#{lineid}"></a><span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span>' | 115 <a href="#{lineid}"></a><span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span>' |
110 difflineat = ' | 116 difflineat = ' |