Migrate from xhtml2odt to pandoc for ODT generation (refs #4178)

3 files changed, 91 insertions, 76 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/window_image.html b/ishtar_common/templates/ishtar/blocks/window_image.html
index aa43e1ca5..ab1013df9 100644
--- a/ishtar_common/templates/ishtar/blocks/window_image.html
+++ b/ishtar_common/templates/ishtar/blocks/window_image.html
@@ -1,81 +1,12 @@
 {% load i18n %}{% if item.images.count %}
+{% if output == "ODT" or output == "PDF"%}
+{% include "ishtar/blocks/window_image_odt.html" %}
+{% else %}
 <div class="lightgallery-captions">
     {% for image in item.images.all %}
     <div id="lightgallery-{{window_id}}-caption-{{forloop.counter0}}">
         <span class="close">&times</span>
-        {% if image.title %}<h3>{{image.title}}</h3>{% endif %}
-        {% if image.description %}<p class="raw-description">
-        {{image.description}}
-        </p>{% endif %}
-        {% if image.licences.count %}
-        <div class="row">
-            <div class="col-2">
-                <strong>{% trans "Licenses" %}</strong>
-            </div>
-            <div class="col-10">
-                {% for license in image.licenses.all %}
-                {% if not forloop.first %} ; {% endif %}{% if license.url %}<a href="{{license.url}}">{% endif %}
-                {{license}}
-                {% if license.url %}</a>{% endif %}
-                {% endfor %}
-            </div>
-        </div>
-        {% endif %}
-        {% if image.authors.count or image.authors_raw %}
-        <div class="row">
-            <div class="col-2">
-                <strong>{% trans "Authors" %}</strong>
-            </div>
-            <div class="col-10">
-                {% for author in image.authors.all %}
-                {% if not forloop.first %} ; {% endif %}{{author}}{% endfor %}
-                {% if image.authors_raw %}
-                {% if image.authors.count %} ; {% endif %}
-                {{image.authors_raw}}
-                {% endif %}
-            </div>
-        </div>
-        {% endif %}
-        {% if image.image_type %}
-        <div class="row">
-            <div class="col-2">
-                <strong>{% trans "Type" %}</strong>
-            </div>
-            <div class="col-10">
-                {{image.image_type}}
-            </div>
-        </div>
-        {% endif %}
-        {% if image.reference %}
-        <div class="row">
-            <div class="col-2">
-                <strong>{% trans "Ref." %}</strong>
-            </div>
-            <div class="col-10">
-                {{image.reference}}
-            </div>
-        </div>
-        {% endif %}
-        {% if image.internal_reference %}
-        <div class="row">
-            <div class="col-2">
-                <strong>{% trans "Internal ref." %}</strong>
-            </div>
-            <div class="col-10">
-                {{image.internal_reference}}
-            </div>
-        </div>
-        {% endif %}
-        {% if image.creation_date %}
-        <div class="row">
-            <div class="col-2">
-                <strong>{% trans "Creation date" %}</strong>
-            </div>
-            <div class="col-10">
-                {{image.creation_date}}
-            </div>
-        </div>
-        {% endif %}
+        {% include "ishtar/blocks/window_image_detail.html" %}
         <a href="{% url 'edit-document' image.pk %}">
             {% trans "Modify" %} &nbsp;<i class="fa fa-pencil"></i>
         </a>
@@ -84,10 +15,11 @@
 </div>
 <div id="lightgallery-{{window_id}}">
     {% for image in item.images.all %}
-    {% if output != "ODT" %}<a data-sub-html="#lightgallery-{{window_id}}-caption-{{forloop.counter0}}" href="{{image.image.url}}"{% if not forloop.first %}
-               class="lightgallery-subimage"{% endif %}>{% endif %}
+    <a data-sub-html="#lightgallery-{{window_id}}-caption-{{forloop.counter0}}" href="{{image.image.url}}"{% if not forloop.first %}
+               class="lightgallery-subimage"{% endif %}>
         <img{% if forloop.first %} class='card-img-top'{% endif %} src="{{BASE_URL}}{{image.thumbnail.url}}">
-    {% if output != "ODT" %}</a>{% endif %}
+    </a>
     {% endfor %}
 </div>
 {% endif%}
+{% endif%}
diff --git a/ishtar_common/templates/ishtar/blocks/window_image_detail.html b/ishtar_common/templates/ishtar/blocks/window_image_detail.html
new file mode 100644
index 000000000..c64d72ac2
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/window_image_detail.html
@@ -0,0 +1,74 @@
+{% load i18n %}
+        {% if image.title %}<h3>{{image.title}}</h3>{% endif %}
+        {% if image.description %}<p class="raw-description">
+        {{image.description}}
+        </p>{% endif %}
+        {% if image.licences.count %}
+        <div class="row">
+            <div class="col-2">
+                <strong>{% trans "Licenses" %}</strong>
+            </div>
+            <div class="col-10">
+                {% for license in image.licenses.all %}
+                {% if not forloop.first %} ; {% endif %}{% if license.url %}<a href="{{license.url}}">{% endif %}
+                {{license}}
+                {% if license.url %}</a>{% endif %}
+                {% endfor %}
+            </div>
+        </div>
+        {% endif %}
+        {% if image.authors.count or image.authors_raw %}
+        <div class="row">
+            <div class="col-2">
+                <strong>{% trans "Authors" %}</strong>
+            </div>
+            <div class="col-10">
+                {% for author in image.authors.all %}
+                {% if not forloop.first %} ; {% endif %}{{author}}{% endfor %}
+                {% if image.authors_raw %}
+                {% if image.authors.count %} ; {% endif %}
+                {{image.authors_raw}}
+                {% endif %}
+            </div>
+        </div>
+        {% endif %}
+        {% if image.image_type %}
+        <div class="row">
+            <div class="col-2">
+                <strong>{% trans "Type" %}</strong>
+            </div>
+            <div class="col-10">
+                {{image.image_type}}
+            </div>
+        </div>
+        {% endif %}
+        {% if image.reference %}
+        <div class="row">
+            <div class="col-2">
+                <strong>{% trans "Ref." %}</strong>
+            </div>
+            <div class="col-10">
+                {{image.reference}}
+            </div>
+        </div>
+        {% endif %}
+        {% if image.internal_reference %}
+        <div class="row">
+            <div class="col-2">
+                <strong>{% trans "Internal ref." %}</strong>
+            </div>
+            <div class="col-10">
+                {{image.internal_reference}}
+            </div>
+        </div>
+        {% endif %}
+        {% if image.creation_date %}
+        <div class="row">
+            <div class="col-2">
+                <strong>{% trans "Creation date" %}</strong>
+            </div>
+            <div class="col-10">
+                {{image.creation_date}}
+            </div>
+        </div>
+        {% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/window_image_odt.html b/ishtar_common/templates/ishtar/blocks/window_image_odt.html
new file mode 100644
index 000000000..9c9383cdd
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/window_image_odt.html
@@ -0,0 +1,9 @@
+{% load i18n %}
+<div class="lightgallery-captions">
+    {% for image in item.images.all %}
+    <div id="lightgallery-{{window_id}}-caption-{{forloop.counter0}}">
+        <img src="{{BASE_URL}}{{image.thumbnail.url}}">
+        {% include "ishtar/blocks/window_image_detail.html" %}
+    </div>
+    {% endfor %}
+</div>