Mercurial > hg
comparison mercurial/templates/paper/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 |
---|---|
77 | 77 |
78 annotateline = ' | 78 annotateline = ' |
79 <tr id="{lineid}"{ifeq(node, originalnode, ' class="thisrev"')}> | 79 <tr id="{lineid}"{ifeq(node, originalnode, ' class="thisrev"')}> |
80 <td class="annotate"> | 80 <td class="annotate"> |
81 {if(blockhead, | 81 {if(blockhead, |
82 '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" | 82 '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}"> |
83 title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>', | 83 {author|user}@{rev} |
84 '')} | 84 </a>')} |
85 <div class="annotate-info"> | |
86 <div>{node|short}: {desc|escape|firstline}</div> | |
87 <div>parents: {parents%annotateparent}</div> | |
88 </div> | |
85 </td> | 89 </td> |
86 <td class="source"><a href="#{lineid}">{linenumber}</a> {line|escape}</td> | 90 <td class="source"><a href="#{lineid}">{linenumber}</a> {line|escape}</td> |
87 </tr>' | 91 </tr>' |
88 | 92 annotateparent = ' |
93 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}</a>' | |
89 diffblock = '<div class="bottomline inc-lineno"><pre class="sourcelines wrap">{lines}</pre></div>' | 94 diffblock = '<div class="bottomline inc-lineno"><pre class="sourcelines wrap">{lines}</pre></div>' |
90 difflineplus = ' | 95 difflineplus = ' |
91 <span id="{lineid}" class="plusline">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | 96 <span id="{lineid}" class="plusline">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' |
92 difflineminus = ' | 97 difflineminus = ' |
93 <span id="{lineid}" class="minusline">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | 98 <span id="{lineid}" class="minusline">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' |