From eeac75815046953df158a20a7cad34ab3afa7052 Mon Sep 17 00:00:00 2001 From: gloas <gloas@afi-sa.fr> Date: Mon, 3 Apr 2017 15:11:44 +0200 Subject: [PATCH] CIP #57952 rename widgets --- library/Class/Systeme/ModulesAccueil.php | 25 ++++++++------- .../ModulesAccueil/BibliothequeNumerique.php | 2 +- .../Systeme/ModulesAccueil/Calendrier.php | 2 +- .../Systeme/ModulesAccueil/CarteZones.php | 2 +- .../Systeme/ModulesAccueil/Compteurs.php | 2 +- .../Systeme/ModulesAccueil/Critiques.php | 2 +- .../Systeme/ModulesAccueil/DomainBrowser.php | 2 +- .../Systeme/ModulesAccueil/Formations.php | 2 +- .../ModulesAccueil/HistoriqueRecherches.php | 2 +- .../Class/Systeme/ModulesAccueil/Kiosque.php | 2 +- .../Class/Systeme/ModulesAccueil/Langue.php | 2 +- .../Class/Systeme/ModulesAccueil/Library.php | 2 +- .../Systeme/ModulesAccueil/MenuVertical.php | 2 +- .../Systeme/ModulesAccueil/Multimedia.php | 2 +- library/Class/Systeme/ModulesAccueil/News.php | 2 +- .../Systeme/ModulesAccueil/Newsletters.php | 2 +- .../Class/Systeme/ModulesAccueil/Panier.php | 2 +- .../ModulesAccueil/PremierChapitre.php | 2 +- .../Class/Systeme/ModulesAccueil/Prets.php | 2 +- .../ModulesAccueil/RechercheGuidee.php | 2 +- .../ModulesAccueil/RechercheSimple.php | 2 +- .../Systeme/ModulesAccueil/Reservations.php | 2 +- library/Class/Systeme/ModulesAccueil/Rss.php | 2 +- .../Systeme/ModulesAccueil/Sitotheque.php | 2 +- library/Class/Systeme/ModulesAccueil/Tags.php | 2 +- library/Class/Systeme/ModulesMenu.php | 31 ++++++++----------- 26 files changed, 50 insertions(+), 54 deletions(-) diff --git a/library/Class/Systeme/ModulesAccueil.php b/library/Class/Systeme/ModulesAccueil.php index c801ad577cf..220b96f62cf 100644 --- a/library/Class/Systeme/ModulesAccueil.php +++ b/library/Class/Systeme/ModulesAccueil.php @@ -28,18 +28,6 @@ class Class_Systeme_ModulesAccueil extends Class_Systeme_ModulesAbstract { const GROUP_SITE = 'ACCUEIL_SITE'; const GROUP_ABONNE = 'ACCUEIL_ABONNE'; - /** - * @var array - */ - protected $_groupes = array( - self::GROUP_INFO => "Modules Information", - self::GROUP_RECH => "Modules Recherche", - self::GROUP_SITE => "Modules Site", - self::GROUP_ABONNE => "Modules Abonné" - ); - - - /** * @var array */ @@ -67,6 +55,19 @@ class Class_Systeme_ModulesAccueil extends Class_Systeme_ModulesAbstract { } + public function __construct() { + $this->initGroups(); + } + + + public function initGroups() { + return $this->_groupes = [self::GROUP_INFO => $this->_('Boites d\'informations'), + self::GROUP_RECH => $this->_('Boites de recherche'), + self::GROUP_SITE => $this->_('Boites du site'), + self::GROUP_ABONNE => $this->_('Boites d\'abonné')]; + } + + /** * @param string $code * @return Class_Systeme_ModulesAccueil_Null or subclass diff --git a/library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php b/library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php index d1d374ef90a..99126e90a4a 100644 --- a/library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php +++ b/library/Class/Systeme/ModulesAccueil/BibliothequeNumerique.php @@ -46,7 +46,7 @@ class Class_Systeme_ModulesAccueil_BibliothequeNumerique extends Class_Systeme_M public function __construct() { - $this->_libelle = $this->_('Bibliothèque numérique'); + $this->_libelle = $this->_('Boite bibliothèque numérique'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Albums'; $this->_defaultValues = ['titre' => $this->_libelle, 'id_categories' => '', diff --git a/library/Class/Systeme/ModulesAccueil/Calendrier.php b/library/Class/Systeme/ModulesAccueil/Calendrier.php index 10556f5333e..43a8fa2a46f 100644 --- a/library/Class/Systeme/ModulesAccueil/Calendrier.php +++ b/library/Class/Systeme/ModulesAccueil/Calendrier.php @@ -30,7 +30,7 @@ class Class_Systeme_ModulesAccueil_Calendrier extends Class_Systeme_ModulesAccue public function __construct() { - $this->_libelle = $this->_('Calendrier des événements'); + $this->_libelle = $this->_('Boite calendrier'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Calendar'; $this->_defaultValues = ['titre' => $this->_libelle, 'id_categorie' => '', diff --git a/library/Class/Systeme/ModulesAccueil/CarteZones.php b/library/Class/Systeme/ModulesAccueil/CarteZones.php index bc6ff64379c..29e40d4cf9e 100644 --- a/library/Class/Systeme/ModulesAccueil/CarteZones.php +++ b/library/Class/Systeme/ModulesAccueil/CarteZones.php @@ -30,7 +30,7 @@ class Class_Systeme_ModulesAccueil_CarteZones extends Class_Systeme_ModulesAccue public function __construct() { - $this->_libelle = $this->_('Carte des zones'); + $this->_libelle = $this->_('Boite carte des zones'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Zones'; $this->_defaultValues = ['titre' => $this->_('Rechercher une bibliothèque'), 'message_carte' => $this->_('Message sous la carte')]; diff --git a/library/Class/Systeme/ModulesAccueil/Compteurs.php b/library/Class/Systeme/ModulesAccueil/Compteurs.php index 2bf402919fa..222071984c6 100644 --- a/library/Class/Systeme/ModulesAccueil/Compteurs.php +++ b/library/Class/Systeme/ModulesAccueil/Compteurs.php @@ -31,7 +31,7 @@ class Class_Systeme_ModulesAccueil_Compteurs extends Class_Systeme_ModulesAccuei public function __construct() { - $this->_libelle = $this->_('Compteurs statistiques'); + $this->_libelle = $this->_('Boite compteurs statistiques'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Statistics'; $this->_defaultValues = ['titre' => $this->_libelle, 'nb_notices' => 1]; diff --git a/library/Class/Systeme/ModulesAccueil/Critiques.php b/library/Class/Systeme/ModulesAccueil/Critiques.php index cf4740d4e9d..43a356ec629 100644 --- a/library/Class/Systeme/ModulesAccueil/Critiques.php +++ b/library/Class/Systeme/ModulesAccueil/Critiques.php @@ -29,7 +29,7 @@ class Class_Systeme_ModulesAccueil_Critiques extends Class_Systeme_ModulesAccuei public function __construct() { - $this->_libelle = $this->_('Critiques'); + $this->_libelle = $this->_('Boite critiques'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Reviews'; $this->_defaultValues = ['titre' => $this->_libelle, 'nb_aff_avis' => 2, diff --git a/library/Class/Systeme/ModulesAccueil/DomainBrowser.php b/library/Class/Systeme/ModulesAccueil/DomainBrowser.php index 4a8897b0058..ba86983aaca 100644 --- a/library/Class/Systeme/ModulesAccueil/DomainBrowser.php +++ b/library/Class/Systeme/ModulesAccueil/DomainBrowser.php @@ -29,7 +29,7 @@ class Class_Systeme_ModulesAccueil_DomainBrowser extends Class_Systeme_ModulesAc public function __construct() { - $this->_libelle = $this->_('Domaines'); + $this->_libelle = $this->_('Boite domaines'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Domains'; $this->_defaultValues = ['titre' => $this->_libelle, 'allow_breadcrumb' => 0, diff --git a/library/Class/Systeme/ModulesAccueil/Formations.php b/library/Class/Systeme/ModulesAccueil/Formations.php index 00b71ba2b55..3ec4a3f13bb 100644 --- a/library/Class/Systeme/ModulesAccueil/Formations.php +++ b/library/Class/Systeme/ModulesAccueil/Formations.php @@ -37,7 +37,7 @@ class Class_Systeme_ModulesAccueil_Formations extends Class_Systeme_ModulesAccue public function __construct() { - $this->_libelle = $this->_('Formations'); + $this->_libelle = $this->_('Boite formations'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Formations'; $this->_defaultValues = ['titre' => $this->_libelle, 'selected_formations' => '', diff --git a/library/Class/Systeme/ModulesAccueil/HistoriqueRecherches.php b/library/Class/Systeme/ModulesAccueil/HistoriqueRecherches.php index e30dd445560..d827001ceba 100644 --- a/library/Class/Systeme/ModulesAccueil/HistoriqueRecherches.php +++ b/library/Class/Systeme/ModulesAccueil/HistoriqueRecherches.php @@ -28,7 +28,7 @@ class Class_Systeme_ModulesAccueil_HistoriqueRecherches extends Class_Systeme_Mo public function __construct() { - $this->_libelle = $this->_('Historique recherches'); + $this->_libelle = $this->_('Boite historique recherches'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Base'; $this->_defaultValues = ['titre' => $this->_('Mes recherches')]; } diff --git a/library/Class/Systeme/ModulesAccueil/Kiosque.php b/library/Class/Systeme/ModulesAccueil/Kiosque.php index aa7f45b8faa..4a44c582597 100644 --- a/library/Class/Systeme/ModulesAccueil/Kiosque.php +++ b/library/Class/Systeme/ModulesAccueil/Kiosque.php @@ -33,7 +33,7 @@ class Class_Systeme_ModulesAccueil_Kiosque extends Class_Systeme_ModulesAccueil_ public function __construct() { - $this->_libelle = $this->_('Kiosque de documents'); + $this->_libelle = $this->_('Boite kiosque'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Carousel'; $this->_defaultValues = ['titre' => $this->_libelle, 'style_liste' => "slide_show", diff --git a/library/Class/Systeme/ModulesAccueil/Langue.php b/library/Class/Systeme/ModulesAccueil/Langue.php index 899b6e77937..3d51b1b9991 100644 --- a/library/Class/Systeme/ModulesAccueil/Langue.php +++ b/library/Class/Systeme/ModulesAccueil/Langue.php @@ -29,7 +29,7 @@ class Class_Systeme_ModulesAccueil_Langue extends Class_Systeme_ModulesAccueil_N public function __construct() { - $this->_libelle = $this->_('Langue du site'); + $this->_libelle = $this->_('Boite langue du site'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Base'; $this->_defaultValues = ['titre' => $this->_libelle]; } diff --git a/library/Class/Systeme/ModulesAccueil/Library.php b/library/Class/Systeme/ModulesAccueil/Library.php index 8a324527a9c..ddb80114d6c 100644 --- a/library/Class/Systeme/ModulesAccueil/Library.php +++ b/library/Class/Systeme/ModulesAccueil/Library.php @@ -54,7 +54,7 @@ class Class_Systeme_ModulesAccueil_Library extends Class_Systeme_ModulesAccueil_ public function __construct() { - $this->_libelle = $this->_('Bibliothèques'); + $this->_libelle = $this->_('Boite bibliothèques'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Libraries'; $this->_defaultValues = ['titre' => $this->_libelle, 'libraries' => '', diff --git a/library/Class/Systeme/ModulesAccueil/MenuVertical.php b/library/Class/Systeme/ModulesAccueil/MenuVertical.php index cc5afbc9de3..69d74c9fc0e 100644 --- a/library/Class/Systeme/ModulesAccueil/MenuVertical.php +++ b/library/Class/Systeme/ModulesAccueil/MenuVertical.php @@ -35,7 +35,7 @@ class Class_Systeme_ModulesAccueil_MenuVertical extends Class_Systeme_ModulesAcc public function __construct() { - $this->_libelle = $this->_('Menu'); + $this->_libelle = $this->_('Boite menu'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Menu'; } diff --git a/library/Class/Systeme/ModulesAccueil/Multimedia.php b/library/Class/Systeme/ModulesAccueil/Multimedia.php index 5495b9c5e56..8035cfd0769 100644 --- a/library/Class/Systeme/ModulesAccueil/Multimedia.php +++ b/library/Class/Systeme/ModulesAccueil/Multimedia.php @@ -28,7 +28,7 @@ class Class_Systeme_ModulesAccueil_Multimedia extends Class_Systeme_ModulesAccue public function __construct() { - $this->_libelle = $this->_('Postes multimédia'); + $this->_libelle = $this->_('Boite postes multimédia'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Base'; $this->_defaultValues = ['titre' => $this->_libelle]; } diff --git a/library/Class/Systeme/ModulesAccueil/News.php b/library/Class/Systeme/ModulesAccueil/News.php index a0262183d21..a7655dfdb68 100644 --- a/library/Class/Systeme/ModulesAccueil/News.php +++ b/library/Class/Systeme/ModulesAccueil/News.php @@ -37,7 +37,7 @@ class Class_Systeme_ModulesAccueil_News extends Class_Systeme_ModulesAccueil_Nul public function __construct() { - $this->_libelle = $this->_('Articles'); + $this->_libelle = $this->_('Boite articles'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Articles'; $this->_defaultValues = ['titre' => $this->_libelle, 'anchor' => '', diff --git a/library/Class/Systeme/ModulesAccueil/Newsletters.php b/library/Class/Systeme/ModulesAccueil/Newsletters.php index 1dc80a3d36f..4df26abeed0 100644 --- a/library/Class/Systeme/ModulesAccueil/Newsletters.php +++ b/library/Class/Systeme/ModulesAccueil/Newsletters.php @@ -28,7 +28,7 @@ class Class_Systeme_ModulesAccueil_Newsletters extends Class_Systeme_ModulesAccu public function __construct() { - $this->_libelle = $this->_('Lettres d\'informations'); + $this->_libelle = $this->_('Boite lettres d\'informations'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Base'; $this->_defaultValues = ['titre' => $this->_libelle]; } diff --git a/library/Class/Systeme/ModulesAccueil/Panier.php b/library/Class/Systeme/ModulesAccueil/Panier.php index 8a088b40282..cfdbd8fdcf2 100644 --- a/library/Class/Systeme/ModulesAccueil/Panier.php +++ b/library/Class/Systeme/ModulesAccueil/Panier.php @@ -30,7 +30,7 @@ class Class_Systeme_ModulesAccueil_Panier extends Class_Systeme_ModulesAccueil_N public function __construct() { - $this->_libelle = $this->_('Mes paniers'); + $this->_libelle = $this->_('Boite paniers'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Base'; $this->_defaultValues = ['titre' => $this->_libelle]; } diff --git a/library/Class/Systeme/ModulesAccueil/PremierChapitre.php b/library/Class/Systeme/ModulesAccueil/PremierChapitre.php index 3690e89dfa6..47b88032a90 100644 --- a/library/Class/Systeme/ModulesAccueil/PremierChapitre.php +++ b/library/Class/Systeme/ModulesAccueil/PremierChapitre.php @@ -30,7 +30,7 @@ class Class_Systeme_ModulesAccueil_PremierChapitre extends Class_Systeme_Modules public function __construct() { - $this->_libelle = 'Premier Chapitre'; + $this->_libelle = 'Boite Premier Chapitre'; $this->_form = 'ZendAfi_Form_Configuration_Widget_PremierChapitre'; $this->_defaultValues = ['titre' => $this->_libelle, 'intro' => '', diff --git a/library/Class/Systeme/ModulesAccueil/Prets.php b/library/Class/Systeme/ModulesAccueil/Prets.php index 8f39a085fc2..9768a3f16a9 100644 --- a/library/Class/Systeme/ModulesAccueil/Prets.php +++ b/library/Class/Systeme/ModulesAccueil/Prets.php @@ -29,7 +29,7 @@ class Class_Systeme_ModulesAccueil_Prets extends Class_Systeme_ModulesAccueil_Nu public function __construct() { - $this->_libelle = $this->_('Mes prêts'); + $this->_libelle = $this->_('Boite prêts'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Base'; $this->_defaultValues = ['titre' => $this->_('Mes prêts')]; } diff --git a/library/Class/Systeme/ModulesAccueil/RechercheGuidee.php b/library/Class/Systeme/ModulesAccueil/RechercheGuidee.php index 530924b90b5..7d5860fab80 100644 --- a/library/Class/Systeme/ModulesAccueil/RechercheGuidee.php +++ b/library/Class/Systeme/ModulesAccueil/RechercheGuidee.php @@ -29,7 +29,7 @@ class Class_Systeme_ModulesAccueil_RechercheGuidee extends Class_Systeme_Modules public function __construct() { - $this->_libelle = $this->_('Recherche guidée'); + $this->_libelle = $this->_('Boite recherche guidée'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Base'; $this->_defaultValues = ['titre' => $this->_libelle]; } diff --git a/library/Class/Systeme/ModulesAccueil/RechercheSimple.php b/library/Class/Systeme/ModulesAccueil/RechercheSimple.php index b48547b4585..47d45db3a67 100644 --- a/library/Class/Systeme/ModulesAccueil/RechercheSimple.php +++ b/library/Class/Systeme/ModulesAccueil/RechercheSimple.php @@ -33,7 +33,7 @@ class Class_Systeme_ModulesAccueil_RechercheSimple extends Class_Systeme_Modules public function __construct() { - $this->_libelle = $this->_('Recherche'); + $this->_libelle = $this->_('Boite recherche'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Search'; $this->_defaultValues = ['titre' => $this->_libelle, 'message' => '', diff --git a/library/Class/Systeme/ModulesAccueil/Reservations.php b/library/Class/Systeme/ModulesAccueil/Reservations.php index 7cd59bfed19..4424f4881cb 100644 --- a/library/Class/Systeme/ModulesAccueil/Reservations.php +++ b/library/Class/Systeme/ModulesAccueil/Reservations.php @@ -28,7 +28,7 @@ class Class_Systeme_ModulesAccueil_Reservations extends Class_Systeme_ModulesAcc public function __construct() { - $this->_libelle = $this->_('Mes réservations'); + $this->_libelle = $this->_('Boite réservations'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Base'; $this->_defaultValues = ['titre' => $this->_('Mes réservations')]; } diff --git a/library/Class/Systeme/ModulesAccueil/Rss.php b/library/Class/Systeme/ModulesAccueil/Rss.php index bc3b0eeb0ce..2167c0f27e8 100644 --- a/library/Class/Systeme/ModulesAccueil/Rss.php +++ b/library/Class/Systeme/ModulesAccueil/Rss.php @@ -29,7 +29,7 @@ class Class_Systeme_ModulesAccueil_Rss extends Class_Systeme_ModulesAccueil_Null public function __construct() { - $this->_libelle = $this->_('Fils RSS'); + $this->_libelle = $this->_('Boite RSS'); $this->_form = 'ZendAfi_Form_Configuration_Widget_RSS'; $this->_defaultValues = ['titre' => $this->_libelle, 'type_aff' => 1, diff --git a/library/Class/Systeme/ModulesAccueil/Sitotheque.php b/library/Class/Systeme/ModulesAccueil/Sitotheque.php index 2afc2a799df..c8c14674e89 100644 --- a/library/Class/Systeme/ModulesAccueil/Sitotheque.php +++ b/library/Class/Systeme/ModulesAccueil/Sitotheque.php @@ -38,7 +38,7 @@ class Class_Systeme_ModulesAccueil_Sitotheque extends Class_Systeme_ModulesAccue public function __construct() { - $this->_libelle = $this->_('Sitothèques'); + $this->_libelle = $this->_('Boite sitothèques'); $this->_form = 'ZendAfi_Form_Configuration_Widget_ListOfSites'; $this->_defaultValues = ['titre' => $this->_libelle, 'type_aff' => self::DISPLAY_PAGINATED, diff --git a/library/Class/Systeme/ModulesAccueil/Tags.php b/library/Class/Systeme/ModulesAccueil/Tags.php index 8161a3e8d3d..365a94eb97b 100644 --- a/library/Class/Systeme/ModulesAccueil/Tags.php +++ b/library/Class/Systeme/ModulesAccueil/Tags.php @@ -29,7 +29,7 @@ class Class_Systeme_ModulesAccueil_Tags extends Class_Systeme_ModulesAccueil_Nul public function __construct() { - $this->_libelle = $this->_('Nuage de tags'); + $this->_libelle = $this->_('Boite nuage de tags'); $this->_form = 'ZendAfi_Form_Configuration_Widget_Tags'; $this->_defaultValues = ['titre' => $this->_libelle, 'message' => $this->_('Message du dessus'), diff --git a/library/Class/Systeme/ModulesMenu.php b/library/Class/Systeme/ModulesMenu.php index 8b56234e2e3..5cdeee094b1 100644 --- a/library/Class/Systeme/ModulesMenu.php +++ b/library/Class/Systeme/ModulesMenu.php @@ -36,14 +36,6 @@ class Class_Systeme_ModulesMenu extends Class_Systeme_ModulesAbstract { protected static $_modules; - protected $_groupes = [ - self::GROUP_MENU_NAVIGATION => "Navigation" , - self::GROUP_MENU_INFORMATIONS => "Informations", - self::GROUP_MENU_RECHERCHES =>"Recherches" , - self::GROUP_MENU_CATALOGUES => "Catalogues", - self::GROUP_MENU_ABONNES => "Abonnés" - ]; - private $fonctions; @@ -73,12 +65,16 @@ class Class_Systeme_ModulesMenu extends Class_Systeme_ModulesAbstract { unset($this->fonctions[$key]); } - if (Class_AdminVar::isMenuBoiteEnabled()) { - $this->_groupes[Class_Systeme_ModulesAccueil::GROUP_INFO] = "Modules informations"; - $this->_groupes[Class_Systeme_ModulesAccueil::GROUP_RECH] = "Modules Recherches"; - $this->_groupes[Class_Systeme_ModulesAccueil::GROUP_SITE] = "Modules Site"; - $this->_groupes[Class_Systeme_ModulesAccueil::GROUP_ABONNE] = "Modules Abonnés"; - } + if (Class_AdminVar::isMenuBoiteEnabled()) + $this->_groupes = (new Class_Systeme_ModulesAccueil())->initGroups(); + + $this->_groupes = array_merge($this->_groupes, + [self::GROUP_MENU_NAVIGATION => $this->_('Liens de navigation'), + self::GROUP_MENU_INFORMATIONS => $this->_('Liens d\'informations'), + self::GROUP_MENU_RECHERCHES => $this->_('Liens de recherche'), + self::GROUP_MENU_CATALOGUES => $this->_('Liens de catalogues'), + self::GROUP_MENU_ABONNES => $this->_('Liens vers l\'abonné')]); + } @@ -173,14 +169,13 @@ class Class_Systeme_ModulesMenu extends Class_Systeme_ModulesAbstract { foreach($menus as $id => $entry) $entries[] = (new Class_Entity()) ->setId($id) - ->setLabel($this->_('%s%s', - $entry->getCategoryLabel(), - $entry->getLibelle())) + ->setCategory($entry->getCategoryLabel()) + ->setLabel($entry->getLibelle()) ->setForm($entry->getForm()); usort($entries, function($a, $b) { - return $a->getLabel() > $b->getLabel(); + return strtolower($a->getLabel()) > strtolower($b->getLabel()); }); return $entries; -- GitLab