From 4047ec14f31c157e48bcefdf87ea94e797cb3baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 6 Apr 2014 14:50:37 +0200 Subject: [PATCH] backoffice: use status colour in status ') - filters = [('all', _('All')), ('pending', _('Pending')), ('done', _('Done'))] + filters = [('all', _('All'), None), + ('pending', _('Pending'), None), + ('done', _('Done'), None)] for status in waitpoint_status: - filters.append((status.id, status.name)) - for filter_id, filter_label in filters: + filters.append((status.id, status.name, status.colour)) + for filter_id, filter_label, filter_colour in filters: if filter_id == selected_filter: selected = ' selected="selected"' else: selected = '' - r += htmltext('') % (filter_id, selected, filter_label) + style = '' + if filter_colour and filter_colour != 'FFFFFF': + fg_colour = misc.get_foreground_colour(filter_colour) + style = 'style="background: #%s; color: %s;"' % ( + filter_colour, fg_colour) + r += htmltext('') % filter_label r += htmltext('') r += htmltext('') % _('Refresh') diff --git a/wcs/forms/backoffice.py b/wcs/forms/backoffice.py index 6a76fa0..55c5a0a 100644 --- a/wcs/forms/backoffice.py +++ b/wcs/forms/backoffice.py @@ -55,15 +55,7 @@ class FormDefUI: colours = [] for status in self.formdef.workflow.possible_status: if status.colour and status.colour != 'FFFFFF': - # luminance coefficients taken from section C-9 fro - # http://www.faqs.org/faqs/graphics/colorspace-faq/ - brightess = int(status.colour[0:2], 16) * 0.212671 + \ - int(status.colour[2:4], 16) * 0.715160 + \ - int(status.colour[4:6], 16) * 0.072169 - if brightess > 128: - fg_colour = 'black' - else: - fg_colour = 'white' + fg_colour = misc.get_foreground_colour(status.colour) colours.append((status.id, status.colour, fg_colour)) if colours: r += htmltext('