diff --git a/application/modules/opac/controllers/NoticeajaxController.php b/application/modules/opac/controllers/NoticeajaxController.php index dac9e3dc8f6948f1806b01bd13fc5626edd96a3e..aba5473e852048427e429eb1033053c18e22b99c 100644 --- a/application/modules/opac/controllers/NoticeajaxController.php +++ b/application/modules/opac/controllers/NoticeajaxController.php @@ -539,6 +539,7 @@ class NoticeAjaxController extends Zend_Controller_Action { protected function _sendResponseWithScripts($html) { Class_ScriptLoader::getInstance() + ->loadJQuery() ->addAdminScript('onload_utils') ->addJQueryReady('setupAnchorsTarget();'); diff --git a/library/Class/ScriptLoader.php b/library/Class/ScriptLoader.php index ebdcd37b911e5d98e2dad705be9b90137883edb2..51f55358fb75773a3868ac95006542a86901131d 100644 --- a/library/Class/ScriptLoader.php +++ b/library/Class/ScriptLoader.php @@ -742,8 +742,7 @@ class Class_ScriptLoader { ->loadJQueryUI() ->addAdminScripts(['treeselect/data_selector.js', 'treeselect/treeselect.js']) - ->addStyleSheets([URL_ADMIN_JS.'jquery_ui/css/jquery-ui.custom.smoothness.min.css', - URL_ADMIN_JS.'treeselect/treeselect.css']); + ->addStyleSheets([URL_ADMIN_JS.'treeselect/treeselect.css']); } diff --git a/library/ZendAfi/View/Helper/Admin/Head.php b/library/ZendAfi/View/Helper/Admin/Head.php index 8d4644a2b8012b0b206648ca5e650de21eb79cd5..f6cd99c2ef0af100d786133552c06f93ff46b1ab 100644 --- a/library/ZendAfi/View/Helper/Admin/Head.php +++ b/library/ZendAfi/View/Helper/Admin/Head.php @@ -23,7 +23,6 @@ class ZendAfi_View_Helper_Admin_Head extends ZendAfi_View_Helper_BaseHelper { public function Admin_Head() { $head_scripts = Class_ScriptLoader::newInstance() - ->addStyleSheet(URL_ADMIN_JS.'jquery_ui/css/jquery-ui.custom.smoothness.min.css') ->loadJQuery() ->loadJQueryUI() ->loadNotificationJS() diff --git a/library/ZendAfi/View/Helper/ListeNotices/Abstract.php b/library/ZendAfi/View/Helper/ListeNotices/Abstract.php index c00b38f595f064be0f075aeff124a5c39da8a9c1..6059efda377aead92cd4e45e6cfc2d65d5da69d8 100644 --- a/library/ZendAfi/View/Helper/ListeNotices/Abstract.php +++ b/library/ZendAfi/View/Helper/ListeNotices/Abstract.php @@ -73,8 +73,8 @@ abstract class ZendAfi_View_Helper_ListeNotices_Abstract extends ZendAfi_View_He Class_ScriptLoader::getInstance() ->addInlineScript("var resumeAjaxBaseUrl='".$this->view->url(['controller' => 'noticeajax', 'action' => 'resumenotice'],null,true)."';") ->addOPACScript('liste_notices_mur') - ->addJQueryReady("scrollToSelectedNoticeInResult(); vignetteHover($('.resultat_recherche .liste_mur .notice[data-id]'));") - ->loadPrettyPhoto(); + ->addJQueryReady("scrollToSelectedNoticeInResult(); vignetteHover($('.resultat_recherche .liste_mur .notice[data-id]'));"); + if(Class_AdminVar::isAfficherDispoSurRechercheEnabled()) Class_ScriptLoader::getInstance() ->addInlineScript("var disponibiliteAjaxBaseUrl='".$this->view->url(['controller' => 'noticeajax', 'action' => 'dispo-notice'], null, true)."';") diff --git a/tests/application/modules/admin/controllers/AdminControllerTest.php b/tests/application/modules/admin/controllers/AdminControllerTest.php index ec3e1cd28e2d70795ce3cd9c92ecb33bc7ef1d7c..d2477b3125e56cdc11beabb2e2017c1ab0794188 100644 --- a/tests/application/modules/admin/controllers/AdminControllerTest.php +++ b/tests/application/modules/admin/controllers/AdminControllerTest.php @@ -57,12 +57,6 @@ class AdminControllerSitoOKTest extends Admin_AbstractControllerTestCase { function prettyPhotoCssShouldBeInHead() { $this->assertXPath("//head/link[contains(@href, 'css/prettyPhoto.css')]"); } - - - /** @test */ - function jquerySmoothnessCssShouldBeInHead() { - $this->assertXPath("//head/link[contains(@href, 'jquery_ui/css/jquery-ui.custom.smoothness.min.css')]"); - } } ?> \ No newline at end of file