Graph generation: manage link - display raw SVG - scale SVG - manage reopening in a specific tab

2 files changed, 16 insertions, 2 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/sheet_relation_image.html b/ishtar_common/templates/ishtar/blocks/sheet_relation_image.html
index 552dc5adc..f636f0b50 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_relation_image.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_relation_image.html
@@ -1,9 +1,17 @@
-{% load i18n %}{% if relation_image %}
+{% load i18n ishtar_helpers %}{% if relation_image %}
+<div class="svg-image">
+{{relation_image|file_content|safe}}
+</div>
+{% comment %}
+<object class="svg-image" data="{{relation_image.url}}"  class="img-fluid img-thumbnail" type="image/svg+xml"> 
+    <img src="{{relation_image.url}}" class="img-fluid img-thumbnail">
+</object>
 <div id="lightgallery-{{window_id}}-relation-image{{type}}" class="text-center">
     {% if output != "ODT" %}<a href="{{relation_image.url}}">{% endif %}
     <img src="{{relation_image.url}}" class="img-fluid img-thumbnail">
     {% if output != "ODT" %}</a>{% endif %}
 </div>
+{% endcomment %}
 {% endif %}
 
 {% if DOT_GENERATION and output != "ODT" and output != "PDF" %}
diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index 6b9c97948..0dda760b8 100644
--- a/ishtar_common/templates/ishtar/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
@@ -73,7 +73,7 @@
       {% block toolbar %}{% endblock %}
       {% endif %}
       <div class="card-body">
-        {% if output != "ODT" and output != "PDF"%}
+        {% if output != "ODT" and output != "PDF" %}
         {% block head_sheet %}
         <script type="text/javascript">
         var last_window='{{window_id}}';
@@ -108,6 +108,12 @@
             {% if item.relation_image %}
             lightGallery(document.getElementById('lightgallery-{{window_id}}-relation-image'));
             {% endif%}
+
+            var hash = window.location.hash.substr(1);
+            if (hash){
+              $('#{{window_id}}-tabs a[href="#{{window_id}}-' + hash + '"]').tab('show');
+            }
+
         });
         </script>
         {% endblock %}