# HG changeset patch
# User Benoit Allard <benoit@aeteurope.nl>
# Date 1227649870 -3600
# Node ID 7b2a77b20964217dffb1722cba6e39672c9e1075
# Parent  ee8af8a4d905bba2f70089ea9b9d22fff2e7982b
coal/paper: display branch names in log

diff -r ee8af8a4d905 -r 7b2a77b20964 templates/coal/map
--- 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>'
diff -r ee8af8a4d905 -r 7b2a77b20964 templates/coal/shortlogentry.tmpl
--- 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>
diff -r ee8af8a4d905 -r 7b2a77b20964 templates/paper/map
--- 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>'
diff -r ee8af8a4d905 -r 7b2a77b20964 templates/static/style-coal.css
--- 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; }
 
diff -r ee8af8a4d905 -r 7b2a77b20964 templates/static/style-paper.css
--- 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; }
 
diff -r ee8af8a4d905 -r 7b2a77b20964 tests/test-hgweb-commands.out
Binary file tests/test-hgweb-commands.out has changed