opendev/system-config
Code Issues Proposed changes

make merge conflict changes black

Browse Source 
instead of using the red dot to be all fails, use a black dot to
represent a change which has a merge conflict. Then it's clearer
when something it off the subway map, why it is, without having
to mouse over the circle (which few people knew about).

Change-Id: Ia44292fa553538e8924993f92a7177dfae34111f
This commit is contained in:
Sean Dague 2014-01-10 15:27:32 -05:00
parent 9669900184
commit d15fd0647e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/openstack_project/files/zuul/black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 355 B

8
modules/openstack_project/files/zuul/status.js
View File

@ -227,8 +227,12 @@ function format_change(change, change_queue) {
html += '<td class="'+cls+'">'; html += '<td class="'+cls+'">';
if (i == change['_tree_index']) { if (i == change['_tree_index']) {
if (change['failing_reasons'] && change['failing_reasons'].length > 0) { if (change['failing_reasons'] && change['failing_reasons'].length > 0) {
html += '<img src="red.png" title="Failing because '+ var reason = change['failing_reasons'].join(', ');
change['failing_reasons'].join(', ')+'"/>'; var image = 'red.png';
if (reason.match(/merge conflict/)) {
image = 'black.png';
}
html += '<img src="' + image + '" title="Failing because ' + reason +'"/>';
} else { } else {
html += '<img src="green.png" title="Succeeding"/>'; html += '<img src="green.png" title="Succeeding"/>';
} }