Adapting access on collections images links in templates
authorRiwad Salim
Wed, 04 Jul 2018 14:02:35 +0200
changeset 17 2f8800dc2c0d
parent 16 5717dd87f67a
child 18 e3f96cf6b484
Adapting access on collections images links in templates
src/iconolab_episteme/templates/iconolab/metadatas/detail_image_metadatas.html
src/iconolab_episteme/templates/iconolab/metadatas/detail_item_metadatas.html
src/iconolab_episteme/templatetags/iconolab_episteme_tags.py
--- a/src/iconolab_episteme/templates/iconolab/metadatas/detail_image_metadatas.html	Tue Jul 03 18:11:59 2018 +0200
+++ b/src/iconolab_episteme/templates/iconolab/metadatas/detail_image_metadatas.html	Wed Jul 04 14:02:35 2018 +0200
@@ -1,4 +1,3 @@
-{% load iconolab_episteme_tags %}
 
 <dl class="dl-horizontal">
   {% if item.metadatas.metadata_obj.image.title %}<dt>Titre</dt><dd>{{item.metadatas.metadata_obj.image.title}}</dd><br>{% endif %}
@@ -7,9 +6,13 @@
   {% if item.metadatas.metadata_obj.image.id %}<dt>Identification</dt><dd>{{item.metadatas.metadata_obj.image.id}}</dd>{% endif %}
 </dl>
 {% if item.metadatas.metadata_obj.image.id %}
+{% with item_link_url=item.get_item_link_url item_link_text=item.get_item_link_text %}
+{% if item_link_url and item_link_text %}
 <p class="text-center">
-  <a href= "{% eso_link item.metadatas %}" target="_blank">
-  Cet objet dans la base d'images de l'ESO
+  <a href= "{{item_link_url}}" target="_blank">
+  {{item_link_text}}
   </a>
 </p>
 {% endif %}
+{% endwith %}
+{% endif %}
--- a/src/iconolab_episteme/templates/iconolab/metadatas/detail_item_metadatas.html	Tue Jul 03 18:11:59 2018 +0200
+++ b/src/iconolab_episteme/templates/iconolab/metadatas/detail_item_metadatas.html	Wed Jul 04 14:02:35 2018 +0200
@@ -1,8 +1,13 @@
-{% load iconolab_episteme_tags %}
 
 {% if item.metadatas.metadata_obj.image.title %}<h3>Titre : <small>{{item.metadatas.metadata_obj.image.title}}</small></h3>{% endif %}
 {% if item.metadatas.metadata_obj.image.description_html %}<div><h4 style='float:left'>Description :</h4> <div class='text-muted' style='display:inline-block'>{{item.metadatas.metadata_obj.image.description_html|safe}}</div></div>{% endif %}
 {% if item.metadatas.metadata_obj.image.credit %}<h5>Crédits : <small>{{item.metadatas.metadata_obj.image.credit}}</small></h5>{% endif %}
 {% if item.metadatas.metadata_obj.image.id %}<h5>Identification : <small>{{item.metadatas.metadata_obj.image.id}}</small></h5>{% endif %} 
-{% if item.metadatas.metadata_obj.image.id %}<h5><a href="{% eso_link item.metadatas %}" target="_blank">Cet objet dans la base d'images de l'ESO</a></h5>{% endif %}
+{% if item.metadatas.metadata_obj.image.id %}
+{% with item_link_url=item.get_item_link_url item_link_text=item.get_item_link_text %}
+{% if item_link_url and item_link_text %}
+<h5><a href="{{item_link_url}}" target="_blank">{{item_link_text}}</a></h5>
+{% endif %}
+{% endwith %}
+{% endif %}
 <br>
--- a/src/iconolab_episteme/templatetags/iconolab_episteme_tags.py	Tue Jul 03 18:11:59 2018 +0200
+++ b/src/iconolab_episteme/templatetags/iconolab_episteme_tags.py	Wed Jul 04 14:02:35 2018 +0200
@@ -1,16 +1,10 @@
 from django.template import Library
-from django.conf import settings
-from iconolab.models import (Collection, ItemMetadata)
 
 from iconolab_episteme import __version__
 
 register = Library()
 
 @register.simple_tag
-def eso_link(item_metadata):
-    return settings.ESO_NOTICE_BASE_URL + item_metadata.raw_natural_key
-
-@register.simple_tag
 def episteme_version():
     return __version__