diff --git a/apis_core/apis_entities/static/css/E53_Place_popover.css b/apis_core/apis_entities/static/css/E53_Place_popover.css index 44f3a3757..e2d6f02bc 100644 --- a/apis_core/apis_entities/static/css/E53_Place_popover.css +++ b/apis_core/apis_entities/static/css/E53_Place_popover.css @@ -1,3 +1,6 @@ +#map { + height: 300px; +} #popovermap { width: 500px; height: 500px; diff --git a/apis_core/apis_entities/static/css/apis_entities.css b/apis_core/apis_entities/static/css/apis_entities.css new file mode 100644 index 000000000..a9c61aa9f --- /dev/null +++ b/apis_core/apis_entities/static/css/apis_entities.css @@ -0,0 +1,23 @@ +/* single object view header */ +#single-object-header h2 { + text-align: center; +} + +/* navigation between objects from single object view header */ +.prev-in-list { + float: right; +} +.next-in-list { + float: left; +} + +/* additional object actions */ +.object-duplicate { + color: blueviolet; +} +.object-merge { + color: dodgerblue; +} +.object-history { + color: #007bff; +} diff --git a/apis_core/apis_entities/templates/apis_core/apis_entities/abstractentity.html b/apis_core/apis_entities/templates/apis_core/apis_entities/abstractentity.html index 49865e5c9..994f8a72b 100644 --- a/apis_core/apis_entities/templates/apis_core/apis_entities/abstractentity.html +++ b/apis_core/apis_entities/templates/apis_core/apis_entities/abstractentity.html @@ -1,4 +1,10 @@ {% extends "generic/generic_content.html" %} +{% load static %} + +{% block styles %} + {{ block.super }} + +{% endblock styles %} {% block content %}
@@ -6,10 +12,10 @@
{% block card-header-content %} -
+
{% include "apis_entities/partials/prev_url.html" %}
-

+

{% include "apis_entities/partials/listview_url.html" %} {{ object }} diff --git a/apis_core/apis_entities/templates/apis_core/apis_entities/e53_place_detail.html b/apis_core/apis_entities/templates/apis_core/apis_entities/e53_place_detail.html index a21a43409..affa5dde5 100644 --- a/apis_core/apis_entities/templates/apis_core/apis_entities/e53_place_detail.html +++ b/apis_core/apis_entities/templates/apis_core/apis_entities/e53_place_detail.html @@ -13,7 +13,6 @@ {% if object.latitude and object.longitude %} {% endif %} diff --git a/apis_core/apis_entities/templates/apis_entities/partials/entity_actions_nav.html b/apis_core/apis_entities/templates/apis_entities/partials/entity_actions_nav.html index eb33c9c64..c235941bf 100644 --- a/apis_core/apis_entities/templates/apis_entities/partials/entity_actions_nav.html +++ b/apis_core/apis_entities/templates/apis_entities/partials/entity_actions_nav.html @@ -10,14 +10,11 @@ {% endif %} {% if object.get_add_permission in perms %} - content_copy Duplicate - + cell_merge Merge {% endif %} diff --git a/apis_core/apis_entities/templates/apis_entities/partials/entity_base_nav.html b/apis_core/apis_entities/templates/apis_entities/partials/entity_base_nav.html index a97b659dd..6c5c01303 100644 --- a/apis_core/apis_entities/templates/apis_entities/partials/entity_base_nav.html +++ b/apis_core/apis_entities/templates/apis_entities/partials/entity_base_nav.html @@ -10,9 +10,8 @@ href="{{ object.get_edit_url }}">editEdit {% if object.history %} - {% endif %} diff --git a/apis_core/apis_entities/templates/apis_entities/partials/next_url.html b/apis_core/apis_entities/templates/apis_entities/partials/next_url.html index 5850ce400..af975a611 100644 --- a/apis_core/apis_entities/templates/apis_entities/partials/next_url.html +++ b/apis_core/apis_entities/templates/apis_entities/partials/next_url.html @@ -1,7 +1,7 @@ {% if object.get_next_id %}

