diff --git a/VERSIONS_WIP/64072 b/VERSIONS_WIP/64072 new file mode 100644 index 0000000000000000000000000000000000000000..24342a7f90708e6d49a67d8b35ca7f1b09f7bbb6 --- /dev/null +++ b/VERSIONS_WIP/64072 @@ -0,0 +1 @@ + - ticket #64072 : Rétrocompatibilité graphique 7.10 \ No newline at end of file diff --git a/application/modules/opac/views/scripts/site_down.phtml b/application/modules/opac/views/scripts/site_down.phtml index da66509fdb9fa64cb2bb2761d3a663a8fbc5cf1f..390c6e825ef86cd9f43214ad398f37f0acec0def 100644 --- a/application/modules/opac/views/scripts/site_down.phtml +++ b/application/modules/opac/views/scripts/site_down.phtml @@ -1,6 +1,7 @@ <?php ob_start(); echo '<body '.$this->bodyParam.'>'; +echo $this->Admin_FrontNav(); ?> <div id="site_web_wrapper" style="width:<?php echo $this->profil->getWidthSite(); ?>; margin-left:auto; margin-right:auto"> diff --git a/public/admin/css/front_nav.css b/public/admin/css/front_nav.css index 20d17cf5b70547f15f61130bfcb5cdc4c4482c8c..ed4ae78ac438ed741465b234e4269a381e2ab055 100644 --- a/public/admin/css/front_nav.css +++ b/public/admin/css/front_nav.css @@ -122,7 +122,7 @@ #site_web_wrapper[data-show_admin_icons="true"] .configuration_module { - z-index: 101; + z-index: 99; display: block !important; position: absolute; right: 10px; @@ -139,7 +139,7 @@ #site_web_wrapper a[href*="/admin"] { - z-index: 101; + z-index: 99; background-color: transparent !important; margin: 0 !important; border: 2px solid transparent !important; @@ -167,6 +167,7 @@ } +#site_web_wrapper a[data-popup="true"].image-loading-status, #site_web_wrapper #menu_horizontal:hover a[href*="/admin"], #site_web_wrapper .boite:hover a[href*="/admin"] { opacity: 1 !important; @@ -179,6 +180,7 @@ } +#site_web_wrapper a[data-popup="true"].image-loading-status, #site_web_wrapper a[href*="/admin"]:hover { border-color: black !important; background-color: white !important; diff --git a/public/admin/css/subModal.css b/public/admin/css/subModal.css index 8a70a5cdc3715f05be6721e1a6b5e274b7bf43a9..9ba799ab1cc85cd7c75c24a4b7a9e4f3b17e1944 100644 --- a/public/admin/css/subModal.css +++ b/public/admin/css/subModal.css @@ -73,6 +73,7 @@ a[data-popup="true"].image-loading-status { margin: 0 !important; padding: 0 !important; cursor: progress; + vertical-align: top; } a[data-popup="true"].image-loading-status img { diff --git a/public/opac/css/global.css b/public/opac/css/global.css index b14fcc8a308b32e159d5c4dda54316b5e321c274..ae7e3ca57362bc24cf5b53f5b29e8e0fdd6b7dde 100644 --- a/public/opac/css/global.css +++ b/public/opac/css/global.css @@ -3357,7 +3357,8 @@ th.actions { margin-bottom: 1em; } -.opac .boiteMilieu .contenu { + +.opac #colContenuInner > .boiteMilieu .contenu { overflow: visible; } diff --git a/public/opac/js/toggle_menu.css b/public/opac/js/toggle_menu.css index c63b780f353e4a561029f4e460a9b1ec120febe9..e056ac84f819576f05e769672d4db0203cda7227 100644 --- a/public/opac/js/toggle_menu.css +++ b/public/opac/js/toggle_menu.css @@ -8,7 +8,6 @@ text-align: center; transition-duration: .5s; transition-property: all; - width: 100%; z-index: 101; } diff --git a/public/opac/skins/modele/css/global.css b/public/opac/skins/modele/css/global.css index 11ba2baf37346758356e9ced766a8f7b283bf764..9f5136ac0964bc6da9aebecdf6bfce7be578af51 100644 --- a/public/opac/skins/modele/css/global.css +++ b/public/opac/skins/modele/css/global.css @@ -93,7 +93,7 @@ a:hover {color:#D44100;} top: 1.5em; left: 2.5em; padding: 2px; - z-index: 10; + z-index: 101; } #menu_horizontal ul li ul li { diff --git a/public/opac/skins/original/css/global.css b/public/opac/skins/original/css/global.css index 9cf5d1c76ed59ccbc4e202fe42528654e9798c71..988408cdc680ff0799d4bdc3897933a45d1ca294 100644 --- a/public/opac/skins/original/css/global.css +++ b/public/opac/skins/original/css/global.css @@ -110,7 +110,7 @@ a:visited{color:#0058A5; text-decoration:none;} _width: 10em; /* IE6 seulement */ left: 2.5em; padding: 2px; - z-index: 10; + z-index: 101; } #menu_horizontal ul li ul li { diff --git a/tests/application/modules/opac/controllers/IndexControllerTest.php b/tests/application/modules/opac/controllers/IndexControllerTest.php index ef742d323110e7a997b7afd9040392a7afdbc3d4..0179f8ce679c579156b2be6bccb301028be49893 100644 --- a/tests/application/modules/opac/controllers/IndexControllerTest.php +++ b/tests/application/modules/opac/controllers/IndexControllerTest.php @@ -914,4 +914,20 @@ class IndexControllerWithSuperAdminLoggedTest extends AbstractControllerTestCase public function scriptToShowAmberIdeShouldBePresent() { $this->assertXPathContentContains('//script', 'showAmberIDE()'); } +} + + + + +class IndexControllerSiteDownActionTest extends AbstractControllerTestCase { + public function setUp() { + parent::setUp(); + $this->dispatch('/opac/index/sitedown', true); + } + + + /** @test */ + public function frontNavCssShouldBeLoaded() { + $this->assertXPath('//link[contains(@href, "front_nav.css")]'); + } } \ No newline at end of file