Merged in template changes from Mercurial 1.4.1.
Merged in template changes from Mercurial 1.4.1.
1.1 --- a/atom/changelogentry.tmpl Sun Oct 18 00:37:53 2009 -0500
1.2 +++ b/atom/changelogentry.tmpl Fri Dec 11 16:19:29 2009 -0600
1.3 @@ -1,7 +1,7 @@
1.4 <entry>
1.5 <title>{desc|strip|firstline|strip|escape|nonempty}</title>
1.6 <id>{urlbase}{url}#changeset-{node}</id>
1.7 - <link href="{urlbase}{url}rev/{node}"/>
1.8 + <link href="{urlbase}{url}rev/{node|short}"/>
1.9 <author>
1.10 <name>{author|person|escape}</name>
1.11 <email>{author|email|obfuscate}</email>
2.1 --- a/atom/tagentry.tmpl Sun Oct 18 00:37:53 2009 -0500
2.2 +++ b/atom/tagentry.tmpl Fri Dec 11 16:19:29 2009 -0600
2.3 @@ -1,6 +1,6 @@
2.4 <entry>
2.5 <title>{tag|escape}</title>
2.6 - <link rel="alternate" href="{urlbase}{url}rev/{node}"/>
2.7 + <link rel="alternate" href="{urlbase}{url}rev/{node|short}"/>
2.8 <id>{urlbase}{url}#tag-{node}</id>
2.9 <updated>{date|rfc3339date}</updated>
2.10 <published>{date|rfc3339date}</published>
3.1 --- a/gitweb/changelogentry.tmpl Sun Oct 18 00:37:53 2009 -0500
3.2 +++ b/gitweb/changelogentry.tmpl Fri Dec 11 16:19:29 2009 -0600
3.3 @@ -1,5 +1,5 @@
3.4 <div>
3.5 -<a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age} ago</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a>
3.6 +<a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a>
3.7 </div>
3.8 <div class="title_text">
3.9 <div class="log_link">
4.1 --- a/gitweb/changeset.tmpl Sun Oct 18 00:37:53 2009 -0500
4.2 +++ b/gitweb/changeset.tmpl Fri Dec 11 16:19:29 2009 -0600
4.3 @@ -29,7 +29,7 @@
4.4 <div class="title_text">
4.5 <table cellspacing="0">
4.6 <tr><td>author</td><td>{author|obfuscate}</td></tr>
4.7 -<tr><td></td><td>{date|date} ({date|age} ago)</td></tr>
4.8 +<tr><td></td><td>{date|date} ({date|age})</td></tr>
4.9 {branch%changesetbranch}
4.10 <tr><td>changeset {rev}</td><td style="font-family:monospace">{node|short}</td></tr>
4.11 {parent%changesetparent}
5.1 --- a/gitweb/fileannotate.tmpl Sun Oct 18 00:37:53 2009 -0500
5.2 +++ b/gitweb/fileannotate.tmpl Fri Dec 11 16:19:29 2009 -0600
5.3 @@ -36,7 +36,7 @@
5.4 <td>{author|obfuscate}</td></tr>
5.5 <tr>
5.6 <td></td>
5.7 - <td>{date|date} ({date|age} ago)</td></tr>
5.8 + <td>{date|date} ({date|age})</td></tr>
5.9 {branch%filerevbranch}
5.10 <tr>
5.11 <td>changeset {rev}</td>
6.1 --- a/gitweb/filerevision.tmpl Sun Oct 18 00:37:53 2009 -0500
6.2 +++ b/gitweb/filerevision.tmpl Fri Dec 11 16:19:29 2009 -0600
6.3 @@ -36,7 +36,7 @@
6.4 <td>{author|obfuscate}</td></tr>
6.5 <tr>
6.6 <td></td>
6.7 - <td>{date|date} ({date|age} ago)</td></tr>
6.8 + <td>{date|date} ({date|age})</td></tr>
6.9 {branch%filerevbranch}
6.10 <tr>
6.11 <td>changeset {rev}</td>
7.1 --- a/gitweb/map Sun Oct 18 00:37:53 2009 -0500
7.2 +++ b/gitweb/map Fri Dec 11 16:19:29 2009 -0600
7.3 @@ -150,7 +150,7 @@
7.4 tags = tags.tmpl
7.5 tagentry = '
7.6 <tr class="parity{parity}">
7.7 - <td class="age"><i>{date|age} ago</i></td>
7.8 + <td class="age"><i>{date|age}</i></td>
7.9 <td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{tag|escape}</b></a></td>
7.10 <td class="link">
7.11 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
7.12 @@ -161,7 +161,7 @@
7.13 branches = branches.tmpl
7.14 branchentry = '
7.15 <tr class="parity{parity}">
7.16 - <td class="age"><i>{date|age} ago</i></td>
7.17 + <td class="age"><i>{date|age}</i></td>
7.18 <td><a class="list" href="{url}shortlog/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td>
7.19 <td class="{status}">{branch|escape}</td>
7.20 <td class="link">
7.21 @@ -204,7 +204,7 @@
7.22 inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
7.23 shortlogentry = '
7.24 <tr class="parity{parity}">
7.25 - <td class="age"><i>{date|age} ago</i></td>
7.26 + <td class="age"><i>{date|age}</i></td>
7.27 <td><i>{author|person}</i></td>
7.28 <td>
7.29 <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">
7.30 @@ -219,7 +219,7 @@
7.31 </tr>'
7.32 filelogentry = '
7.33 <tr class="parity{parity}">
7.34 - <td class="age"><i>{date|age} ago</i></td>
7.35 + <td class="age"><i>{date|age}</i></td>
7.36 <td>
7.37 <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">
7.38 <b>{desc|strip|firstline|escape|nonempty}</b>
7.39 @@ -238,7 +238,7 @@
7.40 </td>
7.41 <td>{description}</td>
7.42 <td>{contact|obfuscate}</td>
7.43 - <td class="age">{lastchange|age} ago</td>
7.44 + <td class="age">{lastchange|age}</td>
7.45 <td class="indexlinks">{archives%indexarchiveentry}</td>
7.46 <td><div class="rss_logo"><a href="{url}rss-log">RSS</a> <a href="{url}atom-log">Atom</a></div></td>
7.47 </tr>\n'
8.1 --- a/gitweb_am/changeset.tmpl Sun Oct 18 00:37:53 2009 -0500
8.2 +++ b/gitweb_am/changeset.tmpl Fri Dec 11 16:19:29 2009 -0600
8.3 @@ -27,7 +27,7 @@
8.4 <div class="title_text">
8.5 <table cellspacing="0">
8.6 <tr><td>author</td><td>{author|obfuscate}</td></tr>
8.7 -<tr><td></td><td>{date|date} ({date|age} ago)</td></tr>
8.8 +<tr><td></td><td>{date|date} ({date|age})</td></tr>
8.9 {branch%changesetbranch}
8.10 <tr><td>changeset {rev}</td><td style="font-family:monospace">{node|short}</td></tr>
8.11 {parent%changesetparent}
9.1 --- a/gitweb_am/fileannotate.tmpl Sun Oct 18 00:37:53 2009 -0500
9.2 +++ b/gitweb_am/fileannotate.tmpl Fri Dec 11 16:19:29 2009 -0600
9.3 @@ -34,7 +34,7 @@
9.4 <td>{author|obfuscate}</td></tr>
9.5 <tr>
9.6 <td></td>
9.7 - <td>{date|date} ({date|age} ago)</td></tr>
9.8 + <td>{date|date} ({date|age})</td></tr>
9.9 {branch%filerevbranch}
9.10 <tr>
9.11 <td>changeset {rev}</td>
10.1 --- a/gitweb_am/filerevision.tmpl Sun Oct 18 00:37:53 2009 -0500
10.2 +++ b/gitweb_am/filerevision.tmpl Fri Dec 11 16:19:29 2009 -0600
10.3 @@ -34,7 +34,7 @@
10.4 <td>{author|obfuscate}</td></tr>
10.5 <tr>
10.6 <td></td>
10.7 - <td>{date|date} ({date|age} ago)</td></tr>
10.8 + <td>{date|date} ({date|age})</td></tr>
10.9 {branch%filerevbranch}
10.10 <tr>
10.11 <td>changeset {rev}</td>
11.1 --- a/monoblue/changelogentry.tmpl Sun Oct 18 00:37:53 2009 -0500
11.2 +++ b/monoblue/changelogentry.tmpl Fri Dec 11 16:19:29 2009 -0600
11.3 @@ -1,6 +1,6 @@
11.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>
11.5 <ul class="changelog-entry">
11.6 - <li class="age">{date|age} ago</li>
11.7 + <li class="age">{date|age}</li>
11.8 <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>
11.9 <li class="description">{desc|strip|escape|addbreaks|nonempty}</li>
11.10 </ul>
12.1 --- a/monoblue/changeset.tmpl Sun Oct 18 00:37:53 2009 -0500
12.2 +++ b/monoblue/changeset.tmpl Fri Dec 11 16:19:29 2009 -0600
12.3 @@ -36,7 +36,7 @@
12.4 <h2 class="no-link no-border">changeset</h2>
12.5
12.6 <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>
12.7 - <p class="changeset-age"><span>{date|age} ago</span></p>
12.8 + <p class="changeset-age"><span>{date|age}</span></p>
12.9
12.10 <dl class="overview">
12.11 <dt>author</dt>
13.1 --- a/monoblue/fileannotate.tmpl Sun Oct 18 00:37:53 2009 -0500
13.2 +++ b/monoblue/fileannotate.tmpl Fri Dec 11 16:19:29 2009 -0600
13.3 @@ -38,7 +38,7 @@
13.4
13.5 <h2 class="no-link no-border">{file|escape}@{node|short} (annotated)</h2>
13.6 <h3 class="changeset">{file|escape}</h3>
13.7 - <p class="changeset-age"><span>{date|age} ago</span></p>
13.8 + <p class="changeset-age"><span>{date|age}</span></p>
13.9
13.10 <dl class="overview">
13.11 <dt>author</dt>
14.1 --- a/monoblue/filerevision.tmpl Sun Oct 18 00:37:53 2009 -0500
14.2 +++ b/monoblue/filerevision.tmpl Fri Dec 11 16:19:29 2009 -0600
14.3 @@ -38,7 +38,7 @@
14.4
14.5 <h2 class="no-link no-border">{file|escape}@{node|short}</h2>
14.6 <h3 class="changeset">{file|escape}</h3>
14.7 - <p class="changeset-age"><span>{date|age} ago</span></p>
14.8 + <p class="changeset-age"><span>{date|age}</span></p>
14.9
14.10 <dl class="overview">
14.11 <dt>author</dt>
15.1 --- a/monoblue/map Sun Oct 18 00:37:53 2009 -0500
15.2 +++ b/monoblue/map Fri Dec 11 16:19:29 2009 -0600
15.3 @@ -127,7 +127,7 @@
15.4 tags = tags.tmpl
15.5 tagentry = '
15.6 <tr class="parity{parity}">
15.7 - <td class="nowrap">{date|age} ago</td>
15.8 + <td class="nowrap">{date|age}</td>
15.9 <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td>
15.10 <td class="nowrap">
15.11 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
15.12 @@ -138,7 +138,7 @@
15.13 branches = branches.tmpl
15.14 branchentry = '
15.15 <tr class="parity{parity}">
15.16 - <td class="nowrap">{date|age} ago</td>
15.17 + <td class="nowrap">{date|age}</td>
15.18 <td><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
15.19 <td class="{status}">{branch|escape}</td>
15.20 <td class="nowrap">
15.21 @@ -170,7 +170,7 @@
15.22 inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
15.23 shortlogentry = '
15.24 <tr class="parity{parity}">
15.25 - <td class="nowrap">{date|age} ago</td>
15.26 + <td class="nowrap">{date|age}</td>
15.27 <td>{author|person}</td>
15.28 <td>
15.29 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">
15.30 @@ -185,7 +185,7 @@
15.31 </tr>'
15.32 filelogentry = '
15.33 <tr class="parity{parity}">
15.34 - <td class="nowrap">{date|age} ago</td>
15.35 + <td class="nowrap">{date|age}</td>
15.36 <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td>
15.37 <td class="nowrap">
15.38 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
15.39 @@ -198,7 +198,7 @@
15.40 <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
15.41 <td>{description}</td>
15.42 <td>{contact|obfuscate}</td>
15.43 - <td>{lastchange|age} ago</td>
15.44 + <td>{lastchange|age}</td>
15.45 <td class="indexlinks">{archives%indexarchiveentry}</td>
15.46 <td>
15.47 <div class="rss_logo">
16.1 --- a/paper/changeset.tmpl Sun Oct 18 00:37:53 2009 -0500
16.2 +++ b/paper/changeset.tmpl Fri Dec 11 16:19:29 2009 -0600
16.3 @@ -45,7 +45,7 @@
16.4 </tr>
16.5 <tr>
16.6 <th class="date">date</th>
16.7 - <td class="date">{date|date} ({date|age} ago)</td></tr>
16.8 + <td class="date">{date|date} ({date|age})</td></tr>
16.9 <tr>
16.10 <th class="author">parents</th>
16.11 <td class="author">{parent%changesetparent}</td>
17.1 --- a/paper/fileannotate.tmpl Sun Oct 18 00:37:53 2009 -0500
17.2 +++ b/paper/fileannotate.tmpl Fri Dec 11 16:19:29 2009 -0600
17.3 @@ -22,6 +22,7 @@
17.4 </ul>
17.5 <ul>
17.6 <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
17.7 +<li><a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>
17.8 <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
17.9 <li class="active">annotate</li>
17.10 <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
17.11 @@ -49,7 +50,7 @@
17.12 </tr>
17.13 <tr>
17.14 <th class="date">date</th>
17.15 - <td class="date">{date|date} ({date|age} ago)</td>
17.16 + <td class="date">{date|date} ({date|age})</td>
17.17 </tr>
17.18 <tr>
17.19 <th class="author">parents</th>
18.1 --- a/paper/filediff.tmpl Sun Oct 18 00:37:53 2009 -0500
18.2 +++ b/paper/filediff.tmpl Fri Dec 11 16:19:29 2009 -0600
18.3 @@ -21,6 +21,7 @@
18.4 </ul>
18.5 <ul>
18.6 <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
18.7 +<li><a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>
18.8 <li class="active">diff</li>
18.9 <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
18.10 <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
18.11 @@ -48,7 +49,7 @@
18.12 </tr>
18.13 <tr>
18.14 <th>date</th>
18.15 - <td>{date|date} ({date|age} ago)</td>
18.16 + <td>{date|date} ({date|age})</td>
18.17 </tr>
18.18 <tr>
18.19 <th>parents</th>
19.1 --- a/paper/filerevision.tmpl Sun Oct 18 00:37:53 2009 -0500
19.2 +++ b/paper/filerevision.tmpl Fri Dec 11 16:19:29 2009 -0600
19.3 @@ -21,6 +21,7 @@
19.4 </ul>
19.5 <ul>
19.6 <li class="active">file</li>
19.7 +<li><a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>
19.8 <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
19.9 <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
19.10 <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
19.11 @@ -48,7 +49,7 @@
19.12 </tr>
19.13 <tr>
19.14 <th class="date">date</th>
19.15 - <td class="date">{date|date} ({date|age} ago)</td>
19.16 + <td class="date">{date|date} ({date|age})</td>
19.17 </tr>
19.18 <tr>
19.19 <th class="author">parents</th>
20.1 --- a/paper/map Sun Oct 18 00:37:53 2009 -0500
20.2 +++ b/paper/map Fri Dec 11 16:19:29 2009 -0600
20.3 @@ -176,7 +176,7 @@
20.4 <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td>
20.5 <td>{description}</td>
20.6 <td>{contact|obfuscate}</td>
20.7 - <td class="age">{lastchange|age} ago</td>
20.8 + <td class="age">{lastchange|age}</td>
20.9 <td class="indexlinks">{archives%indexarchiveentry}</td>
20.10 </tr>\n'
20.11 indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}"> ↓{type|escape}</a>'
21.1 --- a/paper/notfound.tmpl Sun Oct 18 00:37:53 2009 -0500
21.2 +++ b/paper/notfound.tmpl Fri Dec 11 16:19:29 2009 -0600
21.3 @@ -7,6 +7,6 @@
21.4
21.5 The specified repository "{repo|escape}" is unknown, sorry.
21.6
21.7 -Please go back to the main repository list page.
21.8 +Please go back to the <a href="{url}">main repository list page</a>.
21.9
21.10 {footer}
22.1 --- a/spartan/changelogentry.tmpl Sun Oct 18 00:37:53 2009 -0500
22.2 +++ b/spartan/changelogentry.tmpl Fri Dec 11 16:19:29 2009 -0600
22.3 @@ -1,6 +1,6 @@
22.4 <table class="logEntry parity{parity}">
22.5 <tr>
22.6 - <th class="age">{date|age} ago:</th>
22.7 + <th class="age">{date|age}:</th>
22.8 <th class="firstline">{desc|strip|firstline|escape|nonempty}</th>
22.9 </tr>
22.10 <tr>
23.1 --- a/spartan/changeset.tmpl Sun Oct 18 00:37:53 2009 -0500
23.2 +++ b/spartan/changeset.tmpl Fri Dec 11 16:19:29 2009 -0600
23.3 @@ -30,7 +30,7 @@
23.4 </tr>
23.5 <tr>
23.6 <th class="date">date:</th>
23.7 - <td class="date">{date|date} ({date|age} ago)</td>
23.8 + <td class="date">{date|date} ({date|age})</td>
23.9 </tr>
23.10 <tr>
23.11 <th class="files">files:</th>
24.1 --- a/spartan/fileannotate.tmpl Sun Oct 18 00:37:53 2009 -0500
24.2 +++ b/spartan/fileannotate.tmpl Fri Dec 11 16:19:29 2009 -0600
24.3 @@ -29,7 +29,7 @@
24.4 <td>{author|obfuscate}</td></tr>
24.5 <tr>
24.6 <td class="metatag">date:</td>
24.7 - <td>{date|date} ({date|age} ago)</td>
24.8 + <td>{date|date} ({date|age})</td>
24.9 </tr>
24.10 <tr>
24.11 <td class="metatag">permissions:</td>
25.1 --- a/spartan/filelogentry.tmpl Sun Oct 18 00:37:53 2009 -0500
25.2 +++ b/spartan/filelogentry.tmpl Fri Dec 11 16:19:29 2009 -0600
25.3 @@ -1,6 +1,6 @@
25.4 <table class="logEntry parity{parity}">
25.5 <tr>
25.6 - <th class="age">{date|age} ago:</th>
25.7 + <th class="age">{date|age}:</th>
25.8 <th class="firstline"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></th>
25.9 </tr>
25.10 <tr>
26.1 --- a/spartan/filerevision.tmpl Sun Oct 18 00:37:53 2009 -0500
26.2 +++ b/spartan/filerevision.tmpl Fri Dec 11 16:19:29 2009 -0600
26.3 @@ -29,7 +29,7 @@
26.4 <td>{author|obfuscate}</td></tr>
26.5 <tr>
26.6 <td class="metatag">date:</td>
26.7 - <td>{date|date} ({date|age} ago)</td></tr>
26.8 + <td>{date|date} ({date|age})</td></tr>
26.9 <tr>
26.10 <td class="metatag">permissions:</td>
26.11 <td>{permissions|permissions}</td></tr>
27.1 --- a/spartan/notfound.tmpl Sun Oct 18 00:37:53 2009 -0500
27.2 +++ b/spartan/notfound.tmpl Fri Dec 11 16:19:29 2009 -0600
27.3 @@ -7,6 +7,6 @@
27.4
27.5 The specified repository "{repo|escape}" is unknown, sorry.
27.6
27.7 -Please go back to the main repository list page.
27.8 +Please go back to the <a href="{url}">main repository list page</a>.
27.9
27.10 {footer}
28.1 --- a/static/style-paper.css Sun Oct 18 00:37:53 2009 -0500
28.2 +++ b/static/style-paper.css Fri Dec 11 16:19:29 2009 -0600
28.3 @@ -161,7 +161,7 @@
28.4 border-bottom: 1px solid #999;
28.5 }
28.6 .bigtable tr { border: none; }
28.7 -.bigtable .age { width: 6em; }
28.8 +.bigtable .age { width: 7em; }
28.9 .bigtable .author { width: 12em; }
28.10 .bigtable .description { }
28.11 .bigtable .node { width: 5em; font-family: monospace;}