Download:
child 54:3fb3f68e9627
parent 52:b5f74e147343
53:b4b32a8d2f4e
Anton Shestakov <av6@dwimlabs.net>, Mon, 08 Feb 2016 01:20:57 +0800
viewer: add tags and merge indicator to the tooltip, use css classes for colors

2 файлов изменено, 16 вставок(+), 1 удалений(-) [+]
templates/fancy.html file | annotate | diff | comparison | revisions
viewer.py file | annotate | diff | comparison | revisions
--- a/templates/fancy.html Sun Feb 07 23:51:41 2016 +0800
+++ b/templates/fancy.html Mon Feb 08 01:20:57 2016 +0800
@@ -8,6 +8,15 @@
* {
font-family: monospace;
}
+ .c3-tooltip .branch {
+ color: darkblue;
+ }
+ .c3-tooltip .tags {
+ color: darkred;
+ }
+ .c3-tooltip .merge {
+ color: darkgreen;
+ }
</style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.14/d3.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.4.10/c3.js"></script>
@@ -53,7 +62,11 @@
size: {height: 500},
tooltip: {format: {title: function(x) {
var c = data.csetmap[-x];
- return c.rev + ':' + c.shortnode + ' <span style="color: darkblue;">' + c.branch + '</span> ' + c.firstline;
+ return c.rev + ':' + c.shortnode
+ + ' <span class="branch">' + c.branch + '</span>'
+ + ' <span class="tags">' + c.tags.join(', ') + '</span>'
+ + ' <span class="merge">' + c.merge + '</span> '
+ + c.firstline;
}}},
axis: {x: {tick: {format: function(x) { return -x; }}}},
data: data
--- a/viewer.py Sun Feb 07 23:51:41 2016 +0800
+++ b/viewer.py Mon Feb 08 01:20:57 2016 +0800
@@ -262,6 +262,8 @@
csetmap[cset['rev']] = {
'rev': cset['rev'],
'branch': cset['branch'],
+ 'tags': cset['tags'],
+ 'merge': 'M' if len(cset['parents']) > 1 else '',
'shortnode': cset['node'][:12],
'firstline': xhtml_escape(cset['desc'].partition('\n')[0])
}