From 32008a755868f8be0a56294945600d482e6483ca Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Wed, 31 May 2017 14:00:08 +0200
Subject: [PATCH] dev #60900 fix CSS
---
public/admin/js/global.js | 3 +++
public/admin/skins/bokeh74/front_nav.css | 2 +-
public/opac/css/global.css | 2 +-
.../opac/controllers/AbonneControllerSettingsTest.php | 10 ++++++++--
.../modules/opac/controllers/IndexControllerTest.php | 8 +++++++-
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/public/admin/js/global.js b/public/admin/js/global.js
index 4e45689dde9..1109abe39ec 100644
--- a/public/admin/js/global.js
+++ b/public/admin/js/global.js
@@ -339,6 +339,7 @@ function hideAdminIcons() {
$("#site_web_wrapper").attr('data-show_admin_icons', 'false');
$('.activate_show_admin_icons').show();
$('.deactivate_show_admin_icons').hide();
+ $.ajax( baseUrl + '/admin/users/settings/key/show_admin_icons/value/0');
}
@@ -351,6 +352,7 @@ function showMenuAdmin() {
$('#menuAdmin').css('display','block');
}
+
function toggleMenuAdmin(anchor) {
if(!$('#menuAdmin').length)
return;
@@ -375,6 +377,7 @@ function toggleMenuAdmin(anchor) {
hideMenuAdmin();
}
+
if(typeof setFlagMaj != 'function'){
window.setFlagMaj = function(bMode){};
}
diff --git a/public/admin/skins/bokeh74/front_nav.css b/public/admin/skins/bokeh74/front_nav.css
index 8c85d86d28a..b823bddb027 100644
--- a/public/admin/skins/bokeh74/front_nav.css
+++ b/public/admin/skins/bokeh74/front_nav.css
@@ -54,7 +54,7 @@
}
.menu_admin_front a img {
- filter: invert();
+ filter: invert(1);
float: right;
vertical-align: middle;
padding-right: 1.5em;
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index c4fe095a4b6..befa0c63f5c 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -1567,7 +1567,7 @@ body.abonne_multimedia-hold-view .actions a {
right: 0px;
top: 0px;
cursor: pointer;
- z-index: 101;
+ z-index: 10;
}
diff --git a/tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php b/tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php
index c38ce192900..4c4b1b67d03 100644
--- a/tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php
+++ b/tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php
@@ -294,13 +294,19 @@ class AbonneControllerSettingsAdminSettingsTest extends AbonneControllerSettings
public function setUp() {
parent::setUp();
$this->_user->beAdminPortail();
-
- $this->dispatch('/admin/users/settings/key/show_admin_icons/value/1', true);
}
/** @test */
public function userShowAdminIconsShouldBeEnabled() {
+ $this->dispatch('/admin/users/settings/key/show_admin_icons/value/1', true);
$this->assertEquals(1, Class_User_Settings::newWith($this->_user)->get('show_admin_icons'));
}
+
+
+ /** @test */
+ public function userShowAdminIconsShouldBeDisabled() {
+ $this->dispatch('/admin/users/settings/key/show_admin_icons/value/0', true);
+ $this->assertEquals(0, Class_User_Settings::newWith($this->_user)->get('show_admin_icons'));
+ }
}
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/IndexControllerTest.php b/tests/application/modules/opac/controllers/IndexControllerTest.php
index eaa1c132db5..0a8987196d7 100644
--- a/tests/application/modules/opac/controllers/IndexControllerTest.php
+++ b/tests/application/modules/opac/controllers/IndexControllerTest.php
@@ -804,4 +804,10 @@ class IndexControllerWithBibAdminLoggedTest extends AbstractControllerTestCase {
public function scriptToShowAdminIconsShouldBePresent() {
$this->assertXPathContentContains('//script', 'showAdminIcons()');
}
-}
\ No newline at end of file
+
+
+ /** @test */
+ public function scriptCssEditorShouldNotBePresent() {
+ $this->assertNotXPathContentContains('//script', 'showCSSEditor()');
+ }
+}
--
GitLab