hgtemplates: incorporate gitweb theme changes into gitweb_mozilla (
bug 1228088); r?dminor
Mostly RSS and ATOM foo. Nothing too serious by the looks of it.
MozReview-Commit-ID: 1kEpFzRwIGL
--- a/hgtemplates/gitweb_mozilla/bookmarks.tmpl
+++ b/hgtemplates/gitweb_mozilla/bookmarks.tmpl
@@ -1,14 +1,14 @@
{header}
<title>{repo|escape}: Bookmarks</title>
<link rel="alternate" type="application/atom+xml"
- href="{url|urlescape}atom-bookmarks" title="Atom feed for {repo|escape}"/>
+ href="{url|urlescape}atom-bookmarks" title="Atom feed for {repo|escape}: bookmarks"/>
<link rel="alternate" type="application/rss+xml"
- href="{url|urlescape}rss-bookmarks" title="RSS feed for {repo|escape}"/>
+ href="{url|urlescape}rss-bookmarks" title="RSS feed for {repo|escape}: bookmarks"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / bookmarks
</div>
--- a/hgtemplates/gitweb_mozilla/branches.tmpl
+++ b/hgtemplates/gitweb_mozilla/branches.tmpl
@@ -1,14 +1,14 @@
{header}
<title>{repo|escape}: Branches</title>
<link rel="alternate" type="application/atom+xml"
- href="{url|urlescape}atom-branches" title="Atom feed for {repo|escape}"/>
+ href="{url|urlescape}atom-branches" title="Atom feed for {repo|escape}: branches"/>
<link rel="alternate" type="application/rss+xml"
- href="{url|urlescape}rss-branches" title="RSS feed for {repo|escape}"/>
+ href="{url|urlescape}rss-branches" title="RSS feed for {repo|escape}: branches"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / branches
</div>
--- a/hgtemplates/gitweb_mozilla/changelog.tmpl
+++ b/hgtemplates/gitweb_mozilla/changelog.tmpl
@@ -1,13 +1,14 @@
{header}
<title>{repo|escape}: Changelog</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
-
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / changelog
</div>
--- a/hgtemplates/gitweb_mozilla/changeset.tmpl
+++ b/hgtemplates/gitweb_mozilla/changeset.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: changeset {rev}:{node|short}</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset / {node|short} {if(backedoutbynode, '💩')}
</div>
@@ -16,17 +18,17 @@
<a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}pushloghtml{sessionvars%urlparameter}">pushlog</a> |
<a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a> |
<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> |
changeset |
-<a href="{url|urlescape}raw-rev/{node|short}">raw</a> {archives%archiveentry} |
+<a href="{url|urlescape}raw-rev/{symrev}">raw</a> {archives%archiveentry} |
<a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
<br/>
</div>
<div class="title">
{desc|strip|escape|firstline|buglink|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>
</div>
<div class="title_text">
--- a/hgtemplates/gitweb_mozilla/error.tmpl
+++ b/hgtemplates/gitweb_mozilla/error.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: Error</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / error
</div>
--- a/hgtemplates/gitweb_mozilla/fileannotate.tmpl
+++ b/hgtemplates/gitweb_mozilla/fileannotate.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: {file|escape}@{node|short} (annotated)</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate / {file|escape}
</div>
--- a/hgtemplates/gitweb_mozilla/filediff.tmpl
+++ b/hgtemplates/gitweb_mozilla/filediff.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: diff {file|escape}</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / diff / {file|escape}
</div>
--- a/hgtemplates/gitweb_mozilla/filelog.tmpl
+++ b/hgtemplates/gitweb_mozilla/filelog.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: File revisions: {file|escape}</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / file revisions / {file|escape}
</div>
--- a/hgtemplates/gitweb_mozilla/filerevision.tmpl
+++ b/hgtemplates/gitweb_mozilla/filerevision.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: {file|escape}@{node|short}</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / file revision / {file|escape}@{node|short}
</div>
--- a/hgtemplates/gitweb_mozilla/footer.tmpl
+++ b/hgtemplates/gitweb_mozilla/footer.tmpl
@@ -1,11 +1,13 @@
+<script type="text/javascript">process_dates()</script>
<div class="page_footer">
<div class="page_footer_text">{repo|escape}</div>
<div class="page_footer_text" style="padding-left: 10px">Deployed from <a href="https://hg.mozilla.org/hgcustom/version-control-tools/rev/VCTNODE">VCTNODE</a> at DEPLOYDATE.</div>
-<div class="feed">
-<a href="{url|urlescape}atom-log"><img src="{staticurl}livemarks16.png" alt="Feed" title="Feed of repository changes"/></a>
+<div class="rss_logo">
+<a href="{url|urlescape}rss-log">RSS</a>
+<a href="{url|urlescape}atom-log">Atom</a>
</div>
<br />
{motd}
</div>
</body>
</html>
--- a/hgtemplates/gitweb_mozilla/graph.tmpl
+++ b/hgtemplates/gitweb_mozilla/graph.tmpl
@@ -37,17 +37,17 @@ graph |
</div>
<div class="title"> </div>
<noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>
<div id="wrapper">
<ul id="nodebgs"></ul>
-<canvas id="graph" width="480" height="{canvasheight}"></canvas>
+<canvas id="graph" width="{canvaswidth}" height="{canvasheight}"></canvas>
<ul id="graphnodes"></ul>
</div>
<script>
<!-- hide script content
var data = {jsdata|json};
var graph = new Graph();
--- a/hgtemplates/gitweb_mozilla/help.tmpl
+++ b/hgtemplates/gitweb_mozilla/help.tmpl
@@ -1,14 +1,14 @@
{header}
<title>Help: {topic}</title>
<link rel="alternate" type="application/atom+xml"
- href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}"/>
+ href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
<link rel="alternate" type="application/rss+xml"
- href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}"/>
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / help
</div>
--- a/hgtemplates/gitweb_mozilla/helptopics.tmpl
+++ b/hgtemplates/gitweb_mozilla/helptopics.tmpl
@@ -1,14 +1,14 @@
{header}
<title>Help: {title}</title>
<link rel="alternate" type="application/atom+xml"
- href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}"/>
+ href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
<link rel="alternate" type="application/rss+xml"
- href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}"/>
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / help
</div>
@@ -17,25 +17,33 @@
<a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}pushloghtml{sessionvars%urlparameter}">pushlog</a> |
<a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url|urlescape}file{sessionvars%urlparameter}">files</a> |
-help
+{if(subindex,
+ '<a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>',
+ 'help'
+)}
<br/>
</div>
<div class="title"> </div>
<table cellspacing="0">
<tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
{topics % helpentry}
+{if(earlycommands, '
<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
{earlycommands % helpentry}
+')}
+{if(othercommands, '
<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
{othercommands % helpentry}
+')}
+
</table>
{footer}
--- a/hgtemplates/gitweb_mozilla/index.tmpl
+++ b/hgtemplates/gitweb_mozilla/index.tmpl
@@ -1,23 +1,24 @@
{header}
<title>Mercurial repositories index</title>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
- Repositories list
+ <a href="/">Mercurial</a> {pathdef%breadcrumb}
</div>
<table cellspacing="0">
<tr>
<td><a href="?sort={sort_name}">Name</a></td>
<td><a href="?sort={sort_description}">Description</a></td>
- <td><a href="?sort={sort_lastchange}">Last change</a></td>
+ <td><a href="?sort={sort_contact}">Contact</a></td>
+ <td><a href="?sort={sort_lastchange}">Last modified</a></td>
<td> </td>
<td> </td>
</tr>
{entries%indexentry}
</table>
--- a/hgtemplates/gitweb_mozilla/manifest.tmpl
+++ b/hgtemplates/gitweb_mozilla/manifest.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: files</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / files
</div>
--- a/hgtemplates/gitweb_mozilla/map
+++ b/hgtemplates/gitweb_mozilla/map
@@ -9,17 +9,17 @@ error = error.tmpl
notfound = notfound.tmpl
help = help.tmpl
helptopics = helptopics.tmpl
helpentry = '
<tr><td>
<a href="{url|urlescape}help/{topic|escape}{sessionvars%urlparameter}">
- {topic|escape}
+ {if(basename, '{basename|escape}', '{topic|escape}')}
</a>
</td><td>
{summary|escape}
</td></tr>'
naventry = '<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
navshortentry = '<a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
navgraphentry = '<a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
@@ -298,27 +298,35 @@ filelogentry = '
{if(pushdate, '<br/>pushed <i>{pushdate|isodate}</i>', '<br/>pushed <i>unknown</i>')}
</td>
<td><i>{author|person}</i></td>
<td>
<strong><cite>{author|person}</cite> - {desc|strip|firstline|escape|buglink}</strong>
<span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>
</td>
</tr>'
-archiveentry = ' | <a href="{url|urlescape}archive/{symrev}{extension}">{type|escape}</a> '
+archiveentry = ' | <a href="{url|urlescape}archive/{symrev}{extension}{ifeq(path,'/','',path|urlescape)}">{type|escape}</a> '
indexentry = '
<tr class="parity{parity}">
- <td><a class="list" href="{url|urlescape}{sessionvars%urlparameter}"><b>{name|escape}</b></a></td>
+ <td>
+ <a class="list" href="{url|urlescape}{sessionvars%urlparameter}">
+ <b>{name|escape}</b>
+ </a>
+ </td>
<td>{description}</td>
<td class="age">at {lastchange|date}</td>
<td class="indexlinks">{archives%indexarchiveentry}</td>
- <td><a href="{url|urlescape}atom-log"><img src="{staticurl}livemarks16.png" alt="Feed" title="Feed of repository changes"/></a></td>
+ <td>{if(isdirectory, '',
+ '<div class="rss_logo">
+ <a href="{url|urlescape}rss-log">RSS</a> <a href="{url|urlescape}atom-log">Atom</a>
+ </div>'
+ )}
+ </td>
</tr>\n'
indexarchiveentry = ' <a href="{url|urlescape}archive/{node|short}{extension}">{type|escape}</a> '
index = index.tmpl
urlparameter = '{separator}{name}={value|urlescape}'
hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
-
breadcrumb = '> <a href="{url|urlescape}">{name|escape}</a> '
pushlog = pushlog.tmpl
bughyperlink = '<a href="{url}">{no|escape}</a>'
reviewerlink = '<a href="{url|urlescape}log?rev={revset|urlescape}&revcount=50">{name|escape}</a>'
backedoutnodelink = '<a style="font-family: monospace" href="{url|urlescape}rev/{node|short}">{node|short}</a>'
--- a/hgtemplates/gitweb_mozilla/search.tmpl
+++ b/hgtemplates/gitweb_mozilla/search.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: Search</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / search
<form action="{url|urlescape}log">
@@ -21,17 +23,17 @@
<a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}pushloghtml{sessionvars%urlparameter}">pushlog</a> |
<a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
- <a href="{url|urlescape}file{sessionvars%urlparameter}">files</a>{archives%archiveentry}
+<a href="{url|urlescape}file{sessionvars%urlparameter}">files</a>{archives%archiveentry}
|
<a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
<br/>
</div>
<div class="title">searching for {query|escape}</div>
{entries}
--- a/hgtemplates/gitweb_mozilla/shortlog.tmpl
+++ b/hgtemplates/gitweb_mozilla/shortlog.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: Shortlog</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / shortlog
</div>
--- a/hgtemplates/gitweb_mozilla/summary.tmpl
+++ b/hgtemplates/gitweb_mozilla/summary.tmpl
@@ -1,19 +1,20 @@
{header}
<title>{repo|escape}: Summary</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / summary
-
<form action="{url|urlescape}log">
{sessionvars%hiddenformentry}
<div class="search">
<input type="text" name="rev" />
</div>
</form>
</div>
--- a/hgtemplates/gitweb_mozilla/tags.tmpl
+++ b/hgtemplates/gitweb_mozilla/tags.tmpl
@@ -1,12 +1,14 @@
{header}
<title>{repo|escape}: Tags</title>
<link rel="alternate" type="application/atom+xml"
href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}: tags"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}: tags"/>
</head>
<body>
<div class="page_header">
<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / tags
</div>