{repo|escape} (changelog)

# HG changeset patch # User Paul Boddie # Date 1279063813 -7200 # Node ID a475f55fadabb65bc10156238cd65c6ad7d6230f # Parent 7b7229b9379afd033b02a667b3126ec3b4cd7375 Added changelog and annotation support. Introduced word-wrapping prevention for navigation sections. Removed all parity-based colouring for source views. diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/annotateline.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/annotateline.tmpl Wed Jul 14 01:30:13 2010 +0200 @@ -0,0 +1,6 @@ + + {author|user}@{rev} + {linenumber} +

{line|escape}

+ diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/changelog.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/changelog.tmpl Wed Jul 14 01:30:13 2010 +0200 @@ -0,0 +1,41 @@ +{header} +{repo|escape} (changelog) + + + + + + +

{repo|escape}

+ +

Changelog

+ + + + + +{entries%changelogentry} + +

+ + + +{footer} diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/changelogentry.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/changelogentry.tmpl Wed Jul 14 01:30:13 2010 +0200 @@ -0,0 +1,23 @@ + + + {rev}:{node|short} +

{child%changeloglink} +

{parent%changeloglink} + + + + {date|age} + {author|person} + + changeset + files + shortlog + + {desc|strip|escape} + {branches%branchtag}{inbranch%inbranchtag}{tags%tagtag} + + + + {files} + + diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/fileannotate.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/fileannotate.tmpl Wed Jul 14 01:30:13 2010 +0200 @@ -0,0 +1,57 @@ +{header} +{repo|escape} (annotate {file|escape} in {node|short}) + + + + + + +

{repo|escape}

+ +

Annotated {file|escape}

+ +

{child%changesetlink}

{rev}:{node|short}

{parent%changesetlink}

+ + + + + + + + + + + +

{date|age}

{author|person}

{desc|strip|escape}

{branch%branchlabel}

+ + + +{annotate%annotateline} + +

+ +{footer} diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/filediff.tmpl --- a/themes/mercurialweb/filediff.tmpl Tue Jul 13 23:04:17 2010 +0200 +++ b/themes/mercurialweb/filediff.tmpl Wed Jul 14 01:30:13 2010 +0200 @@ -26,7 +26,7 @@

{repo|escape}

Change

Change of {file|escape}

{child%changesetfiledifflink}

{rev}:{node|short}

diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/filerevision.tmpl --- a/themes/mercurialweb/filerevision.tmpl Tue Jul 13 23:04:17 2010 +0200 +++ b/themes/mercurialweb/filerevision.tmpl Wed Jul 14 01:30:13 2010 +0200 @@ -39,6 +39,7 @@ {author|person} raw + annotate files changeset @@ -48,6 +49,6 @@ -

{text%fileline}

{text%fileline}

{footer} diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/map --- a/themes/mercurialweb/map Tue Jul 13 23:04:17 2010 +0200 +++ b/themes/mercurialweb/map Wed Jul 14 01:30:13 2010 +0200 @@ -2,8 +2,10 @@ mimetype = 'text/html; charset={encoding}' branches = branches.tmpl +changelog = changelog.tmpl changeset = changeset.tmpl error = error.tmpl +fileannotate = fileannotate.tmpl filediff = filediff.tmpl filerevision = filerevision.tmpl header = header.tmpl @@ -16,7 +18,9 @@ summary = summary.tmpl tags = tags.tmpl +annotateline = annotateline.tmpl branchentry = branchentry.tmpl +changelogentry = changelogentry.tmpl direntry = direntry.tmpl fileentry = fileentry.tmpl indexentry = indexentry.tmpl @@ -27,15 +31,17 @@ archiveentry = '{type|escape} ' branchlabel = '{name} ' branchtag = '{name} ' +changelogpagerlink = '{label|escape} ' +changeloglink = '{rev}:{node|short} ' changesetlink = '{rev}:{node|short} ' changesetfiledifflink = '{rev}:{node|short} ' filerevlink = '{rev}:{node|short} ' inbranchlabel = '{name} ' inbranchtag = '{name} ' -shortloglink = '{label|escape} ' +shortlogpagerlink = '{label|escape} ' tagtag = '{name} ' -diffblock = '

{lines}

' +diffblock = '

{lines}

' difflineplus = '{linenumber} {line|escape}' difflineminus = '{linenumber} {line|escape}' difflineat = '{linenumber} {line|escape}' @@ -44,7 +50,7 @@ filedifflink = '{file|escape} ' fileellipses = '...' -fileline = '

{linenumber} {line|escape}

' +fileline = '{linenumber} {line|escape}' filenolink = '{file|escape} ' filenodelink = '{file|escape} ' diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/shortlog.tmpl --- a/themes/mercurialweb/shortlog.tmpl Tue Jul 13 23:04:17 2010 +0200 +++ b/themes/mercurialweb/shortlog.tmpl Wed Jul 14 01:30:13 2010 +0200 @@ -28,7 +28,7 @@

Shortlog

- + @@ -36,6 +36,6 @@

- + {footer} diff -r 7b7229b9379a -r a475f55fadab themes/mercurialweb/static/style-mercurialweb.css --- a/themes/mercurialweb/static/style-mercurialweb.css Tue Jul 13 23:04:17 2010 +0200 +++ b/themes/mercurialweb/static/style-mercurialweb.css Wed Jul 14 01:30:13 2010 +0200 @@ -167,6 +167,10 @@ background: #999; } +.navigation { + white-space: nowrap; +} + .navigation a { background: #ccc; } @@ -314,7 +318,11 @@ overflow: hidden; } -/* Changeset presentation. */ +/* Changeset and changelog presentation. */ + +.changelogfiles { + border-bottom: 1px solid #ccc; +} .changesetlinks { position: relative; @@ -323,6 +331,11 @@ line-height: 1.2em; } +span.changesetlinks { + display: inline-block; + vertical-align: text-top; +} + .changesetlinks a { display: block; } @@ -381,6 +394,23 @@ color: #990; } +/* Annotations. */ + +tr.annotate td, +tr.annotate pre { + margin: 0; + padding: 0; +} + +tr.annotate td.line { + font-family: monospace; + background-color: #eee; +} + +td.annotate { + font-size: 80%; +} + /* File views. */ .permissions {