WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit f93b760

Browse files
MajidBenamMajidBenam
authored
Merge pull request #261 from Seshat-Global-History-Databank/instability_data
improoving UI for the instability events and adding the first round o…
2 parents 67e026f + 0e6160d commit f93b760

20 files changed

+287
-241
lines changed

‎seshat/apps/core/templates/core/form_base_for_new_approach_downgrade.html‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -311,26 +311,7 @@ <h4 class="fw-bold pt-2"><span >{{ myvar }}</span></h4>
311311

312312
{% endif %}
313313
{% endif %}
314-
315-
{% if form.instance.pk %}
316-
{% if form.instance.researchers_list %}
317-
<div class="p-2 mb-3" style="background: #daf1de; border-radius:10px;">
318-
<div class="fs-6" style="font-family: Roboto Mono; color:#163832;"> <i class="fa-regular fa-square-check fa-lg"></i> This record has been <b>RA Reviewed</b> by:
319-
<span class="fw-bold">form.instance.researchers_list </span>
320-
</div>
321-
322-
</div>
323-
324-
325-
{% else %}
326-
<div class="p-2 mb-3" style="background: #ffdddd; border-radius:10px;">
327-
<div class="fs-6" style="font-family: Roboto Mono; color:#800000;">
328-
<i class="fa-regular fa-circle-xmark fa-lg"></i> This record has <b><u> not</u> been Expert Reviewed yet</b>.
329-
</div>
330-
</div>
331-
332-
{% endif %}
333-
{% endif %}
314+
334315
</div>
335316

336317
{% block extra_vars %}

‎seshat/apps/core/templates/core/form_base_llm.html‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@
234234
.bg-info-light {
235235
background: #fffdf2; /* rgb(134, 134, 134);*/
236236
color: dodgerblue;
237-
border: 1px solid rgba(30, 143, 255, 0.378);
237+
border: 1px solid rgba(30, 143, 255, 0.178);
238+
background: rgba(30, 143, 255, 0.06);
239+
238240
}
239241

