diff --git a/ietf/group/colors.py b/ietf/group/colors.py deleted file mode 100644 index 0e46dc9bb..000000000 --- a/ietf/group/colors.py +++ /dev/null @@ -1,32 +0,0 @@ -# -# colours should be taken from the group as a list of "Areas" -# but for now, just return a dict of areas and colours. -# - -fg_group_colors = dict() -fg_group_colors['APP']="#008" -fg_group_colors['ART']="#5b5a53" -fg_group_colors['GEN']="#e1dfdb" -fg_group_colors['INT']="#f3fcf6" -fg_group_colors['OPS']="#516770" -fg_group_colors['RAI']="#808" -fg_group_colors['RTG']="#866997" -fg_group_colors['SEC']="#cee6ce" -fg_group_colors['TSV']="#806c6a" -fg_group_colors['IRTF']="#80776e" -fg_group_colors['IETF']="blue" - -bg_group_colors = dict() -bg_group_colors['APP']="#eef" -bg_group_colors['ART']="#c5b8cb" -bg_group_colors['GEN']="#8b879b" -bg_group_colors['INT']="#e7a39d" -bg_group_colors['OPS']="#facab3" -bg_group_colors['RAI']="#fef" -bg_group_colors['RTG']="#fbeeaf" -bg_group_colors['SEC']="#b97373" -bg_group_colors['TSV']="#d4ffe1" -bg_group_colors['IRTF']="#ddf" -bg_group_colors['IETF']="white" - - diff --git a/ietf/group/models.py b/ietf/group/models.py index 7deb0b392..3eaa9cb4e 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -16,7 +16,6 @@ from django.dispatch import receiver import debug # pyflakes:ignore -from ietf.group.colors import fg_group_colors, bg_group_colors from ietf.name.models import (GroupStateName, GroupTypeName, DocTagName, GroupMilestoneStateName, RoleName, AgendaTypeName, AgendaFilterTypeName, ExtResourceName, SessionPurposeName) from ietf.person.models import Email, Person @@ -157,14 +156,6 @@ class Group(GroupInfo): def upcase_acronym(self): return self.acronym.upper() - @property - def fg_color(self): - return fg_group_colors[self.upcase_acronym] - - @property - def bg_color(self): - return bg_group_colors[self.upcase_acronym] - def liaison_approvers(self): '''Returns roles that have liaison statement approval authority for group''' diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py index 2b8394324..94e41f5ed 100644 --- a/ietf/meeting/tests_js.py +++ b/ietf/meeting/tests_js.py @@ -23,7 +23,6 @@ import debug # pyflakes:ignore from ietf.doc.factories import DocumentFactory from ietf.doc.models import State -from ietf.group import colors from ietf.person.models import Person from ietf.group.models import Group from ietf.group.factories import GroupFactory @@ -859,8 +858,6 @@ class ScheduleEditTests(IetfSeleniumTestCase): def testUnschedule(self): meeting = make_meeting_test_data() - colors.fg_group_colors['FARFUT'] = 'blue' - colors.bg_group_colors['FARFUT'] = 'white' self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting=meeting, session__group__acronym='mars', schedule__name='test-schedule').count(),1) @@ -2784,4 +2781,4 @@ class EditTimeslotsTests(IetfSeleniumTestCase): # # def testOpenSchedule(self): # url = urlreverse('ietf.meeting.views.edit_meeting_schedule', kwargs=dict(num='72',name='test-schedule')) -# r = self.client.get(url) \ No newline at end of file +# r = self.client.get(url) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 5c35da300..2ca1cabe7 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -3154,13 +3154,6 @@ class ReorderSlidesTests(TestCase): class EditTests(TestCase): """Test schedule edit operations""" - def setUp(self): - super().setUp() - # make sure we have the colors of the area - from ietf.group.colors import fg_group_colors, bg_group_colors - area_upper = "FARFUT" - fg_group_colors[area_upper] = "#333" - bg_group_colors[area_upper] = "#aaa" def test_official_record_schedule_is_read_only(self): def _set_date_offset_and_retrieve_page(meeting, days_offset, client): @@ -7779,4 +7772,4 @@ class ProceedingsTests(BaseMeetingTestCase): ) pm = meeting.proceedings_materials.get(pk=pm.pk) self.assertEqual(str(pm), 'This Is Not the Default Name') - self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision') \ No newline at end of file + self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision')