# HG changeset patch # User Riwad Salim # Date 1530705755 -7200 # Node ID 2f8800dc2c0df4216eb4f5eaaec1b9b9f5b2496f # Parent 5717dd87f67af64e6d47b90b35f5a8b18fa44597 Adapting access on collections images links in templates diff -r 5717dd87f67a -r 2f8800dc2c0d src/iconolab_episteme/templates/iconolab/metadatas/detail_image_metadatas.html --- 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 %}
{% if item.metadatas.metadata_obj.image.title %}
Titre
{{item.metadatas.metadata_obj.image.title}}

{% endif %} @@ -7,9 +6,13 @@ {% if item.metadatas.metadata_obj.image.id %}
Identification
{{item.metadatas.metadata_obj.image.id}}
{% 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 %}

- - Cet objet dans la base d'images de l'ESO + + {{item_link_text}}

{% endif %} +{% endwith %} +{% endif %} diff -r 5717dd87f67a -r 2f8800dc2c0d src/iconolab_episteme/templates/iconolab/metadatas/detail_item_metadatas.html --- 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 %}

Titre : {{item.metadatas.metadata_obj.image.title}}

{% endif %} {% if item.metadatas.metadata_obj.image.description_html %}

Description :

{{item.metadatas.metadata_obj.image.description_html|safe}}
{% endif %} {% if item.metadatas.metadata_obj.image.credit %}
Crédits : {{item.metadatas.metadata_obj.image.credit}}
{% endif %} {% if item.metadatas.metadata_obj.image.id %}
Identification : {{item.metadatas.metadata_obj.image.id}}
{% endif %} -{% if item.metadatas.metadata_obj.image.id %}
Cet objet dans la base d'images de l'ESO
{% 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 %} +
{{item_link_text}}
+{% endif %} +{% endwith %} +{% endif %}
diff -r 5717dd87f67a -r 2f8800dc2c0d src/iconolab_episteme/templatetags/iconolab_episteme_tags.py --- 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__