Mercurial > hg-stable
changeset 7407:7b2a77b20964
coal/paper: display branch names in log
| author | Benoit Allard <benoit@aeteurope.nl> |
|---|---|
| date | Tue, 25 Nov 2008 22:51:10 +0100 |
| parents | ee8af8a4d905 |
| children | f031a12dfc31 |
| files | templates/coal/map templates/coal/shortlogentry.tmpl templates/paper/map templates/static/style-coal.css templates/static/style-paper.css tests/test-hgweb-commands.out |
| diffstat | 6 files changed, 37 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/templates/coal/map Tue Nov 25 17:54:49 2008 +0100 +++ b/templates/coal/map Tue Nov 25 22:51:10 2008 +0100 @@ -58,6 +58,8 @@ tagentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td class="node">{node|short}</td></tr>' changelogtag = '<span class="tag">{name|escape}</span> ' changesettag = '<span class="tag">{tag|escape}</span> ' +changelogbranchhead = '<span class="branchhead">{name|escape}</span> ' +changelogbranchname = '<span class="branchname">{name|escape}</span> ' filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>' filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>' filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
--- a/templates/coal/shortlogentry.tmpl Tue Nov 25 17:54:49 2008 +0100 +++ b/templates/coal/shortlogentry.tmpl Tue Nov 25 22:51:10 2008 +0100 @@ -1,5 +1,5 @@ <tr class="parity{parity}"> <td class="age">{date|age}</td> <td class="author">{author|person}</td> - <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}</a>{tags%changelogtag}</td> + <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}</td> </tr>
--- a/templates/paper/map Tue Nov 25 17:54:49 2008 +0100 +++ b/templates/paper/map Tue Nov 25 22:51:10 2008 +0100 @@ -56,9 +56,10 @@ fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>' tags = ../coal/tags.tmpl tagentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td class="node">{node|short}</td></tr>' -changelogtag = '<tr><th class="tag">tag:</th><td class="tag">{tag|escape}</td></tr>' changelogtag = '<span class="tag">{name|escape}</span> ' changesettag = '<span class="tag">{tag|escape}</span> ' +changelogbranchhead = '<span class="branchhead">{name|escape}</span> ' +changelogbranchname = '<span class="branchname">{name|escape}</span> ' filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>' filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>' filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
--- a/templates/static/style-coal.css Tue Nov 25 17:54:49 2008 +0100 +++ b/templates/static/style-coal.css Tue Nov 25 22:51:10 2008 +0100 @@ -111,6 +111,22 @@ vertical-align: baseline; } +.branchhead { + color: #000; + font-size: 80%; + font-weight: normal; + margin-left: .5em; + vertical-align: baseline; +} + +.branchname { + color: #000; + font-size: 60%; + font-weight: normal; + margin-left: .5em; + vertical-align: baseline; +} + /* Common */ pre { margin: 0; }
--- a/templates/static/style-paper.css Tue Nov 25 17:54:49 2008 +0100 +++ b/templates/static/style-paper.css Tue Nov 25 22:51:10 2008 +0100 @@ -102,6 +102,22 @@ vertical-align: baseline; } +.branchhead { + color: #000; + font-size: 80%; + font-weight: normal; + margin-left: .5em; + vertical-align: baseline; +} + +.branchname { + color: #000; + font-size: 60%; + font-weight: normal; + margin-left: .5em; + vertical-align: baseline; +} + /* Common */ pre { margin: 0; }