diff --git a/lib/classes/eventsmanager/notify/push.php b/lib/classes/eventsmanager/notify/push.php index 39c4b765e5..2bb3fbeb85 100644 --- a/lib/classes/eventsmanager/notify/push.php +++ b/lib/classes/eventsmanager/notify/push.php @@ -39,7 +39,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract $sender = $user->getDisplayName(); $ret = [ - 'text' => $this->app->trans('%user% vous a envoye un %before_link% panier %after_link%', ['%user%' => $sender, '%before_link%' => '', '%after_link%' => '']) , 'class' => ($unread == 1 ? 'reload_baskets' : '') ]; diff --git a/lib/classes/eventsmanager/notify/validationreminder.php b/lib/classes/eventsmanager/notify/validationreminder.php index 66058c38b8..f80bd29d8e 100644 --- a/lib/classes/eventsmanager/notify/validationreminder.php +++ b/lib/classes/eventsmanager/notify/validationreminder.php @@ -53,7 +53,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra $basket_name = $this->app->trans('Une selection'); } - $bask_link = '' . $basket_name . ''; diff --git a/resources/www/prod/js/jquery.p4.preview.js b/resources/www/prod/js/jquery.p4.preview.js index 9276cb0b58..2dd0ae4a37 100644 --- a/resources/www/prod/js/jquery.p4.preview.js +++ b/resources/www/prod/js/jquery.p4.preview.js @@ -34,13 +34,21 @@ function getNewVideoToken(lst, obj) { * @param contId * @param reload */ -function openPreview(env, pos, contId, reload) { - +function openPreview(event, env, pos, contId, reload) { if (contId == undefined) contId = ''; var roll = 0; var justOpen = false; + var options_serial = p4.tot_options; + var query = p4.tot_query; + var navigation = p4.navigation; + var navigationContext = ''; + + // keep relative position for answer train: + var relativePos = pos; + var absolutePos = 0; + if (!p4.preview.open) { showOverlay(); @@ -66,6 +74,15 @@ function openPreview(env, pos, contId, reload) { if (env == 'BASK') roll = 1; + // if comes from story and in workzone + if (env == 'REG') { + navigationContext = 'storyFromResults'; + var $source = $(event); + if( $source.hasClass('CHIM')) { + navigationContext = 'storyFromWorkzone'; + } + } + } if (reload === true) @@ -78,21 +95,14 @@ function openPreview(env, pos, contId, reload) { $('#PREVIEWIMGCONT').empty(); - var options_serial = p4.tot_options; - var query = p4.tot_query; - var navigation = p4.navigation; - - // keep relative position for answer train: - var relativePos = pos; - // update real absolute position with pagination: - var absolutePos = parseInt(navigation.perPage,10) * (parseInt(navigation.page, 10) - 1) + parseInt(pos,10); - - // if comes from story, work with relative positionning - if (env == 'REG') { - // @TODO - if event comes from workzone (basket|story), - // we can use the relative position in order to display the doubleclicked records - // except we can't know the original event in this implementation + if (navigationContext === 'storyFromWorkzone') { + // if event comes from workzone, set to relative position (CHIM == chutier image) + absolutePos = relativePos; + } else if (navigationContext === 'storyFromResults') { absolutePos = 0; + } else { + // update real absolute position with pagination for records: + absolutePos = parseInt(navigation.perPage, 10) * (parseInt(navigation.page, 10) - 1) + parseInt(pos, 10); } prevAjax = $.ajax({ @@ -361,7 +371,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, '', false); + openPreview(false, 'RESULT', posAsk, '', false); } else { if (!$('#PREVIEWCURRENT li.selected').is(':last-child')) @@ -383,7 +393,7 @@ function getPrevious() { // may go to last result posAsk = (posAsk < 0) ? ((parseInt(p4.tot) - 1)) : posAsk; } - openPreview('RESULT', posAsk, '', false); + openPreview(false, 'RESULT', posAsk, '', false); } else { if (!$('#PREVIEWCURRENT li.selected').is(':first-child')) @@ -431,7 +441,7 @@ function setCurrent(current) { var absolutePos = jsopt[1]; var relativePos = parseInt(absolutePos, 10) - parseInt(p4.navigation.perPage, 10) * (parseInt(p4.navigation.page, 10) - 1); // keep relative position for answer train: - openPreview(jsopt[0], relativePos, jsopt[2],false); + openPreview(this, jsopt[0], relativePos, jsopt[2],false); }); }); } diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index a7079fea50..17f59eb435 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -277,7 +277,7 @@ {% import 'common/thumbnail.html.twig' as thumbnail %} -
diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index 8e7acd40af..1a5dbbfdf8 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -3,7 +3,7 @@