From 43a51a3f450fc7a4d975571a9f272c20f382a740 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Wed, 5 Feb 2014 14:21:07 +0100
Subject: [PATCH 1/2] Fix client template

---
 templates/web/client/index.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/client/index.html.twig b/templates/web/client/index.html.twig
index dfa0ca581d..5a1db83769 100644
--- a/templates/web/client/index.html.twig
+++ b/templates/web/client/index.html.twig
@@ -202,7 +202,7 @@
                                                                                         <tr>
                                                                                             <td style="width:50%" nowrap>
                                                                                                 <input class="checkbox" db="{{ sbasId }}" onchange="checkFilters();" type="checkbox" name="status[]" id="statusfil_{{ sbasId }}_off{{ sbasId }}" value="{{ sbasId }}_of{{ sbasId }}"/>
-                                                                                                <label title="{{ data['labels_off_i18n'][app['locale.I18n']] }}" for="statusfil_{{ sbasId }}_off{{ bit }}">{% if data['img_off'] %}<img src="'{{ data['img_off'] }}" title="{{ data['labels_off_i18n'][app['locale.I18n']] }}" style="width:16px;height:16px;vertical-align:bottom" />{% endif %}{{ data['labels_off_i18n'][app['locale.I18n']] }}</label>
+                                                                                                <label title="{{ data['labels_off_i18n'][app['locale.I18n']] }}" for="statusfil_{{ sbasId }}_off{{ bit }}">{% if data['img_off'] %}<img src="{{ data['img_off'] }}" title="{{ data['labels_off_i18n'][app['locale.I18n']] }}" style="width:16px;height:16px;vertical-align:bottom" />{% endif %}{{ data['labels_off_i18n'][app['locale.I18n']] }}</label>
                                                                                             </td>
                                                                                             <td style="width:50%" nowrap>
                                                                                                 <input class="checkbox" db="{{ sbasId }}" onchange="checkFilters();" type="checkbox" name="status[]" id="statusfil_{{ sbasId }}_on{{ sbasId }}" value="{{ sbasId }}_on{{ sbasId }}"/>

From 6ce351b5c5bb61f9122c61a79a72910e0c3ca896 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Wed, 5 Feb 2014 14:50:27 +0100
Subject: [PATCH 2/2] Fix client template : tooltip source is escaped

---
 templates/web/client/baskets.html.twig            | 4 ++--
 templates/web/prod/preview/basket_train.html.twig | 4 ++--
 templates/web/prod/preview/feed_train.html.twig   | 4 ++--
 templates/web/prod/preview/reg_train.html.twig    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/web/client/baskets.html.twig b/templates/web/client/baskets.html.twig
index 485cce10dd..07de81bd55 100644
--- a/templates/web/client/baskets.html.twig
+++ b/templates/web/client/baskets.html.twig
@@ -98,14 +98,14 @@
 
             {% set tooltip = '' %}
             {% if app['phraseanet.registry'].get('GV_rollover_chu') %}
-                {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.get_number() }) ~ '"' %}
+                {% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.get_number() }) %}
             {% endif %}
 
             <div class="diapochu">
                 <div class="image">
                     <img
                         onclick="openPreview('BASK',{{ record.get_number() }}, {{ selected_basket.getId() }}); return(false);"
-                        {{ tooltip }}
+                        {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %}
                         style="position:relative; top:{{ top }}px; {{ dim }}"
                         class="{{ thumbnail.get_height() > 42 ? 'hThumbnail' : 'vThumbnail' }} baskTips"
                         src="{{ thumbnail.get_url() }}"
diff --git a/templates/web/prod/preview/basket_train.html.twig b/templates/web/prod/preview/basket_train.html.twig
index 410e42ba34..c7c8ab8c97 100644
--- a/templates/web/prod/preview/basket_train.html.twig
+++ b/templates/web/prod/preview/basket_train.html.twig
@@ -18,7 +18,7 @@
 
       {% set tooltip = '' %}
       {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}
-        {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_caption', { 'sbas_id' : child.getRecord(app).get_sbas_id(), 'record_id' : child.getRecord(app).get_record_id(), 'context' : 'basket' }) ~ '"' %}
+        {% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : child.getRecord(app).get_sbas_id(), 'record_id' : child.getRecord(app).get_record_id(), 'context' : 'basket' }) %}
       {% endif %}
 
       {% set class = '' %}
@@ -27,7 +27,7 @@
       {% endif %}
 
       <li class="{{class}} prevTrainCurrent">
-        <img {{tooltip|raw}} jsargs="BASK|{{child.getOrd()}}|{{record.get_container().getId()}}"
+        <img {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %} jsargs="BASK|{{child.getOrd()}}|{{record.get_container().getId()}}"
           class="openPreview prevRegToolTip" return(false);" src="{{thumbnail.get_url()}}"
             style="{{style}}margin:7px;position:relative;"/></li>
     {% endfor %}
diff --git a/templates/web/prod/preview/feed_train.html.twig b/templates/web/prod/preview/feed_train.html.twig
index a91a2ce064..e99c2740f6 100644
--- a/templates/web/prod/preview/feed_train.html.twig
+++ b/templates/web/prod/preview/feed_train.html.twig
@@ -18,7 +18,7 @@
 
       {% set tooltip = '' %}
       {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}
-        {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_preview', { 'sbas_id' : child.get_record().get_sbas_id(), 'record_id' : child.get_record().get_record_id() }) ~ '"' %}
+        {% set tooltip = path('prod_tooltip_preview', { 'sbas_id' : child.get_record().get_sbas_id(), 'record_id' : child.get_record().get_record_id() }) %}
       {% endif %}
 
       {% set class = '' %}
@@ -27,7 +27,7 @@
       {% endif %}
 
       <li class="{{class}} prevTrainCurrent">
-        <img {{tooltip|raw}} jsargs="FEED|{{child.get_ord()}}|{{record.get_container().get_id()}}"
+        <img {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %} jsargs="FEED|{{child.get_ord()}}|{{record.get_container().get_id()}}"
           class="openPreview prevRegToolTip" return(false);" src="{{thumbnail.get_url()}}"
             style="{{style}}margin:7px;position:relative;"/></li>
     {% endfor %}
diff --git a/templates/web/prod/preview/reg_train.html.twig b/templates/web/prod/preview/reg_train.html.twig
index 666f0ee481..bf766d3166 100644
--- a/templates/web/prod/preview/reg_train.html.twig
+++ b/templates/web/prod/preview/reg_train.html.twig
@@ -37,7 +37,7 @@
 
       {% set tooltip = '' %}
       {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}
-        {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_caption', { 'sbas_id' : contained.get_sbas_id(), 'record_id' : contained.get_record_id(), 'context' : 'preview', 'number' : contained.get_number() }) ~ '"' %}
+        {% set tooltip = path('prod_tooltip_caption', { 'sbas_id' : contained.get_sbas_id(), 'record_id' : contained.get_record_id(), 'context' : 'preview', 'number' : contained.get_number() }) %}
       {% endif %}
 
       {% set class = '' %}
@@ -46,7 +46,7 @@
       {% endif %}
 
       <li class="{{class}} prevTrainCurrent" style="">
-        <img {{tooltip}} jsargs="REG|{{loop.index}}|{{regroupement.get_serialize_key}}"
+        <img {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %} jsargs="REG|{{loop.index}}|{{regroupement.get_serialize_key}}"
           class="openPreview prevRegToolTip" src="{{thumbnail.get_url()}}"
           style="{{style}}margin:7px;position:relative;"/></li>
     {% endfor %}