diff --git a/public/admin/css/global.css b/public/admin/css/global.css index 8e61638190e9b82a2108738cb2f0e80298142d28..507b12f69ce54f232b7926578813b7022d675189 100644 --- a/public/admin/css/global.css +++ b/public/admin/css/global.css @@ -1372,4 +1372,21 @@ div#reader { .ouvertures_index ul { clear: both; +} + +form td .lieu { + display: inline-block; +} + +form #fieldset-location td:first-child { + float: left; +} + +form #fieldset-location .lieu, +form #fieldset-location .edit_location { + float: right; +} + +a[class^="edit_"] { + margin: 0 3px; } \ No newline at end of file diff --git a/public/admin/skins/retro/global.css b/public/admin/skins/retro/global.css index fb0bdc4f7963054021ff19e0c72f2d5c9e1ddc1f..31ec540d4598cab00c1f52daa9c7dd31739138e2 100755 --- a/public/admin/skins/retro/global.css +++ b/public/admin/skins/retro/global.css @@ -589,3 +589,20 @@ fieldset { .form .tag_saisie { display: none; } + +form td .lieu { + display: inline-block; +} + +form #fieldset-location td:first-child { + float: left; +} + +form #fieldset-location .lieu, +form #fieldset-location .edit_location { + float: right; +} + +a[class^="edit_"] { + margin: 0 3px; +} \ No newline at end of file diff --git a/tests/application/modules/admin/controllers/BibControllerTest.php b/tests/application/modules/admin/controllers/BibControllerTest.php index 28cfb6eddb5f4e589fc9933b90777aeee4278f59..c2b93d605312b5c33bbc82f7ff3e30fbc6377dd3 100644 --- a/tests/application/modules/admin/controllers/BibControllerTest.php +++ b/tests/application/modules/admin/controllers/BibControllerTest.php @@ -399,6 +399,18 @@ class BibControllerWithAdminBibEditAnnecyTest extends BibControllerWithAdminBibT public function withNoRedmineAPISetRedmineAccountNameShouldNotBePresent() { $this->assertNotXPathContentContains('//table//tr//td', 'nom d\'utilsateur'); } + + + /** @test */ + public function editLocationCranShouldBePresent() { + $this->assertXpathContentContains('//script', '/admin/lieu/edit/id/78\' class=\'edit_location\''); + } + + + /** @test */ + public function locationCranPreviewShouldBePresent() { + $this->assertXPathContentContains('//script', '<h3>Cran-Gevrier'); + } }