Skip to content

Commit df1b6ec

Browse files
dmytrotskodmytrotsko
committed
Added grey ovals to display geo granularity and temporal granularity. Expanded text about number of shown indicator sets & indicators
1 parent 59cba5a commit df1b6ec

24 files changed

+197
-251
lines changed

‎src/fixtures/severity_pyramid_rungs.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126
"fields": {
127127
"created": "2024-08-15T09:57:49.327Z",
128128
"modified": "2024-08-15T13:07:46.136Z",
129-
"name": "Case",
130-
"display_name": "Case",
129+
"name": "Ascertained (Case)",
130+
"display_name": "Ascertained (Case)",
131131
"used_in": "signal_sets"
132132
}
133133
},

‎src/signal_sets/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,4 +248,4 @@ class Meta:
248248

249249
@property
250250
def get_available_geographies(self):
251-
return ", ".join([geo.display_name for geo in self.available_geographies.all()])
251+
return [geo.display_name for geo in self.available_geographies.all()]

‎src/signal_sets/views.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ def get_url_params(self):
8686
url_params_str = f"{url_params_str}&{param_name}={param_value}"
8787
return url_params_dict, url_params_str
8888

89-
def get_related_signals(self, queryset):
89+
def get_related_signals(self, queryset, signal_set_ids):
9090
related_signals = []
91-
for signal in queryset.prefetch_related(
91+
for signal in queryset.filter(signal_set__id__in=signal_set_ids).prefetch_related(
9292
"signal_set", "source", "severity_pyramid_rung"
9393
):
9494
related_signals.append(
@@ -124,7 +124,7 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
124124
context["filter"] = filter
125125
context["signal_sets"] = filter.qs
126126
context["related_signals"] = json.dumps(
127-
self.get_related_signals(filter.signals_qs)
127+
self.get_related_signals(filter.signals_qs, filter.qs.values_list("id", flat=True))
128128
)
129129
context["available_geographies"] = Geography.objects.filter(used_in="signals")
130130
context["geographic_granularities"] = [

‎src/signals/admin.py

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ class SeverityPyramidRungAdmin(admin.ModelAdmin):
103103
"display_name",
104104
"used_in",
105105
)
106+
exclude = ("id",)
106107
search_fields: tuple[Literal["name"]] = ("name",)
107108

108109

‎src/staticfiles/admin/css/autocomplete.css

-4
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,3 @@ select.admin-autocomplete {
273273
display: block;
274274
padding: 6px;
275275
}
276-
277-
.errors .select2-selection {
278-
border: 1px solid var(--error-fg);
279-
}

‎src/staticfiles/admin/css/base.css

+12-35
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ html[data-theme="light"],
1313
--body-fg: #333;
1414
--body-bg: #fff;
1515
--body-quiet-color: #666;
16-
--body-medium-color: #444;
1716
--body-loud-color: #000;
1817

1918
--header-color: #ffc;
@@ -85,8 +84,6 @@ html[data-theme="light"],
8584
"Segoe UI Emoji",
8685
"Segoe UI Symbol",
8786
"Noto Color Emoji";
88-
89-
color-scheme: light;
9087
}
9188

9289
html, body {
@@ -150,6 +147,7 @@ h1 {
150147
margin: 0 0 20px;
151148
font-weight: 300;
152149
font-size: 1.25rem;
150+
color: var(--body-quiet-color);
153151
}
154152

155153
h2 {
@@ -165,15 +163,14 @@ h2.subhead {
165163
h3 {
166164
font-size: 0.875rem;
167165
margin: .8em 0 .3em 0;
168-
color: var(--body-medium-color);
166+
color: var(--body-quiet-color);
169167
font-weight: bold;
170168
}
171169

172170
h4 {
173171
font-size: 0.75rem;
174172
margin: 1em 0 .8em 0;
175173
padding-bottom: 3px;
176-
color: var(--body-medium-color);
177174
}
178175

179176
h5 {
@@ -220,10 +217,6 @@ fieldset {
220217
border-top: 1px solid var(--hairline-color);
221218
}
222219

223-
details summary {
224-
cursor: pointer;
225-
}
226-
227220
blockquote {
228221
font-size: 0.6875rem;
229222
color: #777;
@@ -320,7 +313,7 @@ td, th {
320313
}
321314

322315
th {
323-
font-weight: 500;
316+
font-weight: 600;
324317
text-align: left;
325318
}
326319

@@ -341,7 +334,7 @@ tfoot td {
341334
}
342335

343336
thead th.required {
344-
font-weight: bold;
337+
color: var(--body-loud-color);
345338
}
346339

347340
tr.alt {
@@ -489,13 +482,8 @@ textarea {
489482
vertical-align: top;
490483
}
491484

492-
/*
493-
Minifiers remove the default (text) "type" attribute from "input" HTML tags.
494-
Add input:not([type]) to make the CSS stylesheet work the same.
495-
*/
496-
input:not([type]), input[type=text], input[type=password], input[type=email],
497-
input[type=url], input[type=number], input[type=tel], textarea, select,
498-
.vTextField {
485+
input[type=text], input[type=password], input[type=email], input[type=url],
486+
input[type=number], input[type=tel], textarea, select, .vTextField {
499487
border: 1px solid var(--border-color);
500488
border-radius: 4px;
501489
padding: 5px 6px;
@@ -504,13 +492,9 @@ input[type=url], input[type=number], input[type=tel], textarea, select,
504492
background-color: var(--body-bg);
505493
}
506494

507-
/*
508-
Minifiers remove the default (text) "type" attribute from "input" HTML tags.
509-
Add input:not([type]) to make the CSS stylesheet work the same.
510-
*/
511-
input:not([type]):focus, input[type=text]:focus, input[type=password]:focus,
512-
input[type=email]:focus, input[type=url]:focus, input[type=number]:focus,
513-
input[type=tel]:focus, textarea:focus, select:focus, .vTextField:focus {
495+
input[type=text]:focus, input[type=password]:focus, input[type=email]:focus,
496+
input[type=url]:focus, input[type=number]:focus, input[type=tel]:focus,
497+
textarea:focus, select:focus, .vTextField:focus {
514498
border-color: var(--body-quiet-color);
515499
}
516500

@@ -894,10 +878,9 @@ a.deletelink:focus, a.deletelink:hover {
894878
margin-right: -300px;
895879
}
896880

897-
@media (forced-colors: active) {
898-
#content-related {
899-
border: 1px solid;
900-
}
881+
#footer {
882+
clear: both;
883+
padding: 10px;
901884
}
902885

903886
/* COLUMN TYPES */
@@ -945,12 +928,6 @@ a.deletelink:focus, a.deletelink:hover {
945928
text-decoration: underline;
946929
}
947930

948-
@media (forced-colors: active) {
949-
#header {
950-
border-bottom: 1px solid;
951-
}
952-
}
953-
954931
#branding {
955932
display: flex;
956933
}

‎src/staticfiles/admin/css/changelists.css

+1-6
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,6 @@
139139
margin: 0 0 0 30px;
140140
}
141141

142-
@media (forced-colors: active) {
143-
#changelist-filter {
144-
border: 1px solid;
145-
}
146-
}
147-
148142
#changelist-filter h2 {
149143
font-size: 0.875rem;
150144
text-transform: uppercase;
@@ -159,6 +153,7 @@
159153
font-weight: 400;
160154
padding: 0 15px;
161155
margin-bottom: 10px;
156+
cursor: pointer;
162157
}
163158

164159
#changelist-filter details summary > * {

‎src/staticfiles/admin/css/dark_mode.css

+2-8
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
--body-fg: #eeeeee;
77
--body-bg: #121212;
8-
--body-quiet-color: #d0d0d0;
9-
--body-medium-color: #e0e0e0;
8+
--body-quiet-color: #e0e0e0;
109
--body-loud-color: #ffffff;
1110

1211
--breadcrumbs-link-fg: #e0e0e0;
@@ -30,8 +29,6 @@
3029

3130
--close-button-bg: #333333;
3231
--close-button-hover-bg: #666666;
33-
34-
color-scheme: dark;
3532
}
3633
}
3734

@@ -42,8 +39,7 @@ html[data-theme="dark"] {
4239

4340
--body-fg: #eeeeee;
4441
--body-bg: #121212;
45-
--body-quiet-color: #d0d0d0;
46-
--body-medium-color: #e0e0e0;
42+
--body-quiet-color: #e0e0e0;
4743
--body-loud-color: #ffffff;
4844

4945
--breadcrumbs-link-fg: #e0e0e0;
@@ -67,8 +63,6 @@ html[data-theme="dark"] {
6763

6864
--close-button-bg: #333333;
6965
--close-button-hover-bg: #666666;
70-
71-
color-scheme: dark;
7266
}
7367

7468
/* THEME SWITCH */

0 commit comments

Comments
 (0)