diff --git a/VERSIONS_HOTLINE/61718 b/VERSIONS_HOTLINE/61718 new file mode 100644 index 0000000000000000000000000000000000000000..abd0fa8ed5b3fd6eaeec67df59b88145deebe960 --- /dev/null +++ b/VERSIONS_HOTLINE/61718 @@ -0,0 +1,2 @@ + - ticket #61718 : Administration: correction de l'accessibilité des liens situés sous l'emplacement du menu. + \ No newline at end of file diff --git a/library/ZendAfi/View/Helper/Admin/FrontNav.php b/library/ZendAfi/View/Helper/Admin/FrontNav.php index 7fd31ea02be22c16b7e610a87290d00e0a223cba..f26d56d7f47ed0f2d7ed2ca22fac52840f911083 100644 --- a/library/ZendAfi/View/Helper/Admin/FrontNav.php +++ b/library/ZendAfi/View/Helper/Admin/FrontNav.php @@ -26,7 +26,11 @@ class ZendAfi_View_Helper_Admin_FrontNav extends ZendAfi_View_Helper_BaseHelper if(!Class_Users::isCurrentUserCanAccesBackend()) return ''; - Class_Admin_Skin::current()->renderAdminFrontNavCssOn(Class_ScriptLoader::getInstance()); + $instance = Class_ScriptLoader::getInstance(); + + Class_Admin_Skin::current()->renderAdminFrontNavCssOn($instance); + + $instance->addJQueryReady('$("#site_web_wrapper").mousedown(function() {$(".menu_admin_front").addClass("hidden");});'); $html = [$this->view->Admin_Button((new Class_Entity()) ->setText($this->_('Administration')) diff --git a/public/admin/skins/bokeh72/front_nav.css b/public/admin/skins/bokeh72/front_nav.css index b94e5da522bef98fac2455a38339bb2986ad5aaf..7055fa7b95c0d948cf3677fafebe7b7100d39b42 100644 --- a/public/admin/skins/bokeh72/front_nav.css +++ b/public/admin/skins/bokeh72/front_nav.css @@ -45,6 +45,7 @@ .menu_admin_front.hidden > div { margin-left: -300px; + position: absolute; } .menu_admin_front > button { @@ -90,15 +91,6 @@ text-align: left !important; } -.menu_admin_front .form td + td { - text-align: right !important; - width: 120px; - overflow: hidden; - float: right; - margin-right: 1em; - vertical-align: middle; -} - .menu_admin_front form + .boutons { display: none; } @@ -114,7 +106,7 @@ .menu_admin_front .form select { display: inline; height: 2em; - width: 115px; + width: 270px; } #site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] { @@ -148,4 +140,4 @@ font-size: 1.17em; margin: 1em 0 1em 0; font-weight: bold; -} \ No newline at end of file +} diff --git a/public/admin/skins/bokeh74/front_nav.css b/public/admin/skins/bokeh74/front_nav.css index fbf76e4a6e21638c2808fbb8c65ef49737bfa213..5214189aa087316a706a9c2df78e359cf4b71949 100644 --- a/public/admin/skins/bokeh74/front_nav.css +++ b/public/admin/skins/bokeh74/front_nav.css @@ -46,6 +46,7 @@ .menu_admin_front.hidden > div { margin-left: -300px; + position: absolute; } .menu_admin_front > button { @@ -91,15 +92,6 @@ text-align: left !important; } -.menu_admin_front .form td + td { - text-align: right !important; - width: 120px; - overflow: hidden; - float: right; - margin-right: 1em; - vertical-align: middle; -} - .menu_admin_front form + .boutons { display: none; } @@ -115,7 +107,7 @@ .menu_admin_front .form select { display: inline; height: 2em; - width: 115px; + width: 270px; } #site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] { @@ -160,4 +152,4 @@ .menu_admin_front .admin_menu_title label { font-weight: bold; -} \ No newline at end of file +} diff --git a/public/admin/skins/retro/front_nav.css b/public/admin/skins/retro/front_nav.css index 73d4d29e7335df472a7b3460f98b08abfd68d1d5..d1f11a3ed337e56b39be10f735ff0b508b2c81db 100644 --- a/public/admin/skins/retro/front_nav.css +++ b/public/admin/skins/retro/front_nav.css @@ -62,6 +62,7 @@ .menu_admin_front.hidden > div { margin-left: -300px; + position: absolute; } .menu_admin_front > button { @@ -107,15 +108,6 @@ text-align: left !important; } -.menu_admin_front .form td + td { - text-align: right !important; - width: 150px; - overflow: hidden; - float: right; - margin-right: 1.5em; - vertical-align: middle; -} - .menu_admin_front form + .boutons { display: none; } @@ -130,7 +122,7 @@ .menu_admin_front .form select { height: 2em; - width: 149px; + width: 270px; } #site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] { @@ -165,4 +157,4 @@ font-size: 1.17em; margin: 1em 0 1em 0; font-weight: bold; -} \ 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 0366244faafba7c6f95b46d305674daaa24a237f..87d815cf8c82efe90b041e3d6029f235a275cd97 100644 --- a/tests/application/modules/opac/controllers/IndexControllerTest.php +++ b/tests/application/modules/opac/controllers/IndexControllerTest.php @@ -770,6 +770,12 @@ class IndexControllerWithBibAdminLoggedTest extends AbstractControllerTestCase { } + /** @test */ + public function scriptToHideAdminMenuShouldBePresent() { + $this->assertXPathContentContains('//script', 'mousedown(function('); + } + + /** @test */ public function moveWidgetsShouldNotBePresent() { $this->assertNotXPathContentContains('//body/div//ul/li/ul/li/a', 'Déplacement des boites');