diff --git a/library/ZendAfi/Controller/Plugin/XHProfile.php b/library/ZendAfi/Controller/Plugin/XHProfile.php index 495b098324d6e6fcb115b4cf4a0d8ff91b6cae01..e0ced9850b4c62fe6a45af3abd0000dd0da63161 100644 --- a/library/ZendAfi/Controller/Plugin/XHProfile.php +++ b/library/ZendAfi/Controller/Plugin/XHProfile.php @@ -37,10 +37,9 @@ class ZendAfi_Controller_Plugin_XHProfile extends Zend_Controller_Plugin_Abstrac $view=new ZendAfi_Controller_Action_Helper_View(); Class_ScriptLoader::getInstance() - ->addJQueryReady('$("<button>Profile</button>") + ->addJQueryReady('$("<li><a href=\"#\">Profile XHProf</a></li>") .attr("onclick", "window.open(\''.$view->url(["xhprof" => 1]).'\', \'_blank\')") - .attr("style", "position:absolute;top:0;right:0") - .appendTo(\'body\')'); + .appendTo(\'body .menu_admin_front .dev_tools\')'); } if (!$request->getParam('xhprof', false)) diff --git a/library/ZendAfi/View/Helper/Accueil/Kiosque.php b/library/ZendAfi/View/Helper/Accueil/Kiosque.php index 84d936ae977585884a7ab2e14d1309bc0f46563d..52beda3fe2fe52f936eebf58f948fb6cff2ab826 100644 --- a/library/ZendAfi/View/Helper/Accueil/Kiosque.php +++ b/library/ZendAfi/View/Helper/Accueil/Kiosque.php @@ -69,10 +69,7 @@ class ZendAfi_View_Helper_Accueil_Kiosque extends ZendAfi_View_Helper_Accueil_Ba $this->contenu = (in_array($this->preferences['style_liste'], ['mur', 'vignettes', 'chrono'])) ? $this->getKiosqueHtml() : $this->getKiosqueIFrame(); - $this->contenu = - $this->getAddEditLinks() - .$this->getChangeKiosqueData() - .$this->contenu; + $this->contenu = $this->getChangeKiosqueData() . $this->contenu; return $this->getHtmlArray(); } @@ -130,12 +127,15 @@ class ZendAfi_View_Helper_Accueil_Kiosque extends ZendAfi_View_Helper_Accueil_Ba ],null,true); return - '<div class="change_kiosque_data">'. - $this->view->tagAnchor($change_kiosque_selection_url, - $this->view->tagImg(URL_ADMIN_IMG.'picto/domaines_16.png', - ['title' => $this->view->_('Modifier la source de données du kiosque')]), - ['data-popup'=>'true']). - '</div>'; + $this->_tag('div', + $this->getAddEditLinks() . + $this->view->tagAnchor($change_kiosque_selection_url, + $this->view->tagImg(Class_Admin_Skin::current() + ->getIconUrl('icons', + 'domains'), + ['title' => $this->view->_('Modifier la source de données du kiosque')]), + ['data-popup'=>'true']), + ['class' => 'change_kiosque_data configuration_module']); } diff --git a/library/ZendAfi/View/Helper/Admin/FrontNav.php b/library/ZendAfi/View/Helper/Admin/FrontNav.php index 944fe999decdf0eb8138db9202241dbccf984b33..ddc04f1a99f1b67815512071604db311c313a293 100644 --- a/library/ZendAfi/View/Helper/Admin/FrontNav.php +++ b/library/ZendAfi/View/Helper/Admin/FrontNav.php @@ -254,7 +254,7 @@ class ZendAfi_View_Helper_Admin_FrontNav extends ZendAfi_View_Helper_BaseHelper return ''; return $this->_tag('h3', $this->_('Développement')) - . $this->_tag('ul', implode($this->_lify($tools))); + . $this->_tag('ul', implode($this->_lify($tools)), ['class' => 'dev_tools']); } diff --git a/public/admin/skins/bokeh72/front_nav.css b/public/admin/skins/bokeh72/front_nav.css index 618fbaaf49b5ef48b9ed5d26d0ea9b8c4f697594..97e51fd7a997374cc11b7e030db69d454b6bbaf1 100644 --- a/public/admin/skins/bokeh72/front_nav.css +++ b/public/admin/skins/bokeh72/front_nav.css @@ -31,7 +31,7 @@ position: fixed; top: 0; left: 0; - z-index: 101; + z-index: 102; } .menu_admin_front > button, diff --git a/public/admin/skins/bokeh74/front_nav.css b/public/admin/skins/bokeh74/front_nav.css index d463cf3565b432dbe0859bee7b6abd244cb8eab6..50bde8a9797898a0427d3e33d1a5f0be6766c3d0 100644 --- a/public/admin/skins/bokeh74/front_nav.css +++ b/public/admin/skins/bokeh74/front_nav.css @@ -31,7 +31,7 @@ position: fixed; top: 0; left: 0; - z-index: 101; + z-index: 102; } .menu_admin_front > button, diff --git a/public/admin/skins/retro/front_nav.css b/public/admin/skins/retro/front_nav.css index dfef4305c8cf5eeaa090bbe9145f83455fecf838..2b7045bef4eb12a474b1ca689fbd2b8625ce8276 100644 --- a/public/admin/skins/retro/front_nav.css +++ b/public/admin/skins/retro/front_nav.css @@ -48,7 +48,7 @@ position: fixed; top: 0; left: 0; - z-index: 101; + z-index: 102; } .menu_admin_front > button, diff --git a/public/opac/css/global.css b/public/opac/css/global.css index befa0c63f5c48470febeeee178ce3c1a4ed193cc..adcd75febd82d31fdc5122a9756b19c218ff323d 100644 --- a/public/opac/css/global.css +++ b/public/opac/css/global.css @@ -1076,8 +1076,9 @@ article, } -.boite.kiosque .change_kiosque_data { - display: inline; +.boite.kiosque .change_kiosque_data.configuration_module { + float: left; + left: 2em; }