240242
.bg-danger-light {
@@ -249,7 +251,9 @@
249251
.bg-success-light {
250252
background: #fffdf2; /* rgb(134, 134, 134);*/
251253
color: teal;
252-
border: 1px solid rgba(0, 128, 128, 0.38);
254+
border: 1px solid rgba(0, 128, 128, 0.18);
255+
background: rgba(0, 128, 128, 0.08);
256+
253257
}
254258

255259
.bg-warning-light {
@@ -283,8 +287,9 @@
283287
.bg-secondary-light {
284288
background: #fffdf2;
285289
color: crimson;
286-
border: 1px solid rgba(220, 20, 60, 0.366);
287-
290+
border: 1px solid rgba(220, 20, 60, 0.18);
291+
background: rgba(220, 20, 60, 0.06);
292+
288293

289294
}
290295

@@ -300,7 +305,6 @@
300305
padding-left: 10px;
301306
border-radius: 5px;
302307
margin:0px;
303-
font-family: 'Roboto Mono', monospace;
304308
/*box-shadow: -4px 4px 0px rgba(78, 28, 23, 0.5);
305309
/*box-shadow: -2px 0px 4px rgba(25, 135, 84, 0.5); */
306310
background-color:#fefae6; /* fffdf2 fefae6*/

‎seshat/apps/core/templates/core/generic_templates/generic_list_llm.html‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -136,38 +136,28 @@
136136
<td style="text-align: left; z-index:890; border-width:0;" >
137137
{% autoescape off %}
138138

139-
{% if obj.researchers_list and obj.seshat_experts_list %}
140139
<small style="vertical-align: bottom; display:inline-block;">
141-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Generated using LLMs."><span class="text-secondary border border-1 rounded border-secondary" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">AI</span></a>
142-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Checked By: {{ obj.researchers_list }}">
143-
<i class="fa-solid fa-user-tie fa-lg pb-1" style="color: #138086" aria-hidden="true"></i></a>
144-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Expert Reviewed By: {{ obj.seshat_experts_list }}">
145-
<span>
146-
<i class="fa-solid fa-user-graduate fa-lg" style="color: #843b62" aria-hidden="true"></i>
147-
</span>
140+
<a data-bs-toggle="tooltip" data-bs-html="true" class="fw-light text-teal" title="Generated using LLMs."><span class="text-secondary border border-1 rounded border-secondary" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">AI</span></a>
141+
142+
{% if obj.researchers_list %}
143+
<a data-bs-toggle="tooltip" data-bs-html="true" title="Checked By: {{ obj.researchers_list }}">
144+
<i class="fa-solid fa-user-tie fa-lg" style="color: #138086" aria-hidden="true"></i>
148145
</a>
149-
</small>
150-
151-
{% elif obj.researchers_list %}
152-
<small style="vertical-align: bottom; ">
153-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Generated using LLMs."><span class="text-secondary border border-1 rounded border-secondary" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">AI</span></a>
154-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Checked By: {{ obj.researchers_list }}">
155-
<i class="fa-solid fa-user-tie fa-lg" style="color: #138086" aria-hidden="true"></i>
156-
</a>
157-
</small>
158-
159-
{% else %}
160-
<small style="vertical-align: bottom; ">
161-
<a data-bs-toggle="tooltip" data-bs-html="true" class="fw-normal text-teal" title="Generated using LLMs."><span class="text-secondary border border-1 rounded border-secondary" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">AI</span></a>
162-
</small>
146+
{% endif %}
147+
{% if obj.comment %}
148+
<a data-bs-toggle="tooltip" data-bs-html="true" class="fw-normal text-teal" title="Seshat-approved Description added."><span class="text-success border border-1 rounded border-success" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">D</span></a>
163149

164-
{% endif %}
165-
{% if obj.comment %}
166-
<small style="vertical-align: bottom; ">
167-
<a data-bs-toggle="tooltip" data-bs-html="true" class="fw-normal text-teal" title="Seshat-approved Description added."><span class="text-success border border-1 rounded border-success" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">D</span></a>
168-
</small>
150+
{% endif %}
169151

170-
{% endif %}
152+
{% if obj.seshat_experts_list %}
153+
<a data-bs-toggle="tooltip" data-bs-html="true" title="Expert Reviewed By: {{ obj.seshat_experts_list }}">
154+
<span>
155+
<i class="fa-solid fa-user-graduate fa-lg" style="color: #843b62" aria-hidden="true"></i>
156+
</span>
157+
</a>
158+
{% endif %}
159+
160+
</small>
171161

172162
{% endautoescape %}
173163
</td>

‎seshat/apps/core/templates/core/list_base_for_new_approach.html‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,21 @@
6969
border: 1px solid lightgray;
7070
}
7171

72-
72+
.bg-secondary-light {
73+
background: #fffdf2;
74+
color: crimson;
75+
border: 1px solid rgba(220, 20, 60, 0.18);
76+
background: rgba(220, 20, 60, 0.06);
77+
}
7378

7479

7580

76-
.bg-info-light {
81+
.bg-info-light {
7782
background: #fffdf2; /* rgb(134, 134, 134);*/
7883
color: dodgerblue;
79-
border: 1px solid dodgerblue;
84+
border: 1px solid rgba(30, 143, 255, 0.178);
85+
background: rgba(30, 143, 255, 0.06);
86+
8087
}
8188

8289
.bg-danger-light {
@@ -87,13 +94,15 @@
8794
.my_small_link:hover {
8895
color:navajowhite;
8996
}
97+
98+
.bg-success-light {
99+
background: #fffdf2; /* rgb(134, 134, 134);*/
100+
color: teal;
101+
border: 1px solid rgba(0, 128, 128, 0.18);
102+
background: rgba(0, 128, 128, 0.08);
90103

91-
.bg-success-light {
92-
background: #fffdf2; /* rgb(134, 134, 134);*/
93-
color: teal;
94-
border: 1px solid teal;
95-
}
96-
104+
}
105+
97106
.bg-warning-light {
98107
background: #fffdf2; /* rgb(134, 134, 134);*/
99108
color: darkorange;
@@ -122,14 +131,7 @@
122131
border: 1px solid hotpink;
123132
}
124133

125-
.bg-secondary-light {
126-
background: #fffdf2;
127-
color: lightcoral;
128-
border: 1px solid lightcoral;
129-
130-
131-
}
132-
134+
133135

134136

135137
</style>

‎seshat/apps/core/templates/core/partials/_abc.html‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@
3838
<i class="fa-solid fa-pen"></i>
3939
</a>
4040
{% endwith %}
41-
{% else %}
42-
<a class="p-0 m-0"
43-
style=" overflow: hidden;"
44-
href="{% url 'seshatcomment-update' value.comment.id %}">
45-
<span class="badge badge-jid text-dark" style="vertical-align:bottom; white-space: nowrap; z-index:998; background-color:#0887064c" data-bs-toggle="popover" title="Edit Description" >
46-
<i class="fa-solid fa-pen-to-square"></i>
47-
</span>
48-
</a>
4941
{% endif %}
5042
{% else %}
5143
{% with dynamic_url=value.clean_name|add:"-detail" %}

‎seshat/apps/core/templates/core/partials/_abc_obj.html‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@
3333
<i class="fa-solid fa-pen"></i>
3434
</a>
3535
{% endwith %}
36-
{% else %}
37-
<a class="p-0 m-0"
38-
style=" overflow: hidden;"
39-
href="{% url 'seshatcomment-update' obj.comment.id %}">
40-
<span class="badge text-dark" style="vertical-align:bottom; white-space: nowrap; z-index:998; background-color:#0887064c" data-bs-toggle="popover" title="Edit Description" >
41-
<i class="fa-solid fa-pen-to-square"></i>
42-
</span>
43-
</a>
4436
{% endif %}
4537
{% else %}
4638
{% with dynamic_url=obj.clean_name|add:"-detail" %}

‎seshat/apps/core/templates/core/partials/_abc_rt.html‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,6 @@
2727
</span>
2828
</span>
2929
</a>
30-
31-
{% else %}
32-
<a class="p-0 m-0"
33-
style="display:block; overflow: hidden;"
34-
href="{% url 'seshatcomment-update' value.comment.id %}">
35-
<span class="badge badge-jid text-dark" style="vertical-align:bottom; white-space: nowrap; z-index:998; background-color:#0887064c">
36-
<i class="fa-solid fa-pen-to-square"></i>
37-
<span>
38-
&nbsp;&nbsp;Edit Description
39-
</span>
40-
</span>
41-
</a>
4230
{% endif %}
4331
{% else %}
4432
<a class="p-0 m-0"

‎seshat/apps/core/templates/core/partials/_abc_x.html‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,6 @@
4040
</span>
4141
</span>
4242
</a>
43-
44-
{% else %}
45-
<a class="p-0 m-0"
46-
style="display:block; overflow: hidden;"
47-
href="{% url 'seshatcomment-update' value.comment.id %}">
48-
<span class="badge badge-jid text-dark" style="vertical-align:bottom; white-space: nowrap; z-index:998; background-color:#0887064c">
49-
<i class="fa-solid fa-pen-to-square"></i>
50-
<span>
51-
&nbsp;&nbsp;Edit Description (NEW)
52-
</span>
53-
</span>
54-
</a>
5543
{% endif %}
5644
{% endif %}
5745
{% endif %}

‎seshat/apps/core/templates/core/partials/_seshat_data_row_after.html‎

Lines changed: 28 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
</td>
1818
<td class="fw-normal text-dark" style="text-align: left;">{{ form.instance.get_instability_types }}
1919
</td>
20-
<td class="fw-normal text-dark" style="text-align: right;">
20+
<td class="fw-normal text-dark" style="text-align: center;">
2121
{% if form.instance.year_from == None %}
2222
{% elif form.instance.year_from == form.instance.year_to %}
2323
{% if form.instance.year_from < 0 %}
24-
<span style="text-align: right; border-width: 0;">{{ form.instance.year_from|abs|intcomma }} <small class="text-secondary">BCE</small> </span>
24+
<span style="text-align: center; border-width: 0;">{{ form.instance.year_from|abs|intcomma }} <small class="text-secondary">BCE</small> </span>
2525
{% else %}
26-
<span style="text-align: right; border-width: 0;">{{ form.instance.year_from }} <small class="text-secondary">CE</small></span>
26+
<span style="text-align: center; border-width: 0;">{{ form.instance.year_from }} <small class="text-secondary">CE</small></span>
2727
{% endif %}
2828
{% elif form.instance.year_to == None %}
2929
{% if form.instance.year_from < 0 %}
30-
<span style="text-align: right; border-width: 0;">{{ form.instance.year_from|abs }} <small class="text-secondary">BCE</small></span>
30+
<span style="text-align: center; border-width: 0;">{{ form.instance.year_from|abs }} <small class="text-secondary">BCE</small></span>
3131
{% else %}
32-
<span style="text-align: right; border-width: 0;">{{ form.instance.year_from }} <small class="text-secondary">CE</small></span>
32+
<span style="text-align: center; border-width: 0;">{{ form.instance.year_from }} <small class="text-secondary">CE</small></span>
3333
{% endif %}
3434
{% elif form.instance.year_to == None and form.instance.year_from == None %}
35-
<span style="text-align: right; border-width: 0;"> <i class="fa-solid fa-minus"></i> </span>
35+
<span style="text-align: center; border-width: 0;"> <i class="fa-solid fa-minus"></i> </span>
3636
{% else %}
3737
{% if form.instance.year_from < 0 and form.instance.year_to < 0 %}
38-
<span style="text-align: right; border-width: 0;">{{ form.instance.year_from|abs }} <small class="text-secondary">BCE</small> <i class="fa-solid fa-arrow-right-long"></i> {{ form.instance.year_to|abs }}&nbsp;<small class="text-secondary">BCE</small></span>
38+
<span style="text-align: center; border-width: 0;">{{ form.instance.year_from|abs }} <small class="text-secondary">BCE</small> <i class="fa-solid fa-arrow-right-long"></i> {{ form.instance.year_to|abs }}&nbsp;<small class="text-secondary">BCE</small></span>
3939
{% elif form.instance.year_from < 0 and form.instance.year_to >= 0 %}
40-
<span style="text-align: right; border-width: 0;">{{ form.instance.year_from|abs }} <small class="text-secondary">BCE</small> <i class="fa-solid fa-arrow-right-long"></i> {{ form.instance.year_to }}&nbsp;<small class="text-secondary">CE</small></span>
40+
<span style="text-align: center; border-width: 0;">{{ form.instance.year_from|abs }} <small class="text-secondary">BCE</small> <i class="fa-solid fa-arrow-right-long"></i> {{ form.instance.year_to }}&nbsp;<small class="text-secondary">CE</small></span>
4141
{% else %}
42-
<span style="text-align: right; border-width: 0;">{{ form.instance.year_from }} <small class="text-secondary">CE</small> <i class="fa-solid fa-arrow-right-long"></i> {{ form.instance.year_to }}&nbsp;<small class="text-secondary">CE</small></span>
42+
<span style="text-align: center; border-width: 0;">{{ form.instance.year_from }} <small class="text-secondary">CE</small> <i class="fa-solid fa-arrow-right-long"></i> {{ form.instance.year_to }}&nbsp;<small class="text-secondary">CE</small></span>
4343
{% endif %}
4444
{% endif %}
4545
</td>
@@ -57,40 +57,29 @@
5757
<td class="fw-normal text-dark" style="text-align: left;">
5858
{% autoescape off %}
5959

60-
{% if form.instance.researchers_list and form.instance.seshat_experts_list %}
6160
<small style="vertical-align: bottom; display:inline-block;">
62-
<span data-bs-toggle="tooltip" title="Generated using LLMs.">
63-
<span class="text-secondary border border-1 rounded border-secondary" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px;">AI</span>
64-
</span>
65-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Checked By: {{ form.instance.researchers_list }}">
66-
<i class="fa-solid fa-user-tie fa-lg pb-1" style="color: #138086" aria-hidden="true"></i>
67-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Expert Reviewed By: {{ form.instance.seshat_experts_list }}">
68-
<span><i class="fa-solid fa-user-graduate fa-lg" style="color: #843b62" aria-hidden="true"></i></span>
69-
</a></small>
70-
71-
{% elif form.instance.researchers_list %}
72-
<small style="vertical-align: bottom; ">
73-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Generated using LLMs.">
74-
<span class="text-secondary border border-1 rounded border-secondary" style="padding-top:1px; padding-bottom:0px; padding-left:3px; padding-right:3px;">AI</span>
75-
</a>
76-
<a data-bs-toggle="tooltip" data-bs-html="true" title="Checked By: {{ form.instance.researchers_list }}">
77-
<i class="fa-solid fa-user-tie fa-lg" style="color: #138086" aria-hidden="true"></i>
78-
</a>
79-
</small>
80-
81-
{% else %}
82-
<small style="vertical-align: bottom;" data-bs-toggle="tooltip" title="Generated using LLMs.">
83-
<span class="text-secondary border border-1 rounded border-secondary" style="padding-top:1px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">AI</span>
84-
</small>
85-
{% endif %}
61+
<a data-bs-toggle="tooltip" data-bs-html="true" class="fw-light text-teal" title="Generated using LLMs."><span class="text-secondary border border-1 rounded border-secondary" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">AI</span></a>
62+
63+
{% if form.instance.researchers_list %}
64+
<a data-bs-toggle="tooltip" data-bs-html="true" title="Checked By: {{ form.instance.researchers_list }}">
65+
<i class="fa-solid fa-user-tie fa-lg" style="color: #138086" aria-hidden="true"></i>
66+
</a>
67+
{% endif %}
68+
{% if form.instance.comment %}
69+
<a data-bs-toggle="tooltip" data-bs-html="true" class="fw-normal text-teal" title="Seshat-approved Description added."><span class="text-success border border-1 rounded border-success" style="padding-top:2px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">D</span></a>
70+
71+
{% endif %}
72+
73+
{% if form.instance.seshat_experts_list %}
74+
<a data-bs-toggle="tooltip" data-bs-html="true" title="Expert Reviewed By: {{ form.instance.seshat_experts_list }}">
75+
<span>
76+
<i class="fa-solid fa-user-graduate fa-lg" style="color: #843b62" aria-hidden="true"></i>
77+
</span>
78+
</a>
79+
{% endif %}
8680

87-
{% if form.instance.comment %}
88-
<small style="vertical-align: bottom; ">
89-
<a data-bs-toggle="tooltip" data-bs-html="true" class="fw-normal text-teal" title="Seshat-approved Description added."><span class="text-success border border-1 rounded border-success" style="padding-top:1px; padding-bottom:0px; padding-left:3px; padding-right:3px; ">D</span></a>
9081
</small>
9182

92-
{% endif %}
93-
9483

9584
{% endautoescape %}
9685
</td>

‎seshat/apps/core/templates/core/partials/_table_header_polity.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</span>
1717
</legend>
1818
<thead>
19-
<tr class="sticky-top" style="background-color:#fffdf2; height:40px; border: 1px solid #78282355; top: 95px; z-index:900;">
19+
<tr class="sticky-top" style="background-color:#fffdf2; height:40px; border: 1px solid #78282355; top: 85px; z-index:900;">
2020
{% if user|in_group:"Chief Seshat Externalllllllll Experts" %}
2121
<th scope="col" class="fw-light text-secondary" style="text-align: left;">#</th>
2222
{% endif %}

0 commit comments

Comments
 (0)