diff options
3 files changed, 80 insertions, 3 deletions
diff --git a/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html b/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html index 1ccff7326..a127648c3 100644 --- a/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html +++ b/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html @@ -1,4 +1,5 @@ -{% load i18n window_field %} +{% load i18n l10n window_field %} +{% with window_id|add:"-statement-"|add:statement_condition.pk_str as document_window_id %} <div class="p-2{% if even %} odd{% endif %}"> <div class="row"> <div class="offset-md-2 col-md-8"> @@ -6,7 +7,7 @@ {{statement_condition.statement_condition_type.full_label}} - {{statement_condition.date|date:"SHORT_DATE_FORMAT"}} ({{statement_condition.applied_label|lower}}) </h4> </div> - {% if can_change and statement_condition.last %} + {% if PROFILE.statement_condition and can_change %} <div class="col-md-2 text-right"> <div class="btn-group btn-group-sm" role="group" aria-label="Actions"> {% if statement_condition.applied == "D" %} @@ -14,7 +15,7 @@ <i class="fa fa-pencil"></i> </a> {% endif %} - <a class="wait-button btn btn-success" href="/document/create/?find=41468" title="Ajouter un document / une image"> + <a class="wait-button btn btn-success" href="/document/create/?statementcondition={{statement_condition.pk}}" title="Ajouter un document / une image"> <i class="fa fa-plus"></i> doc./image </a> {% if statement_condition.applied == "D" %} @@ -27,6 +28,15 @@ {% endif %} </div> + {% if statement_condition.images.count %} + <div class="clearfix"> + <div class="card float-left col-12 col-md-6 col-lg-4"> + {% with document_image=statement_condition %} + {% include "ishtar/blocks/alt_window_image.html" %} + {% endwith %} + </div> + {% endif %} + <div class="row"> {% field_flex _("Verification officer") statement_condition.verification_officer %} {% field_flex _("Campaign/observation number") statement_condition.campaign_number %} @@ -45,5 +55,23 @@ {% endfor %} </div> {% endif %} + {% if statement_condition.images.count %} + </div> + {% endif %} </div> +{% if statement_condition.images.count %} +<script type="text/javascript">{% localize off %} +jQuery(document).ready(function(){ + var lg = document.getElementById('lightgallery-{{document_window_id}}'); + lg.addEventListener('onAfterAppendSubHtml', function(e){ + $(".lg-sub-html").show(); + $(".lg-sub-html .close").click(function(){ + $(".lg-sub-html").hide(); + }); + }, false); + lightGallery(lg); +}); +{% endlocalize %}</script> +{% endif%} +{% endwith %} diff --git a/ishtar_common/templates/ishtar/blocks/alt_window_image.html b/ishtar_common/templates/ishtar/blocks/alt_window_image.html new file mode 100644 index 000000000..bd1565fa4 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/alt_window_image.html @@ -0,0 +1,48 @@ +{% load i18n ishtar_helpers link_to_window %}{% if document_image.images_number %} +{% if output == "ODT" or output == "PDF"%} +{% else %} +{% with can_edit_document=permission_change_own_document|or_:permission_change_document %} +{% trans "Sheet" as sheet_lbl %} +<div class="lightgallery-captions"> + {% if document_image.main_image and document_image.main_image.image %}{% with image=document_image.main_image %} + <div id="lightgallery-{{document_window_id}}-caption-0"> + <span class="close">×</span> + {% include "ishtar/blocks/window_image_detail.html" %} + {{image|simple_link_to_window:sheet_lbl}} + {% if can_edit_document %} + <a href="{% url 'edit-document' image.pk %}" class="display_details"> + <i class="fa fa-pencil"></i> <small>{% trans "Modify" %}</small> + </a> + {% endif %} + </div> + {% endwith %}{% endif %} + {% for image in document_image.images_without_main_image.all %}{% if image.image %} + <div id="lightgallery-{{document_window_id}}-caption-{{forloop.counter}}"> + <span class="close">×</span> + {% include "ishtar/blocks/window_image_detail.html" %} + {{image|simple_link_to_window:sheet_lbl}} + {% if can_edit_document %} + <a href="{% url 'edit-document' image.pk %}" class="display_details"> + <i class="fa fa-pencil"></i> <small>{% trans "Modify" %}</small> + </a> + {% endif %} + </div> + {% endif %}{% endfor %} +</div> +<div id="lightgallery-{{document_window_id}}"> + {% if document_image.main_image and document_image.main_image.image and document_image.main_image.thumbnail %}{% with image=document_image.main_image %} + <a data-sub-html="#lightgallery-{{document_window_id}}-caption-0" + href="{{image.image.url}}" class="window-main-image"> + <img class='card-img-top' src="{{image.thumbnail.url}}"> + </a> + {% endwith %}{% endif %} + {% for image in document_image.images_without_main_image.all %}{% if image.image and image.thumbnail %} + <a data-sub-html="#lightgallery-{{document_window_id}}-caption-{{forloop.counter}}" + href="{{image.image.url}}" class="lightgallery-subimage"> + <img src="{{image.thumbnail.url}}"> + </a> + {% endif %}{% endfor %} +</div> +{% endwith %} +{% endif%} +{% endif%} diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index d2fa2d2ef..96ea4ed40 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -127,6 +127,7 @@ {% field_flex_full _("Finds") item.finds|add_links %} {% field_flex_full _("Treatments") item.treatments|add_links %} {% field_flex_full _("Exhibitions") item.exhibitions|add_links %} +{% field_flex_full _("Statement conditions") item.statement_conditions|add_links %} {% field_flex_full _("Treatment files") item.treatment_files|add_links %} {% field_flex_full _("Warehouses") item.warehouses|add_links %} {% field_flex_full _("Containers") item.containers|add_links %} |