diff --git a/library/ZendAfi/View/Helper/Accueil/Base.php b/library/ZendAfi/View/Helper/Accueil/Base.php index 549a66540a434df5bffca6be0c36fdbe65334443..7f1b71a56fd22b278c1f4fc9c4bece3970bd5e98 100644 --- a/library/ZendAfi/View/Helper/Accueil/Base.php +++ b/library/ZendAfi/View/Helper/Accueil/Base.php @@ -139,10 +139,11 @@ class ZendAfi_View_Helper_Accueil_Base extends ZendAfi_View_Helper_BaseHelper { //--------------------------------------------------------------------- protected function getHtmlArray() { - return array("TITRE" => $this->titre, - "CONTENU" => $this->getFonctionAdmin().$this->contenu, - "MESSAGE" => $this->message, - "RSS" => $this->rss_interne); + return ["TITRE" => $this->titre, + "CONTENU" => $this->getFonctionAdmin().$this->contenu, + "MESSAGE" => $this->message, + "RSS" => $this->rss_interne, + "TYPE_MODULE" => strtolower($this->type_module)]; } //--------------------------------------------------------------------- diff --git a/public/telephone/skins/original/css/global.css b/public/telephone/skins/original/css/global.css index bd8d05139b67180292731b8b39655828f704a9fa..e6f6acb3b691ea299e8d9f176f852ac13b675b1f 100644 --- a/public/telephone/skins/original/css/global.css +++ b/public/telephone/skins/original/css/global.css @@ -44,6 +44,7 @@ body.main } + /* tags de base */ table, td {padding:0px; margin:0px} table {width: 100%} @@ -131,6 +132,7 @@ form{ .titre { margin-top: 5px } .titre h2 { + padding: 0px 0px 2px 10px; margin: 0px; } @@ -301,4 +303,28 @@ div.bk-widget div.b-counter { .contenu div.vignette_notice img { height: 40px; +} + +@media all and (min-width: 480px) { + + div.ui-content>div { + + float: left; + + margin-left: 1%; + + margin-right: 1%; + + } + +} + +@media all and (min-width: 480px) and (max-width: 1023px) { + + div.ui-content>div { + + width: 48%; + + } + } \ No newline at end of file diff --git a/public/telephone/skins/original/templates/boites/boite_de_la_division_gauche.html b/public/telephone/skins/original/templates/boites/boite_de_la_division_gauche.html index 7d025a87fda7f9c85d931903004d6c1873a884f5..94b5ff57994e2ccf17eacf4f318c4fbe806876d6 100644 --- a/public/telephone/skins/original/templates/boites/boite_de_la_division_gauche.html +++ b/public/telephone/skins/original/templates/boites/boite_de_la_division_gauche.html @@ -1,4 +1,4 @@ -<div> +<div class="{TYPE_MODULE}"> {IF-TITRE} <div class="titre"><h2>{TITRE}</h2></div> {ENDIF} diff --git a/tests/application/modules/telephone/controllers/IndexControllerTest.php b/tests/application/modules/telephone/controllers/IndexControllerTest.php index e08e3212cb722d258d2e3326a0b59a3004d5d8a2..0f9e4d003f73f5b64605d192e5921b2a5098f371 100644 --- a/tests/application/modules/telephone/controllers/IndexControllerTest.php +++ b/tests/application/modules/telephone/controllers/IndexControllerTest.php @@ -266,13 +266,13 @@ class IndexControllerTelephoneSimulationWithModulesTest extends AbstractIndexCon /** @test */ function titreBoiteBibNumeriqueShouldBeMesAlbums() { - $this->assertXPathContentContains('//div[@class="titre"]', 'Mes albums'); + $this->assertXPathContentContains('//div[@class="bib_numerique"]//div[@class="titre"]', 'Mes albums'); } /** @test */ public function boiteCalendrierShouldBeVisible() { - $this->assertXPathContentContains('//h2', 'Agenda', $this->_response->getBody()); + $this->assertXPathContentContains('//div[@class="calendar"]//h2', 'Agenda', $this->_response->getBody()); }