diff --git a/seshat/apps/accounts/admin.py b/seshat/apps/accounts/admin.py index 5c3a7fa69..67dd6d074 100644 --- a/seshat/apps/accounts/admin.py +++ b/seshat/apps/accounts/admin.py @@ -17,7 +17,7 @@ class CustomUserAdmin(admin.ModelAdmin): inlines = (ProfileInline, ) list_display = ('username', 'email', 'first_name', - 'last_name', 'is_staff', 'get_location','get_email_confirmed') + 'last_name', 'is_staff', 'date_joined', 'last_login','get_email_confirmed') list_select_related = ('profile', ) def get_location(self, instance): diff --git a/seshat/apps/core/forms.py b/seshat/apps/core/forms.py index b8aa78f62..beb80493e 100644 --- a/seshat/apps/core/forms.py +++ b/seshat/apps/core/forms.py @@ -280,9 +280,12 @@ class Meta: class ReferenceWithPageForm(forms.Form): ref = forms.ModelChoiceField( queryset=Reference.objects.all(), - widget=forms.Select(attrs={'class': 'form-control form-select mb-1 js-example-basic-single', 'text':'ref'}), - label='' + widget=forms.Select(attrs={'class': 'form-control form-select mb-1 js-example-basic-single', 'text':'ref',}), + label='', + empty_label="Please choose a Reference ..." , + ) + # ref = forms.ModelChoiceField( # queryset=Reference.objects.all(), # widget=forms.Select(attrs={'class': 'form-control form-select mb-3 js-states js-example-basic-single'}), @@ -290,7 +293,7 @@ class ReferenceWithPageForm(forms.Form): # ) page_from = forms.IntegerField(label='', required=False) page_to = forms.IntegerField(label='', required=False) - parent_pars = forms.CharField(widget=forms.Textarea(attrs={'style': 'height: 140px;'}), label='Consulted Paragraphs (Private, for NLP project)', required=False) + parent_pars = forms.CharField(widget=forms.Textarea(attrs={'style': 'height: 60px;', 'placeholder': 'Consulted Paragraphs (Private, for NLP project)' }), label='', required=False) #parent_pars = forms.Textarea(attrs={'class': 'form-control mb-3', 'style': 'height: 120px', 'placeholder':'Please copy and paste the paragraphs you consulted into this field for each reference.'}) @@ -309,6 +312,9 @@ def add_fields(self, form, index): super().add_fields(form, index) form.fields['ref'].widget.attrs['class'] = 'form-control form-select mb-1 p-1 js-example-basic-single' form.fields['page_from'].widget.attrs['class'] = 'form-control mb-1 p-1' + form.fields['page_from'].widget.attrs['placeholder'] = 'p_from' + form.fields['page_to'].widget.attrs['placeholder'] = 'p_to' + form.fields['page_to'].widget.attrs['class'] = 'form-control mb-1 p-1' form.fields['parent_pars'].widget.attrs['class'] = 'form-control mb-1 p-1' @@ -318,23 +324,32 @@ def add_fields(self, form, index): ReferenceFormSet5 = forms.formset_factory(ReferenceWithPageForm, formset=BaseReferenceFormSet, extra=5, max_num=5, can_delete=True, can_order=True) + +ReferenceFormSet10 = forms.formset_factory(ReferenceWithPageForm, formset=BaseReferenceFormSet, extra=10, max_num=10, can_delete=True, can_order=True) #ReferenceFormSet = forms.formset_factory(ReferenceWithPageForm, extra=2, can_delete=True,) class SeshatCommentPartForm2(forms.Form): - comment_text = forms.CharField(label='SubComment Text (Public)', widget=forms.Textarea(attrs={'class': 'form-control mb-1 p-0', 'style': 'height: 200px',})) + comment_text = forms.CharField(label='', widget=forms.Textarea(attrs={'class': 'form-control mb-1 p-1', 'style': 'height: 300px', 'placeholder': 'SubDescription Text (Public)'})) formset = ReferenceFormSet2(prefix='refs') comment_order = forms.IntegerField(label='Do NOT Change This Number: ', required=False,) formset.management_form # Include the management form class SeshatCommentPartForm5(forms.Form): - comment_text = forms.CharField(label='Comment Textu', widget=forms.Textarea(attrs={'class': 'form-control mb-1 p-0', 'style': 'height: 200px',})) + comment_text = forms.CharField(label='', widget=forms.Textarea(attrs={'class': 'form-control mb-1 p-0', 'style': 'height: 200px',})) formset = ReferenceFormSet5(prefix='refs') comment_order = forms.IntegerField(label='Do NOT Change This Number: ', required=False,) formset.management_form # Include the management form +class SeshatCommentPartForm10(forms.Form): + comment_text = forms.CharField(label='', widget=forms.Textarea(attrs={'class': 'form-control mb-1 p-0', 'style': 'height: 200px',})) + + formset = ReferenceFormSet10(prefix='refs') + comment_order = forms.IntegerField(label='Do NOT Change This Number: ', required=False,) + formset.management_form # Include the management form + CommentPartFormSet = forms.formset_factory(SeshatCommentPartForm2, extra=2) @@ -431,3 +446,46 @@ class Meta: unique_together = ("variable_name", "section_name", "subsection_name") # VarHierFormSet = formset_factory(VariablehierarchyForm, extra=10) + + +############ + + +class ReferenceWithPageForm_UPGRADE(forms.Form): + ref = forms.ModelChoiceField( + queryset=Reference.objects.all(), + widget=forms.Select(attrs={'class': 'form-control form-select mb-1 js-example-basic-single'}), + label='' + ) + page_from = forms.IntegerField(label='', required=False) + page_to = forms.IntegerField(label='', required=False) + parent_pars = forms.CharField(widget=forms.Textarea(attrs={'style': 'height: 140px;'}), label='Consulted Paragraphs (UPGRADED) (Private, for NLP project)', required=False) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.helper = FormHelper() + self.helper.form_method = 'post' + self.helper.add_input(Submit('submit', 'Submit')) + + + +ReferenceFormSet2_UPGRADE = formset_factory(ReferenceWithPageForm_UPGRADE, extra=1) + +class SeshatCommentPartForm2_UPGRADE(forms.Form): + comment_text = forms.CharField(label='SubComment Text (Public)', widget=forms.Textarea(attrs={'class': 'form-control mb-1', 'style': 'height: 200px'})) + references_formset = ReferenceFormSet2_UPGRADE(prefix='refs') + #formset = ReferenceFormSet2_UPGRADE(prefix='refs') + comment_order = forms.IntegerField(label='Do NOT Change This Number:', required=False) + references_formset.management_form # Include the management form + + + #formset.management_form # Include the management form + +# class SeshatCommentPartWithReferencesForm_UPGRADE(forms.Form): +# comment_part_form = SeshatCommentPartForm2_UPGRADE() +# references_formset = ReferenceFormSet2_UPGRADE() +# references_formset.management_form # Include the management form + + +#formset = ReferenceFormSet2(prefix='refs') +#comment_order = forms.IntegerField(label='Do NOT Change This Number: ', required=False,) diff --git a/seshat/apps/core/templates/core/code_book_1.html b/seshat/apps/core/templates/core/code_book_1.html new file mode 100644 index 000000000..f3642527e --- /dev/null +++ b/seshat/apps/core/templates/core/code_book_1.html @@ -0,0 +1,3437 @@ + + + + + + + Bootstrap 5 Table Template + + + + + + +
+

