Merged in template changes from Mercurial 1.5.1.
Merged in template changes from Mercurial 1.5.1.
1.1 --- a/coal/map Sat Dec 12 22:23:33 2009 -0600
1.2 +++ b/coal/map Fri Apr 02 17:27:47 2010 -0500
1.3 @@ -23,6 +23,11 @@
1.4 changeset = ../paper/changeset.tmpl
1.5 manifest = ../paper/manifest.tmpl
1.6
1.7 +nav = '{before%naventry} {after%naventry}'
1.8 +navshort = '{before%navshortentry}{after%navshortentry}'
1.9 +navgraph = '{before%navgraphentry}{after%navgraphentry}'
1.10 +filenav = '{before%filenaventry}{after%filenaventry}'
1.11 +
1.12 direntry = '
1.13 <tr class="fileline parity{parity}">
1.14 <td class="name">
1.15 @@ -147,7 +152,7 @@
1.16 changelogtag = '<span class="tag">{name|escape}</span> '
1.17 changesettag = '<span class="tag">{tag|escape}</span> '
1.18 changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
1.19 -changelogbranchname = '<span class="branchname">{name|escape}</span> '
1.20 +changelogbranchname = '<span class="branchname">{name|escape}</span> '
1.21
1.22 filediffparent = '
1.23 <tr>
1.24 @@ -176,7 +181,7 @@
1.25 <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
1.26 <td>{description}</td>
1.27 <td>{contact|obfuscate}</td>
1.28 - <td class="age">{lastchange|age} ago</td>
1.29 + <td class="age">{lastchange|age}</td>
1.30 <td class="indexlinks">{archives%indexarchiveentry}</td>
1.31 </tr>\n'
1.32 indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}"> ↓{type|escape}</a>'
2.1 --- a/gitweb/changelog.tmpl Sat Dec 12 22:23:33 2009 -0600
2.2 +++ b/gitweb/changelog.tmpl Fri Apr 02 17:27:47 2010 -0500
2.3 @@ -27,13 +27,13 @@
2.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
2.5 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
2.6 <br/>
2.7 -{changenav%naventry}<br/>
2.8 +{changenav%nav}<br/>
2.9 </div>
2.10
2.11 {entries%changelogentry}
2.12
2.13 <div class="page_nav">
2.14 -{changenav%naventry}<br/>
2.15 +{changenav%nav}<br/>
2.16 </div>
2.17
2.18 {footer}
3.1 --- a/gitweb/fileannotate.tmpl Sat Dec 12 22:23:33 2009 -0600
3.2 +++ b/gitweb/fileannotate.tmpl Fri Apr 02 17:27:47 2010 -0500
3.3 @@ -21,6 +21,7 @@
3.4 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
3.5 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
3.6 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
3.7 +<a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
3.8 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
3.9 annotate |
3.10 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
4.1 --- a/gitweb/filediff.tmpl Sat Dec 12 22:23:33 2009 -0600
4.2 +++ b/gitweb/filediff.tmpl Fri Apr 02 17:27:47 2010 -0500
4.3 @@ -21,6 +21,7 @@
4.4 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
4.5 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
4.6 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
4.7 +<a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
4.8 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
4.9 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
4.10 diff |
5.1 --- a/gitweb/filelog.tmpl Sat Dec 12 22:23:33 2009 -0600
5.2 +++ b/gitweb/filelog.tmpl Fri Apr 02 17:27:47 2010 -0500
5.3 @@ -24,7 +24,7 @@
5.4 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
5.5 <a href="{url}rss-log/{node|short}/{file|urlescape}">rss</a>
5.6 <br/>
5.7 -{nav%filenaventry}
5.8 +{nav%filenav}
5.9 </div>
5.10
5.11 <div class="title" >{file|urlescape}</div>
5.12 @@ -34,7 +34,7 @@
5.13 </table>
5.14
5.15 <div class="page_nav">
5.16 -{nav%filenaventry}
5.17 +{nav%filenav}
5.18 </div>
5.19
5.20 {footer}
6.1 --- a/gitweb/filerevision.tmpl Sat Dec 12 22:23:33 2009 -0600
6.2 +++ b/gitweb/filerevision.tmpl Fri Apr 02 17:27:47 2010 -0500
6.3 @@ -21,6 +21,7 @@
6.4 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
6.5 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
6.6 file |
6.7 +<a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
6.8 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
6.9 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
6.10 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
7.1 --- a/gitweb/graph.tmpl Sat Dec 12 22:23:33 2009 -0600
7.2 +++ b/gitweb/graph.tmpl Fri Apr 02 17:27:47 2010 -0500
7.3 @@ -29,7 +29,7 @@
7.4 <br/>
7.5 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
7.6 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
7.7 -| {changenav%navgraphentry}<br/>
7.8 +| {changenav%navgraph}<br/>
7.9 </div>
7.10
7.11 <div class="title"> </div>
7.12 @@ -115,7 +115,7 @@
7.13 <div class="page_nav">
7.14 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
7.15 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
7.16 -| {changenav%navgraphentry}
7.17 +| {changenav%navgraph}
7.18 </div>
7.19
7.20 {footer}
8.1 --- a/gitweb/index.tmpl Sat Dec 12 22:23:33 2009 -0600
8.2 +++ b/gitweb/index.tmpl Fri Apr 02 17:27:47 2010 -0500
8.3 @@ -13,7 +13,7 @@
8.4 <td><a href="?sort={sort_name}">Name</a></td>
8.5 <td><a href="?sort={sort_description}">Description</a></td>
8.6 <td><a href="?sort={sort_contact}">Contact</a></td>
8.7 - <td><a href="?sort={sort_lastchange}">Last change</a></td>
8.8 + <td><a href="?sort={sort_lastchange}">Last modified</a></td>
8.9 <td> </td>
8.10 <td> </td>
8.11 </tr>
9.1 --- a/gitweb/map Sat Dec 12 22:23:33 2009 -0600
9.2 +++ b/gitweb/map Fri Apr 02 17:27:47 2010 -0500
9.3 @@ -34,6 +34,12 @@
9.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
9.5 </td>
9.6 </tr>'
9.7 +
9.8 +nav = '{before%naventry} {after%naventry}'
9.9 +navshort = '{before%navshortentry}{after%navshortentry}'
9.10 +navgraph = '{before%navgraphentry}{after%navgraphentry}'
9.11 +filenav = '{before%filenaventry}{after%filenaventry}'
9.12 +
9.13 fileellipses = '...'
9.14 changelogentry = changelogentry.tmpl
9.15 searchentry = changelogentry.tmpl
10.1 --- a/gitweb/shortlog.tmpl Sat Dec 12 22:23:33 2009 -0600
10.2 +++ b/gitweb/shortlog.tmpl Fri Apr 02 17:27:47 2010 -0500
10.3 @@ -25,8 +25,7 @@
10.4 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
10.5 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
10.6 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
10.7 -<br/>
10.8 -{changenav%navshortentry}<br/>
10.9 +<br/>{changenav%navshort}<br/>
10.10 </div>
10.11
10.12 <div class="title"> </div>
10.13 @@ -35,7 +34,7 @@
10.14 </table>
10.15
10.16 <div class="page_nav">
10.17 -{changenav%navshortentry}
10.18 +{changenav%navshort}
10.19 </div>
10.20
10.21 {footer}
11.1 --- a/gitweb_am/changelog.tmpl Sat Dec 12 22:23:33 2009 -0600
11.2 +++ b/gitweb_am/changelog.tmpl Fri Apr 02 17:27:47 2010 -0500
11.3 @@ -25,13 +25,13 @@
11.4 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
11.5 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
11.6 <br/>
11.7 -{changenav%naventry}<br/>
11.8 +{changenav%nav}<br/>
11.9 </div>
11.10
11.11 {entries%changelogentry}
11.12
11.13 <div class="page_nav">
11.14 -{changenav%naventry}<br/>
11.15 +{changenav%nav}<br/>
11.16 </div>
11.17
11.18 {footer}
12.1 --- a/gitweb_am/fileannotate.tmpl Sat Dec 12 22:23:33 2009 -0600
12.2 +++ b/gitweb_am/fileannotate.tmpl Fri Apr 02 17:27:47 2010 -0500
12.3 @@ -19,6 +19,7 @@
12.4 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
12.5 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
12.6 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
12.7 +<a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
12.8 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
12.9 annotate |
12.10 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
13.1 --- a/gitweb_am/filediff.tmpl Sat Dec 12 22:23:33 2009 -0600
13.2 +++ b/gitweb_am/filediff.tmpl Fri Apr 02 17:27:47 2010 -0500
13.3 @@ -19,6 +19,7 @@
13.4 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
13.5 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
13.6 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
13.7 +<a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
13.8 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
13.9 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
13.10 diff |
14.1 --- a/gitweb_am/filelog.tmpl Sat Dec 12 22:23:33 2009 -0600
14.2 +++ b/gitweb_am/filelog.tmpl Fri Apr 02 17:27:47 2010 -0500
14.3 @@ -22,7 +22,7 @@
14.4 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
14.5 <a href="{url}atom-log/{node|short}/{file|urlescape}"><img src="{staticurl}feed.png" alt="Feed" title="Feed of repository changes"/></a>
14.6 <br/>
14.7 -{nav%filenaventry}
14.8 +{nav%filenav}
14.9 </div>
14.10
14.11 <div class="title" >{file|urlescape}</div>
14.12 @@ -32,7 +32,7 @@
14.13 </table>
14.14
14.15 <div class="page_nav">
14.16 -{nav%filenaventry}
14.17 +{nav%filenav}
14.18 </div>
14.19
14.20 {footer}
15.1 --- a/gitweb_am/filerevision.tmpl Sat Dec 12 22:23:33 2009 -0600
15.2 +++ b/gitweb_am/filerevision.tmpl Fri Apr 02 17:27:47 2010 -0500
15.3 @@ -19,6 +19,7 @@
15.4 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
15.5 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
15.6 file |
15.7 +<a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
15.8 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
15.9 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
15.10 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
16.1 --- a/gitweb_am/graph.tmpl Sat Dec 12 22:23:33 2009 -0600
16.2 +++ b/gitweb_am/graph.tmpl Fri Apr 02 17:27:47 2010 -0500
16.3 @@ -27,7 +27,7 @@
16.4 <br/>
16.5 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
16.6 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
16.7 -| {changenav%navgraphentry}<br/>
16.8 +| {changenav%navgraph}<br/>
16.9 </div>
16.10
16.11 <div class="title"> </div>
16.12 @@ -113,7 +113,7 @@
16.13 <div class="page_nav">
16.14 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
16.15 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
16.16 -| {changenav%navgraphentry}
16.17 +| {changenav%navgraph}
16.18 </div>
16.19
16.20 {footer}
17.1 --- a/gitweb_am/index.tmpl Sat Dec 12 22:23:33 2009 -0600
17.2 +++ b/gitweb_am/index.tmpl Fri Apr 02 17:27:47 2010 -0500
17.3 @@ -13,7 +13,7 @@
17.4 <td><a href="?sort={sort_name}">Name</a></td>
17.5 <td><a href="?sort={sort_description}">Description</a></td>
17.6 <!--<td><a href="?sort={sort_contact}">Contact</a></td>-->
17.7 - <td><a href="?sort={sort_lastchange}">Last change</a></td>
17.8 + <td><a href="?sort={sort_lastchange}">Last modified</a></td>
17.9 <td> </td>
17.10 <td> </td>
17.11 </tr>
18.1 --- a/gitweb_am/map Sat Dec 12 22:23:33 2009 -0600
18.2 +++ b/gitweb_am/map Fri Apr 02 17:27:47 2010 -0500
18.3 @@ -34,6 +34,12 @@
18.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
18.5 </td>
18.6 </tr>'
18.7 +
18.8 +nav = '{before%naventry} {after%naventry}'
18.9 +navshort = '{before%navshortentry}{after%navshortentry}'
18.10 +navgraph = '{before%navgraphentry}{after%navgraphentry}'
18.11 +filenav = '{before%filenaventry}{after%filenaventry}'
18.12 +
18.13 fileellipses = '...'
18.14 changelogentry = changelogentry.tmpl
18.15 searchentry = changelogentry.tmpl
19.1 --- a/gitweb_am/shortlog.tmpl Sat Dec 12 22:23:33 2009 -0600
19.2 +++ b/gitweb_am/shortlog.tmpl Fri Apr 02 17:27:47 2010 -0500
19.3 @@ -23,8 +23,7 @@
19.4 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
19.5 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
19.6 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
19.7 -<br/>
19.8 -{changenav%navshortentry}<br/>
19.9 +<br/>{changenav%navshort}<br/>
19.10 </div>
19.11
19.12 <div class="title"> </div>
19.13 @@ -33,7 +32,7 @@
19.14 </table>
19.15
19.16 <div class="page_nav">
19.17 -{changenav%navshortentry}
19.18 +{changenav%navshort}
19.19 </div>
19.20
19.21 {footer}
20.1 --- a/map-cmdline.changelog Sat Dec 12 22:23:33 2009 -0600
20.2 +++ b/map-cmdline.changelog Fri Apr 02 17:27:47 2010 -0500
20.3 @@ -1,11 +1,14 @@
20.4 header = '{date|shortdate} {author|person} <{author|email}>\n\n'
20.5 header_verbose = ''
20.6 -changeset = '\t* {files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\t[{node|short}]{tags}\n\n'
20.7 +changeset = '\t* {files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\t[{node|short}]{tags}{branches}\n\n'
20.8 changeset_quiet = '\t* {desc|firstline|fill68|tabindent|strip}\n\n'
20.9 -changeset_verbose = '{date|isodate} {author|person} <{author|email}> ({node|short}{tags})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n'
20.10 +changeset_verbose = '{date|isodate} {author|person} <{author|email}> ({node|short}{tags}{branches})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n'
20.11 start_tags = ' ['
20.12 tag = '{tag}, '
20.13 last_tag = '{tag}]'
20.14 +start_branches = ' <'
20.15 +branch = '{branch}, '
20.16 +last_branch = '{branch}>'
20.17 file = '{file}, '
20.18 last_file = '{file}:\n\t'
20.19 file_add = '{file_add}, '
21.1 --- a/map-cmdline.default Sat Dec 12 22:23:33 2009 -0600
21.2 +++ b/map-cmdline.default Fri Apr 02 17:27:47 2010 -0500
21.3 @@ -1,7 +1,7 @@
21.4 changeset = 'changeset: {rev}:{node|short}\n{branches}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n'
21.5 changeset_quiet = '{rev}:{node|short}\n'
21.6 -changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies}description:\n{desc|strip}\n\n\n'
21.7 -changeset_debug = 'changeset: {rev}:{node}\n{branches}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies}{extras}description:\n{desc|strip}\n\n\n'
21.8 +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'
21.9 +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'
21.10 start_files = 'files: '
21.11 file = ' {file}'
21.12 end_files = '\n'
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
22.2 +++ b/map-cmdline.xml Fri Apr 02 17:27:47 2010 -0500
22.3 @@ -0,0 +1,19 @@
22.4 +header = '<?xml version="1.0"?>\n<log>\n'
22.5 +footer = '</log>\n'
22.6 +
22.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'
22.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'
22.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'
22.10 +
22.11 +file_add = '<path action="A">{file_add|xmlescape}</path>\n'
22.12 +file_mod = '<path action="M">{file_mod|xmlescape}</path>\n'
22.13 +file_del = '<path action="R">{file_del|xmlescape}</path>\n'
22.14 +
22.15 +start_file_copies = '<copies>\n'
22.16 +file_copy = '<copy source="{source|xmlescape}">{name|xmlescape}</copy>\n'
22.17 +end_file_copies = '</copies>\n'
22.18 +
22.19 +parent = '<parent revision="{rev}" node="{node}" />\n'
22.20 +branch = '<branch>{branch|xmlescape}</branch>\n'
22.21 +tag = '<tag>{tag|xmlescape}</tag>\n'
22.22 +extra = '<extra key="{key|xmlescape}">{value|xmlescape}</extra>\n'
23.1 --- a/monoblue/branches.tmpl Sat Dec 12 22:23:33 2009 -0600
23.2 +++ b/monoblue/branches.tmpl Fri Apr 02 17:27:47 2010 -0500
23.3 @@ -28,7 +28,7 @@
23.4 </ul>
23.5 </div>
23.6
23.7 - <h2 class="no-link no-border">tags</h2>
23.8 + <h2 class="no-link no-border">branches</h2>
23.9 <table cellspacing="0">
23.10 {entries%branchentry}
23.11 </table>
24.1 --- a/monoblue/changelog.tmpl Sat Dec 12 22:23:33 2009 -0600
24.2 +++ b/monoblue/changelog.tmpl Fri Apr 02 17:27:47 2010 -0500
24.3 @@ -34,7 +34,7 @@
24.4 </div>
24.5
24.6 <div class="page-path">
24.7 -{changenav%naventry}
24.8 +{changenav%nav}
24.9 </div>
24.10
24.11 {footer}
25.1 --- a/monoblue/filelog.tmpl Sat Dec 12 22:23:33 2009 -0600
25.2 +++ b/monoblue/filelog.tmpl Fri Apr 02 17:27:47 2010 -0500
25.3 @@ -43,7 +43,7 @@
25.4 </table>
25.5
25.6 <div class="page-path">
25.7 - {nav%filenaventry}
25.8 + {nav%filenav}
25.9 </div>
25.10
25.11 {footer}
26.1 --- a/monoblue/graph.tmpl Sat Dec 12 22:23:33 2009 -0600
26.2 +++ b/monoblue/graph.tmpl Fri Apr 02 17:27:47 2010 -0500
26.3 @@ -76,7 +76,7 @@
26.4 item = item.replace(/_PARITY/, 'parity' + parity);
26.5 item = item.replace(/_NODEID/, cur[0]);
26.6 item = item.replace(/_NODEID/, cur[0]);
26.7 - item = item.replace(/_DESC/, cur[3]);
26.8 + item = item.replace(/_DESC/, cur[3]);
26.9 item = item.replace(/_USER/, cur[4]);
26.10 item = item.replace(/_DATE/, cur[5]);
26.11
26.12 @@ -99,7 +99,7 @@
26.13 tagspan += '</span>';
26.14 }
26.15
26.16 - item = item.replace(/_TAGS/, tagspan);
26.17 + item = item.replace(/_TAGS/, tagspan);
26.18 return [bg, item];
26.19
26.20 }
26.21 @@ -112,7 +112,7 @@
26.22 <div class="page-path">
26.23 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
26.24 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
26.25 - | {changenav%navgraphentry}
26.26 + | {changenav%navgraph}
26.27 </div>
26.28
26.29 {footer}
27.1 --- a/monoblue/index.tmpl Sat Dec 12 22:23:33 2009 -0600
27.2 +++ b/monoblue/index.tmpl Fri Apr 02 17:27:47 2010 -0500
27.3 @@ -9,13 +9,13 @@
27.4 <ul class="page-nav">
27.5 </ul>
27.6 </div>
27.7 -
27.8 +
27.9 <table cellspacing="0">
27.10 <tr>
27.11 <td><a href="?sort={sort_name}">Name</a></td>
27.12 <td><a href="?sort={sort_description}">Description</a></td>
27.13 <td><a href="?sort={sort_contact}">Contact</a></td>
27.14 - <td><a href="?sort={sort_lastchange}">Last change</a></td>
27.15 + <td><a href="?sort={sort_lastchange}">Last modified</a></td>
27.16 <td> </td>
27.17 <td> </td>
27.18 </tr>
28.1 --- a/monoblue/map Sat Dec 12 22:23:33 2009 -0600
28.2 +++ b/monoblue/map Fri Apr 02 17:27:47 2010 -0500
28.3 @@ -32,6 +32,12 @@
28.4 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
28.5 </td>
28.6 </tr>'
28.7 +
28.8 +nav = '{before%naventry} {after%naventry}'
28.9 +navshort = '{before%navshortentry}{after%navshortentry}'
28.10 +navgraph = '{before%navgraphentry}{after%navgraphentry}'
28.11 +filenav = '{before%filenaventry}{after%filenaventry}'
28.12 +
28.13 fileellipses = '...'
28.14 changelogentry = changelogentry.tmpl
28.15 searchentry = changelogentry.tmpl
29.1 --- a/monoblue/shortlog.tmpl Sat Dec 12 22:23:33 2009 -0600
29.2 +++ b/monoblue/shortlog.tmpl Fri Apr 02 17:27:47 2010 -0500
29.3 @@ -35,7 +35,7 @@
29.4 </table>
29.5
29.6 <div class="page-path">
29.7 -{changenav%navshortentry}
29.8 + {changenav%navshort}
29.9 </div>
29.10
29.11 {footer}
30.1 --- a/paper/filelog.tmpl Sat Dec 12 22:23:33 2009 -0600
30.2 +++ b/paper/filelog.tmpl Fri Apr 02 17:27:47 2010 -0500
30.3 @@ -43,7 +43,10 @@
30.4 files, or words in the commit message</div>
30.5 </form>
30.6
30.7 -<div class="navigate">{nav%filenaventry}</div>
30.8 +<div class="navigate">
30.9 +<a href="{url}log/{node|short}/{file|urlescape}{lessvars%urlparameter}">less</a>
30.10 +<a href="{url}log/{node|short}/{file|urlescape}{morevars%urlparameter}">more</a>
30.11 +| {nav%filenav}</div>
30.12
30.13 <table class="bigtable">
30.14 <tr>
30.15 @@ -54,6 +57,12 @@
30.16 {entries%filelogentry}
30.17 </table>
30.18
30.19 +<div class="navigate">
30.20 +<a href="{url}log/{node|short}/{file|urlescape}{lessvars%urlparameter}">less</a>
30.21 +<a href="{url}log/{node|short}/{file|urlescape}{morevars%urlparameter}">more</a>
30.22 +| {nav%filenav}
30.23 +</div>
30.24 +
30.25 </div>
30.26 </div>
30.27
31.1 --- a/paper/graph.tmpl Sat Dec 12 22:23:33 2009 -0600
31.2 +++ b/paper/graph.tmpl Fri Apr 02 17:27:47 2010 -0500
31.3 @@ -40,7 +40,7 @@
31.4 <div class="navigate">
31.5 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
31.6 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
31.7 -| rev {rev}: {changenav%navgraphentry}
31.8 +| rev {rev}: {changenav%navgraph}
31.9 </div>
31.10
31.11 <noscript><p>The revision graph only works with JavaScript-enabled browsers.</p></noscript>
31.12 @@ -123,7 +123,7 @@
31.13 <div class="navigate">
31.14 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
31.15 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
31.16 -| rev {rev}: {changenav%navgraphentry}
31.17 +| rev {rev}: {changenav%navgraph}
31.18 </div>
31.19
31.20 </div>
32.1 --- a/paper/index.tmpl Sat Dec 12 22:23:33 2009 -0600
32.2 +++ b/paper/index.tmpl Fri Apr 02 17:27:47 2010 -0500
32.3 @@ -16,7 +16,7 @@
32.4 <th><a href="?sort={sort_name}">Name</a></th>
32.5 <th><a href="?sort={sort_description}">Description</a></th>
32.6 <th><a href="?sort={sort_contact}">Contact</a></th>
32.7 - <th><a href="?sort={sort_lastchange}">Last change</a></th>
32.8 + <th><a href="?sort={sort_lastchange}">Last modified</a></th>
32.9 <th> </th>
32.10 </tr>
32.11 {entries%indexentry}
33.1 --- a/paper/map Sat Dec 12 22:23:33 2009 -0600
33.2 +++ b/paper/map Fri Apr 02 17:27:47 2010 -0500
33.3 @@ -23,6 +23,11 @@
33.4 changeset = changeset.tmpl
33.5 manifest = manifest.tmpl
33.6
33.7 +nav = '{before%naventry} {after%naventry}'
33.8 +navshort = '{before%navshortentry}{after%navshortentry}'
33.9 +navgraph = '{before%navgraphentry}{after%navgraphentry}'
33.10 +filenav = '{before%filenaventry}{after%filenaventry}'
33.11 +
33.12 direntry = '
33.13 <tr class="fileline parity{parity}">
33.14 <td class="name">
33.15 @@ -147,7 +152,7 @@
33.16 changelogtag = '<span class="tag">{name|escape}</span> '
33.17 changesettag = '<span class="tag">{tag|escape}</span> '
33.18 changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
33.19 -changelogbranchname = '<span class="branchname">{name|escape}</span> '
33.20 +changelogbranchname = '<span class="branchname">{name|escape}</span> '
33.21
33.22 filediffparent = '
33.23 <tr>
34.1 --- a/paper/search.tmpl Sat Dec 12 22:23:33 2009 -0600
34.2 +++ b/paper/search.tmpl Fri Apr 02 17:27:47 2010 -0500
34.3 @@ -28,6 +28,11 @@
34.4 files, or words in the commit message</div>
34.5 </form>
34.6
34.7 +<div class="navigate">
34.8 +<a href="{url}search/{lessvars%urlparameter}">less</a>
34.9 +<a href="{url}search/{morevars%urlparameter}">more</a>
34.10 +</div>
34.11 +
34.12 <table class="bigtable">
34.13 <tr>
34.14 <th class="age">age</th>
34.15 @@ -37,6 +42,11 @@
34.16 {entries}
34.17 </table>
34.18
34.19 +<div class="navigate">
34.20 +<a href="{url}search/{lessvars%urlparameter}">less</a>
34.21 +<a href="{url}search/{morevars%urlparameter}">more</a>
34.22 +</div>
34.23 +
34.24 </div>
34.25 </div>
34.26
35.1 --- a/paper/shortlog.tmpl Sat Dec 12 22:23:33 2009 -0600
35.2 +++ b/paper/shortlog.tmpl Fri Apr 02 17:27:47 2010 -0500
35.3 @@ -39,7 +39,11 @@
35.4 files, or words in the commit message</div>
35.5 </form>
35.6
35.7 -<div class="navigate">rev {rev}: {changenav%navshortentry}</div>
35.8 +<div class="navigate">
35.9 +<a href="{url}shortlog/{rev}{lessvars%urlparameter}">less</a>
35.10 +<a href="{url}shortlog/{rev}{morevars%urlparameter}">more</a>
35.11 +| rev {rev}: {changenav%navshort}
35.12 +</div>
35.13
35.14 <table class="bigtable">
35.15 <tr>
35.16 @@ -50,7 +54,12 @@
35.17 {entries%shortlogentry}
35.18 </table>
35.19
35.20 -<div class="navigate">rev {rev}: {changenav%navshortentry}</div>
35.21 +<div class="navigate">
35.22 +<a href="{url}shortlog/{rev}{lessvars%urlparameter}">less</a>
35.23 +<a href="{url}shortlog/{rev}{morevars%urlparameter}">more</a>
35.24 +| rev {rev}: {changenav%navshort}
35.25 +</div>
35.26 +
35.27 </div>
35.28 </div>
35.29
36.1 --- a/raw/map Sat Dec 12 22:23:33 2009 -0600
36.2 +++ b/raw/map Fri Apr 02 17:27:47 2010 -0500
36.3 @@ -21,3 +21,7 @@
36.4 notfound = notfound.tmpl
36.5 error = error.tmpl
36.6 indexentry = '{url}\n'
36.7 +tags = '{entries%tagentry}'
36.8 +tagentry = '{tag} {node}\n'
36.9 +branches = '{entries%branchentry}'
36.10 +branchentry = '{branch} {node} {status}\n'
37.1 --- a/spartan/changelog.tmpl Sat Dec 12 22:23:33 2009 -0600
37.2 +++ b/spartan/changelog.tmpl Fri Apr 02 17:27:47 2010 -0500
37.3 @@ -25,7 +25,7 @@
37.4 <p>
37.5 <label for="search1">search:</label>
37.6 <input name="rev" id="search1" type="text" size="30">
37.7 -navigate: <small class="navigate">{changenav%naventry}</small>
37.8 +navigate: <small class="navigate">{changenav%nav}</small>
37.9 </p>
37.10 </form>
37.11
37.12 @@ -36,7 +36,7 @@
37.13 <p>
37.14 <label for="search2">search:</label>
37.15 <input name="rev" id="search2" type="text" size="30">
37.16 -navigate: <small class="navigate">{changenav%naventry}</small>
37.17 +navigate: <small class="navigate">{changenav%nav}</small>
37.18 </p>
37.19 </form>
37.20
38.1 --- a/spartan/filelog.tmpl Sat Dec 12 22:23:33 2009 -0600
38.2 +++ b/spartan/filelog.tmpl Fri Apr 02 17:27:47 2010 -0500
38.3 @@ -21,7 +21,7 @@
38.4
38.5 <h2>{file|escape} revision history</h2>
38.6
38.7 -<p>navigate: <small class="navigate">{nav%filenaventry}</small></p>
38.8 +<p>navigate: <small class="navigate">{nav%filenav}</small></p>
38.9
38.10 {entries%filelogentry}
38.11
39.1 --- a/spartan/graph.tmpl Sat Dec 12 22:23:33 2009 -0600
39.2 +++ b/spartan/graph.tmpl Fri Apr 02 17:27:47 2010 -0500
39.3 @@ -23,7 +23,7 @@
39.4 <p>
39.5 <label for="search1">search:</label>
39.6 <input name="rev" id="search1" type="text" size="30">
39.7 -navigate: <small class="navigate">{changenav%navgraphentry}</small>
39.8 +navigate: <small class="navigate">{changenav%navgraph}</small>
39.9 </p>
39.10 </form>
39.11
39.12 @@ -89,7 +89,7 @@
39.13 <p>
39.14 <label for="search1">search:</label>
39.15 <input name="rev" id="search1" type="text" size="30">
39.16 -navigate: <small class="navigate">{changenav%navgraphentry}</small>
39.17 +navigate: <small class="navigate">{changenav%navgraph}</small>
39.18 </p>
39.19 </form>
39.20
40.1 --- a/spartan/index.tmpl Sat Dec 12 22:23:33 2009 -0600
40.2 +++ b/spartan/index.tmpl Fri Apr 02 17:27:47 2010 -0500
40.3 @@ -10,7 +10,7 @@
40.4 <td><a href="?sort={sort_name}">Name</a></td>
40.5 <td><a href="?sort={sort_description}">Description</a></td>
40.6 <td><a href="?sort={sort_contact}">Contact</a></td>
40.7 - <td><a href="?sort={sort_lastchange}">Last change</a></td>
40.8 + <td><a href="?sort={sort_lastchange}">Last modified</a></td>
40.9 <td> </td>
40.10 </tr>
40.11 {entries%indexentry}
41.1 --- a/spartan/map Sat Dec 12 22:23:33 2009 -0600
41.2 +++ b/spartan/map Fri Apr 02 17:27:47 2010 -0500
41.3 @@ -20,6 +20,11 @@
41.4 changeset = changeset.tmpl
41.5 manifest = manifest.tmpl
41.6
41.7 +nav = '{before%naventry} {after%naventry}'
41.8 +navshort = '{before%navshortentry}{after%navshortentry}'
41.9 +navgraph = '{before%navgraphentry}{after%navgraphentry}'
41.10 +filenav = '{before%filenaventry}{after%filenaventry}'
41.11 +
41.12 direntry = '
41.13 <tr class="parity{parity}">
41.14 <td><tt>drwxr-xr-x</tt>
41.15 @@ -163,7 +168,7 @@
41.16 <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
41.17 <td>{description}</td>
41.18 <td>{contact|obfuscate}</td>
41.19 - <td class="age">{lastchange|age} ago</td>
41.20 + <td class="age">{lastchange|age}</td>
41.21 <td class="indexlinks">
41.22 <a href="{url}rss-log">RSS</a>
41.23 <a href="{url}atom-log">Atom</a>
42.1 --- a/spartan/shortlog.tmpl Sat Dec 12 22:23:33 2009 -0600
42.2 +++ b/spartan/shortlog.tmpl Fri Apr 02 17:27:47 2010 -0500
42.3 @@ -25,7 +25,7 @@
42.4 <p>
42.5 <label for="search1">search:</label>
42.6 <input name="rev" id="search1" type="text" size="30">
42.7 -navigate: <small class="navigate">{changenav%navshortentry}</small>
42.8 +navigate: <small class="navigate">{changenav%navshort}</small>
42.9 </p>
42.10 </form>
42.11
42.12 @@ -36,7 +36,7 @@
42.13 <p>
42.14 <label for="search2">search:</label>
42.15 <input name="rev" id="search2" type="text" size="30">
42.16 -navigate: <small class="navigate">{changenav%navshortentry}</small>
42.17 +navigate: <small class="navigate">{changenav%navshort}</small>
42.18 </p>
42.19 </form>
42.20
43.1 --- a/static/style-coal.css Sat Dec 12 22:23:33 2009 -0600
43.2 +++ b/static/style-coal.css Fri Apr 02 17:27:47 2010 -0500
43.3 @@ -131,7 +131,7 @@
43.4
43.5 .branchname {
43.6 color: #000;
43.7 - font-size: 60%;
43.8 + font-size: 60%;
43.9 font-weight: normal;
43.10 margin-left: .5em;
43.11 vertical-align: baseline;
44.1 --- a/static/style-paper.css Sat Dec 12 22:23:33 2009 -0600
44.2 +++ b/static/style-paper.css Fri Apr 02 17:27:47 2010 -0500
44.3 @@ -122,7 +122,7 @@
44.4
44.5 .branchname {
44.6 color: #000;
44.7 - font-size: 60%;
44.8 + font-size: 60%;
44.9 font-weight: normal;
44.10 margin-left: .5em;
44.11 vertical-align: baseline;