diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-27 18:11:56 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-27 18:11:56 +0200 |
| commit | af865c9ecc18fe31e56c7aff26ab05e8ef40421a (patch) | |
| tree | 2447cbdbda05087d78d6a0e8f8c9563f584d8ed3 | |
| parent | 3642f48c8a62d7a39adfe9472ab7de209b291334 (diff) | |
| download | Ishtar-af865c9ecc18fe31e56c7aff26ab05e8ef40421a.tar.bz2 Ishtar-af865c9ecc18fe31e56c7aff26ab05e8ef40421a.zip | |
Adapt JSON field on sheets.
5 files changed, 7 insertions, 4 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 6137e6be8..2cb4c1dcb 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -24,8 +24,6 @@ </div> </div> - - <div class='row'> {% field_flex "Complete ID" item.full_label %} {% include "ishtar/blocks/sheet_creation_section.html" %} diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 2e65fab11..062dbc5a8 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -61,9 +61,10 @@ {% field_flex "Type" item.file_type %} {% field_flex_detail "Related file" item.related_file %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} - {% include "ishtar/blocks/sheet_json.html" %} </div> +{% include "ishtar/blocks/sheet_json.html" %} + <h3>{% trans "Localisation"%}</h3> <div class="row"> {% field_flex_multiple "Towns" item.towns %} diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html index 9836a25b0..a69609f90 100644 --- a/archaeological_operations/templates/ishtar/sheet_site.html +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -64,6 +64,8 @@ </div> {% endif %} +{% include "ishtar/blocks/sheet_json.html" %} + {% trans "Operations" as operations %} {% if item.operations.count %} {% dynamic_table_document operations 'operations' 'archaeological_sites' item.pk '' output %} diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index d29d74c00..ff5aeb04b 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -32,9 +32,9 @@ {% include "ishtar/blocks/sheet_creation_section.html" %} {% field_flex "Location" item.precise_location %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} - {% include "ishtar/blocks/sheet_json.html" %} </div> +{% include "ishtar/blocks/sheet_json.html" %} {% if item.finds.count %} <h4>{% trans "Content" %}</h4> diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 7405224e2..465c02db5 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -44,6 +44,8 @@ {% field_flex_full "Authors" item.authors|add_links:'person' %} </div> +{% include "ishtar/blocks/sheet_json.html" %} + {% block related %} {% if item.has_related %} <h2>{% trans "Related items" %}</h2> |