[PATCH 2 of 2] hgweb: graph display branchname for coal/paper and monoblue

[Benoit Allard]

# HG changeset patch
# User Benoit Allard <benoit at aeteurope.nl>
# Date 1227552180 -3600
# Node ID 436a0ef04b027318969a51d5a40d70b889682e7d
# Parent  11d8c06f545db62f3d4a13763761b433ff98c8cf
hgweb: graph display branchname for coal/paper and monoblue

diff -r 11d8c06f545d -r 436a0ef04b02 templates/coal/graph.tmpl
--- a/templates/coal/graph.tmpl	Mon Nov 24 19:19:30 2008 +0100
+++ b/templates/coal/graph.tmpl	Mon Nov 24 19:43:00 2008 +0100
@@ -70,8 +70,7 @@
 
 var revlink = '<li style="_STYLE"><span class="desc">';
 revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-revlink += '</span><span class="tag">_TAGS</span>';
-revlink += '<span class="info">_DATE ago, by _USER</span></li>';
+revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
 
 graph.vertex = function(x, y, color, parity, cur) {
 	
@@ -90,9 +89,29 @@
 	item = item.replace(/_DESC/, cur[3]);
 	item = item.replace(/_USER/, cur[4]);
 	item = item.replace(/_DATE/, cur[5]);
-	item = item.replace(/_TAGS/, cur[7].join('&nbsp; '));
+
+        var tagspan = '';
+        if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
+            tagspan = '<span class="logtags">';
+            if (cur[6][1]) {
+                tagspan += '<span class="branchhead" title="' + cur[6][0] + '">';
+                tagspan += cur[6][0] + '</span> ';
+            } else if (!cur[6][1] && cur[6][0] != 'default') {
+                tagspan += '<span class="branchname" title="' + cur[6][0] + '">';
+                tagspan += cur[6][0] + '</span> ';
+            }
+            if (cur[7].length) {
+                for (var t in cur[7]) {
+                    var tag = cur[7][t];
+                    tagspan += '<span class="tag">' + tag + '</span> ';
+                }
+            }
+            tagspan += '</span>';
+        }
+    
+        item = item.replace(/_TAGS/, tagspan);
 	
-	return [bg, item];
+        return [bg, item];
 	
 }
 
diff -r 11d8c06f545d -r 436a0ef04b02 templates/monoblue/graph.tmpl
--- a/templates/monoblue/graph.tmpl	Mon Nov 24 19:19:30 2008 +0100
+++ b/templates/monoblue/graph.tmpl	Mon Nov 24 19:43:00 2008 +0100
@@ -59,7 +59,7 @@
 
     var revlink = '<li style="_STYLE"><span class="desc">';
     revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-    revlink += '</span><span class="info">_DATE ago, by _USER</span></li>';
+    revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
 
     graph.vertex = function(x, y, color, parity, cur) {
 
@@ -78,6 +78,27 @@
         item = item.replace(/_DESC/, cur[3]);
         item = item.replace(/_USER/, cur[4]);
         item = item.replace(/_DATE/, cur[5]);
+
+        var tagspan = '';
+        if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
+            tagspan = '<span class="logtags">';
+            if (cur[6][1]) {
+                tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
+                tagspan += cur[6][0] + '</span> ';
+            } else if (!cur[6][1] && cur[6][0] != 'default') {
+                tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
+                tagspan += cur[6][0] + '</span> ';
+            }
+            if (cur[7].length) {
+                for (var t in cur[7]) {
+                    var tag = cur[7][t];
+                    tagspan += '<span class="tagtag">' + tag + '</span> ';
+                }
+            }
+            tagspan += '</span>';
+        }
+    
+        item = item.replace(/_TAGS/, tagspan); 
 
         return [bg, item];