| author | Anton Shestakov <engored@ya.ru> |
| Sat, 10 Jan 2015 19:58:28 +0800 | |
| changeset 24129 | 3fc86f1c39d8 |
| parent 20255 | b1d65cb8c759 |
| child 25604 | 0cdcbc477cac |
| permissions | -rw-r--r-- |
|
8430
8b47efdf40ee
monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8355
diff
changeset
|
1 |
{header}
|
|
8b47efdf40ee
monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8355
diff
changeset
|
2 |
<title>{repo|escape}: graph</title>
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
3 |
<link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
4 |
<link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
5 |
<!--[if IE]><script type="text/javascript" src="{staticurl|urlescape}excanvas.js"></script><![endif]-->
|
| 7111 | 6 |
</head> |
7 |
||
8 |
<body> |
|
9 |
<div id="container"> |
|
10 |
<div class="page-header"> |
|
|
18258
bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages
Angel Ezquerra <angel.ezquerra at gmail.com>
parents:
17580
diff
changeset
|
11 |
<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1>
|
| 7111 | 12 |
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
13 |
<form action="{url|urlescape}log">
|
| 7111 | 14 |
{sessionvars%hiddenformentry}
|
15 |
<dl class="search"> |
|
16 |
<dt><label>Search: </label></dt> |
|
17 |
<dd><input type="text" name="rev" /></dd> |
|
18 |
</dl> |
|
19 |
</form> |
|
20 |
||
21 |
<ul class="page-nav"> |
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
22 |
<li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
23 |
<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
24 |
<li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
|
| 7111 | 25 |
<li class="current">graph</li> |
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
26 |
<li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
27 |
<li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
28 |
<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
29 |
<li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a></li>
|
|
24129
3fc86f1c39d8
hgweb: don't mix tabs and spaces in monoblue templates
Anton Shestakov <engored@ya.ru>
parents:
20255
diff
changeset
|
30 |
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
|
| 7111 | 31 |
</ul> |
32 |
</div> |
|
33 |
||
34 |
<h2 class="no-link no-border">graph</h2> |
|
35 |
||
36 |
<div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div> |
|
37 |
<div id="wrapper"> |
|
38 |
<ul id="nodebgs"></ul> |
|
|
13610
7359cb753a54
templates: widen the graph canvas (issue2683)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12666
diff
changeset
|
39 |
<canvas id="graph" width="480" height="{canvasheight}"></canvas>
|
| 7111 | 40 |
<ul id="graphnodes"></ul> |
41 |
</div> |
|
42 |
||
43 |
<script> |
|
44 |
<!-- hide script content |
|
45 |
||
46 |
document.getElementById('noscript').style.display = 'none';
|
|
47 |
||
48 |
var data = {jsdata|json};
|
|
49 |
var graph = new Graph(); |
|
50 |
graph.scale({bg_height});
|
|
51 |
||
|
10856
b07bd417115b
templates: escape javascript braces
Matt Mackall <mpm@selenic.com>
parents:
10575
diff
changeset
|
52 |
graph.vertex = function(x, y, color, parity, cur) \{
|
| 7111 | 53 |
|
54 |
this.ctx.beginPath(); |
|
55 |
color = this.setColor(color, 0.25, 0.75); |
|
56 |
this.ctx.arc(x, y, radius, 0, Math.PI * 2, true); |
|
57 |
this.ctx.fill(); |
|
58 |
||
59 |
var bg = '<li class="bg parity' + parity + '"></li>'; |
|
|
17580
ffe3630cb243
hgweb: fix incorrect graph padding calculation (issue3626)
Tim Delaney <timothy.c.delaney@gmail.com>
parents:
17421
diff
changeset
|
60 |
var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; |
| 7111 | 61 |
var nstyle = 'padding-left: ' + left + 'px;'; |
62 |
||
|
7408
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
63 |
var tagspan = ''; |
|
13794
5c18a0bca26f
hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)
Yuya Nishihara <yuya@tcha.org>
parents:
13610
diff
changeset
|
64 |
if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{
|
|
7408
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
65 |
tagspan = '<span class="logtags">'; |
|
10856
b07bd417115b
templates: escape javascript braces
Matt Mackall <mpm@selenic.com>
parents:
10575
diff
changeset
|
66 |
if (cur[6][1]) \{
|
|
7408
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
67 |
tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; |
|
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
68 |
tagspan += cur[6][0] + '</span> '; |
|
10856
b07bd417115b
templates: escape javascript braces
Matt Mackall <mpm@selenic.com>
parents:
10575
diff
changeset
|
69 |
} else if (!cur[6][1] && cur[6][0] != 'default') \{
|
|
7408
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
70 |
tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">'; |
|
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
71 |
tagspan += cur[6][0] + '</span> '; |
|
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
72 |
} |
|
10856
b07bd417115b
templates: escape javascript braces
Matt Mackall <mpm@selenic.com>
parents:
10575
diff
changeset
|
73 |
if (cur[7].length) \{
|
|
b07bd417115b
templates: escape javascript braces
Matt Mackall <mpm@selenic.com>
parents:
10575
diff
changeset
|
74 |
for (var t in cur[7]) \{
|
|
7408
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
75 |
var tag = cur[7][t]; |
|
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
76 |
tagspan += '<span class="tagtag">' + tag + '</span> '; |
|
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
77 |
} |
|
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
78 |
} |
|
13794
5c18a0bca26f
hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)
Yuya Nishihara <yuya@tcha.org>
parents:
13610
diff
changeset
|
79 |
if (cur[8].length) \{
|
|
5c18a0bca26f
hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)
Yuya Nishihara <yuya@tcha.org>
parents:
13610
diff
changeset
|
80 |
for (var t in cur[8]) \{
|
|
5c18a0bca26f
hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)
Yuya Nishihara <yuya@tcha.org>
parents:
13610
diff
changeset
|
81 |
var bookmark = cur[8][t]; |
|
5c18a0bca26f
hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)
Yuya Nishihara <yuya@tcha.org>
parents:
13610
diff
changeset
|
82 |
tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; |
|
5c18a0bca26f
hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)
Yuya Nishihara <yuya@tcha.org>
parents:
13610
diff
changeset
|
83 |
} |
|
5c18a0bca26f
hgweb: add bookmark labels to monoblue theme (based on 270f57d35525)
Yuya Nishihara <yuya@tcha.org>
parents:
13610
diff
changeset
|
84 |
} |
|
7408
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
85 |
tagspan += '</span>'; |
|
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
86 |
} |
|
f031a12dfc31
coal/paper/monoblue: show branch names in hgweb graph
Benoit Allard <benoit@aeteurope.nl>
parents:
7111
diff
changeset
|
87 |
|
|
17421
3eb85477c0d9
hgweb: avoid bad $$ processing in graph (issue3601)
Mads Kiilerich <mads@kiilerich.com>
parents:
16137
diff
changeset
|
88 |
var item = '<li style="' + nstyle + '"><span class="desc">'; |
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
89 |
item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
|
|
17421
3eb85477c0d9
hgweb: avoid bad $$ processing in graph (issue3601)
Mads Kiilerich <mads@kiilerich.com>
parents:
16137
diff
changeset
|
90 |
item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; |
|
3eb85477c0d9
hgweb: avoid bad $$ processing in graph (issue3601)
Mads Kiilerich <mads@kiilerich.com>
parents:
16137
diff
changeset
|
91 |
|
| 7111 | 92 |
return [bg, item]; |
93 |
||
94 |
} |
|
95 |
||
96 |
graph.render(data); |
|
97 |
||
98 |
// stop hiding script --> |
|
99 |
</script> |
|
100 |
||
101 |
<div class="page-path"> |
|
|
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
102 |
<a href="{url|urlescape}graph/{rev}{lessvars%urlparameter}">less</a>
|
|
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
103 |
<a href="{url|urlescape}graph/{rev}{morevars%urlparameter}">more</a>
|
|
10254
8d5de52431f2
hgweb: changenav: separate pages before and after the current position
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9999
diff
changeset
|
104 |
| {changenav%navgraph}
|
| 7111 | 105 |
</div> |
106 |
||
|
20255
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
107 |
<script type="text/javascript"> |
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
108 |
ajaxScrollInit( |
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
109 |
'{url|urlescape}graph/{rev}?revcount=%next%&style={style}',
|
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
110 |
{revcount}+60,
|
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
111 |
function (htmlText, previousVal) \{ return previousVal + 60; },
|
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
112 |
'#wrapper', |
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
113 |
'<div class="%class%" style="text-align: center;">%text%</div>', |
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
114 |
'graph' |
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
115 |
); |
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
116 |
</script> |
|
b1d65cb8c759
hgweb: infinite scroll support for monoblue style
Takumi IINO <trot.thunder@gmail.com>
parents:
18526
diff
changeset
|
117 |
|
|
8430
8b47efdf40ee
monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8355
diff
changeset
|
118 |
{footer}
|