- + chevron_right

diff --git a/apis_core/apis_entities/templates/apis_entities/partials/prev_url.html b/apis_core/apis_entities/templates/apis_entities/partials/prev_url.html index 9eea5d00c..d11ed2a05 100644 --- a/apis_core/apis_entities/templates/apis_entities/partials/prev_url.html +++ b/apis_core/apis_entities/templates/apis_entities/partials/prev_url.html @@ -1,7 +1,7 @@ {% if object.get_prev_id %}

- + chevron_left

diff --git a/apis_core/apis_entities/templates/columns/duplicate.html b/apis_core/apis_entities/templates/columns/duplicate.html index c497dbeef..9d2a93324 100644 --- a/apis_core/apis_entities/templates/columns/duplicate.html +++ b/apis_core/apis_entities/templates/columns/duplicate.html @@ -1,3 +1,4 @@ content_copy + class="object-duplicate" + href="{{ record.get_duplicate_url }}"> + content_copy diff --git a/apis_core/apis_relations/static/css/apis_relations.css b/apis_core/apis_relations/static/css/apis_relations.css new file mode 100644 index 000000000..daaeb61d3 --- /dev/null +++ b/apis_core/apis_relations/static/css/apis_relations.css @@ -0,0 +1,11 @@ +/* navigation between objects from object detail view */ +/* TODO relates to potentially redundant relations_detail_generic.html template */ +.next-in-list { + float: right; +} + +/* single object view header */ +/* TODO relates to potentially redundant relations_detail_generic.html template */ +#single-object-header h2:nth-of-type(2) { + text-align: center; +} diff --git a/apis_core/apis_relations/templates/apis_relations/relations_detail_generic.html b/apis_core/apis_relations/templates/apis_relations/relations_detail_generic.html index b1807f6bf..91aa3406e 100644 --- a/apis_core/apis_relations/templates/apis_relations/relations_detail_generic.html +++ b/apis_core/apis_relations/templates/apis_relations/relations_detail_generic.html @@ -3,6 +3,11 @@ {% block title %}{{ object }}{% endblock %} +{% block styles %} + {{ block.super }} + +{% endblock styles %} + {% block scriptHeader %} {{ block.super }} {% endblock scriptHeader %} @@ -11,7 +16,7 @@
-
+
{% if object.get_prev %}

@@ -22,7 +27,7 @@

{% endif %}

-

+

{% if object.get_listview_url %} {{ entity_type }}s @@ -53,7 +58,7 @@

{% if object.get_next %} - +

diff --git a/apis_core/core/static/css/core.css b/apis_core/core/static/css/core.css index 73ecf40b4..ca639fb67 100644 --- a/apis_core/core/static/css/core.css +++ b/apis_core/core/static/css/core.css @@ -5,3 +5,8 @@ a #logo:hover { opacity: 0.5; } + +/* main modal in modal block */ +#main-modal .modal-dialog { + max-width: 800px; +} diff --git a/apis_core/core/static/css/override_bootstrap.min.css b/apis_core/core/static/css/override_bootstrap.min.css new file mode 100644 index 000000000..9e51e9fda --- /dev/null +++ b/apis_core/core/static/css/override_bootstrap.min.css @@ -0,0 +1,6 @@ +/* override of Bootstrap 4.6.2 generated (min) version to partially +fix an issue with select2 +TODO remove after move to Boostrap 5 */ +.select2-container--default .select2-selection span.select2-selection__rendered { + line-height: initial; +} diff --git a/apis_core/core/templates/base.html b/apis_core/core/templates/base.html index cd0991c71..40e609059 100644 --- a/apis_core/core/templates/base.html +++ b/apis_core/core/templates/base.html @@ -51,7 +51,13 @@ href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.4/leaflet.css" /> - {% include "partials/bootstrap4_css.html" %} + {# Bootstrap 4.6.2 stylesheet, as suggested on #} + {# https://getbootstrap.com/docs/4.6/getting-started/introduction/ #} + + @@ -255,11 +261,11 @@ {% block modal %}

{{ object }}