[PATCH 1 of 2] hgweb: make coal/paper display the branchname

Benoit Allard benoit.allard at gmx.de
Mon Nov 24 16:43:02 CST 2008


# HG changeset patch
# User Benoit Allard <benoit at aeteurope.nl>
# Date 1227550770 -3600
# Node ID 11d8c06f545db62f3d4a13763761b433ff98c8cf
# Parent  41e87b4d0c9d6e05ed7927dc1e06368f2c858091
hgweb: make coal/paper display the branchname

diff -r 41e87b4d0c9d -r 11d8c06f545d templates/coal/map
--- a/templates/coal/map	Sun Nov 23 18:08:19 2008 -0800
+++ b/templates/coal/map	Mon Nov 24 19:19:30 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 41e87b4d0c9d -r 11d8c06f545d templates/coal/shortlogentry.tmpl
--- a/templates/coal/shortlogentry.tmpl	Sun Nov 23 18:08:19 2008 -0800
+++ b/templates/coal/shortlogentry.tmpl	Mon Nov 24 19:19:30 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 41e87b4d0c9d -r 11d8c06f545d templates/paper/map
--- a/templates/paper/map	Sun Nov 23 18:08:19 2008 -0800
+++ b/templates/paper/map	Mon Nov 24 19:19:30 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 41e87b4d0c9d -r 11d8c06f545d templates/static/style-coal.css
--- a/templates/static/style-coal.css	Sun Nov 23 18:08:19 2008 -0800
+++ b/templates/static/style-coal.css	Mon Nov 24 19:19:30 2008 +0100
@@ -110,6 +110,24 @@
   margin-left: .5em;
   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 41e87b4d0c9d -r 11d8c06f545d templates/static/style-paper.css
--- a/templates/static/style-paper.css	Sun Nov 23 18:08:19 2008 -0800
+++ b/templates/static/style-paper.css	Mon Nov 24 19:19:30 2008 +0100
@@ -97,6 +97,22 @@
 .tag {
   color: #999;
   font-size: 70%;
+  font-weight: normal;
+  margin-left: .5em;
+  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;
diff -r 41e87b4d0c9d -r 11d8c06f545d tests/test-hgweb-commands.out
--- a/tests/test-hgweb-commands.out	Sun Nov 23 18:08:19 2008 -0800
+++ b/tests/test-hgweb-commands.out	Mon Nov 24 19:19:30 2008 +0100
@@ -179,7 +179,7 @@
  <tr class="parity0">
   <td class="age">many years</td>
   <td class="author">test</td>
-  <td class="description"><a href="/rev/a4f92ed23982">Added tag 1.0 for changeset 2ef0ac749a14</a><span class="tag">tip</span> </td>
+  <td class="description"><a href="/rev/a4f92ed23982">Added tag 1.0 for changeset 2ef0ac749a14</a><span class="branchhead">default</span> <span class="tag">tip</span> </td>
  </tr>
  <tr class="parity1">
   <td class="age">many years</td>


More information about the Mercurial-devel mailing list