From 9e0c5bc33cc9118b212fc66d6d98e74140283519 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Fri, 7 Apr 2017 20:42:25 +0200
Subject: [PATCH] CIP #57952 fix rt comments
---
.../opac/views/scripts/bib/selection.phtml | 4 ++--
.../ModulesAccueil/BibliothequeNumerique.php | 16 ++++++++--------
library/Class/Systeme/ModulesAccueil/News.php | 2 +-
.../Class/Systeme/ModulesAccueil/Sitotheque.php | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/application/modules/opac/views/scripts/bib/selection.phtml b/application/modules/opac/views/scripts/bib/selection.phtml
index e2858cf0bd6..e56e98fd6af 100644
--- a/application/modules/opac/views/scripts/bib/selection.phtml
+++ b/application/modules/opac/views/scripts/bib/selection.phtml
@@ -5,10 +5,10 @@ $html .= $this->tag('p',
$form_content = [$this->formHidden('update_bib_select', '1'),
$this->Button_Submit((new Class_Entity())->setText($this->_('Valider la sélection'))),
- $this->Button((new Class_Entity())->setText('Tout cocher')
+ $this->Button((new Class_Entity())->setText($this->_('Tout cocher'))
->setAttribs(['class' => 'bouton',
'onclick' => '$(this).closest(form).find(\'input:checkbox\').prop(\'checked\', true); return false;'])),
- $this->Button((new Class_Entity())->setText('Tout décocher')
+ $this->Button((new Class_Entity())->setText($this->_('Tout décocher'))
->setAttribs(['class' => 'bouton',
'onclick' => '$(this).closest(form).find(\'input:checkbox\').prop(\'checked\', false);return false;']))];
diff --git a/library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php b/library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php
index 99126e90a4a..c5353d00898 100644
--- a/library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php
+++ b/library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php
@@ -30,14 +30,6 @@ class Class_Systeme_ModulesAccueil_BibliothequeNumerique extends Class_Systeme_M
ORDER_RECENT = 'orderRecent';
protected
- $_displayModes = [self::DISPLAY_TREE => 'Arborescence',
- self::DISPLAY_ALBUM_TEASER => 'Mise en avant d\'un album',
- self::DISPLAY_PAGINATED => 'Affichage paginé'],
-
- $_orderModes = [self::ORDER_SELECTION => 'Par ordre de sélection',
- self::ORDER_RANDOM => 'Par ordre aléatoire',
- self::ORDER_RECENT => 'Les plus récents'],
-
$_group = Class_Systeme_ModulesAccueil::GROUP_INFO,
$_action = 'bibliotheque-numerique',
$_popupWidth = 800,
@@ -56,6 +48,14 @@ class Class_Systeme_ModulesAccueil_BibliothequeNumerique extends Class_Systeme_M
'id_items' => '',
'id_albums' => '',
'display_order' => self::ORDER_SELECTION];
+
+ $this->_displayModes = [self::DISPLAY_TREE => $this->_('Arborescence'),
+ self::DISPLAY_ALBUM_TEASER => $this->_('Mise en avant d\'un album'),
+ self::DISPLAY_PAGINATED => $this->_('Affichage paginé')];
+
+ $this->_orderModes = [self::ORDER_SELECTION => $this->_('par ordre de sélection'),
+ self::ORDER_RANDOM => $this->_('par ordre aléatoire'),
+ self::ORDER_RECENT => $this->_('les plus récents')],
}
diff --git a/library/Class/Systeme/ModulesAccueil/News.php b/library/Class/Systeme/ModulesAccueil/News.php
index a7655dfdb68..39aaac35aa0 100644
--- a/library/Class/Systeme/ModulesAccueil/News.php
+++ b/library/Class/Systeme/ModulesAccueil/News.php
@@ -47,7 +47,7 @@ class Class_Systeme_ModulesAccueil_News extends Class_Systeme_ModulesAccueil_Nul
'id_items' => '',
'nb_aff' => '1',
'nb_analyse' => '5',
- 'display_order' => 'Selection',
+ 'display_order' => static::SELECTION,
'display_titles_only' => false,
'rss_avis' => true,
'op_largeur_img' => 200,
diff --git a/library/Class/Systeme/ModulesAccueil/Sitotheque.php b/library/Class/Systeme/ModulesAccueil/Sitotheque.php
index c8c14674e89..b80ca537c24 100644
--- a/library/Class/Systeme/ModulesAccueil/Sitotheque.php
+++ b/library/Class/Systeme/ModulesAccueil/Sitotheque.php
@@ -51,7 +51,7 @@ class Class_Systeme_ModulesAccueil_Sitotheque extends Class_Systeme_ModulesAccue
public function updateHook($datas) {
- if(3 != $datas['type_aff'])
+ if(static::DISPLAY_HIERARCHY != $datas['type_aff'])
return $datas;
if ($categories = explode('-', $datas['id_categorie']))
--
GitLab