Sorokin Rationale:
diff --git a/seshat/apps/core/templates/core/generic_templates/generic_list_all.html b/seshat/apps/core/templates/core/generic_templates/generic_list_all.html
index a1dfcd4b8..2e46b6581 100644
--- a/seshat/apps/core/templates/core/generic_templates/generic_list_all.html
+++ b/seshat/apps/core/templates/core/generic_templates/generic_list_all.html
@@ -57,13 +57,13 @@
{% block update_button %}
{% if obj.description and obj.description != 'None' %}
-
+ |
|
{% else %}
-
+ |
diff --git a/seshat/apps/core/templates/core/generic_templates/generic_list_llm.html b/seshat/apps/core/templates/core/generic_templates/generic_list_llm.html
new file mode 100644
index 000000000..06cb612cb
--- /dev/null
+++ b/seshat/apps/core/templates/core/generic_templates/generic_list_llm.html
@@ -0,0 +1,124 @@
+{% extends "core/list_base_for_new_approach.html" %}
+{% load crispy_forms_tags %}
+{% load static %}
+{% load humanize %}
+{% load custom_filters %}
+{% load mathfilters %}
+
+
+
+
+{% block myheadings_list %}
+ |
+
+ Event Name
+
+
+ |
+
+
+ Types
+
+ |
+
+
+ Intensity
+
+ |
+
+
+ Extent
+
+ |
+
+
+
+ Ra Checks
+
+ |
+{% endblock myheadings_list %}
+
+{% block extra_vars_list %}
+
+ {% autoescape off %}
+ {{obj.name}}
+ {% endautoescape %}
+
+
+
+ {% if obj.year_from == None %}
+
+{% elif obj.year_from == obj.year_to %}
+ {% if obj.year_from < 0 %}
+ {{ obj.year_from|abs|intcomma }} BCE
+ {% else %}
+ {{ obj.year_from }} CE
+ {% endif %}
+{% elif obj.year_to == None %}
+ {% if obj.year_from < 0 %}
+ {{ obj.year_from|abs }} BCE
+ {% else %}
+ {{ obj.year_from }} CE
+ {% endif %}
+{% elif obj.year_to == None and obj.year_from == None %}
+
+{% else %}
+ {% if obj.year_from < 0 and obj.year_to < 0 %}
+ {{ obj.year_from|abs }} BCE {{ obj.year_to|abs }} BCE
+ {% elif obj.year_from < 0 and obj.year_to >= 0 %}
+ {{ obj.year_from|abs }} BCE {{ obj.year_to }} CE
+ {% else %}
+ {{ obj.year_from }} CE {{ obj.year_to }} CE
+ {% endif %}
+{% endif %}
+
+
+
+
+
+ |
+
+
+ {% autoescape off %}
+ {{obj.get_instability_types}}
+ {% endautoescape %}
+
+ |
+
+ {% autoescape off %}
+ {{obj.inst_intensity}}
+ {% endautoescape %}
+
+ |
+
+ {% autoescape off %}
+ {{obj.inst_extent}}
+ {% endautoescape %}
+
+ |
+
+ {% autoescape off %}
+ {{obj.get_instability_checks}}
+ {% endautoescape %}
+
+ |
+{% endblock extra_vars_list %}
+
+
+
+{% block update_button %}
+{% if obj.description and obj.description != 'None' %}
+
+
+
+
+ |
+{% else %}
+
+
+
+
+ |
+{% endif %}
+
+{% endblock update_button %}
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 a20ca3641..95825fe17 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
@@ -43,6 +43,77 @@
background-color:#fefae6; /* fffdf2 fefae6*/
background-image: linear-gradient(to right, rgb(246, 127, 127, 0.216),rgb(242, 199, 119, 0.216),rgb(151, 230, 151, 0.216));
}
+
+
+ .bg-absent-light {
+ background: #fffdf2; /* rgb(134, 134, 134);*/
+ color: gray;
+ border: 1px solid lightgray;
+ }
+
+
+
+
+
+ .bg-info-light {
+ background: #fffdf2; /* rgb(134, 134, 134);*/
+ color: dodgerblue;
+ border: 1px solid dodgerblue;
+ }
+
+ .bg-danger-light {
+ background: lightpink;
+
+ }
+
+ .my_small_link:hover {
+ color:navajowhite;
+ }
+
+ .bg-success-light {
+ background: #fffdf2; /* rgb(134, 134, 134);*/
+ color: teal;
+ border: 1px solid teal;
+ }
+
+ .bg-warning-light {
+ background: #fffdf2; /* rgb(134, 134, 134);*/
+ color: darkorange;
+ border: 1px solid goldenrod;
+ }
+
+ .bg-uncoded-light {
+ background: #fffdf2; /* rgb(134, 134, 134);*/
+ color: darkred;
+ border: 1px solid rosybrown;
+ }
+
+ .bg-trans-light {
+ background: cadetblue;
+
+ }
+
+ .custom-right-align {
+ margin-left: auto !important; /* Pushes the column to the right */
+ text-align: right !important; /* Aligns inner content to the right */
+ }
+
+ .bg-unknown-light {
+ background: #fffdf2; /* rgb(134, 134, 134);*/
+ color: hotpink;
+ border: 1px solid hotpink;
+ }
+
+ .bg-secondary-light {
+ background: #fffdf2;
+ color: lightcoral;
+ border: 1px solid lightcoral;
+
+
+ }
+
+
+
{% if object_list %}
@@ -90,15 +161,17 @@
<
| # |
-
+ |
Polity
|
{% block myheadings_list %}
{% endblock myheadings_list %}
+ {% if var_name_display != 'Instability Event' %}
Tags |
+ {% endif %}
- {% if var_name_display != 'Polity Duration' and var_name_display != 'Polity Peak Years' %}
+ {% if var_name_display != 'Polity Duration' and var_name_display != 'Polity Peak Years' and var_name_display != 'Instability Event' %}
@@ -119,7 +192,7 @@ <
|
+ |
{{ forloop.counter }}
{% if obj.comment and obj.comment.id > 1 %}
*
@@ -128,7 +201,7 @@ <
|
{% if obj.polity %}
-
+ |
{% if obj.polity.long_name %}
{{ obj.polity.long_name }}
@@ -147,19 +220,21 @@ <
{% block extra_vars_list %}
{% endblock extra_vars_list %}
- {% include "core/partials/_all_tags_inline_obj.html" %}
+ {% if var_name_display != 'Instability Event' %}
+ {% include "core/partials/_all_tags_inline_obj.html" %}
+ {% endif %}
- {% if var_name_display != 'Polity Duration' and var_name_display != 'Polity Peak Years' %}
+ {% if var_name_display != 'Polity Duration' and var_name_display != 'Polity Peak Years' and var_name_display != 'Instability Event' %}
{% include "core/partials/_years_block_new_obj.html" %}
{% endif %}
{% block update_button %}
{% endblock update_button %}
- |
+ |
|
@@ -168,7 +243,7 @@ <
| |
- |
+ |
Loading...
diff --git a/seshat/apps/core/templates/core/partials/_private_comment_inline_accordion.html b/seshat/apps/core/templates/core/partials/_private_comment_inline_accordion.html
index 482af5264..fe0b0cdcb 100644
--- a/seshat/apps/core/templates/core/partials/_private_comment_inline_accordion.html
+++ b/seshat/apps/core/templates/core/partials/_private_comment_inline_accordion.html
@@ -14,7 +14,7 @@ |