annotate mercurial/templates/gitweb/graph.tmpl @ 36574:45f149bf08d1

templatekw: fix dict construction in _showlist to not mix bytes and strs What we had was fine on Python 2, but was slightly wrong on Python 3. This works on both. Differential Revision: https://phab.mercurial-scm.org/D2554
author Augie Fackler <augie@google.com>
date Fri, 02 Mar 2018 09:09:38 -0500
parents 59c842a3d1e1
children 5faaa31a6082
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8427
cebdfdcc3e42 git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8356
diff changeset
1 {header}
cebdfdcc3e42 git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8356
diff changeset
2 <title>{repo|escape}: Graph</title>
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 <link rel="alternate" type="application/atom+xml"
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
4 href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 <link rel="alternate" type="application/rss+xml"
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
6 href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 </head>
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 <body>
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
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 <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages
Angel Ezquerra <angel.ezquerra at gmail.com>
parents: 17580
diff changeset
12 <a href="/">Mercurial</a> {pathdef%breadcrumb} / graph
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13 </div>
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 <div class="page_nav">
32762
2d93d2159e30 hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents: 32761
diff changeset
16 <div>
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
17 <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |
26666
e901df65b108 gitweb: don't drop current revision context on graph page
Anton Shestakov <av6@dwimlabs.net>
parents: 25605
diff changeset
18 <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> |
25605
dd89304687a3 hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents: 20254
diff changeset
19 <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> |
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20 graph |
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
21 <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
22 <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
23 <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
25605
dd89304687a3 hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents: 20254
diff changeset
24 <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> |
18526
9409aeaafdc1 hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents: 18258
diff changeset
25 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 <br/>
25605
dd89304687a3 hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents: 20254
diff changeset
27 <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
dd89304687a3 hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents: 20254
diff changeset
28 <a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a>
32762
2d93d2159e30 hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents: 32761
diff changeset
29 | {changenav%navgraph}
2d93d2159e30 hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents: 32761
diff changeset
30 </div>
2d93d2159e30 hgweb: refresh styling of gitweb's search form
Gregory Szorc <gregory.szorc@gmail.com>
parents: 32761
diff changeset
31 {searchform}
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32 </div>
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 <div class="title">&nbsp;</div>
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35
7124
63579aa36c8e graph: replace the blinking no javascript message
Benoit Allard <benoit@aeteurope.nl>
parents: 6733
diff changeset
36 <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38 <div id="wrapper">
35407
27ab3150cd50 hgweb: calculate <canvas> width and height client-side
Anton Shestakov <av6@dwimlabs.net>
parents: 35255
diff changeset
39 <canvas id="graph"></canvas>
35220
dc623009e0b0 gitweb: render changesets server-side on /graph page
Anton Shestakov <av6@dwimlabs.net>
parents: 35160
diff changeset
40 <ul id="graphnodes">{nodes%graphentry}</ul>
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
41 </div>
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
42
30766
d7bf7d2bd5ab hgweb: support Content Security Policy
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27913
diff changeset
43 <script{if(nonce, ' nonce="{nonce}"')}>
6733
936a9073bb73 graph: fix JavaScript issues to make it work on IE
Benoit Allard <benoit@aeteurope.nl>
parents: 6729
diff changeset
44 var data = {jsdata|json};
936a9073bb73 graph: fix JavaScript issues to make it work on IE
Benoit Allard <benoit@aeteurope.nl>
parents: 6729
diff changeset
45 var graph = new Graph();
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
46 graph.scale({bg_height});
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
47 graph.render(data);
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
48 </script>
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
49
32992
816a4fa7d5f8 hgweb: use separate CSS class for navigation links in footer
Gregory Szorc <gregory.szorc@gmail.com>
parents: 32762
diff changeset
50 <div class="extra_nav">
25605
dd89304687a3 hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents: 20254
diff changeset
51 <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
dd89304687a3 hgweb: don't dereference symbolic revision in gitweb style
Anton Shestakov <av6@dwimlabs.net>
parents: 20254
diff changeset
52 <a href="{url|urlescape}graph/{symrev}{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
53 | {changenav%navgraph}
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
54 </div>
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
55
30766
d7bf7d2bd5ab hgweb: support Content Security Policy
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27913
diff changeset
56 <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
20254
3896debf0a11 hgweb: infinite scroll support for gitweb style
Takumi IINO <trot.thunder@gmail.com>
parents: 18526
diff changeset
57 ajaxScrollInit(
35409
f84b01257e06 hgweb: render next pages on /graph incrementally
Anton Shestakov <av6@dwimlabs.net>
parents: 35407
diff changeset
58 '{url|urlescape}graph/%next%{graphvars%urlparameter}',
f84b01257e06 hgweb: render next pages on /graph incrementally
Anton Shestakov <av6@dwimlabs.net>
parents: 35407
diff changeset
59 '{nextentry%"{node}"}', <!-- NEXTHASH
35654
59c842a3d1e1 hgweb: remove unused second argument of nextPageVarGet()
Anton Shestakov <av6@dwimlabs.net>
parents: 35605
diff changeset
60 function (htmlText) \{
35409
f84b01257e06 hgweb: render next pages on /graph incrementally
Anton Shestakov <av6@dwimlabs.net>
parents: 35407
diff changeset
61 var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
f84b01257e06 hgweb: render next pages on /graph incrementally
Anton Shestakov <av6@dwimlabs.net>
parents: 35407
diff changeset
62 return m ? m[1] : null;
f84b01257e06 hgweb: render next pages on /graph incrementally
Anton Shestakov <av6@dwimlabs.net>
parents: 35407
diff changeset
63 },
20254
3896debf0a11 hgweb: infinite scroll support for gitweb style
Takumi IINO <trot.thunder@gmail.com>
parents: 18526
diff changeset
64 '#wrapper',
3896debf0a11 hgweb: infinite scroll support for gitweb style
Takumi IINO <trot.thunder@gmail.com>
parents: 18526
diff changeset
65 '<div class="%class%" style="text-align: center;">%text%</div>',
3896debf0a11 hgweb: infinite scroll support for gitweb style
Takumi IINO <trot.thunder@gmail.com>
parents: 18526
diff changeset
66 'graph'
3896debf0a11 hgweb: infinite scroll support for gitweb style
Takumi IINO <trot.thunder@gmail.com>
parents: 18526
diff changeset
67 );
3896debf0a11 hgweb: infinite scroll support for gitweb style
Takumi IINO <trot.thunder@gmail.com>
parents: 18526
diff changeset
68 </script>
3896debf0a11 hgweb: infinite scroll support for gitweb style
Takumi IINO <trot.thunder@gmail.com>
parents: 18526
diff changeset
69
8427
cebdfdcc3e42 git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8356
diff changeset
70 {footer}