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 %}
{{ object }} | {% 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 %} -