From 69151cfc6b79d2c14cd6e143fb2d88fd90e60b9e Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.afi-sa.local>
Date: Thu, 30 Jun 2016 14:33:27 +0200
Subject: [PATCH] dev #41588 add tests on js + upgrade retro and bokeh72 admin
css
---
public/admin/css/global.css | 17 +++++++++++++++++
public/admin/skins/retro/global.css | 17 +++++++++++++++++
.../admin/controllers/BibControllerTest.php | 12 ++++++++++++
3 files changed, 46 insertions(+)
diff --git a/public/admin/css/global.css b/public/admin/css/global.css
index 8e61638190e..507b12f69ce 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 fb0bdc4f796..31ec540d459 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 28cfb6eddb5..c2b93d60531 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');
+ }
}
--
GitLab