Skip to content

Commit 8842d1a

Browse files
norkans7norkans7
committed
Remove color config, and keep the default branding colors set
1 parent c3e36b5 commit 8842d1a

File tree

8 files changed

+22
-127
lines changed

8 files changed

+22
-127
lines changed

‎templates/base_admin_dashboard.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
display: block;
2929
padding-left: 5px;
3030

31-
color: {{ org|config:'dark1_color'|default:'#439932' }};
31+
color: #98DFF9;
3232

33-
border-left: 5px solid {{ org|config:'dark1_color'|default:'#439932' }};
33+
border-left: 5px solid #98DFF9;
3434
}
3535

3636
.row1 a:hover,
3737
.row2 a:hover {
3838
background-color: #E6E7E8;
3939

40-
color: {{ org|config:'dark1_color'|default:'#439932' }};
40+
color: #98DFF9;
4141
}
4242

4343
.row1.inactive a,

‎templates/public_base.html‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,57 +41,57 @@
4141
<style type="text/css">
4242
.bg-dark1,
4343
.bg-dark1-v2024 {
44-
background: {{ org|config:'dark1_color'|default:'#439932' }};
44+
background: #98DFF9;
4545
}
4646

4747
.border-dark1,
4848
.border-dark1-v2024 {
49-
border-color: {{ org|config:'dark1_color'|default:'#439932' }};
49+
border-color: #98DFF9;
5050
}
5151

5252
.hover\:border-dark1:hover,
5353
.hover\:border-dark1-v2024:hover {
54-
border-color: {{ org|config:'dark1_color'|default:'#439932' }};
54+
border-color: #98DFF9;
5555
}
5656

5757
.bg-dark2,
5858
.bg-dark2-v2024 {
59-
background: {{ org|config:'dark2_color' |default:'#1751af' }};
59+
background: #FFC20E;
6060
}
6161

6262
.border-dark2,
6363
.border-dark2-v2024 {
64-
border-color: {{ org|config:'dark2_color'|default:'#1751af' }};
64+
border-color: #FFC20E;
6565
}
6666

6767
.hover\:border-dark2:hover,
6868
.hover\:border-dark2-v2024:hover {
69-
border-color: {{ org|config:'dark2_color'|default:'#1751af' }};
69+
border-color: #FFC20E;
7070
}
7171

7272
.bg-dark3,
7373
.bg-dark3-v2024 {
74-
background: {{ org|config:'dark3_color'|default:'#5eb3e0' }};
74+
background: #FF7100;
7575
}
7676

7777
.border-dark3,
7878
.border-dark3-v2024 {
79-
border-color: {{ org|config:'dark3_color'|default:'#5eb3e0' }};
79+
border-color: #FF7100;
8080
}
8181

8282
.hover\:border-dark3:hover,
8383
.hover\:border-dark3-v2024:hover {
84-
border-color: {{ org|config:'dark3_color'|default:'#5eb3e0' }};
84+
border-color: #FF7100;
8585
}
8686

8787
.border-light1,
8888
.border-light1-v2024 {
89-
border-color: {{ org|config:'light1_color'|default:'#FFD100' }};
89+
border-color: #143E49;
9090
}
9191

9292
.bg-light1,
9393
.bg-light1-v2024 {
94-
background: {{ org|config:'light1_color'|default:'#FFD100' }};
94+
background: #143E49;
9595
}
9696

9797
.bg-light1.hover-dark:hover,
@@ -101,12 +101,12 @@
101101

102102
.text-light1,
103103
.text-light1-v2024 {
104-
color: {{ org|config:'light1_color'|default:'#FFD100' }};
104+
color: #143E49;
105105
}
106106

107107
.bg-light2,
108108
.bg-light2-v2024 {
109-
background: {{ org|config:'light2_color'|default:'#5eb3e0' }};
109+
background: #2653B9;
110110
}
111111

112112
.bg-light2.hover-dark:hover,
@@ -197,15 +197,8 @@
197197

198198
</style>
199199
<script type="text/javascript">
200-
var defaultColors = ["#e4002b", "#ff8200", "#ffd100", "#009a17", "#41b6e6", "#0050b5", "#d9d9d6"];
201-
var orgColors = '{{org|config:"colors"|default:""}}'.toUpperCase().split(',');
200+
var orgColors = ["#98DFF9", "#FFC20E", "#FF7100", "#143E49", "#2653B9", "#e4002b"]
202201

203-
for (var i = 0; i < defaultColors.length; i++) {
204-
var elt = defaultColors[i].trim().toUpperCase();
205-
if ((orgColors.length <= 6) && (!orgColors.includes(elt))) {
206-
orgColors.push(elt);
207-
}
208-
}
209202
</script>
210203
{% if org and org|config:"google_tag_manager_id" %}
211204
<!-- Google Tag Manager -->

‎ureport/polls/models.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -875,10 +875,10 @@ class PollQuestion(SmartModel):
875875
}
876876

877877
QUESTION_COLOR_CHOICE_BG_COLORS = {
878-
"D1": ("dark1_color", "#439932"),
879-
"L1": ("light1_color", "#FFD100"),
880-
"D2": ("dark2_color", "#1751af"),
881-
"D3": ("dark3_color", "#5eb3e0"),
878+
"D1": ("dark1_color", "#98DFF9"),
879+
"L1": ("light1_color", "#143E49"),
880+
"D2": ("dark2_color", "#FFC20E"),
881+
"D3": ("dark3_color", "#FF7100"),
882882
}
883883

