diff --git a/.gitattributes b/.gitattributes index 64d4221ae61c895eb58dbcb33070e5a6ded2f31a..ec48898d373db8d473ebcc1c7d44ae1c61cc4ac3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1987,6 +1987,7 @@ library/ZendAfi/View/Helper/Abonne/Newsletters.php -text library/ZendAfi/View/Helper/Abonne/Paniers.php -text library/ZendAfi/View/Helper/Abonne/Prets.php -text library/ZendAfi/View/Helper/Abonne/Reservations.php -text +library/ZendAfi/View/Helper/Abonne/RetourFiche.php -text library/ZendAfi/View/Helper/AbsoluteUrl.php -text library/ZendAfi/View/Helper/Accueil/Base.php -text library/ZendAfi/View/Helper/Accueil/BibNumerique.php -text diff --git a/application/modules/opac/views/scripts/abonne/formations.phtml b/application/modules/opac/views/scripts/abonne/formations.phtml index 40bac4d079d1c588c26d87f49ef96ed4c4f5644d..8af6eaaa2fa5b8a38c036bdec8da8aeaf9cfb8c9 100644 --- a/application/modules/opac/views/scripts/abonne/formations.phtml +++ b/application/modules/opac/views/scripts/abonne/formations.phtml @@ -15,4 +15,6 @@ foreach($this->formations_by_year as $year => $formations) { } echo $this->closeBoite(); -?> \ No newline at end of file +?> + +<?php echo $this->abonne_RetourFiche(); ?> \ No newline at end of file diff --git a/application/modules/opac/views/scripts/abonne/multimedia-hold-location.phtml b/application/modules/opac/views/scripts/abonne/multimedia-hold-location.phtml index 15b9133558d2fdd5a9eac61d05f23259864e2724..0faf46d0433cff236c1d8f934f164076495fdc42 100644 --- a/application/modules/opac/views/scripts/abonne/multimedia-hold-location.phtml +++ b/application/modules/opac/views/scripts/abonne/multimedia-hold-location.phtml @@ -15,4 +15,6 @@ </ul> </div> -<?php $this->closeBoite();?> \ No newline at end of file +<?php $this->closeBoite();?> + +<?php echo $this->abonne_RetourFiche(); ?> \ No newline at end of file diff --git a/application/modules/opac/views/scripts/abonne/prets.phtml b/application/modules/opac/views/scripts/abonne/prets.phtml index a6fa2371678412ae79931d88d593cc052a5acdec..d2a5e47d9dc33158266b9a3ab2beeaa76d138b61 100644 --- a/application/modules/opac/views/scripts/abonne/prets.phtml +++ b/application/modules/opac/views/scripts/abonne/prets.phtml @@ -38,9 +38,7 @@ if($this->fiche["erreur"]) echo '<p class="error">' . $this->fiche["erreur"] . ' ?> </table> -<?php $this->closeBoite();?> -<div style="margin-top:5px"> -<a href="<?php echo BASE_URL ?>/abonne/fiche"><?php echo $this->_('Retour') ?></a> -</div> +<?php $this->closeBoite(); ?> +<?php echo $this->abonne_RetourFiche(); ?> <br/> <br/> diff --git a/application/modules/opac/views/scripts/abonne/reservations.phtml b/application/modules/opac/views/scripts/abonne/reservations.phtml index 402aa7410e1c11febf5c61a98739f1c611784640..ea10daa266ef6e2ba95734c08b355a072e71ec47 100644 --- a/application/modules/opac/views/scripts/abonne/reservations.phtml +++ b/application/modules/opac/views/scripts/abonne/reservations.phtml @@ -54,8 +54,6 @@ </table> <?php $this->closeBoite();?> -<div style="margin-top:5px"> - <a href="<?php echo BASE_URL ?>/abonne/fiche"><?php echo $this->_('Retour') ?></a> -</div> +<?php echo $this->abonne_RetourFiche(); ?> <br/> <br/> diff --git a/application/modules/opac/views/scripts/panier/index.phtml b/application/modules/opac/views/scripts/panier/index.phtml index 4ec3d9bb8089fd780c12e9afc6849f277a1dde40..7ddb4a91e7f1bb3fc9487b740420c87d984afeff 100644 --- a/application/modules/opac/views/scripts/panier/index.phtml +++ b/application/modules/opac/views/scripts/panier/index.phtml @@ -111,3 +111,5 @@ if($this->panier_courant) print('</center>'); if($this->erreur) print('<script>alert("'.$this->erreur.'");</script>'); ?> + +<?php echo $this->abonne_RetourFiche(); ?> \ No newline at end of file diff --git a/library/ZendAfi/View/Helper/Abonne/RetourFiche.php b/library/ZendAfi/View/Helper/Abonne/RetourFiche.php new file mode 100644 index 0000000000000000000000000000000000000000..f500d6af436881d80d6d0ed1aae3d5f125969089 --- /dev/null +++ b/library/ZendAfi/View/Helper/Abonne/RetourFiche.php @@ -0,0 +1,30 @@ +<?php +/** + * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved. + * + * AFI-OPAC 2.0 is free software; you can redistribute it and/or modify + * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by + * the Free Software Foundation. + * + * There are special exceptions to the terms and conditions of the AGPL as it + * is applied to this software (see README file). + * + * AFI-OPAC 2.0 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE + * along with AFI-OPAC 2.0; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +class ZendAfi_View_Helper_Abonne_RetourFiche extends ZendAfi_View_Helper_Abonne_Abstract { + public function abonne_retourFiche() { + return '<div style="margin-top:5px"> + <a href="'.$this->view->url(['controller' => 'abonne', 'action' => 'fiche'], null, true).'">' + .$this->view->_('Retour').'</a> + </div>'; + } +} + +?> \ No newline at end of file