From c7728ec2f706c6f9d2d192cfd55d07732dbb8472 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@git-test.afi-sa.fr>
Date: Tue, 29 Jan 2013 16:40:01 +0000
Subject: [PATCH] Generation de site : modification des droits pour etre
accessible au administrateur du site Transformation du menu catalogues
dynamiques en domaines
---
.../admin/controllers/CatalogueController.php | 12 ++++++------
.../modules/opac/views/scripts/catalogue/index.phtml | 2 +-
.../ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php | 4 ++--
library/translation/en.po | 5 ++++-
library/translation/fr.po | 7 +++++--
library/translation/fr.pot | 5 ++++-
library/translation/ro.po | 5 ++++-
library/translation/translate_en.csv | 10 +++++-----
.../admin/controllers/CatalogueControllerTest.php | 10 +++++-----
.../admin/controllers/ProfilControllerTest.php | 5 +++++
10 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/application/modules/admin/controllers/CatalogueController.php b/application/modules/admin/controllers/CatalogueController.php
index 6c20b597a8b..9e2cb6a6d3a 100644
--- a/application/modules/admin/controllers/CatalogueController.php
+++ b/application/modules/admin/controllers/CatalogueController.php
@@ -41,9 +41,9 @@ class Admin_CatalogueController extends Zend_Controller_Action
$class_catalogue = new Class_Catalogue();
$catalogues=$class_catalogue->getCatalogue(0);
$this->view->catalogues = $catalogues;
- if(!$catalogues) $this->view->message="Aucun catalogue n'a été trouvé";
+ if(!$catalogues) $this->view->message="Aucun domaine n'a été trouvé";
- $this->view->titre = "Définition des catalogues dynamiques";
+ $this->view->titre = "Définition des domaines";
}
//----------------------------------------------------------------------------------
@@ -65,7 +65,7 @@ class Admin_CatalogueController extends Zend_Controller_Action
$this->view->avec_vignettes=$ret["avec_vignettes"];
$this->view->notices=$ret["notices"];
$this->view->id_catalogue=$id_catalogue;
- $this->view->titre = 'Test du catalogue: '.fetchOne("select LIBELLE from catalogue where id_catalogue=$id_catalogue");
+ $this->view->titre = 'Test du domaine: '.fetchOne("select LIBELLE from catalogue where id_catalogue=$id_catalogue");
}
//----------------------------------------------------------------------------------
@@ -74,7 +74,7 @@ class Admin_CatalogueController extends Zend_Controller_Action
function addAction() {
$catalogue = Class_Catalogue::getLoader()
->newInstance()
- ->setLibelle("** nouveau catalogue **");
+ ->setLibelle("** nouveau domaine **");
if ($this->isSaved($catalogue)) {
$this->_redirect("admin/catalogue/index");
@@ -82,7 +82,7 @@ class Admin_CatalogueController extends Zend_Controller_Action
}
$this->view->catalogue = $catalogue;
- $this->view->titre = "Ajout de catalogue";
+ $this->view->titre = "Ajout de domaine";
$this->getHelper('ViewRenderer')->renderScript('catalogue/form.phtml');
}
@@ -102,7 +102,7 @@ class Admin_CatalogueController extends Zend_Controller_Action
return;
}
- $this->view->titre="Modification de catalogue";
+ $this->view->titre="Modification de domaine";
$this->view->catalogue=$catalogue;
$this->getHelper('ViewRenderer')->renderScript('catalogue/form.phtml');
}
diff --git a/application/modules/opac/views/scripts/catalogue/index.phtml b/application/modules/opac/views/scripts/catalogue/index.phtml
index 9b4fe2f4c3b..0957fa7afd2 100644
--- a/application/modules/opac/views/scripts/catalogue/index.phtml
+++ b/application/modules/opac/views/scripts/catalogue/index.phtml
@@ -1,4 +1,4 @@
-<?php $this->openBoite("Catalogue");?>
+<?php $this->openBoite("Domaine");?>
<br><br>
<div>
<?php if($this->url_retour_notice)print('<span style="padding-right:10px"><a href="'.$this->url_retour_notice.'">» Retour à la notice</a></span>'); ?>
diff --git a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
index 84f25d78cc9..e12c8395993 100644
--- a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
+++ b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
@@ -57,7 +57,7 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdmin extends ZendAfi_View_Helper_Base
// Menu Modules
$menu_modules = $this->openBoite($this->translate()->_("Gestionnaire de contenu"));
$menu_modules .= $this->addMenu("articles_16.png", $this->translate()->_("Articles"), "/admin/cms", $acl_all);
- $menu_modules .= $this->addMenu("domaines_16.png", $this->translate()->_("Catalogues dynamiques"), "/admin/catalogue", $acl_admins);
+ $menu_modules .= $this->addMenu("domaines_16.png", $this->translate()->_("Domaines"), "/admin/catalogue", $acl_admins);
$menu_modules .= $this->addMenu("rss_16.png", $this->translate()->_("Fils RSS"), "/admin/rss", $acl_admins);
$menu_modules .= $this->addMenu("sitotheque_16.png", $this->translate()->_("Sitothèque"), "/admin/sito", $acl_admins);
$menu_modules .= $this->addMenu("moderation_16.png", $this->translate()->_("Modération"), "/admin/modo/", $acl_all, $nb_moderations);
@@ -127,7 +127,7 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdmin extends ZendAfi_View_Helper_Base
$menu_systeme .= $this->addMenu("php.png", $this->translate()->_("Informations système"), "/admin/systeme/phpinfo", $acl_super_admin);
$menu_systeme .= $this->addMenu("images.png", $this->translate()->_("Cache des images"), "/admin/systeme/cacheimages", $acl_super_admin);
$menu_systeme .= $this->addMenu("chat.gif.png", $this->translate()->_("Import avis opac2"), "/admin/systeme/importavisopac2",$acl_super_admin);
- $menu_systeme .= $this->addMenu("generation_16.png",$this->translate()->_("Génération du site"), "/admin/systeme/generationsite", $acl_super_admin);
+ $menu_systeme .= $this->addMenu("generation_16.png",$this->translate()->_("Génération du site"), "/admin/systeme/generationsite", $acl_admins_portail);
$menu_systeme .= $this->addMenu("batch_16.png", $this->translate()->_("Batchs"), "/admin/batch", $acl_super_admin);
$menu_systeme .= $this->closeBoite();
diff --git a/library/translation/en.po b/library/translation/en.po
index 917ff04b357..7b49900f392 100644
--- a/library/translation/en.po
+++ b/library/translation/en.po
@@ -673,6 +673,9 @@ msgid "Ajouter la notice au panier :"
msgstr "Add the notice to the basket :"
#: ../../application/modules/admin/views/scripts/catalogue/index.phtml:2
+msgid "Ajouter un domaine"
+msgstr "Add a domain"
+
#: ../../application/modules/admin/views/scripts/opds/index.phtml:4
msgid "Ajouter un catalogue"
msgstr "Add a catalog"
@@ -1480,7 +1483,7 @@ msgstr "Catalog"
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:25
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:56
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:60
-msgid "Catalogues dynamiques"
+msgid "Domaines"
msgstr "Dynamic catalogs"
#: ../../application/modules/opac/views/scripts/etagere/appelmenu.phtml:1
diff --git a/library/translation/fr.po b/library/translation/fr.po
index eb44849d4ad..9cc4c331d6b 100644
--- a/library/translation/fr.po
+++ b/library/translation/fr.po
@@ -683,6 +683,9 @@ msgid "Ajouter la notice au panier :"
msgstr ""
#: ../../application/modules/admin/views/scripts/catalogue/index.phtml:2
+msgid "Ajouter un domaine"
+msgstr ""
+
#: ../../application/modules/admin/views/scripts/opds/index.phtml:4
msgid "Ajouter un catalogue"
msgstr ""
@@ -1451,7 +1454,7 @@ msgstr ""
#: ../../application/modules/admin/views/scripts/catalogue/form.phtml:9
#: ../../application/modules/opac/views/scripts/catalogue/index.phtml:1
#: ../../application/modules/admin/views/scripts/catalogue/form.phtml:6
-msgid "Catalogue"
+msgid "Domaine"
msgstr ""
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:73
@@ -1463,7 +1466,7 @@ msgstr ""
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:25
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:56
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:60
-msgid "Catalogues dynamiques"
+msgid "Domaines"
msgstr ""
#: ../../application/modules/opac/views/scripts/etagere/appelmenu.phtml:1
diff --git a/library/translation/fr.pot b/library/translation/fr.pot
index bd31a2c9ec5..5048fe898b7 100644
--- a/library/translation/fr.pot
+++ b/library/translation/fr.pot
@@ -628,6 +628,9 @@ msgid "Tags utilisateur"
msgstr ""
#: ../../application/modules/admin/views/scripts/catalogue/index.phtml:2
+msgid "Ajouter un domaine"
+msgstr ""
+
#: ../../application/modules/admin/views/scripts/opds/index.phtml:4
msgid "Ajouter un catalogue"
msgstr ""
@@ -3467,7 +3470,7 @@ msgstr ""
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:25
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:56
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:60
-msgid "Catalogues dynamiques"
+msgid "Domaines"
msgstr ""
#: ../../library/ZendAfi/View/Helper/admin/MenuGaucheAdmin.php:26
diff --git a/library/translation/ro.po b/library/translation/ro.po
index ce91acd23dc..daf44a5f6a7 100644
--- a/library/translation/ro.po
+++ b/library/translation/ro.po
@@ -694,6 +694,9 @@ msgid "Ajouter la notice au panier :"
msgstr "Adaugă instrucţiunea în coş"
#: ../../application/modules/admin/views/scripts/catalogue/index.phtml:2
+msgid "Ajouter un domaine"
+msgstr "Adaugă un domain"
+
#: ../../application/modules/admin/views/scripts/opds/index.phtml:4
msgid "Ajouter un catalogue"
msgstr "Adaugă un catalog"
@@ -1497,7 +1500,7 @@ msgstr "Catalog"
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:25
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:56
#: ../../library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php:60
-msgid "Catalogues dynamiques"
+msgid "Domaines"
msgstr "Cataloguri dinamice"
#: ../../application/modules/opac/views/scripts/etagere/appelmenu.phtml:1
diff --git a/library/translation/translate_en.csv b/library/translation/translate_en.csv
index 9e0d47e252e..245671c1d67 100644
--- a/library/translation/translate_en.csv
+++ b/library/translation/translate_en.csv
@@ -504,17 +504,17 @@ clef;key
// PanierController
Ajouter Catalogue;Add Catalogue
-Ajouter Catalogues dynamiques;Add Dynamic Catalogues
+Ajouter Domaines;Add Domains
Catalogue dynamique;Dynamic Catalogue
-Catalogues dynamiques;Dynamic Catalogues
+Domaines; Domains
Centre d'intérêt;Center of Interest
Dewey;Dewey
Genre;Genre
-Gestionnaire des Catalogues dynamiques;Manage Dynamic Catalogues
+Gestionnaire des Domaines;Manage Domains
Le champ 'Dewey' doit être inférieur à 9 caractères;'Dewey' needs to be less than 50 characters long
Limite;Limit
-Liste de vos catalogues dynamiques;List of your dynamic catalogues
-Modifier Catalogues dynamiques;Modify Dynamic Catalogues
+Liste de vos domaines;List of your domains
+Modifier Domaines;Modify Domains
Mot matière;Keyword
Top_20;Top 20
diff --git a/tests/application/modules/admin/controllers/CatalogueControllerTest.php b/tests/application/modules/admin/controllers/CatalogueControllerTest.php
index 710543db4ea..98262ca7264 100644
--- a/tests/application/modules/admin/controllers/CatalogueControllerTest.php
+++ b/tests/application/modules/admin/controllers/CatalogueControllerTest.php
@@ -68,8 +68,8 @@ class CatalogueControllerWithModoPortailIndexTest extends AdminCatalogueControll
/** @test */
- public function titreShouldBeDefinitionDesCataloguesDynamiques() {
- $this->assertXPathContentContains('//h1', 'Définition des catalogues dynamiques');
+ public function titreShouldBeDefinitionDesDomaines() {
+ $this->assertXPathContentContains('//h1', 'Définition des domaines');
}
@@ -101,8 +101,8 @@ class CatalogueControllerWithAdminBibAndNoOAIIndexTest extends AdminCatalogueCon
/** @test */
- public function titreShouldBeDefinitionDesCataloguesDynamiques() {
- $this->assertXPathContentContains('//h1', 'Définition des catalogues dynamiques');
+ public function titreShouldBeDefinitionDesDomaines() {
+ $this->assertXPathContentContains('//h1', 'Définition des domaines');
}
@@ -128,7 +128,7 @@ class CatalogueControllerWithAModoBibIndexTest extends AdminCatalogueControllerT
/** @test */
public function pageShouldNotBeDisplayed() {
- $this->assertNotXPathContentContains('//h1', 'Définition des catalogues dynamiques');
+ $this->assertNotXPathContentContains('//h1', 'Définition des domaines');
}
}
diff --git a/tests/application/modules/admin/controllers/ProfilControllerTest.php b/tests/application/modules/admin/controllers/ProfilControllerTest.php
index d592403d721..8cecbfbaa6a 100644
--- a/tests/application/modules/admin/controllers/ProfilControllerTest.php
+++ b/tests/application/modules/admin/controllers/ProfilControllerTest.php
@@ -602,6 +602,11 @@ class Admin_ProfilControllerProfilJeunesseTestMenusIndex extends Admin_ProfilCon
$this->assertXPath("//tr[@class='second']//td//a[contains(@href, 'menusmaj/id_profil/5/id_menu/H/mode/edit')]");
}
+ /** @test */
+ public function duplicateHorizontalMenu() {
+ $this->assertXPath("//tr[@class='second']//td//a[contains(@href, 'menusmaj/id_profil/5/id_menu/H/mode/duplicate')]");
+ }
+
/** @test */
public function cannotDeleteMenuHorizontalLink() {
--
GitLab