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

PHRAS-768 #time 5m

Browse Source 
report de PHRAS-344 (story / preview / train : bounce)
This commit is contained in:
Jean-Yves Gaulier
2015-10-15 15:22:44 +02:00
parent cb98ac8216
commit 8bced4b4ad
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/prod/preview/appears_in.html.twig
View File

@@ -3,7 +3,7 @@
<ul>
<li class="title">{{ 'Apparait aussi dans ces reportages' | trans }}</li>
{% for par in parents %}
<li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}'); return(false);"
<li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}', true); return(false);"
class="otherRegToolTip" {% if app['conf'].get(['registry', 'classic', 'stories-preview']) %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : par.get_sbas_id(), 'record_id' : par.get_record_id(), 'context' : 'basket' }) }}" {% endif %}>
<img src="{{par.get_thumbnail().get_url()}}" style="width:25px;height:25px;"/>
<span class="title" title="{{ par.get_title() }}"> {{ par.get_title() }} </span>

20
www/include/jquery.p4.preview.js
View File

@@ -154,7 +154,9 @@ function openPreview(env, pos, contId, reload) {
setPreview();
if (env != 'RESULT') {
setCurrent(data.current);
if (justOpen || reload) {
setCurrent(data.current);
}
viewCurrent($('#PREVIEWCURRENT li.selected'));
}
else {
@@ -333,7 +335,7 @@ function getNext() {
if (p4.preview.mode == 'RESULT') {
posAsk = parseInt(p4.preview.current.pos) + 1;
posAsk = (posAsk > parseInt(p4.tot) || isNaN(posAsk)) ? 0 : posAsk;
openPreview('RESULT', posAsk);
openPreview('RESULT', posAsk, '', false);
}
else {
if (!$('#PREVIEWCURRENT li.selected').is(':last-child'))
@@ -352,7 +354,7 @@ function getPrevious() {
if (p4.preview.mode == 'RESULT') {
posAsk = parseInt(p4.preview.current.pos) - 1;
posAsk = (posAsk < 0) ? ((parseInt(p4.tot) - 1)) : posAsk;
openPreview('RESULT', posAsk);
openPreview('RESULT', posAsk, '', false);
}
else {
if (!$('#PREVIEWCURRENT li.selected').is(':first-child'))
@@ -396,7 +398,7 @@ function setCurrent(current) {
$(el).removeClass('openPreview');
$(el).bind('click', function () {
viewCurrent($(this).parent());
openPreview(jsopt[0], jsopt[1], jsopt[2]);
openPreview(jsopt[0], jsopt[1], jsopt[2],false);
});
});
}
@@ -479,16 +481,6 @@ function classicMode() {
p4.currentViewMode = 'classic';
}
function doudouMode() {
$('#PREVIEWCURRENT li').removeClass('see-all');
$('#PREVIEWCURRENT ul').width('auto');
$('#PREVIEWCURRENTCONT').css({
'overflow-x': 'hidden'
});
p4.currentViewMode = 'enhance';
viewCurrent($('#PREVIEWCURRENT li.selected'));
}
function closePreview() {
p4.preview.open = false;
hideOverlay();