From 4830555f7d210a27774a1748a0eba4c386e59d7b Mon Sep 17 00:00:00 2001
From: gloas <gloas@git-test.afi-sa.fr>
Date: Mon, 2 Dec 2013 09:00:07 +0000
Subject: [PATCH] ajout variablie pour l affichage de la boite panier dans la
division flottante
---
.../admin/controllers/IndexController.php | 3 ++-
library/Class/AdminVar.php | 7 ++++++-
library/Class/Profil.php | 6 ++++--
public/opac/css/global.css | 16 ++++++++--------
.../controllers/AdminIndexControllerTest.php | 6 ++++++
tests/library/Class/ProfilTest.php | 12 +++++++++++-
6 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php
index b265b74fd39..a6473975468 100644
--- a/application/modules/admin/controllers/IndexController.php
+++ b/application/modules/admin/controllers/IndexController.php
@@ -184,7 +184,8 @@ class Admin_IndexController extends Zend_Controller_Action {
'AFFICHER_DISPONIBILITE_SUR_RECHERCHE' => 'Activation de la disponibilite dans le resultat de recherche. 0 = inactif, 1 = actif',
'NOM_DOMAINE' => 'Nom de domaine principal de l\'OPAC, ex: monopac.macommune.fr',
'WEBKIOSK_KEY' => 'Clé publique pour le cryptage des données Aesis Webkiosk',
- 'WEBKIOSK_RESERVATION_URL' => 'URL d\'accès à l\'interface de réservation des postes Aesis Webkiosk'
+ 'WEBKIOSK_RESERVATION_URL' => 'URL d\'accès à l\'interface de réservation des postes Aesis Webkiosk',
+ 'BOITE_PANIER_AUTO' => 'Ajouter automatiquement une boîte panier dans la division flottante. 0 = inactif, 1 = actif'
);
diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index 1f7e4afa20a..fb8c180f003 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -100,7 +100,8 @@ class Class_AdminVar extends Storm_Model_Abstract {
'TOUTAPPRENDRE_KEY',
'MUSICME_URL',
'MUSICME_BIB_ID',
- 'DATE_LAST_FULL_INTEGRATION_USERS'
+ 'DATE_LAST_FULL_INTEGRATION_USERS',
+ 'BOITE_PANIER_AUTO'
);
@@ -306,6 +307,10 @@ class Class_AdminVar extends Storm_Model_Abstract {
}
+ public static function isBoitePanierAutoEnabled() {
+ return self::isModuleEnabled('BOITE_PANIER_AUTO');
+ }
+
/**
* @return array
diff --git a/library/Class/Profil.php b/library/Class/Profil.php
index 18e72344d11..135b8c2b091 100644
--- a/library/Class/Profil.php
+++ b/library/Class/Profil.php
@@ -1148,8 +1148,10 @@ class Class_Profil extends Storm_Model_Abstract {
protected function getCfgDivisionFiveAsArray() {
- return $this->setBoitePanierInDivisionFive()
- ->getCfgAccueilAsArray();
+ if(Class_AdminVar::isBoitePanierAutoEnabled())
+ $this->setBoitePanierInDivisionFive();
+
+ return $this->getCfgAccueilAsArray();
}
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index bfeb19274d1..a70d445a7b0 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -532,7 +532,7 @@ form#calendar_select_categorie {
}
#abonne_edit .help {
- font-size: 1.em;
+ font-size: 1em;
width: 90%;
margin-left: auto;
margin-right: auto;
@@ -547,7 +547,7 @@ form#calendar_select_categorie {
border:1px solid #C8C8C8;
color:#3C5188;
padding:10px 10px 5px 10px;
- font-size: 1.em;
+ font-size: 1em;
}
.zend_form fieldset {color:#3C5188;margin:0px;padding:10px 10px 10px 2px;border:1px solid #DCDCDC;margin-bottom:15px;}
@@ -588,7 +588,7 @@ input.bouton{ font-size: 0.9em; color:#5f5f5f; background-color:#f0f0f0; borde
img {border:none;}
-select{color:#666666;font-family:Arial;font-size:1.em;}
+select{color:#666666;font-family:Arial;font-size:1em;}
.errors {
color: red;
@@ -640,7 +640,7 @@ div.clear {
ul.notice_info {
list-style-type:none;
- font-size:1.em;
+ font-size:1em;
margin-left:30;
margin-bottom:0;
}
@@ -1327,7 +1327,7 @@ body.abonne_multimedia-hold-view .actions a {
.resultats_page div.info-recherche, .resultats_page div.criteres_recherche {
- font-size:1.em;
+ font-size:1em;
}
.resultats_page div.info-recherche span.nombre-recherche,
@@ -2125,7 +2125,7 @@ div.ui-dialog-titlebar {
}
.ui-dialog #opac-dialog {
- font-size:1.em;
+ font-size:1em;
}
.ajout-panier .zend_form {
@@ -2144,13 +2144,13 @@ div.ui-dialog-titlebar {
.ajout-panier .zend_form select {
width: 200px;
- font-size: 1.em;
+ font-size: 1em;
}
.ajout-panier .zend_form input {
float:left;
width: 150px;
- font-size:1.em;
+ font-size:1em;
margin-left:15px;
}
diff --git a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
index 52743bd4a8c..f5857a959d9 100644
--- a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
+++ b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
@@ -171,6 +171,12 @@ class AdminIndexControllerAdminVarActionTest extends Admin_AbstractControllerTes
$this->assertXpathContentContains('//td', 'WEBKIOSK_KEY');
}
+
+ /** @test */
+ public function boitePanierAutoKeyShouldBePresent() {
+ $this->assertXpathContentContains('//td', 'BOITE_PANIER_AUTO');
+ }
+
}
diff --git a/tests/library/Class/ProfilTest.php b/tests/library/Class/ProfilTest.php
index 0b0eba9f042..ca89fe58699 100644
--- a/tests/library/Class/ProfilTest.php
+++ b/tests/library/Class/ProfilTest.php
@@ -686,10 +686,20 @@ class ProfilAdulteChatenayTest extends ProfilAdulteChatenayTestCase {
/** @test **/
- public function modulePanierShouldHaveBeendAdded() {
+ public function withPanierAutoModulePanierShouldHaveBeendAdded() {
+ Class_AdminVar::newInstanceWithId('BOITE_PANIER_AUTO', ['valeur' => '1']);
$this->profil->getBoitesDivision(5);
$this->assertTrue($this->profil->hasBoitePanier());
}
+
+
+ /** @test **/
+ public function withoutPanierAutoModulePanierShouldHaveBeendAdded() {
+ Class_AdminVar::newInstanceWithId('BOITE_PANIER_AUTO', ['valeur' => '0']);
+ $this->profil->getBoitesDivision(5);
+ $this->assertFalse($this->profil->hasBoitePanier());
+ }
+
}
--
GitLab