diff --git a/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml b/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml index fb80ae1d1db1385328ff5e3941b9b73935a1075d..14c74a9b7aa9cef51d573a72a8106eb63c00f1ce 100644 --- a/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml +++ b/application/modules/opac/views/scripts/recherche/resultatRecherche.phtml @@ -34,31 +34,32 @@ if ($this->is_pertinence) { <span> <?php echo $this->tagAnchor($this->url($this->criteres_recherche->getUrlRetourRechercheInitiale(), null, true), - sprintf('» %s', - $this->_('Retour à la recherche initiale')));?> + $this->_('Retour à la recherche initiale'));?> </span> <span> <?php echo $this->tagAnchor($this->url($this->criteres_recherche->getUrlNouvelleRecherche(), null, true), - '» '.$this->_('Nouvelle recherche')); ?> + $this->_('Nouvelle recherche')); ?> </span> - <span> - <?php if ((int)$preferences['suggestion_achat'] == 1) - echo $this->tagAnchor(['controller' => 'abonne', - 'action' => 'suggestion-achat'], - '» '.$this->_('Suggérer un achat'));?> - </span> -<span class="print"> -<?php - echo $this->tagPrintLink($this->search_result->fetchRecords(), 'Notice_List'); -?> -</span> - </div> + <?php + if ((int)$preferences['suggestion_achat'] == 1) + echo $this->tag('span', + $this->tagAnchor(['controller' => 'abonne', + 'action' => 'suggestion-achat'], + $this->_('Suggérer un achat'))); + ?> + <span class="print"> + <?php + echo $this->tagPrintLink($this->search_result->fetchRecords(), 'Notice_List'); + ?> + </span> + </div> </div> + <?php $this->closeBoite(); ?> diff --git a/library/ZendAfi/View/Helper/TagPrintLink.php b/library/ZendAfi/View/Helper/TagPrintLink.php index 2d7b1559eb33c84adfeed925b007b337d65a2b6b..65344b69958c85d11eb0b341c40e3372aed27907 100644 --- a/library/ZendAfi/View/Helper/TagPrintLink.php +++ b/library/ZendAfi/View/Helper/TagPrintLink.php @@ -26,15 +26,17 @@ class ZendAfi_View_Helper_TagPrintLink extends Zend_View_Helper_HtmlElement { if(!$models) return ''; - if (!$model_fusion=Class_ModeleFusion::getFusionForStrategyAndProfil($strategy, Class_Profil::getCurrentProfil()->getId())) { + if (!$model_fusion=Class_ModeleFusion::getFusionForStrategyAndProfil($strategy, + Class_Profil::getCurrentProfil()->getId())) { if(!$model_fusion = Class_ModeleFusion::getFusionForStrategy($strategy)) return ''; } - $ids = array_map(function($model) { - return $model->getId(); - - }, $models); + $ids = array_map( + function($model) { + return $model->getId(); + }, + $models); $url = $this->view->url( ['action' => 'print', @@ -42,7 +44,9 @@ class ZendAfi_View_Helper_TagPrintLink extends Zend_View_Helper_HtmlElement { 'strategy' => $strategy, 'modele_fusion' => $model_fusion->getId()]); - return $this->view->tagAnchor($url, $this->view->_('Imprimer')); + return $this->view->tagAnchor($url, + $this->view->_('Imprimer'), + ['target' => '_blank']); } } ?> \ No newline at end of file diff --git a/public/opac/css/global.css b/public/opac/css/global.css index 305d4d6485a488650f3e748e8e65089c8f0f659b..1be6e988a5571ec1fe29184ee5467ce38340890e 100644 --- a/public/opac/css/global.css +++ b/public/opac/css/global.css @@ -1366,6 +1366,12 @@ body.abonne_multimedia-hold-view .actions a { padding-right: 10px; } + +.recherche_actions a:before { + content: "» "; +} + + #menu_horizontal { position: relative; } diff --git a/tests/application/modules/opac/controllers/RechercheControllerPrintActionTest.php b/tests/application/modules/opac/controllers/RechercheControllerPrintActionTest.php index 04d1e6fe44be67ab5dc14b25f686a56993bdd8e4..d031b70f43490ef6f2eda0cb4bf4fdec1b971e20 100644 --- a/tests/application/modules/opac/controllers/RechercheControllerPrintActionTest.php +++ b/tests/application/modules/opac/controllers/RechercheControllerPrintActionTest.php @@ -51,7 +51,9 @@ class RechercheControllerPrintActionLinkTest extends AbstractControllerTestCase /** @test */ public function printLinkShouldBePresent() { - $this->assertXPathContentContains('//a[contains(@href, "/recherche/print/id_catalogue/3/id_module/9/aleatoire/1/filtres/APaul%3B/ids/1/strategy/Notice_List/modele_fusion/1")]', 'Imprimer',$this->_response->getBody()); + $this->assertXPathContentContains('//a[contains(@href, "/recherche/print/id_catalogue/3/id_module/9/aleatoire/1/filtres/APaul%3B/ids/1/strategy/Notice_List/modele_fusion/1")][@target="_blank"]', + 'Imprimer', + $this->_response->getBody()); } }