diff --git a/public/admin/js/global.js b/public/admin/js/global.js index 4e45689dde9f0edc5bd0a684891bd4c9908ba311..1109abe39ecf7a12db5d92f72bc7d020e1c249e8 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 8c85d86d28acb09be7a8cc97007fed10d2715417..b823bddb02767ef0d693c71342377b153ef7b113 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 c4fe095a4b64fa6229ca63cbd0232d9c18fc62e1..befa0c63f5c48470febeeee178ce3c1a4ed193cc 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 c38ce192900b82c5f69913cdbd4bdd40b02fc79a..4c4b1b67d03351f024f3e606c3a76cd57496e8b0 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 eaa1c132db502c7962585be958def0f01c0bcc26..0a8987196d71dce9052f80f6d7f105152d1687f1 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()'); + } +}