coal/paper/monoblue: show branch names in hgweb graph

templates/coal/graph.tmpl

@@ -70,8 +70,7 graph.edge = function(x0, y0, x1, y1, co
 
 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,8 +89,27 graph.vertex = function(x, y, color, par
 	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];
 	
 }

templates/monoblue/graph.tmpl

@@ -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) {
 
@@ -79,6 +79,26
         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];
 
     }

templates/static/style-coal.css

@@ -119,6 +119,10 a { text-decoration:none; }
   vertical-align: baseline;
 }
 
+ul#graphnodes .branchhead {
+  font-size: 75%;
+}
+
 .branchname {
   color: #000;
   font-size: 60%; 

templates/static/style-paper.css

@@ -110,6 +110,10 a { text-decoration:none; }
   vertical-align: baseline;
 }
 
+ul#graphnodes .branchhead {
+  font-size: 75%;
+}
+
 .branchname {
   color: #000;
   font-size: 60%;