# HG changeset patch # User Paul Boddie # Date 1278892118 -7200 # Node ID 7b233ff06ca3fffb7fcf068bab3096a7f45f24d7 # Parent dca0d6376e6b929df695694db0ace01bcf1bde18 Added error, filerevision and tags support. Added branches and tags support to the summary page, introducing a separate branch class in the stylesheet, with other classes modifying the presentation of branch labels/links. diff -r dca0d6376e6b -r 7b233ff06ca3 themes/mercurialweb/branchentry.tmpl --- a/themes/mercurialweb/branchentry.tmpl Sat Jul 10 20:45:47 2010 +0200 +++ b/themes/mercurialweb/branchentry.tmpl Mon Jul 12 01:48:38 2010 +0200 @@ -1,6 +1,6 @@ {date|age} files - {branch|escape} + {branch|escape} {node|short} diff -r dca0d6376e6b -r 7b233ff06ca3 themes/mercurialweb/error.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/error.tmpl Mon Jul 12 01:48:38 2010 +0200 @@ -0,0 +1,34 @@ +{header} +{repo|escape} (error) + + + + + + +

{repo|escape}

+ +

Error

+ +

{error|escape}

+ +{footer} diff -r dca0d6376e6b -r 7b233ff06ca3 themes/mercurialweb/filerevision.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/filerevision.tmpl Mon Jul 12 01:48:38 2010 +0200 @@ -0,0 +1,53 @@ +{header} +{repo|escape} (file {file|escape} at {node|short}) + + + + + + +

{repo|escape}

+ +

{file|escape}

+ +
{child%filerevlink}
+
{rev}:{node|short}
+
{parent%filerevlink}
+ + + + + + + + + + + + + + +
{date|age}{author|person}changeset{desc|strip|escape}{branch%branchlabel}
+ 
{text%fileline}
+
+ +{footer} diff -r dca0d6376e6b -r 7b233ff06ca3 themes/mercurialweb/map --- a/themes/mercurialweb/map Sat Jul 10 20:45:47 2010 +0200 +++ b/themes/mercurialweb/map Mon Jul 12 01:48:38 2010 +0200 @@ -3,6 +3,8 @@ branches = branches.tmpl changeset = changeset.tmpl +error = error.tmpl +filerevision = filerevision.tmpl header = header.tmpl footer = footer.tmpl index = index.tmpl @@ -10,16 +12,20 @@ search = search.tmpl shortlog = shortlog.tmpl summary = summary.tmpl +tags = tags.tmpl branchentry = branchentry.tmpl indexentry = indexentry.tmpl searchentry = searchentry.tmpl shortlogentry = shortlogentry.tmpl +tagentry = tagentry.tmpl archiveentry = '{type|escape} ' +branchlabel = '{name} ' branchtag = '{name} ' changesetlink = '{rev}:{node|short} ' -filenodelink = '{file|escape} ' +filerevlink = '{rev}:{node|short} ' +inbranchlabel = '{name} ' inbranchtag = '{name} ' shortloglink = '{label|escape} ' tagtag = '{name} ' @@ -30,5 +36,13 @@ difflineat = '{linenumber} {line|escape}' diffline = '{linenumber} {line|escape}' +filedifflink = '{file|escape} ' +fileellipses = '...' + +fileline = '
{linenumber} {line|escape}
' + +filenolink = '{file|escape} ' +filenodelink = '{file|escape} ' + hiddenformentry = '' urlparameter = '{separator}{name}={value|urlescape}' diff -r dca0d6376e6b -r 7b233ff06ca3 themes/mercurialweb/static/style-mercurialweb.css --- a/themes/mercurialweb/static/style-mercurialweb.css Sat Jul 10 20:45:47 2010 +0200 +++ b/themes/mercurialweb/static/style-mercurialweb.css Mon Jul 12 01:48:38 2010 +0200 @@ -65,6 +65,13 @@ background: #f7f7f7; } +hr { + background-color: #ccc; + color: #ccc; + border: 0; + height: 1px; +} + /* Styling of headings from the main site. */ h1 { font-size: 2em; } @@ -84,31 +91,26 @@ background: #f1b500; } -span.branch, -span.branch-open { +span.branch, /* default properties */ +span.open { background: #b5f1b5; } span.inbranch, -span.branch-inactive { - background: #b5b5b5; -} - -span.branch-open, -span.branch-closed, -span.branch-inactive { - padding: 0.25em 0.5em; +span.inactive { + background: #b5b5b5 !important; } -span.branch-closed { - background-color: #f1b5b5; +span.closed { + background-color: #f1b5b5 !important; } +span.branch a, +span.tag a, span.inbranch a, -span.branch a, -span.branch-open a, -span.branch-closed a, -span.branch-inactive a { +span.open a, +span.closed a, +span.inactive a { color: #000; } diff -r dca0d6376e6b -r 7b233ff06ca3 themes/mercurialweb/summary.tmpl --- a/themes/mercurialweb/summary.tmpl Sat Jul 10 20:45:47 2010 +0200 +++ b/themes/mercurialweb/summary.tmpl Mon Jul 12 01:48:38 2010 +0200 @@ -29,7 +29,22 @@

Summary

-

...

+ + + + + + + + + + + + + + + +
Description{desc}
Owner{owner|obfuscate}
Last change{lastchange|rfc822date}
@@ -41,4 +56,20 @@ +

Tags

+ + + +{tags} + +
+ +

Branches

+ + + +{branches%branchentry} + +
+ {footer} diff -r dca0d6376e6b -r 7b233ff06ca3 themes/mercurialweb/tagentry.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/tagentry.tmpl Mon Jul 12 01:48:38 2010 +0200 @@ -0,0 +1,6 @@ + + {date|age} + files + {tag|escape} + {node|short} + diff -r dca0d6376e6b -r 7b233ff06ca3 themes/mercurialweb/tags.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/tags.tmpl Mon Jul 12 01:48:38 2010 +0200 @@ -0,0 +1,38 @@ +{header} +{repo|escape} (tags) + + + + + + +

{repo|escape}

+ +

Tags

+ + + +{entries%tagentry} + +
+ +{footer}