Mercurial > hg
view mercurial/templates/gitweb/graph.tmpl @ 17580:ffe3630cb243 stable
hgweb: fix incorrect graph padding calculation (issue3626)
hgweb has an incorrect padding calculation, causing the text to move further
away from the graph the more branches there are (issue3626). This patch fixes
all existing templates (gitweb, monoblue, paper and spartan).
Tests updated by Patrick Mezard <patrick@mezard.eu>
author | Tim Delaney <timothy.c.delaney@gmail.com> |
---|---|
date | Mon, 17 Sep 2012 21:33:16 +0200 |
parents | 3eb85477c0d9 |
children | bebb05a7e249 |
line wrap: on
line source
{header} <title>{repo|escape}: Graph</title> <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/> <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/> <!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]--> </head> <body> <div class="page_header"> <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph </div> <form action="{url}log"> {sessionvars%hiddenformentry} <div class="search"> <input type="text" name="rev" /> </div> </form> <div class="page_nav"> <a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> | graph | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> | <a href="{url}branches{sessionvars%urlparameter}">branches</a> | <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> | <a href="{url}help{sessionvars%urlparameter}">help</a> <br/> <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a> <a href="{url}graph/{rev}{morevars%urlparameter}">more</a> | {changenav%navgraph}<br/> </div> <div class="title"> </div> <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript> <div id="wrapper"> <ul id="nodebgs"></ul> <canvas id="graph" width="480" height="{canvasheight}"></canvas> <ul id="graphnodes"></ul> </div> <script> <!-- hide script content var data = {jsdata|json}; var graph = new Graph(); graph.scale({bg_height}); graph.vertex = function(x, y, color, parity, cur) \{ this.ctx.beginPath(); color = this.setColor(color, 0.25, 0.75); this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); this.ctx.fill(); var bg = '<li class="bg parity' + parity + '"></li>'; var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; var nstyle = 'padding-left: ' + left + 'px;'; var tagspan = ''; if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ tagspan = '<span class="logtags">'; if (cur[6][1]) \{ tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; tagspan += cur[6][0] + '</span> '; } else if (!cur[6][1] && cur[6][0] != 'default') \{ tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">'; tagspan += cur[6][0] + '</span> '; } if (cur[7].length) \{ for (var t in cur[7]) \{ var tag = cur[7][t]; tagspan += '<span class="tagtag">' + tag + '</span> '; } } if (cur[8].length) \{ for (var t in cur[8]) \{ var bookmark = cur[8][t]; tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; } } tagspan += '</span>'; } var item = '<li style="' + nstyle + '"><span class="desc">'; item += '<a class="list" href="{url}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '"><b>' + cur[3] + '</b></a>'; item += '</span> ' + tagspan + ''; item += '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; return [bg, item]; } graph.render(data); // stop hiding script --> </script> <div class="page_nav"> <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a> <a href="{url}graph/{rev}{morevars%urlparameter}">more</a> | {changenav%navgraph} </div> {footer}