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 4967ac1

Browse files
authored
Merge pull request #297 from Seshat-Global-History-Databank/instability_data
Changes to US violence Data
2 parents 65a52eb + 1481f6c commit 4967ac1

File tree

2 files changed

+62
-20
lines changed

2 files changed

+62
-20
lines changed

seshat/apps/crisisdb/templates/crisisdb/us_violence/list.html

Lines changed: 52 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,60 @@
99
<div class="container">
1010
<div class="row d-flex mt-3">
1111
<div class="col-md-6">
12-
<div class="col-md-12 justify-content-end">
13-
<h6><span class="text-secondary text-end">Section</span>: <mark>CrisisDB / US Political Violence Database
14-
</mark> </h6>
15-
</div>
16-
<div>
17-
<div>
18-
<span class="mb-3"><span class="display-6 h1">&#127482;&#127480; US Political Violence Database</span>
19-
<div class="text-secondary">(All-in-One Mode) </div> </span>
20-
</div>
21-
</div>
22-
<div>
23-
<h6 class="fw-bold pt-3 ps-1 pe-4"><span class="fw-normal"><i class="fa-solid fa-caret-right"></i> Collection of historical records of violent incidents in the United States, spanning from 1782 to the present day. The dataset is categorized by date, incident type, subtypes, casualties, geographical location of the violence, documented fatalities, and the authoritative sources from which this data is derived. Additionally, each entry includes a detailed narrative describing the specific circumstances surrounding the violent incident.</span>
24-
</h6>
12+
<div class="col-md-12 justify-content-end">
13+
<h6>
14+
<span class="text-secondary text-end">Section</span>:
15+
<mark>CrisisDB / US Political Violence Database</mark>
16+
</h6>
17+
</div>
2518

26-
<h6 class="fw-bold pt-1 ps-1 pe-4"><span class="fw-normal">
27-
<div class="pb-1">
28-
<i class="fa-solid fa-caret-right"></i> For the explanation of the methodology underlying this data collection, see:
29-
</div>
19+
<div>
20+
<div>
21+
<span class="mb-3">
22+
<span class="display-6 h1">&#127482;&#127480; US Political Violence Database</span>
23+
<div class="text-secondary">(All-in-One Mode)</div>
24+
</span>
25+
</div>
26+
</div>
3027

31-
<a href="https://peterturchin.com/publications/dynamics-of-political-instability-in-the-united-states-1780-2010/">Turchin, P. 2012.<i> Dynamics of Political Instability in the United States, 1780–2010.</i> Journal of Peace Research 4:577-591.</a>
32-
</h6>
33-
</div>
28+
<div>
29+
<h6 class="fw-bold pt-3 ps-1 pe-4">
30+
<span class="fw-normal">
31+
<i class="fa-solid fa-caret-right"></i>
32+
Collection of historical records of violent incidents in the United States,
33+
spanning from 1782 to the present day. The dataset is categorized by date,
34+
incident type, subtypes, casualties, geographical location of the violence,
35+
documented fatalities, and the authoritative sources from which this data is derived.
36+
Additionally, each entry includes a detailed narrative describing the specific
37+
circumstances surrounding the violent incident.
38+
</span>
39+
</h6>
40+
41+
<!-- ✨ New note block -->
42+
<h6 class="fw-bold pt-1 ps-1 pe-4">
43+
<span class="fw-normal">
44+
<i class="fa-solid fa-caret-right"></i>
45+
This dataset is still a work in progress, especially for the 2010–2025 period.
46+
Suggestions for missing events are welcome.
47+
Please contact us at
48+
<a href="mailto:[email protected]">[email protected]</a>.
49+
</span>
50+
</h6>
51+
<!-- ✨ End new note block -->
52+
53+
<h6 class="fw-bold pt-1 ps-1 pe-4">
54+
<span class="fw-normal">
55+
<div class="pb-1">
56+
<i class="fa-solid fa-caret-right"></i>
57+
For the explanation of the methodology underlying this data collection, see:
58+
</div>
59+
<a href="https://peterturchin.com/publications/dynamics-of-political-instability-in-the-united-states-1780-2010/">
60+
Turchin, P. 2012. <i>Dynamics of Political Instability in the United States, 1780–2010.</i>
61+
Journal of Peace Research 4:577-591.
62+
</a>
63+
</span>
64+
</h6>
65+
</div>
3466

3567
</div>
3668
<div class="col-md-6">

seshat/apps/crisisdb/templates/crisisdb/us_violence/list_paginated.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ <h6><span class="text-secondary text-end">Section</span>: <mark>CrisisDB /
2222
<h6 class="fw-bold pt-3 ps-1 pe-4"><span class="fw-normal"><i class="fa-solid fa-caret-right"></i> Collection of historical records of violent incidents in the United States, spanning from 1782 to the present day. The dataset is categorized by date, incident type, subtypes, casualties, geographical location of the violence, documented fatalities, and the authoritative sources from which this data is derived. Additionally, each entry includes a detailed narrative describing the specific circumstances surrounding the violent incident.</span>
2323
</h6>
2424

25+
<h6 class="fw-bold pt-1 ps-1 pe-4">
26+
<span class="fw-normal">
27+
<i class="fa-solid fa-caret-right"></i>
28+
This dataset is still a work in progress, especially for the 2010–2025 period.
29+
Suggestions for missing events are welcome.
30+
Please contact us at
31+
<a href="mailto:[email protected]">[email protected]</a>.
32+
</span>
33+
</h6>
34+
2535
<h6 class="fw-bold pt-1 ps-1 pe-4"><span class="fw-normal">
2636
<div class="pb-1">
2737
<i class="fa-solid fa-caret-right"></i> For the explanation of the methodology underlying this data collection, see:

0 commit comments

Comments
 (0)