From b806f3855af24a1494d5a076443c5ebdf1973e84 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Sat, 13 Jan 2024 10:37:41 +0100 Subject: [PATCH 1/3] german buttons; titles, ... [skip ci] --- apis_core/apis_entities/forms.py | 8 ++++---- .../templates/apis_entities/edit_view.html | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apis_core/apis_entities/forms.py b/apis_core/apis_entities/forms.py index 6587005..12edb34 100644 --- a/apis_core/apis_entities/forms.py +++ b/apis_core/apis_entities/forms.py @@ -22,7 +22,7 @@ def save(self, *args, **kwargs): def __init__(self, entity, *args, **kwargs): attrs = { - "data-placeholder": "Type to get suggestions", + "data-placeholder": "Tippe um Vorschläge zu bekommen", "data-minimum-input-length": 1, "data-html": True, "style": "width: auto", @@ -45,7 +45,7 @@ def __init__(self, entity, *args, **kwargs): args=[entity.title(), ent_merge_pk], ) label = f"Suche nach Objekten vom Type: {entity.title()}" - button_label = "Merge" + button_label = "zusammenführen" self.helper.form_action = reverse( "apis:apis_entities:merge_view", kwargs=form_kwargs ) @@ -88,8 +88,8 @@ def __init__(self, *args, **kwargs): acc_grp1 = Fieldset("Metadata {}".format(entity.title())) acc_grp2 = AccordionGroup("MetaInfo", "references", "notes", "review") attrs = { - "data-placeholder": "Type to get suggestions", - "data-minimum-input-length": getattr(settings, "APIS_MIN_CHAR", 3), + "data-placeholder": "Tippe um Vorschläge zu bekommen", + "data-minimum-input-length": 1, "data-html": True, } diff --git a/apis_core/apis_entities/templates/apis_entities/edit_view.html b/apis_core/apis_entities/templates/apis_entities/edit_view.html index dac7da5..c5ad2f6 100644 --- a/apis_core/apis_entities/templates/apis_entities/edit_view.html +++ b/apis_core/apis_entities/templates/apis_entities/edit_view.html @@ -11,37 +11,37 @@

- {{ entity_type }}s + {{ instance }}

- + - - + +

- Edit the Entity + Entität bearbeiten

{% crispy form %}
- - Delete + + löschen

-

Merge Entity

+

Entitäten zusammenführen

Die aktuelle Entität {{ instance }} wird gelöscht, deren Eigenschaften/Verbindungen aber auf die ausgewählten Entität übertragen.

{% crispy form_merge_with form_merge_with.helper %}
-

Edit the Relations

+

Bearbeiten der Verbindungen

{% for obj in right_card %}

{{ obj.0 }}

From 3f3fe8a8e942e62251c3cc3a49863701dc237d30 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Sat, 13 Jan 2024 10:52:41 +0100 Subject: [PATCH 2/3] title, boostrap icons --- .../detail_views/entity_detail_generic.html | 27 ++++++------------- .../edit_button_generic_ajax_form.html | 2 +- 2 files changed, 9 insertions(+), 20 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 1d6e1c6..6008569 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 @@ -12,9 +12,7 @@ {% if object.get_prev_url %}

- - - +

{% endif %} @@ -30,13 +28,13 @@

{% if object.get_edit_url %} - + {% endif %} {% if object.get_delete_url %} | - + {% endif %}

@@ -46,9 +44,7 @@

{% if object.get_next_url %}

- - - +

{% endif %} @@ -58,17 +54,10 @@

- General Info - - - - - - - + - {% if entity_type != 'event' %}| TEI{% endif %} + {% if entity_type != 'event' %}| {% endif %}

{% block info-table %} @@ -148,9 +137,9 @@

{% for x in object.uri_set.all %} - {{ x }} {% if user.is_authenticated %} + {{ x }} {% if user.is_authenticated %} - | + | {% endif %}
{% endfor %} diff --git a/apis_core/apis_relations/templates/apis_relations/edit_button_generic_ajax_form.html b/apis_core/apis_relations/templates/apis_relations/edit_button_generic_ajax_form.html index eb09043..d8b3528 100644 --- a/apis_core/apis_relations/templates/apis_relations/edit_button_generic_ajax_form.html +++ b/apis_core/apis_relations/templates/apis_relations/edit_button_generic_ajax_form.html @@ -11,5 +11,5 @@ "entity_type": "{{ entity_type }}", "ButtonText": "speichern" }'> - + From 3a6d501c8dabd242560a88d09146364bf5b674f2 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Sat, 13 Jan 2024 10:56:08 +0100 Subject: [PATCH 3/3] fixes uri detail view [skip ci] --- .../templates/apis_metainfo/uri_detail.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/apis_core/apis_metainfo/templates/apis_metainfo/uri_detail.html b/apis_core/apis_metainfo/templates/apis_metainfo/uri_detail.html index 7e3915a..a09e382 100644 --- a/apis_core/apis_metainfo/templates/apis_metainfo/uri_detail.html +++ b/apis_core/apis_metainfo/templates/apis_metainfo/uri_detail.html @@ -12,7 +12,7 @@ {% if object.get_prev_url %}

- +

{% endif %} @@ -26,13 +26,13 @@

{% if user.is_authenticated %}

{% if object.get_edit_url %} - + {% endif %} {% if object.get_delete_url %} | - + {% endif %} @@ -45,9 +45,7 @@

{% if object.get_next_url %}

- - - +

{% endif %}