hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	templates/web/client/baskets.html.twig
	templates/web/client/index.html.twig
	templates/web/prod/preview/basket_train.html.twig
	templates/web/prod/preview/feed_train.html.twig
	templates/web/prod/preview/reg_train.html.twig
This commit is contained in:
Romain Neutron
2014-02-05 18:35:44 +01:00
parent 3b9b5a3240 dc3963e264
commit 280e8b6178
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/client/baskets.html.twig
View File

@@ -94,14 +94,14 @@
{% set tooltip = '' %} {% set tooltip = '' %}
{% if app['conf'].get(['registry', 'classic', 'basket-rollover']) %} {% if app['conf'].get(['registry', 'classic', 'basket-rollover']) %}
{% 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 %} {% endif %}
<div class="diapochu"> <div class="diapochu">
<div class="image"> <div class="image">
<img <img
onclick="openPreview('BASK',{{ record.get_number() }}, {{ selected_basket.getId() }}); return(false);" onclick="openPreview('BASK',{{ record.get_number() }}, {{ selected_basket.getId() }}); return(false);"
{{ tooltip }} {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %}
style="position:relative; top:{{ top }}px; {{ dim }}" style="position:relative; top:{{ top }}px; {{ dim }}"
class="{{ thumbnail.get_height() > 42 ? 'hThumbnail' : 'vThumbnail' }} baskTips" class="{{ thumbnail.get_height() > 42 ? 'hThumbnail' : 'vThumbnail' }} baskTips"
src="{{ thumbnail.get_url() }}" src="{{ thumbnail.get_url() }}"

2
templates/web/client/index.html.twig
View File

@@ -202,7 +202,7 @@
<tr> <tr>
<td style="width:50%" nowrap> <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 }}"/> <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']] }}" for="statusfil_{{ sbasId }}_off{{ bit }}">{% if data['img_off'] %}<img src="'{{ data['img_off'] }}" title="{{ data['labels_off_i18n'][app['locale']] }}" style="width:16px;height:16px;vertical-align:bottom" />{% endif %}{{ data['labels_off_i18n'][app['locale']] }}</label> <label title="{{ data['labels_off_i18n'][app['locale']] }}" for="statusfil_{{ sbasId }}_off{{ bit }}">{% if data['img_off'] %}<img src="{{ data['img_off'] }}" title="{{ data['labels_off_i18n'][app['locale']] }}" style="width:16px;height:16px;vertical-align:bottom" />{% endif %}{{ data['labels_off_i18n'][app['locale']] }}</label>
</td> </td>
<td style="width:50%" nowrap> <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 }}"/> <input class="checkbox" db="{{ sbasId }}" onchange="checkFilters();" type="checkbox" name="status[]" id="statusfil_{{ sbasId }}_on{{ sbasId }}" value="{{ sbasId }}_on{{ sbasId }}"/>

4
templates/web/prod/preview/basket_train.html.twig
View File

@@ -18,7 +18,7 @@
{% set tooltip = '' %} {% set tooltip = '' %}
{% if app['conf'].get(['registry', 'classic', 'stories-preview']) %} {% if app['conf'].get(['registry', 'classic', 'stories-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 %} {% endif %}
{% set class = '' %} {% set class = '' %}
@@ -27,7 +27,7 @@
{% endif %} {% endif %}
<li class="{{class}} prevTrainCurrent"> <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()}}" class="openPreview prevRegToolTip" return(false);" src="{{thumbnail.get_url()}}"
style="{{style}}margin:7px;position:relative;"/></li> style="{{style}}margin:7px;position:relative;"/></li>
{% endfor %} {% endfor %}

4
templates/web/prod/preview/feed_train.html.twig
View File

@@ -18,7 +18,7 @@
{% set tooltip = '' %} {% set tooltip = '' %}
{% if app['conf'].get(['registry', 'classic', 'stories-preview']) %} {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}
{% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_preview', { 'sbas_id' : child.getRecord(app).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 %} {% endif %}
{% set class = '' %} {% set class = '' %}
@@ -27,7 +27,7 @@
{% endif %} {% endif %}
<li class="{{class}} prevTrainCurrent"> <li class="{{class}} prevTrainCurrent">
<img {{tooltip|raw}} jsargs="FEED|{{child.get_ord()}}|{{record.get_container().getId()}}" <img {% if tooltip %}tooltipsrc="{{ tooltip }}"{% endif %} jsargs="FEED|{{child.get_ord()}}|{{record.get_container().getId()}}"
class="openPreview prevRegToolTip" return(false);" src="{{thumbnail.get_url()}}" class="openPreview prevRegToolTip" return(false);" src="{{thumbnail.get_url()}}"
style="{{style}}margin:7px;position:relative;"/></li> style="{{style}}margin:7px;position:relative;"/></li>
{% endfor %} {% endfor %}

4
templates/web/prod/preview/reg_train.html.twig
View File

@@ -37,7 +37,7 @@
{% set tooltip = '' %} {% set tooltip = '' %}
{% if app['conf'].get(['registry', 'classic', 'stories-preview']) %} {% if app['conf'].get(['registry', 'classic', 'stories-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 %} {% endif %}
{% set class = '' %} {% set class = '' %}
@@ -46,7 +46,7 @@
{% endif %} {% endif %}
<li class="{{class}} prevTrainCurrent" style=""> <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()}}" class="openPreview prevRegToolTip" src="{{thumbnail.get_url()}}"
style="{{style}}margin:7px;position:relative;"/></li> style="{{style}}margin:7px;position:relative;"/></li>
{% endfor %} {% endfor %}