diff --git a/library/ZendAfi/View/Helper/Admin/FrontNav.php b/library/ZendAfi/View/Helper/Admin/FrontNav.php index 4e9db5c0ad37b96fc15533320ce736bac8866d28..23206f8a7c50762a4a1467937081bbf841a0d320 100644 --- a/library/ZendAfi/View/Helper/Admin/FrontNav.php +++ b/library/ZendAfi/View/Helper/Admin/FrontNav.php @@ -33,7 +33,7 @@ class ZendAfi_View_Helper_Admin_FrontNav extends ZendAfi_View_Helper_BaseHelper ->setImage($this->view->tagImg(Class_Admin_Skin::current() ->getIconUrl('buttons', 'configuration'))) - ->setAttribs(['onclick' => '$(\'.menu_admin_front\').toggleClass(\'hidden\');return false;'])), + ->setAttribs(['onclick' => '$(\'.menu_admin_front\').toggleClass(\'hidden\');return false;'])), $this->_tag('div', $this->_tag('ul', implode($this->_getEntries())))]; @@ -67,7 +67,7 @@ class ZendAfi_View_Helper_Admin_FrontNav extends ZendAfi_View_Helper_BaseHelper 'controller' => 'users', 'action' => 'edit', 'id' => $id], - $this->_('Mon compte : %s', Class_Users::getNomAff($id))); + $this->_('Mon compte : %s', Class_Users::getNomAff($id))); } @@ -81,11 +81,22 @@ class ZendAfi_View_Helper_Admin_FrontNav extends ZendAfi_View_Helper_BaseHelper 'controller' => 'index', 'action' => 'clearcache']); - $actions = [ $this->view->tagAnchor($clear_cache_url, - $this->_("Vider le cache de Bokeh")), + $actions = [$this->view->tagAnchor($clear_cache_url, + $this->_("Vider le cache de Bokeh")), $this->view->tagAnchor('#', - $this->_('Activer déplacement des boites'), - ['onclick' => 'window.reactiveOpacBlocksSorting();return true;'])]; + $this->_('Déplacement des boites') . + $this->view->tagImg(Class_Admin_Skin::current() + ->getIconUrl('actions', + 'toggle_off')), + ['class' => 'activate_block_sorting', + 'onclick' => 'window.reactiveOpacBlocksSorting();return true;']), + $this->view->tagAnchor('#', + $this->_('Déplacement des boites') . + $this->view->tagImg(Class_Admin_Skin::current() + ->getIconUrl('actions', + 'toggle_on')), + ['class' => 'deactivate_block_sorting', + 'onclick' => 'window.deactiveOpacBlocksSorting();return true;'])]; return $this->_tag('ul', implode($this->_lify($actions))); } diff --git a/public/admin/js/cfg.accueil.js b/public/admin/js/cfg.accueil.js index 6e9a897acf47023c32841b6ef15dea5463361f62..f7a4c1fa060cf7611ba69b696716b67b98191c00 100644 --- a/public/admin/js/cfg.accueil.js +++ b/public/admin/js/cfg.accueil.js @@ -21,8 +21,8 @@ function opacBlocksSorting(moduleSortUrl, currentProfilId) { - opacBlocksSortingInitPositions(); - + opacBlocksSortingInitPositions(); + $('div.layout-division>div').sortable({ cursor: 'move', connectWith: 'div.layout-division>div', @@ -43,6 +43,7 @@ function opacBlocksSorting(moduleSortUrl, currentProfilId) { opacBlocksSortingInitPositions(); }}); }}); + window.deactiveOpacBlocksSorting(); } diff --git a/public/admin/js/global.js b/public/admin/js/global.js index 73060bc86da94d7679edd016884ccb24549de5ea..4738de521fb20dfd8929d03eb8dd8748eaaf4146 100644 --- a/public/admin/js/global.js +++ b/public/admin/js/global.js @@ -270,11 +270,14 @@ if (initializeNoticeMurAnimation == undefined) { function deactiveOpacBlocksSorting() { $('div.layout-division>div').sortable("disable"); - + $('.activate_block_sorting').closest('li').show(); + $('.deactivate_block_sorting').closest('li').hide(); } function reactiveOpacBlocksSorting() { $('div.layout-division>div').sortable("enable"); + $('.deactivate_block_sorting').closest('li').show(); + $('.activate_block_sorting').closest('li').hide(); } function hideMenuAdmin() { diff --git a/public/admin/skins/bokeh74/config.json b/public/admin/skins/bokeh74/config.json index dd261d49812b938a54510f0bf0a8f351105dd67b..93e7163170a26f3db1060912be22427bef1cd91e 100644 --- a/public/admin/skins/bokeh74/config.json +++ b/public/admin/skins/bokeh74/config.json @@ -134,7 +134,9 @@ "cancel": "icons/actions/cancel_24.png", "computers": "icons/menu/postes_24.png", "batch": "icons/actions/batch_16.png", - "rollback": "icons/actions/rollback_24.png" + "rollback": "icons/actions/rollback_24.png", + "toggle_off": "icons/actions/toggle_off.png", + "toggle_on": "icons/actions/toggle_on.png" }, "buttons": diff --git a/public/admin/skins/bokeh74/front_nav.css b/public/admin/skins/bokeh74/front_nav.css index 1cc293c29c6930e65d643289b13e4cba7a530c82..6877089ca4dc55e781b3f6087dae9e8a1e334e2d 100644 --- a/public/admin/skins/bokeh74/front_nav.css +++ b/public/admin/skins/bokeh74/front_nav.css @@ -28,4 +28,23 @@ .menu_admin_front:not(.hidden) > button > img { transform: rotate(45deg); +} + +.menu_admin_front a { + color: var(--nav-text); + display: block; + line-height: 2em; +} + +.menu_admin_front img { + filter: invert(); + float: right; + vertical-align: middle; + padding-right: 1.5em; +} + +.menu_admin_front ul, +.menu_admin_front li { + margin: 0 0 0 0.5em; + padding: 0 0 0 0.5em; } \ 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 7821b2ef5e9fd75b66e9f69af5eb2c37d252c9ab..cfe7cefe7a375ba07a0f21ef964bf242e21909b0 100644 --- a/tests/application/modules/opac/controllers/IndexControllerTest.php +++ b/tests/application/modules/opac/controllers/IndexControllerTest.php @@ -746,6 +746,6 @@ class IndexControllerWithBibAdminLoggedTest extends AbstractControllerTestCase { /** @test */ public function linkToToggleWidgetMoveShouldBeInMenu() { - $this->assertXPathContentContains('//body/div//ul/li/ul/li/a', 'Activer déplacement des boites'); + $this->assertXPathContentContains('//body/div//ul/li/ul/li/a', 'Déplacement des boites'); } } \ No newline at end of file