Mercurial > hg
diff templates/gitweb/graph.tmpl @ 6720:084c9f1ef2bd
graph: display branch name alongside tags
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 23 Jun 2008 12:54:27 +0200 |
parents | bf72e756c98b |
children | f4b6dec99950 |
line wrap: on
line diff
--- a/templates/gitweb/graph.tmpl Mon Jun 23 10:36:00 2008 +0200 +++ b/templates/gitweb/graph.tmpl Mon Jun 23 12:54:27 2008 +0200 @@ -86,16 +86,26 @@ item = item.replace(/_DESC/, cur[3]); item = item.replace(/_USER/, cur[4]); item = item.replace(/_DATE/, cur[5]); - if (cur[6].length) { - var tagspan = '<span class="logtags">'; - for (var t in cur[6]) { - var tag = cur[6][t]; - tagspan += '<span class="tagtag">' + tag + '</span> '; + + 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>'; - } else { - tagspan = ''; } + item = item.replace(/_TAGS/, tagspan); nodes.innerHTML += item;