diff --git a/templates/web/common/caption_templates/answer.html b/templates/web/common/caption_templates/answer.html
index d182f7dd46..9db6009803 100644
--- a/templates/web/common/caption_templates/answer.html
+++ b/templates/web/common/caption_templates/answer.html
@@ -2,4 +2,4 @@
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
{{name}} : {{value.value|raw}}
{% endfor %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/templates/web/common/databox_field.twig b/templates/web/common/databox_field.twig
deleted file mode 100644
index d30948f912..0000000000
--- a/templates/web/common/databox_field.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-{% set field_name = field.get_name() %}
-
- {{field_name}}
- {% if field.get_type() == 'text' %}
- ({% trans 'Type texte' %})
- {% elseif field.get_type() == 'number' %}
- ({% trans 'Type nombre' %})
- {% elseif field.get_type() == 'date' %}
- ({% trans 'Type date' %})
- {% endif %}
-
-
-
- {% trans 'Source' %} : {{ field.get_tag().getGroupName() }} / {{ field.get_tag().getName() }}
-
-
-{% if field.is_indexable() is empty %}
-
- {% trans 'Ce champ n\'est pas indexe' %}
-
-{% endif %}
-{% if field.is_multi() %}
-
- {% trans 'Ce champ est multivalue' %}
-
-{% endif %}
-{% if field.is_readonly() %}
-
- {% trans 'Ce champ est en lecture seule' %}
-
-{% endif %}
-{% if field.get_tbranch() %}
-
- {% trans 'Ce champ est relie a une branche de thesaurus' %}
-
-{% endif %}
-{% if field.get_thumbtitle() %}
-
- {% trans 'Ce champ est utilise en titre a l\'affichage' %}
-
-{% endif %}
-{% if field.is_required() %}
-
- {% trans 'Ce champ est requis' %}
-
-{% endif %}
-
-{% if field.get_dces_element() %}
-
-
- {% set DublinCoreElementSet = '
DublinCore Element Set' %}
- {% trans %}
- Ce champ est decrit comme element du {{ DublinCoreElementSet }}
- {% endtrans %}
-
-{% endif %}
diff --git a/templates/web/common/databox_field_DCES.twig b/templates/web/common/databox_field_DCES.twig
deleted file mode 100644
index ad1cdd4535..0000000000
--- a/templates/web/common/databox_field_DCES.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{% if field.get_dces_element() %}
-
- {% set element_name = field.get_dces_element().get_label() %}
-
-
- {% trans %}
- Ce champ est decrit comme l'element DublinCore {{element_name}}
- {% endtrans %}
-
-
- {% trans 'Description' %} : {{ field.get_dces_element().get_definition() }}
-
-
- {% set lien = '' ~ field.get_dces_element().get_documentation_link() ~ '' %}
- {% trans %}
- Pour davantage d'informations, consulter le lien suivant {{ lien }}
- {% endtrans %}
-
-
-
-{% endif %}
diff --git a/templates/web/common/databox_field_restrictions.twig b/templates/web/common/databox_field_restrictions.twig
deleted file mode 100644
index 6f25298f14..0000000000
--- a/templates/web/common/databox_field_restrictions.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- {% trans 'Les indications donnees ci dessous sont a titre informatif.' %}
- {% trans 'Si vous ne les respectez pas, les documents seront correctement indexes, mais les metadonnees inscrites risquent d\'etre erronnees' %}
- {% set norm_name = '' ~ field.get_tag().getGroupName() ~ '' %}
- {% trans %}
- Ces informations sont directement fournies par la norme de metadonnees de ce champ : {{ norm_name }}
- {% endtrans %}
-
-
-
-
-
-{% if field.get_tag().getMinLength() > 0 %}
- {% set minLength = field.get_tag().getMinLength() %}
- {% trans %}
- Le champ doit contenir {{ minLength }} caracteres minimum.
- {% endtrans %}
-{% endif %}
-{% if field.get_tag().getMaxLength() > 0 %}
- {% set maxLength = field.get_tag().getMaxLength() %}
- {% trans %}
- Le champ ne peut contenir plus de {{ maxLength }} caracteres.
- {% endtrans %}
-{% endif %}
-
diff --git a/templates/web/common/technical_datas.twig b/templates/web/common/technical_datas.twig
index 90d6c44707..34ad85f733 100644
--- a/templates/web/common/technical_datas.twig
+++ b/templates/web/common/technical_datas.twig
@@ -4,63 +4,37 @@
{% set document = record.get_subdef('document') %}
- {% if document %}
- {% if document.get_width() %}
- {% trans 'Size' %} :
- {{document.get_width()}} x {{document.get_height()}}
- {% endif %}
- {% endif %}
-
-
- {% if record.get_original_name() %}
{% trans 'Nom Original' %} :
{{record.get_original_name() }}
-
- {% endif %}
+
- {% if record.get_mime() %}
- {% trans 'Type Mime' %} :
{{record.get_mime() }}
-
+
+ {% if document and document.get_size() %}
+ - {{document.get_size()|formatoctet}}
{% endif %}
+
- {% if document %}
- {% if document.get_size() %}
- {% trans 'Taille' %} :
- {{document.get_size()|formatoctet}}
-
- {% endif %}
- {% endif %}
-
-
-
- {% if record.get_technical_infos(constant('media_subdef::TC_DATA_SHUTTERSPEED')) is not empty %}
- {% trans 'Shutter speed' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_SHUTTERSPEED')) }} s.
-
- {% endif %}
-
- {% if record.get_technical_infos(constant('media_subdef::TC_DATA_FOCALLENGTH')) is not empty %}
- {% trans 'Focal length' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_FOCALLENGTH')) }} mm
-
- {% endif %}
-
- {% if document %}
+ {% if document and document.get_width() and document.get_height() %}
+ {% trans 'Size' %} :
+ {{document.get_width()}} x {{document.get_height()}} px
+
{% if record.get_type() == 'image' and document.get_width() and document.get_height() %}
- {% trans 'Dimensions a l\'impression' %}
- :
{% set size_w = (document.get_width() * (254/100) / 300) %}
{% set size_h = (document.get_height() * (254/100) / 300) %}
- 300 dpi : {{size_w|round(1)}}x{{size_h|round(1)}} cm
- {% set size_w = (document.get_width() * (254/100) / 72) %}
+ {{ size_w|round(1) }} x {{ size_h|round(1) }} cm (300dpi)
+ {% set size_w = (document.get_width() * (254/100) / 72) %}
{% set size_h = (document.get_height() * (254/100) / 72) %}
- / 72 dpi : {{size_w|round(1)}}x{{size_h|round(1)}} cm
+ {{ size_w|round(1) }} x {{ size_h|round(1) }} cm (72dpi)
{% endif %}
{% endif %}
-
+ {% if record.get_technical_infos(constant('media_subdef::TC_DATA_CAMERAMODEL')) is not empty %}
+ {% trans 'Camera Model' %} :
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_CAMERAMODEL')) }}
+
+ {% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_COLORSPACE')) is not empty %}
{% trans 'Color space' %} :
{{record.get_technical_infos(constant('media_subdef::TC_DATA_COLORSPACE')) }}
@@ -73,12 +47,12 @@
{% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_COLORDEPTH')) is not empty %}
{% trans 'Color Depth' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_COLORDEPTH')) }}
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_COLORDEPTH')) }} bits
{% endif %}
- {% if record.get_technical_infos(constant('media_subdef::TC_DATA_CAMERAMODEL')) is not empty %}
- {% trans 'Camera Model' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_CAMERAMODEL')) }}
+ {% if record.get_technical_infos(constant('media_subdef::TC_DATA_ISO')) is not empty %}
+ {% trans 'ISO sensibility' %} :
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_ISO')) }}
{% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_FLASHFIRED')) is not null %}
@@ -90,36 +64,40 @@
{% endif %}
{% endif %}
+ {% if record.get_technical_infos(constant('media_subdef::TC_DATA_SHUTTERSPEED')) is not empty %}
+ {% trans 'Shutter speed' %} :
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_SHUTTERSPEED')) }} s.
+
+ {% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_APERTURE')) is not empty %}
{% trans 'Aperture' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_APERTURE')) }}
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_APERTURE')) | round(2) }}
{% endif %}
+ {% if record.get_technical_infos(constant('media_subdef::TC_DATA_FOCALLENGTH')) is not empty %}
+ {% trans 'Focal length' %} :
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_FOCALLENGTH')) }} mm
+
+ {% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_HYPERFOCALDISTANCE')) is not empty %}
{% trans 'Hyperfocal distance' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_HYPERFOCALDISTANCE')) }}
-
- {% endif %}
- {% if record.get_technical_infos(constant('media_subdef::TC_DATA_ISO')) is not empty %}
- {% trans 'ISO sensibility' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_ISO')) }}
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_HYPERFOCALDISTANCE')) | round(2) }} mm
{% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_LIGHTVALUE')) is not empty %}
{% trans 'Light Value' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_LIGHTVALUE')) }}
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_LIGHTVALUE')) | round(2) }}
{% endif %}
-
{% if record.get_formated_duration() %}
{% trans 'Duree' %} :
- {{record.get_formated_duration() }}
+ {{record.get_formated_duration() | round(2) }}
{% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_FRAMERATE')) is not empty %}
{% trans 'Images par secondes' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_FRAMERATE')) }} ips
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_FRAMERATE')) | round(2) }} ips
{% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_AUDIOCODEC')) %}
@@ -134,7 +112,7 @@
{% endif %}
{% if record.get_technical_infos(constant('media_subdef::TC_DATA_AUDIOSAMPLERATE')) %}
{% trans 'Frequence d\'echantillonage' %} :
- {{record.get_technical_infos(constant('media_subdef::TC_DATA_AUDIOSAMPLERATE')) }} kHz
+ {{record.get_technical_infos(constant('media_subdef::TC_DATA_AUDIOSAMPLERATE')) | round(2) }} kHz
{% endif %}
diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig
index 9af10f81d3..707b9756bb 100644
--- a/templates/web/prod/Tooltip/Basket.html.twig
+++ b/templates/web/prod/Tooltip/Basket.html.twig
@@ -1,29 +1,33 @@
{% import 'common/thumbnail.html' as thumbnail %}
-
-
-
- {{ basket.getName() }}
-
-
-
- {{ basket.getDescription()|nl2br }}
-
-
- {% set nb_records = basket.getElements()|length %}
- {% set date = basket.getUpdated()|prettyString %}
- {% trans %}
- {{ nb_records }} records
- {% endtrans %}
- - {{ date }}
-
-
- {% for element in basket.getElements() %}
- {% if loop.index <= 9 %}
-
- {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session) }}
-
- {% endif %}
- {% endfor %}
+
+{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+
+{% set title %} {{ basket.getName() }} {% endset %}
+{% set width = 300 %}
+{% set maxwidth = null %}
+
+{% block content %}
+
-
+
+ {% set nb_records = basket.getElements()|length %}
+ {% set date = basket.getUpdated()|prettyString %}
+ {% trans %}
+ {{ nb_records }} records
+ {% endtrans %}
+ - {{ date }}
+
+
+ {% for element in basket.getElements() %}
+ {% if loop.index <= 9 %}
+
+ {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session) }}
+
+ {% endif %}
+ {% endfor %}
+
+
+
+{% endblock %}
diff --git a/templates/web/prod/Tooltip/Caption.html.twig b/templates/web/prod/Tooltip/Caption.html.twig
new file mode 100644
index 0000000000..0f2438fb59
--- /dev/null
+++ b/templates/web/prod/Tooltip/Caption.html.twig
@@ -0,0 +1,9 @@
+{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+
+{% set title %}{% trans 'Caption' %}{% endset %}
+{% set width = 400 %}
+{% set maxwidth = 700 %}
+
+{% block content %}
+ {% include 'common/caption.html' %}
+{% endblock %}
diff --git a/templates/web/prod/Tooltip/DCESFieldInfo.html.twig b/templates/web/prod/Tooltip/DCESFieldInfo.html.twig
new file mode 100644
index 0000000000..5aeb1e5c89
--- /dev/null
+++ b/templates/web/prod/Tooltip/DCESFieldInfo.html.twig
@@ -0,0 +1,27 @@
+{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+
+{% set title %} DC {{ field.get_dces_element().get_label() }} {% endset %}
+{% set width = 600 %}
+{% set maxwidth = null %}
+
+{% block content %}
+ {% if field.get_dces_element() %}
+ {% set element_name = field.get_dces_element().get_label() %}
+
+
+ {% trans %}
+ Ce champ est decrit comme l'element DublinCore {{element_name}}
+ {% endtrans %}
+
+
+ {% trans 'Description' %} : {{ field.get_dces_element().get_definition() }}
+
+
+ {% set lien = '' ~ field.get_dces_element().get_documentation_link() ~ '' %}
+ {% trans %}
+ Pour davantage d'informations, consulter le lien suivant {{ lien }}
+ {% endtrans %}
+
+
+ {% endif %}
+{% endblock %}
diff --git a/templates/web/prod/Tooltip/DataboxField.html.twig b/templates/web/prod/Tooltip/DataboxField.html.twig
new file mode 100644
index 0000000000..6ba5aefa35
--- /dev/null
+++ b/templates/web/prod/Tooltip/DataboxField.html.twig
@@ -0,0 +1,66 @@
+{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+
+{% set title %}
+ {{ field.get_name() }}
+
+ {% if field.get_type() == 'text' %}
+ ({% trans 'Type texte' %})
+ {% elseif field.get_type() == 'number' %}
+ ({% trans 'Type nombre' %})
+ {% elseif field.get_type() == 'date' %}
+ ({% trans 'Type date' %})
+ {% endif %}
+{% endset %}
+{% set width = 300 %}
+{% set maxwidth = null %}
+
+{% block content %}
+
+ {% trans 'Source' %} : {{ field.get_tag().getGroupName() }} / {{ field.get_tag().getName() }}
+
+
+ {% if field.is_indexable() is empty %}
+
+ {% trans 'Ce champ n\'est pas indexe' %}
+
+ {% endif %}
+ {% if field.is_multi() %}
+
+ {% trans 'Ce champ est multivalue' %}
+
+ {% endif %}
+ {% if field.is_readonly() %}
+
+ {% trans 'Ce champ est en lecture seule' %}
+
+ {% endif %}
+ {% if field.get_tbranch() %}
+
+ {% trans 'Ce champ est relie a une branche de thesaurus' %}
+
+ {% endif %}
+ {% if field.get_thumbtitle() %}
+
+ {% trans 'Ce champ est utilise en titre a l\'affichage' %}
+
+ {% endif %}
+ {% if field.is_required() %}
+
+ {% trans 'Ce champ est requis' %}
+
+ {% endif %}
+
+ {% if field.get_dces_element() %}
+
+
+ {% set DublinCoreElementSet = '
DublinCore Element Set' %}
+ {% trans %}
+ Ce champ est decrit comme element du {{ DublinCoreElementSet }}
+ {% endtrans %}
+
+ {% endif %}
+
+{% endblock %}
+
+
+
diff --git a/templates/web/prod/Tooltip/DataboxFieldRestrictions.html.twig b/templates/web/prod/Tooltip/DataboxFieldRestrictions.html.twig
new file mode 100644
index 0000000000..1667791dd2
--- /dev/null
+++ b/templates/web/prod/Tooltip/DataboxFieldRestrictions.html.twig
@@ -0,0 +1,35 @@
+{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+
+{% set title %} {{ field.get_name() }} ({{ field.get_tag().getTagname() }}) {% endset %}
+{% set width = 600 %}
+{% set maxwidth = null %}
+
+{% block content %}
+
+ {% if field.get_tag().getMinLength() > 0 %}
+ {% set minLength = field.get_tag().getMinLength() %}
+ {% trans %}
+ Le champ doit contenir {{ minLength }} caracteres minimum.
+ {% endtrans %}
+ {% endif %}
+ {% if field.get_tag().getMaxLength() > 0 %}
+ {% set maxLength = field.get_tag().getMaxLength() %}
+ {% trans %}
+ Le champ ne peut contenir plus de {{ maxLength }} caracteres.
+ {% endtrans %}
+ {% endif %}
+
+
+
+
+
+ {% trans 'Les indications donnees ci dessous sont a titre informatif.' %}
+ {% trans 'Si vous ne les respectez pas, les documents seront correctement indexes, mais les metadonnees inscrites risquent d\'etre erronnees' %}
+ {% set norm_name = '' ~ field.get_tag().getGroupName() ~ '' %}
+ {% trans %}
+ Ces informations sont directement fournies par la norme de metadonnees de ce champ : {{ norm_name }}
+ {% endtrans %}
+
+
+
+{% endblock %}
diff --git a/templates/web/prod/Tooltip/Preview.html.twig b/templates/web/prod/Tooltip/Preview.html.twig
new file mode 100644
index 0000000000..20a21b25fb
--- /dev/null
+++ b/templates/web/prod/Tooltip/Preview.html.twig
@@ -0,0 +1,9 @@
+{% extends 'prod/Tooltip/Tooltip.html.twig'%}
+
+{% set title %} {{ record.get_title() }} {% endset %}
+{% set width = null %}
+{% set maxwidth = null %}
+
+{% block content %}
+ {% include 'common/preview.html' %}
+{% endblock %}
diff --git a/templates/web/prod/Tooltip/Story.html.twig b/templates/web/prod/Tooltip/Story.html.twig
index 20886a1bf7..bbc90abc2b 100644
--- a/templates/web/prod/Tooltip/Story.html.twig
+++ b/templates/web/prod/Tooltip/Story.html.twig
@@ -1,28 +1,30 @@
{% import 'common/thumbnail.html' as thumbnail %}
-