diff --git a/application/modules/admin/controllers/LieuController.php b/application/modules/admin/controllers/LieuController.php index f732d8ed1f5e70c994817d18e6beb8a97065a5dd..e8354ff697f1dc5edb1763f69d5624ed7965ae20 100644 --- a/application/modules/admin/controllers/LieuController.php +++ b/application/modules/admin/controllers/LieuController.php @@ -89,7 +89,7 @@ class Admin_LieuController extends Zend_Controller_Action { 'allowEmpty' => false ]) ->addElement('url', 'url', ['label' => 'Site web', - 'size' => 100, + 'size' => 50, 'maxlength' => 255]) ->addElement('text', 'telephone', ['label' => 'Téléphone', diff --git a/library/ZendAfi/View/Helper/MapForLieu.php b/library/ZendAfi/View/Helper/MapForLieu.php index d5bfc0baa0bd08c4f43bfed76261e27f5afb4f3e..cf3709b40e65944dbb27129abdf44b5aabd1f874 100644 --- a/library/ZendAfi/View/Helper/MapForLieu.php +++ b/library/ZendAfi/View/Helper/MapForLieu.php @@ -27,6 +27,9 @@ class ZendAfi_View_Helper_MapForLieu extends Zend_View_Helper_HtmlElement { $lieu->getVille(), $lieu->getPays())); + if (($latitude = $lieu->getLatitude()) && ($longitude = $lieu->getLongitude())) + $full_adresse = $latitude.','.$longitude.','.$full_adresse; + $params = array('sensor' => 'false', 'zoom' => 15, 'size' => '200x200', diff --git a/tests/application/modules/opac/controllers/AbonneControllerFormationsTest.php b/tests/application/modules/opac/controllers/AbonneControllerFormationsTest.php index eae90106e4f5a6b92d0001b5b3fd8a3afe74e1b9..9298ddd9f1f09bb5e53406a5171de99473b0a896 100644 --- a/tests/application/modules/opac/controllers/AbonneControllerFormationsTest.php +++ b/tests/application/modules/opac/controllers/AbonneControllerFormationsTest.php @@ -50,19 +50,21 @@ abstract class AbstractAbonneControllerFormationsTestCase extends AbstractContro ->setValeur('1'); $this->_gallice_cafe = Class_Lieu::getLoader() - ->newInstanceWithId(98) - ->setLibelle('Gallice'); + ->newInstanceWithId(98) + ->setLibelle('Gallice'); $this->_bib_romains = Class_Lieu::getLoader() - ->newInstanceWithId(99) - ->setLibelle('Bibliothèque des romains'); + ->newInstanceWithId(99) + ->setLibelle('Bibliothèque des romains'); $this->_bonlieu = Class_Lieu::getLoader() - ->newInstanceWithId(100) - ->setLibelle('Bonlieu') - ->setAdresse("1, rue Jean-Jaures\nBP 294") - ->setCodePostal(74007) - ->setVille('Annecy'); + ->newInstanceWithId(100) + ->setLibelle('Bonlieu') + ->setAdresse("1, rue Jean-Jaures\nBP 294") + ->setCodePostal(74007) + ->setVille('Annecy') + ->setLatitude('45.902179') + ->setLongitude('6.128715'); Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Users') ->whenCalled('save')->answers(true); @@ -576,7 +578,7 @@ class AbonneControllerFormationsSessionFevrierJavaTest extends AbstractAbonneCon /** @test */ function ddShouldContainsGoogleMap() { - $this->assertXPath('//dd//img[@src="http://maps.googleapis.com/maps/api/staticmap?sensor=false&zoom=15&size=300x300¢er=1%2C+rue+Jean-Jaures%0ABP+294%2C74007%2CAnnecy%2CFRANCE&markers=1%2C+rue+Jean-Jaures%0ABP+294%2C74007%2CAnnecy%2CFRANCE"]', + $this->assertXPath('//dd//img[@src="http://maps.googleapis.com/maps/api/staticmap?sensor=false&zoom=15&size=300x300¢er=45.902179%2C6.128715%2C1%2C+rue+Jean-Jaures%0ABP+294%2C74007%2CAnnecy%2CFRANCE&markers=45.902179%2C6.128715%2C1%2C+rue+Jean-Jaures%0ABP+294%2C74007%2CAnnecy%2CFRANCE"]', $this->_response->getBody()); }