Merged in template changes from Mercurial 1.8.2. default tip
Merged in template changes from Mercurial 1.8.2.
1.1 --- a/coal/map Thu Apr 07 09:20:02 2011 -0700
1.2 +++ b/coal/map Mon Apr 11 15:51:22 2011 -0700
1.3 @@ -10,6 +10,11 @@
1.4 shortlogentry = ../paper/shortlogentry.tmpl
1.5 graph = ../paper/graph.tmpl
1.6
1.7 +help = ../paper/help.tmpl
1.8 +helptopics = ../paper/helptopics.tmpl
1.9 +
1.10 +helpentry = '<tr><td><a href="{url}help/{topic|escape}{sessionvars%urlparameter}">{topic|escape}</a></td><td>{summary|escape}</td></tr>'
1.11 +
1.12 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
1.13 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
1.14 navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
2.1 --- a/gitweb/branches.tmpl Thu Apr 07 09:20:02 2011 -0700
2.2 +++ b/gitweb/branches.tmpl Mon Apr 11 15:51:22 2011 -0700
2.3 @@ -18,7 +18,8 @@
2.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
2.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
2.6 branches |
2.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
2.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
2.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
2.10 <br/>
2.11 </div>
2.12
3.1 --- a/gitweb/changelog.tmpl Thu Apr 07 09:20:02 2011 -0700
3.2 +++ b/gitweb/changelog.tmpl Mon Apr 11 15:51:22 2011 -0700
3.3 @@ -25,7 +25,8 @@
3.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
3.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
3.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
3.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
3.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
3.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
3.10 <br/>
3.11 {changenav%nav}<br/>
3.12 </div>
4.1 --- a/gitweb/changeset.tmpl Thu Apr 07 09:20:02 2011 -0700
4.2 +++ b/gitweb/changeset.tmpl Mon Apr 11 15:51:22 2011 -0700
4.3 @@ -20,7 +20,9 @@
4.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
4.5 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
4.6 changeset |
4.7 -<a href="{url}raw-rev/{node|short}">raw</a> {archives%archiveentry}<br/>
4.8 +<a href="{url}raw-rev/{node|short}">raw</a> {archives%archiveentry} |
4.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
4.10 +<br/>
4.11 </div>
4.12
4.13 <div>
5.1 --- a/gitweb/error.tmpl Thu Apr 07 09:20:02 2011 -0700
5.2 +++ b/gitweb/error.tmpl Mon Apr 11 15:51:22 2011 -0700
5.3 @@ -12,7 +12,14 @@
5.4 </div>
5.5
5.6 <div class="page_nav">
5.7 -<a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a><br/>
5.8 +<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
5.9 +<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
5.10 +<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
5.11 +<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
5.12 +<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
5.13 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
5.14 +<a href="{url}help{sessionvars%urlparameter}">help</a>
5.15 +<br/>
5.16 </div>
5.17
5.18 <div class="page_body">
6.1 --- a/gitweb/fileannotate.tmpl Thu Apr 07 09:20:02 2011 -0700
6.2 +++ b/gitweb/fileannotate.tmpl Mon Apr 11 15:51:22 2011 -0700
6.3 @@ -25,7 +25,9 @@
6.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
6.5 annotate |
6.6 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
6.7 -<a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a><br/>
6.8 +<a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a> |
6.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
6.10 +<br/>
6.11 </div>
6.12
6.13 <div class="title">{file|escape}</div>
7.1 --- a/gitweb/filediff.tmpl Thu Apr 07 09:20:02 2011 -0700
7.2 +++ b/gitweb/filediff.tmpl Mon Apr 11 15:51:22 2011 -0700
7.3 @@ -25,7 +25,8 @@
7.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
7.5 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
7.6 diff |
7.7 -<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/>
7.8 +<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/> |
7.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
7.10 </div>
7.11
7.12 <div class="title">{file|escape}</div>
8.1 --- a/gitweb/filelog.tmpl Thu Apr 07 09:20:02 2011 -0700
8.2 +++ b/gitweb/filelog.tmpl Mon Apr 11 15:51:22 2011 -0700
8.3 @@ -22,7 +22,8 @@
8.4 revisions |
8.5 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
8.6 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
8.7 -<a href="{url}rss-log/{node|short}/{file|urlescape}">rss</a>
8.8 +<a href="{url}rss-log/tip/{file|urlescape}">rss</a> |
8.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
8.10 <br/>
8.11 {nav%filenav}
8.12 </div>
9.1 --- a/gitweb/filerevision.tmpl Thu Apr 07 09:20:02 2011 -0700
9.2 +++ b/gitweb/filerevision.tmpl Mon Apr 11 15:51:22 2011 -0700
9.3 @@ -25,7 +25,9 @@
9.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
9.5 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
9.6 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
9.7 -<a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a><br/>
9.8 +<a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a> |
9.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
9.10 +<br/>
9.11 </div>
9.12
9.13 <div class="title">{file|escape}</div>
10.1 --- a/gitweb/graph.tmpl Thu Apr 07 09:20:02 2011 -0700
10.2 +++ b/gitweb/graph.tmpl Mon Apr 11 15:51:22 2011 -0700
10.3 @@ -25,7 +25,8 @@
10.4 graph |
10.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
10.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
10.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
10.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
10.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
10.10 <br/>
10.11 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
10.12 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
10.13 @@ -38,7 +39,7 @@
10.14
10.15 <div id="wrapper">
10.16 <ul id="nodebgs"></ul>
10.17 -<canvas id="graph" width="224" height="{canvasheight}"></canvas>
10.18 +<canvas id="graph" width="480" height="{canvasheight}"></canvas>
10.19 <ul id="graphnodes"></ul>
10.20 </div>
10.21
10.22 @@ -50,7 +51,7 @@
10.23 var graph = new Graph();
10.24 graph.scale({bg_height});
10.25
10.26 -graph.edge = function(x0, y0, x1, y1, color) {
10.27 +graph.edge = function(x0, y0, x1, y1, color) \{
10.28
10.29 this.setColor(color, 0.0, 0.65);
10.30 this.ctx.beginPath();
10.31 @@ -65,7 +66,7 @@
10.32 revlink += '</span> _TAGS';
10.33 revlink += '<span class="info">_DATE, by _USER</span></li>';
10.34
10.35 -graph.vertex = function(x, y, color, parity, cur) {
10.36 +graph.vertex = function(x, y, color, parity, cur) \{
10.37
10.38 this.ctx.beginPath();
10.39 color = this.setColor(color, 0.25, 0.75);
10.40 @@ -84,17 +85,17 @@
10.41 item = item.replace(/_DATE/, cur[5]);
10.42
10.43 var tagspan = '';
10.44 - if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
10.45 + if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) \{
10.46 tagspan = '<span class="logtags">';
10.47 - if (cur[6][1]) {
10.48 + if (cur[6][1]) \{
10.49 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
10.50 tagspan += cur[6][0] + '</span> ';
10.51 - } else if (!cur[6][1] && cur[6][0] != 'default') {
10.52 + } else if (!cur[6][1] && cur[6][0] != 'default') \{
10.53 tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
10.54 tagspan += cur[6][0] + '</span> ';
10.55 }
10.56 - if (cur[7].length) {
10.57 - for (var t in cur[7]) {
10.58 + if (cur[7].length) \{
10.59 + for (var t in cur[7]) \{
10.60 var tag = cur[7][t];
10.61 tagspan += '<span class="tagtag">' + tag + '</span> ';
10.62 }
11.1 --- a/gitweb/manifest.tmpl Thu Apr 07 09:20:02 2011 -0700
11.2 +++ b/gitweb/manifest.tmpl Mon Apr 11 15:51:22 2011 -0700
11.3 @@ -19,7 +19,9 @@
11.4 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
11.5 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
11.6 files |
11.7 -<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> {archives%archiveentry}<br/>
11.8 +<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> {archives%archiveentry} |
11.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
11.10 +<br/>
11.11 </div>
11.12
11.13 <div class="title">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></div>
12.1 --- a/gitweb/map Thu Apr 07 09:20:02 2011 -0700
12.2 +++ b/gitweb/map Mon Apr 11 15:51:22 2011 -0700
12.3 @@ -7,6 +7,12 @@
12.4 summary = summary.tmpl
12.5 error = error.tmpl
12.6 notfound = notfound.tmpl
12.7 +
12.8 +help = help.tmpl
12.9 +helptopics = helptopics.tmpl
12.10 +
12.11 +helpentry = '<tr><td><a href="{url}help/{topic|escape}{sessionvars%urlparameter}">{topic|escape}</a></td><td>{summary|escape}</td></tr>'
12.12 +
12.13 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
12.14 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
12.15 navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
13.1 --- a/gitweb/search.tmpl Thu Apr 07 09:20:02 2011 -0700
13.2 +++ b/gitweb/search.tmpl Mon Apr 11 15:51:22 2011 -0700
13.3 @@ -26,6 +26,8 @@
13.4 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
13.5 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
13.6 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
13.7 + |
13.8 + <a href="{url}help{sessionvars%urlparameter}">help</a>
13.9 <br/>
13.10 </div>
13.11
14.1 --- a/gitweb/shortlog.tmpl Thu Apr 07 09:20:02 2011 -0700
14.2 +++ b/gitweb/shortlog.tmpl Mon Apr 11 15:51:22 2011 -0700
14.3 @@ -24,7 +24,8 @@
14.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
14.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
14.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
14.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
14.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
14.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
14.10 <br/>{changenav%navshort}<br/>
14.11 </div>
14.12
15.1 --- a/gitweb/summary.tmpl Thu Apr 07 09:20:02 2011 -0700
15.2 +++ b/gitweb/summary.tmpl Mon Apr 11 15:51:22 2011 -0700
15.3 @@ -25,7 +25,8 @@
15.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
15.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
15.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
15.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
15.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
15.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
15.10 <br/>
15.11 </div>
15.12
16.1 --- a/gitweb/tags.tmpl Thu Apr 07 09:20:02 2011 -0700
16.2 +++ b/gitweb/tags.tmpl Mon Apr 11 15:51:22 2011 -0700
16.3 @@ -18,7 +18,8 @@
16.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
16.5 tags |
16.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
16.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
16.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
16.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
16.10 <br/>
16.11 </div>
16.12
17.1 --- a/gitweb_am/branches.tmpl Thu Apr 07 09:20:02 2011 -0700
17.2 +++ b/gitweb_am/branches.tmpl Mon Apr 11 15:51:22 2011 -0700
17.3 @@ -18,7 +18,8 @@
17.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
17.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
17.6 branches |
17.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
17.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
17.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
17.10 <br/>
17.11 </div>
17.12
18.1 --- a/gitweb_am/changelog.tmpl Thu Apr 07 09:20:02 2011 -0700
18.2 +++ b/gitweb_am/changelog.tmpl Mon Apr 11 15:51:22 2011 -0700
18.3 @@ -25,7 +25,8 @@
18.4 <a href="{url}graph/{rev}{sessionvars%urlparameter}">graph</a> |
18.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
18.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
18.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
18.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
18.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
18.10 <br/>
18.11 {changenav%nav}<br/>
18.12 </div>
19.1 --- a/gitweb_am/changeset.tmpl Thu Apr 07 09:20:02 2011 -0700
19.2 +++ b/gitweb_am/changeset.tmpl Mon Apr 11 15:51:22 2011 -0700
19.3 @@ -20,7 +20,9 @@
19.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
19.5 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
19.6 changeset |
19.7 -<a href="{url}raw-rev/{node|short}">raw</a> {archives%archiveentry}<br/>
19.8 +<a href="{url}raw-rev/{node|short}">raw</a> {archives%archiveentry} |
19.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
19.10 +<br/>
19.11 </div>
19.12
19.13 <div class="title">
20.1 --- a/gitweb_am/error.tmpl Thu Apr 07 09:20:02 2011 -0700
20.2 +++ b/gitweb_am/error.tmpl Mon Apr 11 15:51:22 2011 -0700
20.3 @@ -6,7 +6,7 @@
20.4 <body>
20.5
20.6 <div class="page_header">
20.7 - <a href="../">Home</a> -
20.8 + <a href="../">Home</a> -
20.9 <a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> - error
20.10 <a href="http://wiki.alliedmods.net/Mercurial_Tutorial" title="Mercurial" style="float: right;">Mercurial</a>
20.11 </div>
20.12 @@ -18,7 +18,9 @@
20.13 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
20.14 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20.15 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
20.16 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a><br/>
20.17 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
20.18 +<a href="{url}help{sessionvars%urlparameter}">help</a>
20.19 +<br/>
20.20 </div>
20.21
20.22 <div class="page_body">
21.1 --- a/gitweb_am/fileannotate.tmpl Thu Apr 07 09:20:02 2011 -0700
21.2 +++ b/gitweb_am/fileannotate.tmpl Mon Apr 11 15:51:22 2011 -0700
21.3 @@ -25,7 +25,9 @@
21.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
21.5 annotate |
21.6 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
21.7 -<a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a><br/>
21.8 +<a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a> |
21.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
21.10 +<br/>
21.11 </div>
21.12
21.13 <div class="title">{file|escape}</div>
22.1 --- a/gitweb_am/filediff.tmpl Thu Apr 07 09:20:02 2011 -0700
22.2 +++ b/gitweb_am/filediff.tmpl Mon Apr 11 15:51:22 2011 -0700
22.3 @@ -25,7 +25,8 @@
22.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
22.5 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
22.6 diff |
22.7 -<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/>
22.8 +<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/> |
22.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
22.10 </div>
22.11
22.12 <div class="title">{file|escape}</div>
23.1 --- a/gitweb_am/filelog.tmpl Thu Apr 07 09:20:02 2011 -0700
23.2 +++ b/gitweb_am/filelog.tmpl Mon Apr 11 15:51:22 2011 -0700
23.3 @@ -22,7 +22,8 @@
23.4 revisions |
23.5 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
23.6 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
23.7 -<a href="{url}atom-log/{node|short}/{file|urlescape}"><img src="{staticurl}feed.png" alt="Feed" title="Feed of repository changes"/></a>
23.8 +<a href="{url}atom-log/tip/{file|urlescape}"><img src="{staticurl}feed.png" alt="Feed" title="Feed of repository changes"/></a>
23.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
23.10 <br/>
23.11 {nav%filenav}
23.12 </div>
24.1 --- a/gitweb_am/filerevision.tmpl Thu Apr 07 09:20:02 2011 -0700
24.2 +++ b/gitweb_am/filerevision.tmpl Mon Apr 11 15:51:22 2011 -0700
24.3 @@ -25,7 +25,9 @@
24.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
24.5 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
24.6 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
24.7 -<a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a><br/>
24.8 +<a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a> |
24.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
24.10 +<br/>
24.11 </div>
24.12
24.13 <div class="title">{file|escape}</div>
25.1 --- a/gitweb_am/graph.tmpl Thu Apr 07 09:20:02 2011 -0700
25.2 +++ b/gitweb_am/graph.tmpl Mon Apr 11 15:51:22 2011 -0700
25.3 @@ -25,7 +25,8 @@
25.4 graph |
25.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
25.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
25.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
25.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
25.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
25.10 <br/>
25.11 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
25.12 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
25.13 @@ -38,7 +39,7 @@
25.14
25.15 <div id="wrapper">
25.16 <ul id="nodebgs"></ul>
25.17 -<canvas id="graph" width="224" height="{canvasheight}"></canvas>
25.18 +<canvas id="graph" width="480" height="{canvasheight}"></canvas>
25.19 <ul id="graphnodes"></ul>
25.20 </div>
25.21
25.22 @@ -50,7 +51,7 @@
25.23 var graph = new Graph();
25.24 graph.scale({bg_height});
25.25
25.26 -graph.edge = function(x0, y0, x1, y1, color) {
25.27 +graph.edge = function(x0, y0, x1, y1, color) \{
25.28
25.29 this.setColor(color, 0.0, 0.65);
25.30 this.ctx.beginPath();
25.31 @@ -65,7 +66,7 @@
25.32 revlink += '</span> _TAGS';
25.33 revlink += '<span class="info">_DATE, by _USER</span></li>';
25.34
25.35 -graph.vertex = function(x, y, color, parity, cur) {
25.36 +graph.vertex = function(x, y, color, parity, cur) \{
25.37
25.38 this.ctx.beginPath();
25.39 color = this.setColor(color, 0.25, 0.75);
25.40 @@ -84,17 +85,17 @@
25.41 item = item.replace(/_DATE/, cur[5]);
25.42
25.43 var tagspan = '';
25.44 - if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
25.45 + if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) \{
25.46 tagspan = '<span class="logtags">';
25.47 - if (cur[6][1]) {
25.48 + if (cur[6][1]) \{
25.49 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
25.50 tagspan += cur[6][0] + '</span> ';
25.51 - } else if (!cur[6][1] && cur[6][0] != 'default') {
25.52 + } else if (!cur[6][1] && cur[6][0] != 'default') \{
25.53 tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
25.54 tagspan += cur[6][0] + '</span> ';
25.55 }
25.56 - if (cur[7].length) {
25.57 - for (var t in cur[7]) {
25.58 + if (cur[7].length) \{
25.59 + for (var t in cur[7]) \{
25.60 var tag = cur[7][t];
25.61 tagspan += '<span class="tagtag">' + tag + '</span> ';
25.62 }
26.1 --- a/gitweb_am/manifest.tmpl Thu Apr 07 09:20:02 2011 -0700
26.2 +++ b/gitweb_am/manifest.tmpl Mon Apr 11 15:51:22 2011 -0700
26.3 @@ -19,7 +19,9 @@
26.4 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
26.5 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
26.6 files |
26.7 -<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> {archives%archiveentry}<br/>
26.8 +<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> {archives%archiveentry} |
26.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
26.10 +<br/>
26.11 </div>
26.12
26.13 <div class="title">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></div>
27.1 --- a/gitweb_am/map Thu Apr 07 09:20:02 2011 -0700
27.2 +++ b/gitweb_am/map Mon Apr 11 15:51:22 2011 -0700
27.3 @@ -7,6 +7,12 @@
27.4 summary = summary.tmpl
27.5 error = error.tmpl
27.6 notfound = notfound.tmpl
27.7 +
27.8 +help = help.tmpl
27.9 +helptopics = helptopics.tmpl
27.10 +
27.11 +helpentry = '<tr><td><a href="{url}help/{topic|escape}{sessionvars%urlparameter}">{topic|escape}</a></td><td>{summary|escape}</td></tr>'
27.12 +
27.13 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
27.14 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
27.15 navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
28.1 --- a/gitweb_am/search.tmpl Thu Apr 07 09:20:02 2011 -0700
28.2 +++ b/gitweb_am/search.tmpl Mon Apr 11 15:51:22 2011 -0700
28.3 @@ -26,6 +26,8 @@
28.4 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
28.5 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
28.6 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
28.7 + |
28.8 + <a href="{url}help{sessionvars%urlparameter}">help</a>
28.9 <br/>
28.10 </div>
28.11
29.1 --- a/gitweb_am/shortlog.tmpl Thu Apr 07 09:20:02 2011 -0700
29.2 +++ b/gitweb_am/shortlog.tmpl Mon Apr 11 15:51:22 2011 -0700
29.3 @@ -24,7 +24,8 @@
29.4 <a href="{url}graph/{rev}{sessionvars%urlparameter}">graph</a> |
29.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
29.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
29.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
29.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
29.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
29.10 <br/>{changenav%navshort}<br/>
29.11 </div>
29.12
30.1 --- a/gitweb_am/summary.tmpl Thu Apr 07 09:20:02 2011 -0700
30.2 +++ b/gitweb_am/summary.tmpl Mon Apr 11 15:51:22 2011 -0700
30.3 @@ -25,7 +25,8 @@
30.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
30.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
30.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
30.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
30.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
30.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
30.10 <br/>
30.11 </div>
30.12
31.1 --- a/gitweb_am/tags.tmpl Thu Apr 07 09:20:02 2011 -0700
31.2 +++ b/gitweb_am/tags.tmpl Mon Apr 11 15:51:22 2011 -0700
31.3 @@ -18,7 +18,8 @@
31.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
31.5 tags |
31.6 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
31.7 -<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
31.8 +<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
31.9 +<a href="{url}help{sessionvars%urlparameter}">help</a>
31.10 <br/>
31.11 </div>
31.12
32.1 --- a/map-cmdline.default Thu Apr 07 09:20:02 2011 -0700
32.2 +++ b/map-cmdline.default Mon Apr 11 15:51:22 2011 -0700
32.3 @@ -1,7 +1,7 @@
32.4 -changeset = 'changeset: {rev}:{node|short}\n{branches}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n'
32.5 +changeset = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n'
32.6 changeset_quiet = '{rev}:{node|short}\n'
32.7 -changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n'
32.8 -changeset_debug = 'changeset: {rev}:{node}\n{branches}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n'
32.9 +changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n'
32.10 +changeset_debug = 'changeset: {rev}:{node}\n{branches}{bookmarks}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n'
32.11 start_files = 'files: '
32.12 file = ' {file}'
32.13 end_files = '\n'
32.14 @@ -21,4 +21,5 @@
32.15 manifest = 'manifest: {rev}:{node}\n'
32.16 branch = 'branch: {branch}\n'
32.17 tag = 'tag: {tag}\n'
32.18 +bookmark = 'bookmark: {bookmark}\n'
32.19 extra = 'extra: {key}={value|stringescape}\n'
33.1 --- a/map-cmdline.xml Thu Apr 07 09:20:02 2011 -0700
33.2 +++ b/map-cmdline.xml Mon Apr 11 15:51:22 2011 -0700
33.3 @@ -1,9 +1,9 @@
33.4 header = '<?xml version="1.0"?>\n<log>\n'
33.5 footer = '</log>\n'
33.6
33.7 -changeset = '<logentry revision="{rev}" node="{node}">\n{branches}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n</logentry>\n'
33.8 -changeset_verbose = '<logentry revision="{rev}" node="{node}">\n{branches}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}</logentry>\n'
33.9 -changeset_debug = '<logentry revision="{rev}" node="{node}">\n{branches}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}{extras}</logentry>\n'
33.10 +changeset = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n</logentry>\n'
33.11 +changeset_verbose = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}</logentry>\n'
33.12 +changeset_debug = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}{extras}</logentry>\n'
33.13
33.14 file_add = '<path action="A">{file_add|xmlescape}</path>\n'
33.15 file_mod = '<path action="M">{file_mod|xmlescape}</path>\n'
33.16 @@ -16,4 +16,5 @@
33.17 parent = '<parent revision="{rev}" node="{node}" />\n'
33.18 branch = '<branch>{branch|xmlescape}</branch>\n'
33.19 tag = '<tag>{tag|xmlescape}</tag>\n'
33.20 +bookmark = '<bookmark>{bookmark|xmlescape}</bookmark>\n'
33.21 extra = '<extra key="{key|xmlescape}">{value|xmlescape}</extra>\n'
34.1 --- a/monoblue/branches.tmpl Thu Apr 07 09:20:02 2011 -0700
34.2 +++ b/monoblue/branches.tmpl Mon Apr 11 15:51:22 2011 -0700
34.3 @@ -25,6 +25,7 @@
34.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
34.5 <li class="current">branches</li>
34.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
34.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
34.8 </ul>
34.9 </div>
34.10
35.1 --- a/monoblue/changelog.tmpl Thu Apr 07 09:20:02 2011 -0700
35.2 +++ b/monoblue/changelog.tmpl Mon Apr 11 15:51:22 2011 -0700
35.3 @@ -25,6 +25,7 @@
35.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
35.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
35.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
35.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
35.8 </ul>
35.9 </div>
35.10
36.1 --- a/monoblue/changelogentry.tmpl Thu Apr 07 09:20:02 2011 -0700
36.2 +++ b/monoblue/changelogentry.tmpl Mon Apr 11 15:51:22 2011 -0700
36.3 @@ -1,4 +1,4 @@
36.4 -<h3 class="changelog"><a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></h3>
36.5 +<h3 class="changelog"><a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3>
36.6 <ul class="changelog-entry">
36.7 <li class="age">{date|age}</li>
36.8 <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>
37.1 --- a/monoblue/changeset.tmpl Thu Apr 07 09:20:02 2011 -0700
37.2 +++ b/monoblue/changeset.tmpl Mon Apr 11 15:51:22 2011 -0700
37.3 @@ -25,6 +25,7 @@
37.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
37.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
37.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
37.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
37.8 </ul>
37.9 </div>
37.10
37.11 @@ -35,7 +36,7 @@
37.12
37.13 <h2 class="no-link no-border">changeset</h2>
37.14
37.15 - <h3 class="changeset"><a href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></h3>
37.16 + <h3 class="changeset"><a href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3>
37.17 <p class="changeset-age"><span>{date|age}</span></p>
37.18
37.19 <dl class="overview">
38.1 --- a/monoblue/error.tmpl Thu Apr 07 09:20:02 2011 -0700
38.2 +++ b/monoblue/error.tmpl Mon Apr 11 15:51:22 2011 -0700
38.3 @@ -25,6 +25,7 @@
38.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
38.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
38.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
38.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
38.8 </ul>
38.9 </div>
38.10
39.1 --- a/monoblue/fileannotate.tmpl Thu Apr 07 09:20:02 2011 -0700
39.2 +++ b/monoblue/fileannotate.tmpl Mon Apr 11 15:51:22 2011 -0700
39.3 @@ -25,6 +25,7 @@
39.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
39.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
39.6 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
39.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
39.8 </ul>
39.9 </div>
39.10
40.1 --- a/monoblue/filediff.tmpl Thu Apr 07 09:20:02 2011 -0700
40.2 +++ b/monoblue/filediff.tmpl Mon Apr 11 15:51:22 2011 -0700
40.3 @@ -25,6 +25,7 @@
40.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
40.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
40.6 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
40.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
40.8 </ul>
40.9 </div>
40.10
41.1 --- a/monoblue/filelog.tmpl Thu Apr 07 09:20:02 2011 -0700
41.2 +++ b/monoblue/filelog.tmpl Mon Apr 11 15:51:22 2011 -0700
41.3 @@ -25,6 +25,7 @@
41.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
41.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
41.6 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
41.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
41.8 </ul>
41.9 </div>
41.10
41.11 @@ -33,7 +34,7 @@
41.12 <li class="current">revisions</li>
41.13 <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
41.14 <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
41.15 - <li><a href="{url}rss-log/{node|short}/{file|urlescape}">rss</a></li>
41.16 + <li><a href="{url}rss-log/tip/{file|urlescape}">rss</a></li>
41.17 </ul>
41.18
41.19 <h2 class="no-link no-border">{file|urlescape}</h2>
42.1 --- a/monoblue/filerevision.tmpl Thu Apr 07 09:20:02 2011 -0700
42.2 +++ b/monoblue/filerevision.tmpl Mon Apr 11 15:51:22 2011 -0700
42.3 @@ -25,6 +25,7 @@
42.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
42.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
42.6 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
42.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
42.8 </ul>
42.9 </div>
42.10
43.1 --- a/monoblue/graph.tmpl Thu Apr 07 09:20:02 2011 -0700
43.2 +++ b/monoblue/graph.tmpl Mon Apr 11 15:51:22 2011 -0700
43.3 @@ -26,6 +26,7 @@
43.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
43.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
43.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
43.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
43.8 </ul>
43.9 </div>
43.10
43.11 @@ -34,7 +35,7 @@
43.12 <div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>
43.13 <div id="wrapper">
43.14 <ul id="nodebgs"></ul>
43.15 - <canvas id="graph" width="224" height="{canvasheight}"></canvas>
43.16 + <canvas id="graph" width="480" height="{canvasheight}"></canvas>
43.17 <ul id="graphnodes"></ul>
43.18 </div>
43.19
43.20 @@ -48,7 +49,7 @@
43.21 var graph = new Graph();
43.22 graph.scale({bg_height});
43.23
43.24 - graph.edge = function(x0, y0, x1, y1, color) {
43.25 + graph.edge = function(x0, y0, x1, y1, color) \{
43.26
43.27 this.setColor(color, 0.0, 0.65);
43.28 this.ctx.beginPath();
43.29 @@ -62,7 +63,7 @@
43.30 revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
43.31 revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
43.32
43.33 - graph.vertex = function(x, y, color, parity, cur) {
43.34 + graph.vertex = function(x, y, color, parity, cur) \{
43.35
43.36 this.ctx.beginPath();
43.37 color = this.setColor(color, 0.25, 0.75);
43.38 @@ -81,21 +82,27 @@
43.39 item = item.replace(/_DATE/, cur[5]);
43.40
43.41 var tagspan = '';
43.42 - if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
43.43 + if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{
43.44 tagspan = '<span class="logtags">';
43.45 - if (cur[6][1]) {
43.46 + if (cur[6][1]) \{
43.47 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
43.48 tagspan += cur[6][0] + '</span> ';
43.49 - } else if (!cur[6][1] && cur[6][0] != 'default') {
43.50 + } else if (!cur[6][1] && cur[6][0] != 'default') \{
43.51 tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
43.52 tagspan += cur[6][0] + '</span> ';
43.53 }
43.54 - if (cur[7].length) {
43.55 - for (var t in cur[7]) {
43.56 + if (cur[7].length) \{
43.57 + for (var t in cur[7]) \{
43.58 var tag = cur[7][t];
43.59 tagspan += '<span class="tagtag">' + tag + '</span> ';
43.60 }
43.61 }
43.62 + if (cur[8].length) \{
43.63 + for (var t in cur[8]) \{
43.64 + var bookmark = cur[8][t];
43.65 + tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';
43.66 + }
43.67 + }
43.68 tagspan += '</span>';
43.69 }
43.70
44.1 --- a/monoblue/manifest.tmpl Thu Apr 07 09:20:02 2011 -0700
44.2 +++ b/monoblue/manifest.tmpl Mon Apr 11 15:51:22 2011 -0700
44.3 @@ -25,6 +25,7 @@
44.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
44.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
44.6 <li class="current">files</li>
44.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
44.8 </ul>
44.9 </div>
44.10
44.11 @@ -34,7 +35,7 @@
44.12 </ul>
44.13
44.14 <h2 class="no-link no-border">files</h2>
44.15 - <p class="files">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></p>
44.16 + <p class="files">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></p>
44.17
44.18 <table>
44.19 <tr class="parity{upparity}">
45.1 --- a/monoblue/map Thu Apr 07 09:20:02 2011 -0700
45.2 +++ b/monoblue/map Mon Apr 11 15:51:22 2011 -0700
45.3 @@ -7,6 +7,12 @@
45.4 summary = summary.tmpl
45.5 error = error.tmpl
45.6 notfound = notfound.tmpl
45.7 +
45.8 +help = help.tmpl
45.9 +helptopics = helptopics.tmpl
45.10 +
45.11 +helpentry = '<tr><td><a href="{url}help/{topic|escape}{sessionvars%urlparameter}">{topic|escape}</a></td><td>{summary|escape}</td></tr>'
45.12 +
45.13 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
45.14 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
45.15 navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
45.16 @@ -75,7 +81,7 @@
45.17 <tr class="parity{parity}">
45.18 <td class="linenr">
45.19 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}"
45.20 - title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>
45.21 + title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a>
45.22 </td>
45.23 <td class="lineno">
45.24 <a href="#{lineid}" id="{lineid}">{linenumber}</a>
45.25 @@ -174,6 +180,7 @@
45.26 tagtag = '<span class="tagtag" title="{name}">{name}</span> '
45.27 branchtag = '<span class="branchtag" title="{name}">{name}</span> '
45.28 inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
45.29 +bookmarktag = '<span class="bookmarktag" title="{name}">{name}</span> '
45.30 shortlogentry = '
45.31 <tr class="parity{parity}">
45.32 <td class="nowrap">{date|age}</td>
45.33 @@ -181,7 +188,7 @@
45.34 <td>
45.35 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">
45.36 {desc|strip|firstline|escape|nonempty}
45.37 - <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span>
45.38 + <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>
45.39 </a>
45.40 </td>
45.41 <td class="nowrap">
46.1 --- a/monoblue/notfound.tmpl Thu Apr 07 09:20:02 2011 -0700
46.2 +++ b/monoblue/notfound.tmpl Mon Apr 11 15:51:22 2011 -0700
46.3 @@ -25,6 +25,7 @@
46.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
46.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
46.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
46.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
46.8 </ul>
46.9 </div>
46.10
47.1 --- a/monoblue/search.tmpl Thu Apr 07 09:20:02 2011 -0700
47.2 +++ b/monoblue/search.tmpl Mon Apr 11 15:51:22 2011 -0700
47.3 @@ -25,6 +25,7 @@
47.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
47.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
47.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
47.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
47.8 </ul>
47.9 </div>
47.10
48.1 --- a/monoblue/shortlog.tmpl Thu Apr 07 09:20:02 2011 -0700
48.2 +++ b/monoblue/shortlog.tmpl Mon Apr 11 15:51:22 2011 -0700
48.3 @@ -24,7 +24,9 @@
48.4 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
48.5 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
48.6 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
48.7 - <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
48.8 + <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
48.9 + {archives%archiveentry}
48.10 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
48.11 </ul>
48.12 </div>
48.13
49.1 --- a/monoblue/summary.tmpl Thu Apr 07 09:20:02 2011 -0700
49.2 +++ b/monoblue/summary.tmpl Mon Apr 11 15:51:22 2011 -0700
49.3 @@ -25,6 +25,7 @@
49.4 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
49.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
49.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
49.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
49.8 </ul>
49.9 </div>
49.10
50.1 --- a/monoblue/tags.tmpl Thu Apr 07 09:20:02 2011 -0700
50.2 +++ b/monoblue/tags.tmpl Mon Apr 11 15:51:22 2011 -0700
50.3 @@ -25,6 +25,7 @@
50.4 <li class="current">tags</li>
50.5 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
50.6 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
50.7 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
50.8 </ul>
50.9 </div>
50.10
51.1 --- a/paper/branches.tmpl Thu Apr 07 09:20:02 2011 -0700
51.2 +++ b/paper/branches.tmpl Mon Apr 11 15:51:22 2011 -0700
51.3 @@ -17,8 +17,12 @@
51.4 <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
51.5 <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
51.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
51.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
51.8 <li class="active">branches</li>
51.9 </ul>
51.10 +<ul>
51.11 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
51.12 +</ul>
51.13 </div>
51.14
51.15 <div class="main">
51.16 @@ -37,7 +41,18 @@
51.17 <th>branch</th>
51.18 <th>node</th>
51.19 </tr>
51.20 -{entries%branchentry}
51.21 +{entries %
51.22 +' <tr class="tagEntry parity{parity}">
51.23 + <td>
51.24 + <a href="{url}shortlog/{node|short}{sessionvars%urlparameter}" class="{status}">
51.25 + {branch|escape}
51.26 + </a>
51.27 + </td>
51.28 + <td class="node">
51.29 + {node|short}
51.30 + </td>
51.31 + </tr>'
51.32 +}
51.33 </table>
51.34 </div>
51.35 </div>
52.1 --- a/paper/changeset.tmpl Thu Apr 07 09:20:02 2011 -0700
52.2 +++ b/paper/changeset.tmpl Mon Apr 11 15:51:22 2011 -0700
52.3 @@ -12,6 +12,7 @@
52.4 <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
52.5 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
52.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
52.7 + <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
52.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
52.9 </ul>
52.10 <ul>
52.11 @@ -22,12 +23,15 @@
52.12 <ul>
52.13 {archives%archiveentry}
52.14 </ul>
52.15 +<ul>
52.16 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
52.17 +</ul>
52.18 </div>
52.19
52.20 <div class="main">
52.21
52.22 <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
52.23 -<h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag}</h3>
52.24 +<h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag} {changesetbookmark}</h3>
52.25
52.26 <form class="search" action="{url}log">
52.27 {sessionvars%hiddenformentry}
53.1 --- a/paper/error.tmpl Thu Apr 07 09:20:02 2011 -0700
53.2 +++ b/paper/error.tmpl Mon Apr 11 15:51:22 2011 -0700
53.3 @@ -13,7 +13,9 @@
53.4 <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
53.5 <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
53.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
53.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
53.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
53.9 +<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
53.10 </ul>
53.11 </div>
53.12
54.1 --- a/paper/fileannotate.tmpl Thu Apr 07 09:20:02 2011 -0700
54.2 +++ b/paper/fileannotate.tmpl Mon Apr 11 15:51:22 2011 -0700
54.3 @@ -13,6 +13,7 @@
54.4 <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
54.5 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
54.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
54.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
54.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
54.9 </ul>
54.10
54.11 @@ -28,6 +29,9 @@
54.12 <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
54.13 <li><a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a></li>
54.14 </ul>
54.15 +<ul>
54.16 +<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
54.17 +</ul>
54.18 </div>
54.19
54.20 <div class="main">
55.1 --- a/paper/filediff.tmpl Thu Apr 07 09:20:02 2011 -0700
55.2 +++ b/paper/filediff.tmpl Mon Apr 11 15:51:22 2011 -0700
55.3 @@ -13,6 +13,7 @@
55.4 <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
55.5 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
55.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
55.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
55.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
55.9 </ul>
55.10 <ul>
55.11 @@ -27,6 +28,9 @@
55.12 <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
55.13 <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li>
55.14 </ul>
55.15 +<ul>
55.16 +<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
55.17 +</ul>
55.18 </div>
55.19
55.20 <div class="main">
56.1 --- a/paper/filelog.tmpl Thu Apr 07 09:20:02 2011 -0700
56.2 +++ b/paper/filelog.tmpl Mon Apr 11 15:51:22 2011 -0700
56.3 @@ -17,6 +17,7 @@
56.4 <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
56.5 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
56.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
56.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
56.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
56.9 </ul>
56.10 <ul>
56.11 @@ -30,6 +31,9 @@
56.12 <li class="active">file log</li>
56.13 <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li>
56.14 </ul>
56.15 +<ul>
56.16 +<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
56.17 +</ul>
56.18 </div>
56.19
56.20 <div class="main">
57.1 --- a/paper/filerevision.tmpl Thu Apr 07 09:20:02 2011 -0700
57.2 +++ b/paper/filerevision.tmpl Mon Apr 11 15:51:22 2011 -0700
57.3 @@ -27,6 +27,9 @@
57.4 <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
57.5 <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li>
57.6 </ul>
57.7 +<ul>
57.8 +<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
57.9 +</ul>
57.10 </div>
57.11
57.12 <div class="main">
58.1 --- a/paper/graph.tmpl Thu Apr 07 09:20:02 2011 -0700
58.2 +++ b/paper/graph.tmpl Mon Apr 11 15:51:22 2011 -0700
58.3 @@ -18,12 +18,16 @@
58.4 <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
58.5 <li class="active">graph</li>
58.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
58.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
58.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
58.9 </ul>
58.10 <ul>
58.11 <li><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a></li>
58.12 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
58.13 </ul>
58.14 +<ul>
58.15 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
58.16 +</ul>
58.17 </div>
58.18
58.19 <div class="main">
58.20 @@ -47,7 +51,7 @@
58.21
58.22 <div id="wrapper">
58.23 <ul id="nodebgs"></ul>
58.24 -<canvas id="graph" width="224" height="{canvasheight}"></canvas>
58.25 +<canvas id="graph" width="480" height="{canvasheight}"></canvas>
58.26 <ul id="graphnodes"></ul>
58.27 </div>
58.28
58.29 @@ -59,7 +63,7 @@
58.30 var graph = new Graph();
58.31 graph.scale({bg_height});
58.32
58.33 -graph.edge = function(x0, y0, x1, y1, color) {
58.34 +graph.edge = function(x0, y0, x1, y1, color) \{
58.35
58.36 this.setColor(color, 0.0, 0.65);
58.37 this.ctx.beginPath();
58.38 @@ -73,7 +77,7 @@
58.39 revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
58.40 revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
58.41
58.42 -graph.vertex = function(x, y, color, parity, cur) {
58.43 +graph.vertex = function(x, y, color, parity, cur) \{
58.44
58.45 this.ctx.beginPath();
58.46 color = this.setColor(color, 0.25, 0.75);
58.47 @@ -92,21 +96,27 @@
58.48 item = item.replace(/_DATE/, cur[5]);
58.49
58.50 var tagspan = '';
58.51 - if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
58.52 + if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) \{
58.53 tagspan = '<span class="logtags">';
58.54 - if (cur[6][1]) {
58.55 + if (cur[6][1]) \{
58.56 tagspan += '<span class="branchhead" title="' + cur[6][0] + '">';
58.57 tagspan += cur[6][0] + '</span> ';
58.58 - } else if (!cur[6][1] && cur[6][0] != 'default') {
58.59 + } else if (!cur[6][1] && cur[6][0] != 'default') \{
58.60 tagspan += '<span class="branchname" title="' + cur[6][0] + '">';
58.61 tagspan += cur[6][0] + '</span> ';
58.62 }
58.63 - if (cur[7].length) {
58.64 - for (var t in cur[7]) {
58.65 + if (cur[7].length) \{
58.66 + for (var t in cur[7]) \{
58.67 var tag = cur[7][t];
58.68 tagspan += '<span class="tag">' + tag + '</span> ';
58.69 }
58.70 }
58.71 + if (cur[8].length) \{
58.72 + for (var b in cur[8]) \{
58.73 + var bookmark = cur[8][b];
58.74 + tagspan += '<span class="tag">' + bookmark + '</span> ';
58.75 + }
58.76 + }
58.77 tagspan += '</span>';
58.78 }
58.79
59.1 --- a/paper/manifest.tmpl Thu Apr 07 09:20:02 2011 -0700
59.2 +++ b/paper/manifest.tmpl Mon Apr 11 15:51:22 2011 -0700
59.3 @@ -13,6 +13,7 @@
59.4 <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
59.5 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
59.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
59.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
59.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
59.9 </ul>
59.10 <ul>
59.11 @@ -22,6 +23,9 @@
59.12 <ul>
59.13 {archives%archiveentry}
59.14 </ul>
59.15 +<ul>
59.16 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
59.17 +</ul>
59.18 </div>
59.19
59.20 <div class="main">
60.1 --- a/paper/map Thu Apr 07 09:20:02 2011 -0700
60.2 +++ b/paper/map Mon Apr 11 15:51:22 2011 -0700
60.3 @@ -9,6 +9,10 @@
60.4 shortlog = shortlog.tmpl
60.5 shortlogentry = shortlogentry.tmpl
60.6 graph = graph.tmpl
60.7 +help = help.tmpl
60.8 +helptopics = helptopics.tmpl
60.9 +
60.10 +helpentry = '<tr><td><a href="{url}help/{topic|escape}{sessionvars%urlparameter}">{topic|escape}</a></td><td>{summary|escape}</td></tr>'
60.11
60.12 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
60.13 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
60.14 @@ -137,6 +141,18 @@
60.15 {node|short}
60.16 </td>
60.17 </tr>'
60.18 +bookmarks = bookmarks.tmpl
60.19 +bookmarkentry = '
60.20 + <tr class="tagEntry parity{parity}">
60.21 + <td>
60.22 + <a href="{url}rev/{node|short}{sessionvars%urlparameter}">
60.23 + {bookmark|escape}
60.24 + </a>
60.25 + </td>
60.26 + <td class="node">
60.27 + {node|short}
60.28 + </td>
60.29 + </tr>'
60.30 branches = branches.tmpl
60.31 branchentry = '
60.32 <tr class="tagEntry parity{parity}">
60.33 @@ -151,6 +167,7 @@
60.34 </tr>'
60.35 changelogtag = '<span class="tag">{name|escape}</span> '
60.36 changesettag = '<span class="tag">{tag|escape}</span> '
60.37 +changesetbookmark = '<span class="tag">{bookmark|escape}</span> '
60.38 changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
60.39 changelogbranchname = '<span class="branchname">{name|escape}</span> '
60.40
61.1 --- a/paper/search.tmpl Thu Apr 07 09:20:02 2011 -0700
61.2 +++ b/paper/search.tmpl Mon Apr 11 15:51:22 2011 -0700
61.3 @@ -13,7 +13,9 @@
61.4 <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
61.5 <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
61.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
61.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
61.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
61.9 +<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
61.10 </ul>
61.11 </div>
61.12
62.1 --- a/paper/shortlog.tmpl Thu Apr 07 09:20:02 2011 -0700
62.2 +++ b/paper/shortlog.tmpl Mon Apr 11 15:51:22 2011 -0700
62.3 @@ -17,6 +17,7 @@
62.4 <li class="active">log</li>
62.5 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
62.6 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
62.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
62.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
62.9 </ul>
62.10 <ul>
62.11 @@ -26,6 +27,9 @@
62.12 <ul>
62.13 {archives%archiveentry}
62.14 </ul>
62.15 +<ul>
62.16 + <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
62.17 +</ul>
62.18 </div>
62.19
62.20 <div class="main">
63.1 --- a/paper/shortlogentry.tmpl Thu Apr 07 09:20:02 2011 -0700
63.2 +++ b/paper/shortlogentry.tmpl Mon Apr 11 15:51:22 2011 -0700
63.3 @@ -1,5 +1,5 @@
63.4 <tr class="parity{parity}">
63.5 - <td class="age">{date|age}</td>
63.6 + <td class="age">{age(date)}</td>
63.7 <td class="author">{author|person}</td>
63.8 - <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}</td>
63.9 + <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags % '<span class="tag">{name|escape}</span> '}{bookmarks % '<span class="tag">{name|escape}</span> '}</td>
63.10 </tr>
64.1 --- a/paper/tags.tmpl Thu Apr 07 09:20:02 2011 -0700
64.2 +++ b/paper/tags.tmpl Mon Apr 11 15:51:22 2011 -0700
64.3 @@ -17,8 +17,12 @@
64.4 <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
64.5 <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
64.6 <li class="active">tags</li>
64.7 +<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
64.8 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
64.9 </ul>
64.10 +<ul>
64.11 +<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
64.12 +</ul>
64.13 </div>
64.14
64.15 <div class="main">
65.1 --- a/raw/map Thu Apr 07 09:20:02 2011 -0700
65.2 +++ b/raw/map Mon Apr 11 15:51:22 2011 -0700
65.3 @@ -9,6 +9,7 @@
65.4 changesetparent = '# Parent {node}'
65.5 changesetchild = '# Child {node}'
65.6 filenodelink = ''
65.7 +filenolink = ''
65.8 fileline = '{line}'
65.9 diffblock = '{lines}'
65.10 filediff = filediff.tmpl
66.1 --- a/rss/filelogentry.tmpl Thu Apr 07 09:20:02 2011 -0700
66.2 +++ b/rss/filelogentry.tmpl Mon Apr 11 15:51:22 2011 -0700
66.3 @@ -1,6 +1,6 @@
66.4 <item>
66.5 <title>{desc|strip|firstline|strip|escape}</title>
66.6 - <link>{urlbase}{url}log{{node|short}}/{file|urlescape}</link>
66.7 + <link>{urlbase}{url}log{node|short}/{file|urlescape}</link>
66.8 <description><![CDATA[{desc|strip|escape|addbreaks|nonempty}]]></description>
66.9 <author>{author|obfuscate}</author>
66.10 <pubDate>{date|rfc822date}</pubDate>
67.1 --- a/spartan/branches.tmpl Thu Apr 07 09:20:02 2011 -0700
67.2 +++ b/spartan/branches.tmpl Mon Apr 11 15:51:22 2011 -0700
67.3 @@ -13,6 +13,7 @@
67.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a>
67.5 <a href="{url}tags{sessionvars%urlparameter}">tags</a>
67.6 <a href="{url}file/{node|short}/{sessionvars%urlparameter}">files</a>
67.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
67.8 <a type="application/rss+xml" href="{url}rss-branches">rss</a>
67.9 <a type="application/atom+xml" href="{url}atom-branches">atom</a>
67.10 </div>
68.1 --- a/spartan/changelog.tmpl Thu Apr 07 09:20:02 2011 -0700
68.2 +++ b/spartan/changelog.tmpl Mon Apr 11 15:51:22 2011 -0700
68.3 @@ -14,6 +14,7 @@
68.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a>
68.5 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
68.6 {archives%archiveentry}
68.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
68.8 <a type="application/rss+xml" href="{url}rss-log">rss</a>
68.9 <a type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}">atom</a>
68.10 </div>
69.1 --- a/spartan/changeset.tmpl Thu Apr 07 09:20:02 2011 -0700
69.2 +++ b/spartan/changeset.tmpl Mon Apr 11 15:51:22 2011 -0700
69.3 @@ -12,6 +12,7 @@
69.4 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
69.5 <a href="{url}raw-rev/{node|short}">raw</a>
69.6 {archives%archiveentry}
69.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
69.8 </div>
69.9
69.10 <h2>changeset: {desc|strip|escape|firstline|nonempty}</h2>
70.1 --- a/spartan/fileannotate.tmpl Thu Apr 07 09:20:02 2011 -0700
70.2 +++ b/spartan/fileannotate.tmpl Mon Apr 11 15:51:22 2011 -0700
70.3 @@ -14,6 +14,7 @@
70.4 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a>
70.5 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
70.6 <a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a>
70.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
70.8 </div>
70.9
70.10 <h2>Annotate {file|escape}</h2>
71.1 --- a/spartan/filediff.tmpl Thu Apr 07 09:20:02 2011 -0700
71.2 +++ b/spartan/filediff.tmpl Mon Apr 11 15:51:22 2011 -0700
71.3 @@ -14,6 +14,7 @@
71.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
71.5 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
71.6 <a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a>
71.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
71.8 </div>
71.9
71.10 <h2>{file|escape}</h2>
72.1 --- a/spartan/filelog.tmpl Thu Apr 07 09:20:02 2011 -0700
72.2 +++ b/spartan/filelog.tmpl Mon Apr 11 15:51:22 2011 -0700
72.3 @@ -15,6 +15,7 @@
72.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a>
72.5 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a>
72.6 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
72.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
72.8 <a type="application/rss+xml" href="{url}rss-log/tip/{file|urlescape}">rss</a>
72.9 <a type="application/atom+xml" href="{url}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}">atom</a>
72.10 </div>
73.1 --- a/spartan/filerevision.tmpl Thu Apr 07 09:20:02 2011 -0700
73.2 +++ b/spartan/filerevision.tmpl Mon Apr 11 15:51:22 2011 -0700
73.3 @@ -14,6 +14,7 @@
73.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
73.5 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
73.6 <a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a>
73.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
73.8 </div>
73.9
73.10 <h2>{file|escape}</h2>
74.1 --- a/spartan/graph.tmpl Thu Apr 07 09:20:02 2011 -0700
74.2 +++ b/spartan/graph.tmpl Mon Apr 11 15:51:22 2011 -0700
74.3 @@ -14,6 +14,7 @@
74.4 <a href="{url}tags{sessionvars%urlparameter}">tags</a>
74.5 <a href="{url}branches{sessionvars%urlparameter}">branches</a>
74.6 <a href="{url}file/{node|short}/{sessionvars%urlparameter}">files</a>
74.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
74.8 </div>
74.9
74.10 <h2>graph</h2>
74.11 @@ -31,7 +32,7 @@
74.12
74.13 <div id="wrapper">
74.14 <ul id="nodebgs"></ul>
74.15 -<canvas id="graph" width="224" height="{canvasheight}"></canvas>
74.16 +<canvas id="graph" width="480" height="{canvasheight}"></canvas>
74.17 <ul id="graphnodes"></ul>
74.18 </div>
74.19
74.20 @@ -43,7 +44,7 @@
74.21 var graph = new Graph();
74.22 graph.scale({bg_height});
74.23
74.24 -graph.edge = function(x0, y0, x1, y1, color) {
74.25 +graph.edge = function(x0, y0, x1, y1, color) \{
74.26
74.27 this.setColor(color, 0.0, 0.65);
74.28 this.ctx.beginPath();
74.29 @@ -57,7 +58,7 @@
74.30 revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
74.31 revlink += '</span><span class="info">_DATE, by _USER</span></li>';
74.32
74.33 -graph.vertex = function(x, y, color, parity, cur) {
74.34 +graph.vertex = function(x, y, color, parity, cur) \{
74.35
74.36 this.ctx.beginPath();
74.37 color = this.setColor(color, 0.25, 0.75);
75.1 --- a/spartan/manifest.tmpl Thu Apr 07 09:20:02 2011 -0700
75.2 +++ b/spartan/manifest.tmpl Mon Apr 11 15:51:22 2011 -0700
75.3 @@ -11,6 +11,7 @@
75.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a>
75.5 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
75.6 {archives%archiveentry}
75.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
75.8 </div>
75.9
75.10 <h2>files for changeset {node|short}: {path|escape}</h2>
76.1 --- a/spartan/search.tmpl Thu Apr 07 09:20:02 2011 -0700
76.2 +++ b/spartan/search.tmpl Mon Apr 11 15:51:22 2011 -0700
76.3 @@ -11,6 +11,7 @@
76.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a>
76.5 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
76.6 {archives%archiveentry}
76.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
76.8 </div>
76.9
76.10 <h2>searching for {query|escape}</h2>
77.1 --- a/spartan/shortlog.tmpl Thu Apr 07 09:20:02 2011 -0700
77.2 +++ b/spartan/shortlog.tmpl Mon Apr 11 15:51:22 2011 -0700
77.3 @@ -14,6 +14,7 @@
77.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a>
77.5 <a href="{url}file/{node|short}/{sessionvars%urlparameter}">files</a>
77.6 {archives%archiveentry}
77.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
77.8 <a type="application/rss+xml" href="{url}rss-log">rss</a>
77.9 <a type="application/rss+xml" href="{url}atom-log" title="Atom feed for {repo|escape}">atom</a>
77.10 </div>
78.1 --- a/spartan/tags.tmpl Thu Apr 07 09:20:02 2011 -0700
78.2 +++ b/spartan/tags.tmpl Mon Apr 11 15:51:22 2011 -0700
78.3 @@ -13,6 +13,7 @@
78.4 <a href="{url}graph{sessionvars%urlparameter}">graph</a>
78.5 <a href="{url}branches{sessionvars%urlparameter}">branches</a>
78.6 <a href="{url}file/{node|short}/{sessionvars%urlparameter}">files</a>
78.7 +<a href="{url}help{sessionvars%urlparameter}">help</a>
78.8 <a type="application/rss+xml" href="{url}rss-tags">rss</a>
78.9 <a type="application/atom+xml" href="{url}atom-tags">atom</a>
78.10 </div>
79.1 --- a/static/style-gitweb.css Thu Apr 07 09:20:02 2011 -0700
79.2 +++ b/static/style-gitweb.css Mon Apr 11 15:51:22 2011 -0700
79.3 @@ -33,6 +33,7 @@
79.4 tr.dark, .parity1 { background-color:#f6f6f0; }
79.5 tr.dark:hover, .parity1:hover { background-color:#edece6; }
79.6 td { padding:2px 5px; font-size:12px; vertical-align:top; }
79.7 +td.closed { background-color: #99f; }
79.8 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
79.9 td.indexlinks { white-space: nowrap; }
79.10 td.indexlinks a {
80.1 --- a/static/style-monoblue.css Thu Apr 07 09:20:02 2011 -0700
80.2 +++ b/static/style-monoblue.css Mon Apr 11 15:51:22 2011 -0700
80.3 @@ -83,7 +83,7 @@
80.4 margin: 10px 0 0 0;
80.5 list-style-type: none;
80.6 overflow: hidden;
80.7 - width: 800px;
80.8 + width: 900px;
80.9 }
80.10 ul.page-nav li {
80.11 margin: 0 2px 0 0;
80.12 @@ -204,6 +204,9 @@
80.13 table tr td.nowrap {
80.14 white-space: nowrap;
80.15 }
80.16 +table tr td.closed {
80.17 + background-color: #99f;
80.18 +}
80.19 /*
80.20 table tr.parity0:hover,
80.21 table tr.parity1:hover {
80.22 @@ -243,6 +246,10 @@
80.23 background-color: #d5dde6;
80.24 border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
80.25 }
80.26 +span.logtags span.bookmarktag {
80.27 + background-color: #afdffa;
80.28 + border-color: #ccecff #46ace6 #46ace6 #ccecff;
80.29 +}
80.30
80.31 div.diff pre {
80.32 margin: 10px 0 0 0;
81.1 --- a/template-vars.txt Thu Apr 07 09:20:02 2011 -0700
81.2 +++ b/template-vars.txt Mon Apr 11 15:51:22 2011 -0700
81.3 @@ -28,6 +28,10 @@
81.4 annotate an annotated file
81.5 entries the entries relevant to the page
81.6
81.7 +url base url of hgweb interface
81.8 +staticurl base url for static resources
81.9 +
81.10 +
81.11 Templates and commands:
81.12 changelog(rev) - a page for browsing changesets
81.13 naventry - a link for jumping to a changeset number