884884
QUESTION_COLOR_CHOICE_BORDER_COLORS = {

‎ureport/polls/templatetags/ureport.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,6 @@ def org_arrow_link(org):
8989
return mark_safe("&#8594;")
9090

9191

92-
@register.filter
93-
def org_color(org, index):
94-
if not org:
95-
return None
96-
97-
default_colors = ["#e4002b", "#ff8200", "#ffd100", "#009a17", "#41b6e6", "#0050b5", "#d9d9d6"]
98-
99-
org_colors = org.get_config("common.colors", "").upper().split(",")
100-
org_colors = [elt.strip() for elt in org_colors if elt.strip()]
101-
102-
for elt in default_colors:
103-
if len(org_colors) >= 6:
104-
break
105-
if elt.upper() not in org_colors:
106-
org_colors.append(elt.upper())
107-
108-
return org_colors[int(index) % len(org_colors)].strip()
109-
11092

11193
@register.filter
11294
def transparency(color, alpha):

‎ureport/polls/tests.py‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,6 @@ def test_templatetags(self):
10431043
from ureport.polls.templatetags.ureport import (
10441044
config,
10451045
org_arrow_link,
1046-
org_color,
10471046
org_host_link,
10481047
question_results,
10491048
show_org_flags,
@@ -1057,27 +1056,6 @@ def test_templatetags(self):
10571056
self.assertEqual(config(self.uganda, "field_name"), "Done")
10581057
mock.assert_called_with("field_name")
10591058

1060-
self.assertIsNone(org_color(None, 1))
1061-
self.assertEqual(org_color(self.uganda, 0), "#E4002B")
1062-
self.assertEqual(org_color(self.uganda, 1), "#FF8200")
1063-
self.assertEqual(org_color(self.uganda, 2), "#FFD100")
1064-
self.assertEqual(org_color(self.uganda, 3), "#009A17")
1065-
1066-
self.uganda.set_config("common.colors", "#cccccc, #dddddd, #eeeeee, #111111, #222222, #333333, #444444")
1067-
1068-
self.assertEqual(org_color(self.uganda, 0), "#CCCCCC")
1069-
self.assertEqual(org_color(self.uganda, 1), "#DDDDDD")
1070-
self.assertEqual(org_color(self.uganda, 2), "#EEEEEE")
1071-
self.assertEqual(org_color(self.uganda, 3), "#111111")
1072-
self.assertEqual(org_color(self.uganda, 4), "#222222")
1073-
self.assertEqual(org_color(self.uganda, 5), "#333333")
1074-
self.assertEqual(org_color(self.uganda, 6), "#444444")
1075-
self.assertEqual(org_color(self.uganda, 7), "#CCCCCC")
1076-
self.assertEqual(org_color(self.uganda, 8), "#DDDDDD")
1077-
self.assertEqual(org_color(self.uganda, 9), "#EEEEEE")
1078-
self.assertEqual(org_color(self.uganda, 10), "#111111")
1079-
self.assertEqual(org_color(self.uganda, 11), "#222222")
1080-
10811059
self.assertIsNone(transparency(None, 0.8))
10821060
self.assertEqual(transparency("#808080", 0.7), "rgba(128, 128, 128, 0.7)")
10831061

‎ureport/public/context_processors.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ def set_config_display_flags(request):
8585

8686
context["show_bots_link"] = Bot.objects.filter(is_active=True, org=org).exists()
8787

88-
context["colors_map"] = [str(color.strip()) for color in org.get_config("colors_map", "").split(",")]
89-
9088
other_languages_sites = {}
9189
try:
9290
other_languages_sites = json.loads(org.get_config("other_languages_sites"))

‎ureport/public/tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_org_config_fields(self):
5454
self.login(self.superuser)
5555
response = self.client.get(edit_url, SERVER_NAME="nigeria.ureport.io")
5656
self.assertTrue("form" in response.context)
57-
self.assertEqual(len(response.context["form"].fields), 70)
57+
self.assertEqual(len(response.context["form"].fields), 63)
5858

5959
def test_count(self):
6060
count_url = reverse("public.count")

‎ureport/settings_common.py‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -439,62 +439,6 @@
439439
required=False,
440440
),
441441
),
442-
dict(
443-
name="dark1_color",
444-
field=dict(
445-
help_text=_("The primary color for styling for this organization, should be dark"),
446-
required=False,
447-
),
448-
superuser_only=True,
449-
),
450-
dict(
451-
name="dark2_color",
452-
field=dict(
453-
help_text=_("The secondary color for styling for this organization, should be dark"),
454-
required=False,
455-
),
456-
superuser_only=True,
457-
),
458-
dict(
459-
name="dark3_color",
460-
field=dict(
461-
help_text=_("The tertiary color for styling for this organization, should be dark"),
462-
required=False,
463-
),
464-
superuser_only=True,
465-
),
466-
dict(
467-
name="light1_color",
468-
field=dict(
469-
help_text=_("The primary highlight color for styling for this organization, should be light"),
470-
required=False,
471-
),
472-
superuser_only=True,
473-
),
474-
dict(
475-
name="light2_color",
476-
field=dict(
477-
help_text=_("The secondary highlight color for styling for this organization, should be light"),
478-
required=False,
479-
),
480-
superuser_only=True,
481-
),
482-
dict(
483-
name="colors",
484-
field=dict(
485-
help_text=_("Up to 6 colors for styling charts, use comma between colors"),
486-
required=False,
487-
),
488-
superuser_only=True,
489-
),
490-
dict(
491-
name="colors_map",
492-
field=dict(
493-
help_text=_("11 colors for styling maps, use comma between colors, not used if not 11 colors"),
494-
required=False,
495-
),
496-
superuser_only=True,
497-
),
498442
dict(
499443
name="limit_states",
500444
field=dict(help_text=_("The states to show on maps only"), required=False),

0 commit comments

Comments
 (0)