New Seshat Variable Hierarchy (seshatdatabank.info)

+
+ Empty (no codes) HTML files: 0/373 + Ever coded vars: 138 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
h2 > h3 > h4 > h5 > h6 [parent freq] vars [freq]
[1267]   + General variables
+ -
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
RA   + InChaKl.html + 352
Original name   + InChaKl.html + 355
Alternative names   + InChaKl.html + 300
Peak Date   + InChaKl.html + 237
Duration   + CnQingL.html + 3
Degree of centralization   + CnQingL.html + 3
Supra-polity relations   + CnQingL.html + 3
preceding (quasi)polity   + CnQingL.html + 2
relationship to preceding (quasi)polity   + CnQingL.html + 2
succeeding (quasi)polity   + CnQingL.html + 2
Supracultural entity   + CnQingL.html + 2
scale of supra-cultural interaction   + CnQingL.html + 2
Capital   + CnQingL.html + 2
Language   + CnQingL.html + 2
+
[974]   + General variables
+ -
+ Temporal bounds
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Duration   + InChaKl.html + 370
Degree of centralization   + InChaKl.html + 333
Supra-polity relations   + InChaKl.html + 265
preceding (quasi)polity   + CnMing*.html + 1
relationship to preceding (quasi)polity   + CnMing*.html + 1
Supracultural entity   + CnMing*.html + 1
scale of supra-cultural interaction   + CnMing*.html + 1
Capital   + CnMing*.html + 1
Language   + CnMing*.html + 1
+
[1860]   + General variables
+ -
+ Supra-cultural relations
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
preceding (quasi)polity   + InChaKl.html + 334
relationship to preceding (quasi)polity   + InChaKl.html + 283
succeeding (quasi)polity   + InChaKl.html + 337
Capital   + InChaKl.html + 291
Language   + InChaKl.html + 277
Supracultural entity   + TrLysim.html + 210
scale of supra-cultural interaction   + PkUrbn1.html + 127
Original name   + TjSaraz.html + 1
+
[15]   + General variables
+ -
+ Supra-cultural relations
+ Language
+ -		 + + + + + + + + + + + + + + + + + + +
Language   + PeInca*.html + 11
Language Genus   + KhMekBA.html + 2
Language-Family   + KhMekBA.html + 2
+
[342]   + Social Complexity variables
+ -
+ -
+ -
+ -		 + + + + + + + + +
RA   + InChaKl.html + 342
+
[862]   + Social Complexity variables
+ Social Scale
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + +
Polity territory   + InChaKl.html + 288
Polity Population   + InChaKl.html + 275
Population of the largest settlement   + InChaKl.html + 299
+
[1287]   + Social Complexity variables
+ Hierarchical Complexity
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + +
Settlement hierarchy   + InChaKl.html + 364
Administrative levels   + InChaKl.html + 328
Religious levels   + InChaKl.html + 298
Military levels   + InChaKl.html + 297
+
[10]   + Social Complexity variables
+ Hierarchical Complexity
+ -
+ 1. Village
+ -		 + + + + + + + + + + + + + + + + + + +
Administrative levels   + JpAzMom.html + 4
Religious levels   + JpAzMom.html + 3
Military levels   + JpAzMom.html + 3
+
[2]   + Social Complexity variables
+ Hierarchical Complexity
+ -
+ Guard units
+ -		 + + + + + + + + + + + + + +
Religious levels   + JpHeian.html + 1
Military levels   + JpHeian.html + 1
+
[972]   + Social Complexity variables
+ Professions
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + +
Professional military officers   + InChaKl.html + 315
Professional soldiers   + InChaKl.html + 321
Professional priesthood   + InChaKl.html + 336
+
[1249]   + Social Complexity variables
+ Bureaucracy characteristics
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + +
Full-time bureaucrats   + InChaKl.html + 335
Examination system   + InChaKl.html + 294
Specialized government buildings   + InChaKl.html + 349
Merit promotion   + TrLysim.html + 271
+
[1239]   + Social Complexity variables
+ Law
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + +
Formal legal code   + InChaKl.html + 325
Judges   + InChaKl.html + 317
Courts   + InChaKl.html + 304
Professional Lawyers   + ItRomWe.html + 293
+
[1262]   + Social Complexity variables
+ Specialized Buildings: polity owned
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
irrigation systems   + InChaKl.html + 346
food storage sites   + InChaKl.html + 318
drinking water supply systems   + TrLysim.html + 268
markets   + TrLysim.html + 314
Roads   + TrNHitt.html + 4
Bridges   + TrNHitt.html + 4
Canals   + TrNHitt.html + 4
Ports   + TrNHitt.html + 4
+
[1170]   + Social Complexity variables
+ Specialized Buildings: polity owned
+ Transport infrastructure
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + +
Roads   + InChaKl.html + 319
Canals   + InChaKl.html + 279
Ports   + InChaKl.html + 285
Bridges   + TrLysim.html + 287
+
[282]   + Social Complexity variables
+ Specialized Buildings: polity owned
+ Special purpose sites
+ -
+ -		 + + + + + + + + +
Mines or quarries   + InChaKl.html + 282
+
[1725]   + Social Complexity variables
+ Information
+ Writing System
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Nonwritten records   + InChaKl.html + 271
Written records   + InChaKl.html + 358
Script   + InChaKl.html + 358
Non-phonetic writing   + TrLysim.html + 225
Phonetic alphabetic writing   + TrLysim.html + 328
Mnemonic devices   + FrAtlBA.html + 185
+
[2997]   + Social Complexity variables
+ Information
+ Kinds of Written Documents
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Lists, tables, and classifications   + InChaKl.html + 338
Calendar   + InChaKl.html + 342
Sacred Texts   + InChaKl.html + 330
Religious literature   + InChaKl.html + 348
Practical literature   + InChaKl.html + 341
History   + InChaKl.html + 322
Philosophy   + InChaKl.html + 311
Scientific literature   + InChaKl.html + 319
Fiction   + InChaKl.html + 328
Articles   + CnJinSA.html + 3
Tokens   + CnJinSA.html + 3
Precious metals   + CnJinSA.html + 3
Foreign coins   + CnJinSA.html + 3
Indigenous coins   + CnJinSA.html + 3
Paper currency   + CnJinSA.html + 3
+
[9]   + Social Complexity variables
+ Information
+ Kinds of Written Documents
+ Money
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Articles   + CnQingL.html + 1
Tokens   + CnQingL.html + 1
Precious metals   + CnQingL.html + 1
Foreign coins   + CnQingL.html + 1
Indigenous coins   + CnQingL.html + 1
Paper currency   + CnQingL.html + 1
Couriers   + CnQingL.html + 1
Postal stations   + CnQingL.html + 1
General postal service   + CnQingL.html + 1
+
[9]   + Social Complexity variables
+ Information
+ Kinds of Written Documents
+ Money
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Articles   + CnQingE.html + 1
Tokens   + CnQingE.html + 1
Precious metals   + CnQingE.html + 1
Foreign coins   + CnQingE.html + 1
Indigenous coins   + CnQingE.html + 1
Paper currency   + CnQingE.html + 1
Couriers   + CnQingE.html + 1
Postal stations   + CnQingE.html + 1
General postal service   + CnQingE.html + 1
+
[1738]   + Social Complexity variables
+ Information
+ Money
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Articles   + InChaKl.html + 304
Precious metals   + InChaKl.html + 260
Indigenous coins   + InChaKl.html + 338
Paper currency   + InChaKl.html + 323
Foreign coins   + TrLysim.html + 295
Tokens   + PkUrbn1.html + 215
Couriers   + IrIlkhn.html + 1
Postal stations   + IrIlkhn.html + 1
General postal service   + IrIlkhn.html + 1
+
[855]   + Social Complexity variables
+ Information
+ Postal System
+ -
+ -		 + + + + + + + + + + + + + + + + + + +
Couriers   + InChaKl.html + 300
General postal service   + InChaKl.html + 284
Postal stations   + PkUrbn1.html + 271
+
[11]   + Social Complexity variables
+ Information
+ -
+ Measurement System
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Mnemonic devices   + CnQingL.html + 2
Nonwritten records   + CnQingL.html + 2
Written records   + CnQingL.html + 2
Script   + CnQingL.html + 2
Phonetic alphabetic writing   + CnQingL.html + 2
Non-phonetic writing   + CnQingE.html + 1
+
[350]   + Warfare variables
+ -
+ -
+ -
+ -		 + + + + + + + + +
RA   + InChaKl.html + 350
+
[12]   + Warfare variables
+ -
+ Military use of Metals
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + +
Copper   + GrCrNPa.html + 3
Bronze   + GrCrNPa.html + 3
Iron   + GrCrNPa.html + 3
Steel   + GrCrNPa.html + 3
+
[25]   + Warfare variables
+ -
+ Projectiles
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Javelins   + GrCrNPa.html + 3
Self bow   + GrCrNPa.html + 3
Crossbow   + GrCrNPa.html + 3
Tension siege engines   + GrCrNPa.html + 3
Sling siege engines   + GrCrNPa.html + 3
Gunpowder siege artillery   + GrCrNPa.html + 3
Handheld firearms   + GrCrNPa.html + 3
Atlatl   + GrCrPre.html + 1
Slings   + GrCrPre.html + 1
Composite bow   + GrCrPre.html + 2
+
[16]   + Warfare variables
+ -
+ Handheld weapons
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Battle axes   + GrCrNPa.html + 3
Daggers   + GrCrNPa.html + 3
Swords   + GrCrNPa.html + 3
Spears   + GrCrNPa.html + 3
Polearms   + GrCrNPa.html + 3
War clubs   + GrCrPre.html + 1
+
[12]   + Warfare variables
+ -
+ Animals used in warfare
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Camels   + GrCrNPa.html + 3
Elephants   + GrCrNPa.html + 3
Dogs   + GrCrPre.html + 2
Donkeys   + GrCrPre.html + 2
Horses   + GrCrPre.html + 2
+
[24]   + Warfare variables
+ -
+ Armor
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Leather, cloth   + GrCrNPa.html + 2
Shields   + GrCrNPa.html + 2
Helmets   + GrCrNPa.html + 2
Breastplates   + GrCrNPa.html + 2
Limb protection   + GrCrNPa.html + 3
Chainmail   + GrCrNPa.html + 3
Scaled armor   + GrCrNPa.html + 3
Laminar armor   + GrCrNPa.html + 3
Plate armor   + GrCrNPa.html + 3
Wood, bark, etc   + GrCrPre.html + 1
+
[5]   + Warfare variables
+ -
+ Naval technology
+ -
+ -		 + + + + + + + + + + + + + + + + + + +
Small vessels (canoes, etc)   + GrCrNPa.html + 3
Merchant ships pressed into service   + GrCrPre.html + 1
Specialized military vessels   + GrCrPre.html + 1
+
[21]   + Warfare variables
+ -
+ Fortifications
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Settlements in a defensive position   + GrCrNPa.html + 3
Moat   + GrCrNPa.html + 3
Stone walls (non-mortared)   + GrCrNPa.html + 3
Stone walls (mortared)   + GrCrNPa.html + 3
Complex fortifications   + GrCrNPa.html + 3
Long walls   + GrCrNPa.html + 3
Modern fortifications   + GrCrNPa.html + 3
+
[1387]   + Warfare variables
+ Military Technologies
+ Military use of Metals
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + +
Copper   + InChaKl.html + 330
Bronze   + InChaKl.html + 350
Iron   + InChaKl.html + 358
Steel   + InChaKl.html + 349
+
[4]   + Warfare variables
+ Military Technologies
+ Military use of Metals
+ -
+ Copper (H7)		 + + + + + + + + + + + + + + + + + + + + + + + +
Copper   + GrCrCls.html + 1
Bronze   + GrCrCls.html + 1
Iron   + GrCrCls.html + 1
Steel   + GrCrCls.html + 1
+
[10]   + Warfare variables
+ Military Technologies
+ Military use of Metals
+ Projectiles
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Javelins   + CnQingL.html + 1
Atlatl   + CnQingL.html + 1
Slings   + CnQingL.html + 1
Self bow   + CnQingL.html + 1
Composite bow   + CnQingL.html + 1
Crossbow   + CnQingL.html + 1
Tension siege engines   + CnQingL.html + 1
Sling siege engines   + CnQingL.html + 1
Gunpowder siege artillery   + CnQingL.html + 1
Handheld firearms   + CnQingL.html + 1
+
[21]   + Warfare variables
+ Military Technologies
+ Military use of Metals
+ Handheld weapons
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
War clubs   + CnQingL.html + 1
Battle axes   + CnQingL.html + 1
Daggers   + CnQingL.html + 1
Swords   + CnQingL.html + 1
Spears   + CnQingL.html + 1
Polearms   + CnQingL.html + 1
Dogs   + CnQingL.html + 1
Donkeys   + CnQingL.html + 1
Horses   + CnQingL.html + 1
Camels   + CnQingL.html + 1
Elephants   + CnQingL.html + 1
Wood, bark, etc   + CnQingL.html + 1
Leather, cloth   + CnQingL.html + 1
Shields   + CnQingL.html + 1
Helmets   + CnQingL.html + 1
Breastplates   + CnQingL.html + 1
Limb protection   + CnQingL.html + 1
Chainmail   + CnQingL.html + 1
Scaled armor   + CnQingL.html + 1
Laminar armor   + CnQingL.html + 1
Plate armor   + CnQingL.html + 1
+
[3]   + Warfare variables
+ Military Technologies
+ Military use of Metals
+ Naval technology
+ -		 + + + + + + + + + + + + + + + + + + +
Small vessels (canoes, etc)   + CnQingL.html + 1
Merchant ships pressed into service   + CnQingL.html + 1
Specialized military vessels   + CnQingL.html + 1
+
[11]   + Warfare variables
+ Military Technologies
+ Military use of Metals
+ Fortifications
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Settlements in a defensive position   + CnQingL.html + 1
Wooden palisades   + CnQingL.html + 1
Earth ramparts   + CnQingL.html + 1
Ditch   + CnQingL.html + 1
Moat   + CnQingL.html + 1
Stone walls (non-mortared)   + CnQingL.html + 1
Stone walls (mortared)   + CnQingL.html + 1
Fortified camps   + CnQingL.html + 1
Complex fortifications   + CnQingL.html + 1
Long walls   + CnQingL.html + 1
Modern fortifications   + CnQingL.html + 1
+
[3493]   + Warfare variables
+ Military Technologies
+ Projectiles
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Javelins   + InChaKl.html + 355
Atlatl   + InChaKl.html + 359
Slings   + InChaKl.html + 360
Self bow   + InChaKl.html + 357
Composite bow   + InChaKl.html + 361
Crossbow   + InChaKl.html + 343
Tension siege engines   + InChaKl.html + 337
Sling siege engines   + InChaKl.html + 332
Gunpowder siege artillery   + InChaKl.html + 344
Handheld firearms   + InChaKl.html + 345
+
[6]   + Warfare variables
+ Military Technologies
+ Projectiles
+ Handheld weapons
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
War clubs   + TrClcER.html + 1
Battle axes   + TrClcER.html + 1
Daggers   + TrClcER.html + 1
Swords   + TrClcER.html + 1
Spears   + TrClcER.html + 1
Polearms   + TrClcER.html + 1
+
[2132]   + Warfare variables
+ Military Technologies
+ Handheld weapons
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
War clubs   + InChaKl.html + 351
Battle axes   + InChaKl.html + 354
Daggers   + InChaKl.html + 359
Swords   + InChaKl.html + 364
Spears   + InChaKl.html + 364
Polearms   + InChaKl.html + 340
+
[1776]   + Warfare variables
+ Military Technologies
+ Animals used in warfare
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Dogs   + InChaKl.html + 329
Donkeys   + InChaKl.html + 343
Horses   + InChaKl.html + 361
Camels   + InChaKl.html + 349
Elephants   + InChaKl.html + 335
Wood, bark, etc   + AfDurrn.html + 6
Leather, cloth   + AfDurrn.html + 6
Shields   + AfDurrn.html + 6
Helmets   + AfDurrn.html + 6
Breastplates   + AfDurrn.html + 6
Limb protection   + AfDurrn.html + 6
Scaled armor   + AfDurrn.html + 6
Laminar armor   + AfDurrn.html + 6
Plate armor   + AfDurrn.html + 6
Chainmail   + PkSind2.html + 5
+
[3443]   + Warfare variables
+ Military Technologies
+ Armor
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Wood, bark, etc   + InChaKl.html + 325
Leather, cloth   + InChaKl.html + 339
Shields   + InChaKl.html + 358
Helmets   + InChaKl.html + 360
Breastplates   + InChaKl.html + 348
Limb protection   + InChaKl.html + 352
Chainmail   + InChaKl.html + 340
Scaled armor   + InChaKl.html + 336
Laminar armor   + InChaKl.html + 335
Plate armor   + InChaKl.html + 338
Bronze   + GrCrHel.html + 5
Iron   + GrCrHel.html + 3
Steel   + GrCrHel.html + 4
+
[2]   + Warfare variables
+ Military Technologies
+ Armor
+ Naval technology
+ -		 + + + + + + + + + + + + + +
Merchant ships pressed into service   + TrNHitt.html + 1
Specialized military vessels   + TrNHitt.html + 1
+
[985]   + Warfare variables
+ Military Technologies
+ Naval technology
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Small vessels (canoes, etc)   + InChaKl.html + 325
Merchant ships pressed into service   + InChaKl.html + 311
Specialized military vessels   + InChaKl.html + 327
Settlements in a defensive position   + USKameh.html + 2
Wooden palisades   + USKameh.html + 2
Earth ramparts   + USKameh.html + 2
Ditch   + USKameh.html + 2
Moat   + USKameh.html + 2
Stone walls (non-mortared)   + USKameh.html + 2
Stone walls (mortared)   + USKameh.html + 2
Fortified camps   + USKameh.html + 2
Complex fortifications   + USKameh.html + 2
Long walls   + USKameh.html + 2
Modern fortifications   + USKameh.html + 2
+
[33]   + Warfare variables
+ Military Technologies
+ Naval technology
+ Fortifications
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Settlements in a defensive position   + Hawaii2.html + 3
Wooden palisades   + Hawaii2.html + 3
Earth ramparts   + Hawaii2.html + 3
Ditch   + Hawaii2.html + 3
Moat   + Hawaii2.html + 3
Stone walls (non-mortared)   + Hawaii2.html + 3
Stone walls (mortared)   + Hawaii2.html + 3
Fortified camps   + Hawaii2.html + 3
Complex fortifications   + Hawaii2.html + 3
Long walls   + Hawaii2.html + 3
Modern fortifications   + Hawaii2.html + 3
+
[3784]   + Warfare variables
+ Military Technologies
+ Fortifications
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Settlements in a defensive position   + InChaKl.html + 350
Wooden palisades   + InChaKl.html + 352
Earth ramparts   + InChaKl.html + 353
Ditch   + InChaKl.html + 352
Moat   + InChaKl.html + 352
Stone walls (non-mortared)   + InChaKl.html + 348
Stone walls (mortared)   + InChaKl.html + 353
Fortified camps   + InChaKl.html + 351
Modern fortifications   + InChaKl.html + 357
Complex fortifications   + TrLysim.html + 355
Long walls   + PkUrbn1.html + 261
+
[4]   + Warfare variables
+ Military Technologies
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + +
Copper   + FrCaptL.html + 1
Bronze   + FrCaptL.html + 1
Iron   + FrCaptL.html + 1
Steel   + FrCaptL.html + 1
+
[1]   + Warfare variables
+ Largest scale collective ritual of the official cult
+ -
+ -
+ -		 + + + + + + + + +
Duration   + CnMing*.html + 1
+
[1]   + Warfare variables
+ Most widespread collective ritual of the official cult
+ -
+ -
+ -		 + + + + + + + + +
Duration   + CnMing*.html + 1
+
[1]   + Warfare variables
+ Most frequent collective ritual of the official cult
+ -
+ -
+ -		 + + + + + + + + +
Duration   + CnMing*.html + 1
+
[1]   + Warfare variables
+ Most euphoric collective ritual of the official cult
+ -
+ -
+ -		 + + + + + + + + +
Duration   + CnMing*.html + 1
+
[1]   + Warfare variables
+ Most dysphoric collective ritual of the official cult
+ -
+ -
+ -		 + + + + + + + + +
Duration   + CnMing*.html + 1
+
[319]   + Social Mobility
+ Status
+ -
+ Elite status
+ -		 + + + + + + + + +
elite status is hereditary   + InChaKl.html + 319
+
[1]   + Social Mobility
+ -
+ -
+ -
+ -		 + + + + + + + + +
RA   + TrOttm3.html + 1
+
[313]   + Religion and Normative Ideology
+ -
+ -
+ -
+ -		 + + + + + + + + +
RA   + InChaKl.html + 313
+
[650]   + Religion and Normative Ideology
+ Deification of Rulers
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Rulers are legitimated by gods   + InChaKl.html + 322
Rulers are gods   + InChaKl.html + 323
Ideological reinforcement of equality   + JpAzMom.html + 2
Ideological thought equates rulers and commoners   + JpAzMom.html + 2
Ideological thought equates elites and commoners   + JpAzMom.html + 1
+
[1523]   + Religion and Normative Ideology
+ Normative Ideological Aspects of Equity and Prosociality
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Ideological reinforcement of equality   + InChaKl.html + 317
Ideological thought equates rulers and commoners   + InChaKl.html + 316
Ideological thought equates elites and commoners   + InChaKl.html + 313
production of public goods   + InChaKl.html + 290
Ideology reinforces prosociality   + TrLysim.html + 286
communal dining   + SdKusht.html + 1
+
[3410]   + Religion and Normative Ideology
+ Moralizing Supernatural Powers
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Moral concern is primary   + InChaKl.html + 341
Moralizing enforcement is certain   + InChaKl.html + 341
Moralizing norms are broad   + InChaKl.html + 341
Moralizing enforcement is targeted   + InChaKl.html + 341
Moralizing enforcement of rulers   + InChaKl.html + 341
Moralizing religion adopted by elites   + InChaKl.html + 341
Moralizing religion adopted by commoners   + InChaKl.html + 341
Moralizing enforcement in afterlife   + InChaKl.html + 341
Moralizing enforcement in this life   + InChaKl.html + 341
Moralizing enforcement is agentic   + InChaKl.html + 341
+
[9]   + Religion and Normative Ideology
+ Normative ideological Aspects of Equity and Prosociality
+ -
+ -
+ -		 + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
production of public goods   + ItPapHM.html + 2
Ideological reinforcement of equality   + ItStPet.html + 2
Ideological thought equates rulers and commoners   + ItStPet.html + 2
Ideological thought equates elites and commoners   + ItStPet.html + 2
Ideology reinforces prosociality   + ItStPet.html + 1
+
[187]   + Institutional Variables
+ -
+ -
+ -
+ -		 + + + + + + + + +
RA   + TrLysim.html + 187
+
[344]   + Institutional Variables
+ Limits on Power of the Chief Executive
+ Power distributed
+ -
+ -		 + + + + + + + + + + + + + + + + + + +
Impeachment   + TrLysim.html + 122
Constraint on executive by government   + ItRomWe.html + 114
Constraint on executive by non-government   + ItRomWe.html + 108
+
+
+ + + + + + \ No newline at end of file diff --git a/seshat/apps/core/templates/core/detail_base_for_new_approach.html b/seshat/apps/core/templates/core/detail_base_for_new_approach.html index 26b34740d..927eb894b 100644 --- a/seshat/apps/core/templates/core/detail_base_for_new_approach.html +++ b/seshat/apps/core/templates/core/detail_base_for_new_approach.html @@ -1,15 +1,28 @@ {% extends "core/seshat-base.html" %} {% load static %} {% load humanize %} +{% load crispy_forms_tags %} {% block content %} + +
-
+
You entered the following data for:

