From a493435ee4c05c64d6411e9093b107e9bbc98e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Anton=20M=C3=BCller?= Date: Wed, 24 Jan 2024 09:52:35 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=C3=9Cbersetzungen,=20Abst=C3=A4nde=20nach?= =?UTF-8?q?=20Beziehungstypen,=20linke=20Spalte=20eine=20Breite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail_views/entity_detail_generic.html | 20 +++++++++---------- .../detail_views/person_detail.html | 8 ++++---- apis_core/apis_relations/forms2.py | 2 +- apis_core/entity_detail_generic.html | 8 ++++---- static/css/style.css | 4 ++++ 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html b/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html index 6008569..1b02e01 100644 --- a/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html +++ b/apis_core/apis_entities/templates/apis_entities/detail_views/entity_detail_generic.html @@ -53,7 +53,7 @@

-

+

@@ -105,7 +105,7 @@

{% if object.start_date or object.end_date %} - Date + Datum {% if object.start_date_written %} @@ -120,7 +120,7 @@

{% if object.lat %} - Lat/Lng + Länge/Breite {{ object.lat }} / {{ object.lng }} @@ -132,8 +132,8 @@

{% block info-metadata %} -
- Uri(s) + + URI {% for x in object.uri_set.all %} @@ -148,7 +148,7 @@

{% if object.collection.all %}

- Collection(s) + Sammlungen {% for x in object.collection.all %} @@ -162,7 +162,7 @@

{% if object.notes %}

- Notes + Anmerkungen {{ object.notes }} @@ -172,7 +172,7 @@

{% if object.references %}

- References + Belege {{ object.references }} @@ -185,13 +185,13 @@

{% endblock left-pane-additional %}
-

Relations

+

Beziehungen

{% block relations %} {% for obj in right_card %} {% if obj.1.data|length > 0 %}

{{ obj.0 }}

-
+
{% render_table obj.1 %}
{% endif %} diff --git a/apis_core/apis_entities/templates/apis_entities/detail_views/person_detail.html b/apis_core/apis_entities/templates/apis_entities/detail_views/person_detail.html index c311261..63deb42 100644 --- a/apis_core/apis_entities/templates/apis_entities/detail_views/person_detail.html +++ b/apis_core/apis_entities/templates/apis_entities/detail_views/person_detail.html @@ -3,7 +3,7 @@ {% block info-table %} -
+ Name @@ -13,7 +13,7 @@ {% if no_merge_labels %}
- Alternative Namen + anderer Name {% for x in no_merge_labels %} @@ -44,7 +44,7 @@ {% if object.start_date or object.end_date %}
- Lifespan + Lebensspanne {% if object.start_date %} @@ -59,7 +59,7 @@ {% if object.profession.all %}
- Professions + Berufe {% for prof in object.profession.all %} diff --git a/apis_core/apis_relations/forms2.py b/apis_core/apis_relations/forms2.py index c5d099c..87353c1 100644 --- a/apis_core/apis_relations/forms2.py +++ b/apis_core/apis_relations/forms2.py @@ -110,7 +110,7 @@ def get_html_table(self, entity_type, request, site_instance, form_match): table_html = table(data=objects, prefix=prefix) else: tab_query = {"related_" + entity_type.lower(): site_instance} - ttab = self.relation_form.objects.filter(**tab_query) + ttab = self.relation_form.objects.filter(**ttoquery) table_html = table(data=ttab, prefix=prefix) return table_html diff --git a/apis_core/entity_detail_generic.html b/apis_core/entity_detail_generic.html index 31162c6..601fc7d 100644 --- a/apis_core/entity_detail_generic.html +++ b/apis_core/entity_detail_generic.html @@ -64,7 +64,7 @@

-

General Info

+

Allgemein

{% block info-table %} @@ -88,7 +88,7 @@

General Info

{% if object.start_date or object.end_date %}

- Date + Datum {% if object.start_date %} @@ -143,7 +143,7 @@

Texts

{% if object.text.all %}
- Texts + Texte {% for x in object.text.all %}
@@ -160,7 +160,7 @@

{{ x.kind }}

{% else %}
- No text provided for this {{entity}} + Kein Text verfügbar für {{entity}}
{% endif %}
diff --git a/static/css/style.css b/static/css/style.css index 9e24c22..ddf0e49 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -100,3 +100,7 @@ main { margin-right: .75rem; margin-left: .75rem; } + +.left-width { + width: 100px; +} From 49651b687fb88935f027c7a3b207449c50b38254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Anton=20M=C3=BCller?= Date: Wed, 24 Jan 2024 10:01:37 +0100 Subject: [PATCH 2/2] =?UTF-8?q?r=C3=BCckg=C3=A4ngig=20die=20=C3=A4nderung?= =?UTF-8?q?=20an=20forms2.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis_core/apis_relations/forms2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis_core/apis_relations/forms2.py b/apis_core/apis_relations/forms2.py index 87353c1..c5d099c 100644 --- a/apis_core/apis_relations/forms2.py +++ b/apis_core/apis_relations/forms2.py @@ -110,7 +110,7 @@ def get_html_table(self, entity_type, request, site_instance, form_match): table_html = table(data=objects, prefix=prefix) else: tab_query = {"related_" + entity_type.lower(): site_instance} - ttab = self.relation_form.objects.filter(**ttoquery) + ttab = self.relation_form.objects.filter(**tab_query) table_html = table(data=ttab, prefix=prefix) return table_html