##// END OF EJS Templates
gitweb: fix graph again after previous faulty commit (1e0677756f60)
Dirkjan Ochtman -
r7445:29c6e71b default
parent child Browse files
Show More
@@ -1,120 +1,120 b''
1 #header#
1 #header#
2 <title>#repo|escape#: Graph</title>
2 <title>#repo|escape#: Graph</title>
3 <link rel="alternate" type="application/atom+xml"
3 <link rel="alternate" type="application/atom+xml"
4 href="{url}atom-log" title="Atom feed for #repo|escape#"/>
4 href="{url}atom-log" title="Atom feed for #repo|escape#"/>
5 <link rel="alternate" type="application/rss+xml"
5 <link rel="alternate" type="application/rss+xml"
6 href="{url}rss-log" title="RSS feed for #repo|escape#"/>
6 href="{url}rss-log" title="RSS feed for #repo|escape#"/>
7 <!--[if IE]><script type="text/javascript" src="/mercurial/crew/static/excanvas.js"></script><![endif]-->
7 <!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]-->
8 </head>
8 </head>
9 <body>
9 <body>
10
10
11 <div class="page_header">
11 <div class="page_header">
12 <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / graph
12 <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / graph
13 </div>
13 </div>
14
14
15 <form action="{url}log">
15 <form action="{url}log">
16 {sessionvars%hiddenformentry}
16 {sessionvars%hiddenformentry}
17 <div class="search">
17 <div class="search">
18 <input type="text" name="rev" />
18 <input type="text" name="rev" />
19 </div>
19 </div>
20 </form>
20 </form>
21 <div class="page_nav">
21 <div class="page_nav">
22 <a href="{url}summary{sessionvars%urlparameter}">summary</a> |
22 <a href="{url}summary{sessionvars%urlparameter}">summary</a> |
23 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
23 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
24 <a href="{url}log/#rev#{sessionvars%urlparameter}">changelog</a> |
24 <a href="{url}log/#rev#{sessionvars%urlparameter}">changelog</a> |
25 graph |
25 graph |
26 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
26 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
27 <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>
27 <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>
28 <br/>
28 <br/>
29 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
29 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
30 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
30 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
31 | #changenav%navgraphentry#<br/>
31 | #changenav%navgraphentry#<br/>
32 </div>
32 </div>
33
33
34 <div class="title">&nbsp;</div>
34 <div class="title">&nbsp;</div>
35
35
36 <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>
36 <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>
37
37
38 <div id="wrapper">
38 <div id="wrapper">
39 <ul id="nodebgs"></ul>
39 <ul id="nodebgs"></ul>
40 <canvas id="graph" width="224" height="#canvasheight#"></canvas>
40 <canvas id="graph" width="224" height="#canvasheight#"></canvas>
41 <ul id="graphnodes"></ul>
41 <ul id="graphnodes"></ul>
42 </div>
42 </div>
43
43
44 <script type="text/javascript" src="#staticurl#graph.js"></script>
44 <script type="text/javascript" src="#staticurl#graph.js"></script>
45 <script>
45 <script>
46 <!-- hide script content
46 <!-- hide script content
47
47
48 var data = {jsdata|json};
48 var data = {jsdata|json};
49 var graph = new Graph();
49 var graph = new Graph();
50 graph.scale({bg_height});
50 graph.scale({bg_height});
51
51
52 graph.edge = function(x0, y0, x1, y1, color) {
52 graph.edge = function(x0, y0, x1, y1, color) {
53
53
54 this.setColor(color, 0.0, 0.65);
54 this.setColor(color, 0.0, 0.65);
55 this.ctx.beginPath();
55 this.ctx.beginPath();
56 this.ctx.moveTo(x0, y0);
56 this.ctx.moveTo(x0, y0);
57 this.ctx.lineTo(x1, y1);
57 this.ctx.lineTo(x1, y1);
58 this.ctx.stroke();
58 this.ctx.stroke();
59
59
60 }
60 }
61
61
62 var revlink = '<li style="_STYLE"><span class="desc">';
62 var revlink = '<li style="_STYLE"><span class="desc">';
63 revlink += '<a class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>';
63 revlink += '<a class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>';
64 revlink += '</span> _TAGS';
64 revlink += '</span> _TAGS';
65 revlink += '<span class="info">_DATE ago, by _USER</span></li>';
65 revlink += '<span class="info">_DATE ago, by _USER</span></li>';
66
66
67 graph.vertex = function(x, y, color, parity, cur) {
67 graph.vertex = function(x, y, color, parity, cur) {
68
68
69 this.ctx.beginPath();
69 this.ctx.beginPath();
70 color = this.setColor(color, 0.25, 0.75);
70 color = this.setColor(color, 0.25, 0.75);
71 this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
71 this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
72 this.ctx.fill();
72 this.ctx.fill();
73
73
74 var bg = '<li class="bg parity' + parity + '"></li>';
74 var bg = '<li class="bg parity' + parity + '"></li>';
75 var left = (this.columns + 1) * this.bg_height;
75 var left = (this.columns + 1) * this.bg_height;
76 var nstyle = 'padding-left: ' + left + 'px;';
76 var nstyle = 'padding-left: ' + left + 'px;';
77 var item = revlink.replace(/_STYLE/, nstyle);
77 var item = revlink.replace(/_STYLE/, nstyle);
78 item = item.replace(/_PARITY/, 'parity' + parity);
78 item = item.replace(/_PARITY/, 'parity' + parity);
79 item = item.replace(/_NODEID/, cur[0]);
79 item = item.replace(/_NODEID/, cur[0]);
80 item = item.replace(/_NODEID/, cur[0]);
80 item = item.replace(/_NODEID/, cur[0]);
81 item = item.replace(/_DESC/, cur[3]);
81 item = item.replace(/_DESC/, cur[3]);
82 item = item.replace(/_USER/, cur[4]);
82 item = item.replace(/_USER/, cur[4]);
83 item = item.replace(/_DATE/, cur[5]);
83 item = item.replace(/_DATE/, cur[5]);
84
84
85 var tagspan = '';
85 var tagspan = '';
86 if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
86 if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
87 tagspan = '<span class="logtags">';
87 tagspan = '<span class="logtags">';
88 if (cur[6][1]) {
88 if (cur[6][1]) {
89 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
89 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
90 tagspan += cur[6][0] + '</span> ';
90 tagspan += cur[6][0] + '</span> ';
91 } else if (!cur[6][1] && cur[6][0] != 'default') {
91 } else if (!cur[6][1] && cur[6][0] != 'default') {
92 tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
92 tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
93 tagspan += cur[6][0] + '</span> ';
93 tagspan += cur[6][0] + '</span> ';
94 }
94 }
95 if (cur[7].length) {
95 if (cur[7].length) {
96 for (var t in cur[7]) {
96 for (var t in cur[7]) {
97 var tag = cur[7][t];
97 var tag = cur[7][t];
98 tagspan += '<span class="tagtag">' + tag + '</span> ';
98 tagspan += '<span class="tagtag">' + tag + '</span> ';
99 }
99 }
100 }
100 }
101 tagspan += '</span>';
101 tagspan += '</span>';
102 }
102 }
103
103
104 item = item.replace(/_TAGS/, tagspan);
104 item = item.replace(/_TAGS/, tagspan);
105 return [bg, item];
105 return [bg, item];
106
106
107 }
107 }
108
108
109 graph.render(data);
109 graph.render(data);
110
110
111 // stop hiding script -->
111 // stop hiding script -->
112 </script>
112 </script>
113
113
114 <div class="page_nav">
114 <div class="page_nav">
115 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
115 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
116 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
116 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
117 | {changenav%navgraphentry}
117 | {changenav%navgraphentry}
118 </div>
118 </div>
119
119
120 #footer#
120 #footer#
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
General Comments 0
You need to be logged in to leave comments. Login now