{{var_name_display}}

-
+
{% block addmore %} {% endblock addmore %}
@@ -36,21 +49,20 @@

{{var_name_display}}

{% endif %} - +
- + + {% block myheadings %} + {% endblock myheadings %} + + - - {% block myheadings %} - {% endblock myheadings %} - {% include "core/partials/_confidence_disputed_expert.html" %} - @@ -58,8 +70,10 @@

{{var_name_display}}

-
- {% include "core/partials/_years_block_new_object.html" %} - {% block extracols %} - {% endblock extracols %} - {% include "core/partials/_confidence_disputed_expert_object.html" %} -
Tags # Polity Year(s) Description Update
1 + {% block extracols %} + {% endblock extracols %} + {% include "core/partials/_all_tags_inline_new.html" %} + {% if object.polity.long_name %} {{ object.polity.long_name }} @@ -73,11 +87,7 @@

{{var_name_display}}

{% autoescape off %}{{ object.description }}{% endautoescape %} {% with object.clean_name|add:"-update" as meat %}
@@ -91,5 +101,81 @@

{{var_name_display}}

+
+ {% csrf_token %} +
+
+
+ * Insert the first chunk of the description here: + + {{ form.comment_text.label_tag }} {{ form.comment_text }}
+ {{ form.formset.management_form }} + {{ form.management_form }} +
+ +
+ +
+
+ +
+
+
+ {% for form1 in form.formset %} + + +
+ {{ form.id }} {# Include the form ID for proper formset rendering #} +
+
+ Citation #{{ forloop.counter}} + Delete + {{ form1.DELETE }} + +
+
+ {{ form1.ref|as_crispy_field }} +
+
+ {{ form1.page_from|as_crispy_field }} +
+
+ {{ form1.page_to|as_crispy_field }} +
+ +
+ {{ form1.parent_pars|as_crispy_field }} +
+
+ +
+ {% endfor %} + +
+ +
+ +
+ +
+ +
+
+ + +
{% endblock %} \ No newline at end of file diff --git a/seshat/apps/core/templates/core/form_base_for_new_approach_upgrade.html b/seshat/apps/core/templates/core/form_base_for_new_approach_upgrade.html new file mode 100644 index 000000000..d7d0a0ae2 --- /dev/null +++ b/seshat/apps/core/templates/core/form_base_for_new_approach_upgrade.html @@ -0,0 +1,223 @@ +{% extends "core/seshat-base.html" %} +{% load crispy_forms_tags %} + +{% block content %} + + + + + + + + + +
+
+ {% csrf_token %} + + +
+
+
Section: {{var_section}} / + {% if var_subsection %} + {{var_subsection}} + {% else %} +  - + {% endif %} +
+
Enter data for:
+

{{ myvar }}

+
+
+ {% autoescape off %} +
{{ myvar }}: {{my_exp}}
+ {% endautoescape %} + +
+ +
+
+ + {% if messages %} +
    + {% for message in messages %} +
    + +
    + {% endfor %} + {% if form.non_field_errors %} + {% for error in form.non_field_errors %} +
    + +
    + {% endfor %} +
    + {% endif %} +
+
+ {% endif %} +
+
+
+ {{ form.polity|as_crispy_field }} +
+
+ {{ form.year_from|as_crispy_field }} +
+
+ {{ form.year_to|as_crispy_field }} +
+ + {% block extra_vars %} + {% endblock extra_vars %} +
+ {{ form.is_disputed|as_crispy_field }} + {{ form.is_uncertain|as_crispy_field }} + {{ form.expert_reviewed|as_crispy_field }} +
+
+
+
+ {% for radio in form.tag %} + + {% endfor %} +
+
+
+
+
+ * Please note: You will have the opportunity to add descriptions, including references, on the next page. +
+
+ {% block delete_button %} + {% endblock delete_button %} +
+
+ +
+
+
+ + + + +
+ +
+ {% if request.user.is_staff %} +
+
+ You are a Seshat Expert; you can enter a fact. +
+ +
+ {% else %} +
+ + +
+ {% endif %} + +
+ + +
+ +
+
+
* Your entered data will soon be checked by a Seshat Expert.
+
+ + {% block delete_option %} + {% endblock delete_option %} + +
+ + +{% endblock %} \ No newline at end of file diff --git a/seshat/apps/core/templates/core/list_base_for_new_approach.html b/seshat/apps/core/templates/core/list_base_for_new_approach.html index 807e3415c..661a0b1d7 100644 --- a/seshat/apps/core/templates/core/list_base_for_new_approach.html +++ b/seshat/apps/core/templates/core/list_base_for_new_approach.html @@ -2,258 +2,170 @@ {% load static %} {% load humanize %} {% load mathfilters %} +{% load custom_filters %} {% block content %} + +
{% if object_list %}
-
+
-
Section: {{var_section}} +
Section: {{var_section}} {% if var_subsection %} / {{var_subsection}} {% endif %} -
+
-

{{myvar}}

+
Variable: {{myvar}}
{{var_main_desc}}  
-
-
- Contributors: Seshat RAs and Experts -
-
-
+
{% if inner_vars %} -
-
-
Metadata:
-
-
+ {% block download_button %} + {% endblock download_button %} {% block metadownload_button %} {% endblock metadownload_button %} -
-
-
-
-

- -

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariableDefinition
PolityThe Seshat Polity Name
Year(s)The years for which we have the data. [negative = BCE]
ConfidenceInferred : The value is inferred.
- Suspected : The value is suspected (Expert Check Needed).
- Evidenced : The value is backed up by sufficient evidence.
Disputed? - No : No disagreement among scholars.
Yes : There is disagreement among scholars. -
Expert? : Not yet Checked by a Seshat Expert.
: Checked and accepted by a Seshat Expert (or RA).
-
-
-
-
-

- -

-
-
- - - - - - - - - {% for ktop, vtop in inner_vars.items %} - - - {% if vtop.var_exp %} - - {% elif "Definition" in potential_cols %} - - {% endif %} - {% if vtop.scale %} - - {% elif "Scale" in potential_cols %} - - {% endif %} - {% if vtop.units %} - - {% elif "Units" in potential_cols %} - - {% endif %} - {% if vtop.min %} - - {% elif "Min" in potential_cols %} - - {% endif %} - {% if vtop.max %} - - {% elif "Max" in potential_cols %} - - {% endif %} - - {% endfor %} - -
VariableDefinition
{{ktop}}{{vtop.var_exp}}{{vtop.scale}}{{vtop.units}}{{vtop.min}}{{vtop.max}}
-
-
-
- {% endif %} -
+ {% endif %}
{% block main_description %} {% endblock main_description %} {% block secondary_description %} {% endblock secondary_description %} -
-
-
-
Actual Data:
-
-
- - {% block download_button %} - {% endblock download_button %} -
-
+
- - {{myvar}} +
+ {{myvar}} - + - {% block myheadings_list %} {% endblock myheadings_list %} - {% include "core/partials/_confidence_disputed_expert.html" %} - - + + + + {% for obj in object_list %} - -
-
- {% if obj.polity %} - - {% else %} - - {% endif%} - - {% include "core/partials/_years_block_new_obj.html" %} + +
+ + +
- - + - - {% if obj.display_citations %} - -   - - {% endif %} - + {% if obj.polity %} + + {% else %} + + {% endif%} + + + {% block extra_vars_list %} + {% endblock extra_vars_list %} + {% include "core/partials/_all_tags_inline_obj.html" %} + + + {% include "core/partials/_years_block_new_obj.html" %} + + + {% block update_button %} + {% endblock update_button %} + - {% block update_button %} - {% endblock update_button %} - + + + + + + + + {% endfor %}
## -    Polity - - - -   -   Year(s)   +  Polity EditTags + + Year(s) + EditDesc
{{ forloop.counter }} - {% if obj.polity.long_name %} - - {{ obj.polity.long_name }} - - {% else %} - - {{ obj.polity.name }} - - {% endif %} - - -
+ {{ forloop.counter }} + {% if obj.comment and obj.comment.id > 1 %} + * + {% endif %} - - {% block extra_vars_list %} - {% endblock extra_vars_list %} - - {% if obj.tag == "DSP" %} - {{ obj.get_tag_display }} - {% elif obj.tag == "SSP" %} - {{ obj.get_tag_display }} - {% elif obj.tag == "UNK" %} - {{ obj.get_tag_display }} - {% elif obj.tag == "IFR" %} - {{ obj.get_tag_display }} - {% else %} - {{ obj.get_tag_display }} - {% endif %} - - {% if obj.is_disputed %} - Yes - {% else %} - No - {% endif %} - - {% if obj.expert_reviewed %} - - {% else %} - - {% endif %} - + {% if obj.polity.long_name %} + + {{ obj.polity.long_name }} + + {% else %} + + {{ obj.polity.name }} + + {% endif %} + + - +
+
+ + {% autoescape off %} + {% if obj.description %} + {{ obj.description|make_references_look_nicer }} +
+ {% else %} + - + {% endif%} + {% if obj.comment and obj.comment.id > 1 %} + {{obj.comment }} + + + + EDIT + + + {% endif %} + {% endautoescape %} + +
+
+ {% else %}
@@ -278,4 +190,5 @@
{{var_main_desc}}
return new bootstrap.Popover(popoverTriggerEl) }) - {% endblock %} \ No newline at end of file + {% endblock %} + diff --git a/seshat/apps/core/templates/core/partials/_all_tags_inline_new.html b/seshat/apps/core/templates/core/partials/_all_tags_inline_new.html new file mode 100644 index 000000000..9b2aeb736 --- /dev/null +++ b/seshat/apps/core/templates/core/partials/_all_tags_inline_new.html @@ -0,0 +1,40 @@ + + + + {% if object.tag == "DSP" %} + {{ object.get_tag_display }} + {% elif object.tag == "SSP" %} + {{ object.get_tag_display }} + {% elif object.tag == "UNK" %} + {{ object.get_tag_display }} + {% elif object.tag == "IFR" %} + {{ object.get_tag_display }} + {% else %} + {{ object.get_tag_display }} + {% endif %} + + + +{% if object.is_disputed %} + + + Disputed + + +{% endif %} + + +{% if object.is_uncertain %} + + Uncertain + +{% endif %} + + +{% if object.expert_reviewed %} + + Expert + +{% endif %} + + \ No newline at end of file diff --git a/seshat/apps/core/templates/core/partials/_all_tags_inline_obj.html b/seshat/apps/core/templates/core/partials/_all_tags_inline_obj.html new file mode 100644 index 000000000..6d8476b3b --- /dev/null +++ b/seshat/apps/core/templates/core/partials/_all_tags_inline_obj.html @@ -0,0 +1,40 @@ + + + + {% if obj.tag == "DSP" %} + {{ obj.get_tag_display }} + {% elif obj.tag == "SSP" %} + {{ obj.get_tag_display }} + {% elif obj.tag == "UNK" %} + {{ obj.get_tag_display }} + {% elif obj.tag == "IFR" %} + {{ obj.get_tag_display }} + {% else %} + {{ obj.get_tag_display }} + {% endif %} + + + + {% if obj.is_disputed %} + + + Disputed + + + {% endif %} + + + {% if obj.is_uncertain %} + + Uncertain + + {% endif %} + + + {% if obj.expert_reviewed %} + + Expert + + {% endif %} + + \ No newline at end of file diff --git a/seshat/apps/core/templates/core/partials/_footer_bar.html b/seshat/apps/core/templates/core/partials/_footer_bar.html index 15df61099..8c22c317a 100644 --- a/seshat/apps/core/templates/core/partials/_footer_bar.html +++ b/seshat/apps/core/templates/core/partials/_footer_bar.html @@ -1,7 +1,7 @@