# HG changeset patch # User Paul Boddie # Date 1278722670 -7200 # Node ID 73bdffb4a922b02efc6367b76765d95f8552e993 # Parent 8870115b55650d7ac0610b1f6caaeacc60ff87db Added changeset and "not found" page support. Tidied up the branch indicators. Made the search pop-up hint appear at a different z-index. Insisted that the stylesheet is UTF-8 encoded. Added the repository name as a heading on each page. Adjusted the column width in various entry tables. Added a branch status indicator to branch entries. Updated the copyright information. diff -r 8870115b5565 -r 73bdffb4a922 COPYING.txt --- a/COPYING.txt Fri Jun 11 22:16:37 2010 +0200 +++ b/COPYING.txt Sat Jul 10 02:44:30 2010 +0200 @@ -4,6 +4,7 @@ Theme templates: Copyright (C) 2010 Paul Boddie +Copyright (C) 2005-2010 Matt Mackall and others Stylesheets: diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/branchentry.tmpl --- a/themes/mercurialweb/branchentry.tmpl Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/branchentry.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -1,5 +1,6 @@ {date|age} - {branch|escape} + files + {branch|escape} {node|short} diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/branches.tmpl --- a/themes/mercurialweb/branches.tmpl Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/branches.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -25,7 +25,9 @@
-

Branches

+

{repo|escape}

+ +

Branches

diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/changeset.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/changeset.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -0,0 +1,58 @@ +{header} +{repo|escape} (changeset {node|short}) + + + + + + +

{repo|escape}

+ +

Changeset

+ +

+{parent%changesetlink} +{rev}:{node|short} +{child%changesetlink} +

+ +
+ + + + + + + + + + + + + + + +
{date|age}{author|person}files{desc|strip|escape|addbreaks}{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}
+ {diff} +
{files}
+ +{footer} diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/header.tmpl --- a/themes/mercurialweb/header.tmpl Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/header.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -3,4 +3,4 @@ - + diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/map --- a/themes/mercurialweb/map Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/map Sat Jul 10 02:44:30 2010 +0200 @@ -2,9 +2,11 @@ mimetype = 'text/html; charset={encoding}' branches = branches.tmpl +changeset = changeset.tmpl header = header.tmpl footer = footer.tmpl index = index.tmpl +notfound = notfound.tmpl search = search.tmpl shortlog = shortlog.tmpl summary = summary.tmpl @@ -15,9 +17,18 @@ shortlogentry = shortlogentry.tmpl archiveentry = '{type|escape} ' -branchtag = '{name} ' -inbranchtag = '{name} ' +branchtag = '{name} ' +changesetlink = '{rev}:{node|short} ' +filenodelink = '{file|escape} ' +inbranchtag = '{name} ' +shortloglink = '{label|escape} ' tagtag = '{name} ' +diffblock = '
{lines}
' +difflineplus = '{linenumber} {line|escape}' +difflineminus = '{linenumber} {line|escape}' +difflineat = '{linenumber} {line|escape}' +diffline = '{linenumber} {line|escape}' + hiddenformentry = '' urlparameter = '{separator}{name}={value|urlescape}' diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/notfound.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/notfound.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -0,0 +1,23 @@ +{header} +Repository not found + + + + + + +
+ +

Repository not found

+ +

The repository {repo|escape} is not recognised by this server.

+ +

Please consult the repository list for details of +repositories available via this server.

+ +
+ +{footer} diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/search.tmpl --- a/themes/mercurialweb/search.tmpl Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/search.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -25,7 +25,9 @@
-

Results

+

{repo|escape}

+ +

Results

diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/shortlog.tmpl --- a/themes/mercurialweb/shortlog.tmpl Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/shortlog.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -25,7 +25,11 @@
-

Shortlog

+

{repo|escape}

+ +

Shortlog

+ +
{changenav%shortloglink}
@@ -33,4 +37,6 @@
+
{changenav%shortloglink}
+ {footer} diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/shortlogentry.tmpl --- a/themes/mercurialweb/shortlogentry.tmpl Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/shortlogentry.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -2,6 +2,6 @@ {date|age} {author|person} files - {desc|strip|firstline|escape} - {inbranch%inbranchtag}{tags%tagtag} + {desc|strip|firstline|escape} + {branches%branchtag}{inbranch%inbranchtag}{tags%tagtag} diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/static/style-mercurialweb.css --- a/themes/mercurialweb/static/style-mercurialweb.css Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/static/style-mercurialweb.css Sat Jul 10 02:44:30 2010 +0200 @@ -53,6 +53,7 @@ th, td { padding: 0.4em 0.25em; + vertical-align: top; } td p { @@ -72,31 +73,40 @@ /* Repository information. */ +span.tag, +span.branch, +span.inbranch { + padding: 0.25em 0.5em; + white-space: nowrap; +} + span.tag { background: #f1b500; - padding: 0.25em 0.5em; } -span.branch { +span.branch, +span.branch-open { background: #b5f1b5; - padding: 0.25em 0.5em; } -span.inbranch { +span.inbranch, +span.branch-inactive { background: #b5b5b5; +} + +span.branch-open, +span.branch-closed, +span.branch-inactive { padding: 0.25em 0.5em; } span.branch-closed { - background: #b5b5f1; - padding: 0.25em 0.5em; + background-color: #f1b5b5; } -span.branch-inactive { - background: #f1b5b5; - padding: 0.25em 0.5em; -} - +span.inbranch a, +span.branch a, +span.branch-open a, span.branch-closed a, span.branch-inactive a { color: #000; @@ -145,6 +155,10 @@ background: #ccc; } +.pager { + float: right; +} + #navibar a, #navibar li.current span { /* Need a block to redefine the height. */ @@ -224,6 +238,7 @@ position: absolute; top: 42px; left: 16px; + z-index: 3; padding: 0 16px; @@ -273,3 +288,35 @@ #credits a { text-decoration: none; } + +/* Changeset presentation. */ + +.changesetparentlink:before { + content: '← '; /* left arrow (UTF-8) */ +} + +.changeset { + font-weight: bold; +} + +.changesetchildlink:after { + content: '→'; /* right arrow (UTF-8) */ +} + +/* Source views. */ + +.source { + background-color: #eee; +} + +.plusline { + color: #090; +} + +.minusline { + color: #900; +} + +.atline { + color: #990; +} diff -r 8870115b5565 -r 73bdffb4a922 themes/mercurialweb/summary.tmpl --- a/themes/mercurialweb/summary.tmpl Fri Jun 11 22:16:37 2010 +0200 +++ b/themes/mercurialweb/summary.tmpl Sat Jul 10 02:44:30 2010 +0200 @@ -25,13 +25,15 @@
-

Summary

+

{repo|escape}

+ +

Summary

...

-

Shortlog

+

Shortlog