From 4184e0977c1a941a45a04b5a06fd4a31fcb2211c Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Thu, 1 Jun 2017 15:02:34 +0200
Subject: [PATCH] dev #60900 cosmetic
---
.../ZendAfi/Controller/Plugin/XHProfile.php | 5 ++---
.../ZendAfi/View/Helper/Accueil/Kiosque.php | 20 +++++++++----------
.../ZendAfi/View/Helper/Admin/FrontNav.php | 2 +-
public/admin/skins/bokeh72/front_nav.css | 2 +-
public/admin/skins/bokeh74/front_nav.css | 2 +-
public/admin/skins/retro/front_nav.css | 2 +-
public/opac/css/global.css | 5 +++--
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/library/ZendAfi/Controller/Plugin/XHProfile.php b/library/ZendAfi/Controller/Plugin/XHProfile.php
index 495b098324d..e0ced9850b4 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 84d936ae977..52beda3fe2f 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 944fe999dec..ddc04f1a99f 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 618fbaaf49b..97e51fd7a99 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 d463cf3565b..50bde8a9797 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 dfef4305c8c..2b7045bef4e 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 befa0c63f5c..adcd75febd8 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;
}
--
GitLab