From 51f4e91c1ebe3b5736876c8b2e8bc97c5065be94 Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Mon, 28 Aug 2017 16:06:43 +0200
Subject: [PATCH] dev #61993 admin icons hid less text elements
---
VERSIONS_WIP/61993 | 1 +
.../modules/opac/views/scripts/head.phtml | 1 -
public/admin/js/onload_utils.js | 28 -----------------
public/admin/skins/bokeh72/front_nav.css | 28 +++++++++++------
public/admin/skins/bokeh74/front_nav.css | 13 +++++---
public/admin/skins/retro/front_nav.css | 12 ++++---
public/opac/css/global.css | 31 +++++++++++--------
7 files changed, 53 insertions(+), 61 deletions(-)
create mode 100644 VERSIONS_WIP/61993
diff --git a/VERSIONS_WIP/61993 b/VERSIONS_WIP/61993
new file mode 100644
index 00000000000..cac3abf2ea2
--- /dev/null
+++ b/VERSIONS_WIP/61993
@@ -0,0 +1 @@
+ - ticket #61993 : Les icones d'administration en front cachent moins les textes
\ No newline at end of file
diff --git a/application/modules/opac/views/scripts/head.phtml b/application/modules/opac/views/scripts/head.phtml
index af83377af47..701b2380ee1 100644
--- a/application/modules/opac/views/scripts/head.phtml
+++ b/application/modules/opac/views/scripts/head.phtml
@@ -36,7 +36,6 @@
'division-five',
'reload_module'])
->addJQueryReady('
- autoHideShowConfigurationModule();
initializeNoticeMurAnimation();
initializeImgHover();
initializePopups();
diff --git a/public/admin/js/onload_utils.js b/public/admin/js/onload_utils.js
index 22580fd778e..696095416f1 100644
--- a/public/admin/js/onload_utils.js
+++ b/public/admin/js/onload_utils.js
@@ -70,34 +70,6 @@ var setupAnchorsTarget = function() {
}
-var autoHideShowConfigurationModule = function() {
- autoHideShowTagOnParentHover('.configuration_module', 'div.boite');
- autoHideShowTagOnParentHover('a[class^="edit_"]', 'div.boite');
- autoHideShowTagOnParentHover('a[class^="edit_"]', 'div.menu_horizontal');
- autoHideShowTagOnParentHover('.select_kiosque_form', 'div.boite');
- autoHideShowTagOnParentHover('.newsadd', 'div.boite');
- autoHideShowTagOnParentHover('.default_filters', 'div.boite');
-}
-
-
-var autoHideShowTagOnParentHover = function (child_selector, parent_selector) {
- hide_selector = parent_selector + ' ' + child_selector;
- $(hide_selector).hide();
- $(child_selector).parents(parent_selector).hover(
- function() {
- $(this).find(child_selector).fadeIn();
- },
-
- function() {
- if (!$(this).find('select').is(":focus"))
- $(parent_selector).find(child_selector).fadeOut();
- }
- );
-
-}
-
-
-
var initializeImgHover = function() {
var images = $('img[data-hover]');
images.each(function(index, element) {
diff --git a/public/admin/skins/bokeh72/front_nav.css b/public/admin/skins/bokeh72/front_nav.css
index 7055fa7b95c..46f1648b4b1 100644
--- a/public/admin/skins/bokeh72/front_nav.css
+++ b/public/admin/skins/bokeh72/front_nav.css
@@ -109,24 +109,30 @@
width: 270px;
}
-#site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] {
- display: inline-block !important;
-}
-
-
-#site_web_wrapper[data-show_admin_icons="true"] .configuration_module {
- display: block !important;
-}
#site_web_wrapper .footer select[onchange],
#site_web_wrapper .footer a[href*="/admin"],
#site_web_wrapper .admin_tools_lock,
#site_web_wrapper .configuration_module,
#site_web_wrapper a[href*="/admin"] {
- display: none !important;
- opacity: 1 !important;
+ display: none;
+ opacity: 1;
}
+
+#site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] {
+ display: inline-block;
+}
+
+
+#site_web_wrapper[data-show_admin_icons="true"] .configuration_module {
+ display: block;
+ position: absolute;
+ right: 10px;
+ top: 10px;
+}
+
+
.menu_admin_front a:hover,
.menu_admin_front a:focus {
text-decoration: underline;
@@ -141,3 +147,5 @@
margin: 1em 0 1em 0;
font-weight: bold;
}
+
+
diff --git a/public/admin/skins/bokeh74/front_nav.css b/public/admin/skins/bokeh74/front_nav.css
index 5214189aa08..62e93c850d9 100644
--- a/public/admin/skins/bokeh74/front_nav.css
+++ b/public/admin/skins/bokeh74/front_nav.css
@@ -111,7 +111,7 @@
}
#site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] {
- display: inline-block !important;
+ display: inline-block;
}
.menu_admin_front a img {
@@ -123,7 +123,10 @@
}
#site_web_wrapper[data-show_admin_icons="true"] .configuration_module {
- display: block !important;
+ display: block;
+ position: absolute;
+ right: 10px;
+ top: 10px;
}
#site_web_wrapper .footer select[onchange],
@@ -131,8 +134,8 @@
#site_web_wrapper .admin_tools_lock,
#site_web_wrapper .configuration_module,
#site_web_wrapper a[href*="/admin"] {
- display: none !important;
- opacity: 1 !important;
+ display: none;
+ opacity: 1;
}
.menu_admin_front a:hover,
@@ -152,4 +155,4 @@
.menu_admin_front .admin_menu_title label {
font-weight: bold;
-}
+}
\ No newline at end of file
diff --git a/public/admin/skins/retro/front_nav.css b/public/admin/skins/retro/front_nav.css
index d1f11a3ed33..d2336e434a7 100644
--- a/public/admin/skins/retro/front_nav.css
+++ b/public/admin/skins/retro/front_nav.css
@@ -126,12 +126,15 @@
}
#site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] {
- display: inline-block !important;
+ display: inline-block;
}
#site_web_wrapper[data-show_admin_icons="true"] .configuration_module {
- display: block !important;
+ display: block;
+ position: absolute;
+ right: 10px;
+ top: 10px;
}
#site_web_wrapper .footer select[onchange],
@@ -139,10 +142,11 @@
#site_web_wrapper .admin_tools_lock,
#site_web_wrapper .configuration_module,
#site_web_wrapper a[href*="/admin"] {
- display: none !important;
- opacity: 1 !important;
+ display: none;
+ opacity: 1;
}
+
.menu_admin_front a:hover,
.menu_admin_front a:focus {
text-decoration: underline;
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index 481e0d4a31a..df0fd13eb7a 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -412,9 +412,6 @@ table.calendar_table td {
position: relative;
}
-ul.menuGauche {
- overflow: hidden;
-}
ul.menuGauche li {
white-space: nowrap;
@@ -976,10 +973,6 @@ ul.view-raw-rss li {
margin-top: 10px;
}
-.edit_menu {
- left: 0;
- top: 0;
-}
.edit_album {
float: right;
@@ -3175,6 +3168,10 @@ a.loan-export {
padding: 0 20px;
}
+.boite.library section {
+ position: relative;
+}
+
.dilicom-action {
padding: 5px;
margin: 10px;
@@ -3577,17 +3574,13 @@ a.default_filters,
a[class*="edit_"]:not(.edit_profil):focus,
a[class*="edit_"]:not(.edit_profil) {
display: inline-block;
- margin: 0 !important;
- padding: 0 !important;
- left: 0;
- top: 0;
z-index: 101;
background-color: transparent !important;
margin: 0 !important;
- padding: 1px !important;
height: auto !important;
width: auto !important;
border: 2px solid transparent !important;
+ left: 0;
}
a.newsadd:hover,
@@ -3607,7 +3600,7 @@ a[class*="edit_"] img {
margin: 0 !important;
padding: 0 !important;
border-radius: 0 !important;
- vertical-align: middle;
+ vertical-align: top;
}
.edit_profil {
@@ -3629,4 +3622,16 @@ a.default_filters:focus {
.menu_horizontal > a.edit_menu {
left: auto;
right: 0;
+}
+
+
+
+div.menu_vertical ul a.edit_menu,
+#menu_horizontal ul a.edit_menu {
+ left: -1em;
+}
+
+article header .edit_article,
+section .edit_library {
+ top: 2ex;
}
\ No newline at end of file
--
GitLab