diff --git a/VERSIONS_WIP/61993 b/VERSIONS_WIP/61993
new file mode 100644
index 0000000000000000000000000000000000000000..cac3abf2ea2e8ce4810c26daf2686dce8d956ee9
--- /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 af83377af4715b1ed92979c5a5b9ea17fd5a3fd6..701b2380ee1db6304708accf4919b8b5bee57061 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/library/ZendAfi/View/Helper/Accueil/Kiosque.php b/library/ZendAfi/View/Helper/Accueil/Kiosque.php
index 70e98f3a8cff8136fc153a5e636bbafad2c384e4..c59660584b3c19555026ba4cfa435d291d9c47dd 100644
--- a/library/ZendAfi/View/Helper/Accueil/Kiosque.php
+++ b/library/ZendAfi/View/Helper/Accueil/Kiosque.php
@@ -69,20 +69,17 @@ 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->getChangeKiosqueData() . $this->contenu;
+ $this->contenu = $this->contenu;
return $this->getHtmlArray();
}
- public function getAddEditLinks() {
- if (!Class_Users::isCurrentUserCanAccesBackend())
- return '';
-
+ public function getEditLink() {
if (!($this->preferences['id_catalogue'] && ($catalogue = Class_Catalogue::find($this->preferences['id_catalogue']))))
return '';
- $edit_link = $this->view->tagAnchor($this->view->url(['module' => 'admin',
+ return $this->view->tagAnchor($this->view->url(['module' => 'admin',
'controller' => 'catalogue',
'action' => 'edit',
'id_catalogue' => $this->preferences['id_catalogue']]),
@@ -91,10 +88,17 @@ class ZendAfi_View_Helper_Accueil_Kiosque extends ZendAfi_View_Helper_Accueil_Ba
['title' => $this->view->_('Modifier le domaine : %s', htmlspecialchars($catalogue->getLibelle()))]),
['data-popup' => 'true']);
+ }
+
+
+ public function getAddLink() {
+ if (!($this->preferences['id_catalogue'] && ($catalogue = Class_Catalogue::find($this->preferences['id_catalogue']))))
+ return null;
+
if (!$domaine_parent = $catalogue->getDomaineParent())
- return $edit_link;
+ return null;
- $add_link = $this->view->tagAnchor($this->view->url(['module' => 'admin',
+ return $this->view->tagAnchor($this->view->url(['module' => 'admin',
'controller' => 'catalogue',
'action' => 'add',
'id_catalogue' => $domaine_parent->getId(),
@@ -102,15 +106,23 @@ class ZendAfi_View_Helper_Accueil_Kiosque extends ZendAfi_View_Helper_Accueil_Ba
Class_Admin_Skin::current()
->renderActionIconOn('add', $this->view, ['title' => $this->view->_('Afficher un nouveau domaine')]),
['data-popup' => 'true']);
-
- return $edit_link.$add_link;
}
- public function getChangeKiosqueData() {
+ protected function _extendedActions() {
if (!Class_Users::isCurrentUserCanAccesBackend())
- return '<div style="display:none"></div>';
+ return null;
+
+ return [
+ function() { return $this->getChangeKiosqueData(); },
+ function() { return $this->getAddLink(); },
+ function() { return $this->getEditLink(); }
+ ];
+ }
+
+
+ public function getChangeKiosqueData() {
$id_panier = isset($this->preferences['id_panier'])
? $this->preferences['id_panier']
: 0;
@@ -126,17 +138,12 @@ class ZendAfi_View_Helper_Accueil_Kiosque extends ZendAfi_View_Helper_Accueil_Ba
'id_module' => $this->id_module
],null,true);
- return
- $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->_('Choisir un autre domaine')]),
- ['data-popup'=>'true']),
- ['class' => 'change_kiosque_data configuration_module']);
-
+ return $this->view->tagAnchor($change_kiosque_selection_url,
+ $this->view->tagImg(Class_Admin_Skin::current()
+ ->getIconUrl('icons',
+ 'domains'),
+ ['title' => $this->view->_('Choisir un autre domaine')]),
+ ['data-popup'=>'true']);
}
diff --git a/library/ZendAfi/View/Helper/Accueil/Library.php b/library/ZendAfi/View/Helper/Accueil/Library.php
index e60c77814d823b92032110944e44727af0a3f47e..90f29c25174a190247ef529ce376cf35d53aa09f 100644
--- a/library/ZendAfi/View/Helper/Accueil/Library.php
+++ b/library/ZendAfi/View/Helper/Accueil/Library.php
@@ -70,6 +70,7 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
->tagAnchor($this->view->url(array_merge(
$this->_getBaseUrl(),
['default_filters' => 1,
+ 'admin' => 1, // remove this when #64325 done
'render' => null])),
Class_Admin_Skin::current()
->renderMenuIconOn('moderation',
diff --git a/library/ZendAfi/View/Helper/Accueil/MenuVertical.php b/library/ZendAfi/View/Helper/Accueil/MenuVertical.php
index 6f98639b9a02ae46f1c782abfad377768a6e970f..24c4dc6b2a2b7ac39650f0832aaf62e80a4b0edc 100644
--- a/library/ZendAfi/View/Helper/Accueil/MenuVertical.php
+++ b/library/ZendAfi/View/Helper/Accueil/MenuVertical.php
@@ -85,11 +85,16 @@ class ZendAfi_View_Helper_Accueil_MenuVertical extends ZendAfi_View_Helper_Accue
: $this->_getContentAsOldHtml($config);
$this->titre = $titre;
- $this->contenu = $this->_editMenu() . $contenu;
+ $this->contenu = $contenu;
return $this->getHtmlArray();
}
+ protected function _extendedActions() {
+ return [function() { return $this->_editMenu(); }];
+ }
+
+
protected function _editMenu() {
return $this->view->tagEditMenu($this->_menu_id, $this->_menu_id_profil);
}
diff --git a/library/ZendAfi/View/Helper/FonctionsAdmin.php b/library/ZendAfi/View/Helper/FonctionsAdmin.php
index 01d131763eb2510a9508306ab92a5c182e451be2..a8872ea5e6a1ea805a18bbf8bf718ec9b731dca8 100644
--- a/library/ZendAfi/View/Helper/FonctionsAdmin.php
+++ b/library/ZendAfi/View/Helper/FonctionsAdmin.php
@@ -34,18 +34,22 @@ class ZendAfi_View_Helper_FonctionsAdmin extends ZendAfi_View_Helper_BaseHelper
$this->division = $division;
$this->_current_skin = Class_Admin_Skin::current();
- if (!Class_Users::isCurrentUserCanConfigFront())
- return '';
-
- return ($actions = trim($this->_extended($extended_actions) . ' '
- . $this->_config() . ' '
- . $this->_versions() . ' '
- . $this->_add() . ' '
- . $this->_delete())) ?
- $this->_tag('div', $actions,
- ['class' => 'configuration_module',
- 'style' => 'text-align:right']) :
- '';
+ $actions = [$this->_extended($extended_actions)];
+
+ if (Class_Users::isCurrentUserCanConfigFront())
+ $actions = array_merge($actions,
+ [$this->_config(),
+ $this->_versions(),
+ $this->_add(),
+ $this->_delete()]);
+
+ $html = trim(implode(' ', array_filter($actions)));
+
+ return $html
+ ? $this->_tag('div', $html,
+ ['class' => 'configuration_module',
+ 'style' => 'text-align:right'])
+ : '';
}
diff --git a/public/admin/css/front_nav.css b/public/admin/css/front_nav.css
new file mode 100644
index 0000000000000000000000000000000000000000..20d17cf5b70547f15f61130bfcb5cdc4c4482c8c
--- /dev/null
+++ b/public/admin/css/front_nav.css
@@ -0,0 +1,232 @@
+
+.menu_admin_front * {
+ box-sizing: content-box;
+ font-family: arial, sans-serif;
+}
+
+.menu_admin_front .form select,
+.menu_admin_front > div {
+ background-color: var(--widget-background);
+}
+
+.menu_admin_front .admin_menu_title,
+.menu_admin_front .form select,
+.menu_admin_front label {
+ color: var(--main-text);
+}
+
+.menu_admin_front a {
+ color: var(--anchor);
+}
+
+.menu_admin_front .form select {
+ border: 1px solid var(--border-highlight);
+}
+
+.menu_admin_front > div {
+ box-shadow: 1px 1px 5px var(--widget-shadow);
+}
+
+.menu_admin_front {
+ font-size: 12px;
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 102;
+}
+
+.menu_admin_front > button,
+.menu_admin_front > div {
+ transition: all 0.4s;
+}
+
+.menu_admin_front > div {
+ overflow: hidden;
+ width: 300px;
+}
+
+.menu_admin_front.hidden > div {
+ margin-left: -300px;
+ position: absolute;
+}
+
+.menu_admin_front > button {
+ margin: 0;
+ white-space: nowrap;
+}
+
+.menu_admin_front:not(.hidden) > button > img {
+ transform: rotate(45deg);
+}
+
+.menu_admin_front .amdin_menu_title,
+.menu_admin_front form tr,
+.menu_admin_front a {
+ display: block;
+ line-height: 2em;
+}
+
+.menu_admin_front a img {
+ float: right;
+ vertical-align: middle;
+ padding-right: 1.5em;
+}
+
+.menu_admin_front ul,
+.menu_admin_front li {
+ margin: 0 0 0 0.2em;
+ padding: 0 0 0 0.2em;
+ list-style: none;
+}
+
+.menu_admin_front [class*="deactivate"] {
+ display: none;
+}
+
+.menu_admin_front fieldset {
+ padding: 0;
+ margin: 0;
+}
+
+.menu_admin_front .form td {
+ display: inline-block;
+ text-align: left !important;
+}
+
+.menu_admin_front form + .boutons {
+ display: none;
+}
+
+.menu_admin_front .form {
+ text-align: left;
+}
+
+.menu_admin_front .form * {
+ display: block;
+}
+
+.menu_admin_front .form select {
+ display: inline;
+ height: 2em;
+ width: 270px;
+}
+
+#site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] {
+ display: inline-block !important;
+}
+
+
+.menu_admin_front a[href$="/admin"] img {
+ filter: invert(1);
+}
+
+
+#site_web_wrapper[data-show_admin_icons="true"] .configuration_module {
+ z-index: 101;
+ display: block !important;
+ position: absolute;
+ right: 10px;
+ top: 10px;
+}
+
+#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;
+}
+
+
+#site_web_wrapper a[href*="/admin"] {
+ z-index: 101;
+ background-color: transparent !important;
+ margin: 0 !important;
+ border: 2px solid transparent !important;
+ left: 0;
+ padding: 1px !important;
+ opacity: 0.4;
+}
+
+
+#site_web_wrapper a[href*="/admin"],
+#site_web_wrapper a[href*="/admin"] img {
+ height: 16px !important;
+ width: 16px !important;
+}
+
+
+#site_web_wrapper a[href*="/admin"] img {
+ margin: 0 !important;
+ padding: 0 !important;
+ border-radius: 0 !important;
+ vertical-align: top;
+ left: auto !important;
+ top: auto !important;
+ position: static !important;
+}
+
+
+#site_web_wrapper #menu_horizontal:hover a[href*="/admin"],
+#site_web_wrapper .boite:hover a[href*="/admin"] {
+ opacity: 1 !important;
+}
+
+
+#site_web_wrapper .boite:hover .configuration_module {
+ height: 20px;
+ background-color: var(--line-highlight);
+}
+
+
+#site_web_wrapper a[href*="/admin"]:hover {
+ border-color: black !important;
+ background-color: white !important;
+}
+
+.menu_admin_front a:hover,
+.menu_admin_front a:focus {
+ text-decoration: underline;
+}
+
+.menu_admin_front > div {
+ padding-bottom: 1em;
+}
+
+.menu_admin_front .admin_menu_title {
+ font-size: 1.17em;
+ margin: 1em 0 1em 0;
+ font-weight: bold;
+}
+
+.menu_admin_front .admin_menu_title label {
+ font-weight: bold;
+}
+
+
+a[class*="edit_"]:not(.edit_profil) {
+ position: absolute;
+}
+
+.configuration_module a.edit_menu {
+ position: static;
+}
+
+
+.menu_horizontal > a.edit_menu:focus,
+.menu_horizontal > a.edit_menu {
+ left: auto !important;
+ right: 0;
+}
+
+
+
+div.menu_vertical ul a.edit_menu,
+#menu_horizontal ul a.edit_menu {
+ left: -1em !important;
+}
+
+article header .edit_article,
+section .edit_library {
+ top: 2ex;
+}
\ No newline at end of file
diff --git a/public/admin/js/onload_utils.js b/public/admin/js/onload_utils.js
index 22580fd778e9083d37e68c9e4570a7b513d98231..696095416f11c87c76fb55e50f6d9380f4a50c4c 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 7055fa7b95c0d948cf3677fafebe7b7100d39b42..0f2066cd19c0ea1be164ee7b70381382586e6d9c 100644
--- a/public/admin/skins/bokeh72/front_nav.css
+++ b/public/admin/skins/bokeh72/front_nav.css
@@ -1,143 +1 @@
-.menu_admin_front * {
- box-sizing: content-box;
- font-family: arial, sans-serif;
-}
-
-.menu_admin_front .form select,
-.menu_admin_front > div {
- background-color: var(--widget-background);
-}
-
-.menu_admin_front .admin_menu_title,
-.menu_admin_front .form select,
-.menu_admin_front label {
- color: var(--main-text);
-}
-
-.menu_admin_front a {
- color: var(--anchor);
-}
-
-.menu_admin_front .form select {
- border: 1px solid var(--border-highlight);
-}
-
-.menu_admin_front > div {
- box-shadow: 1px 1px 5px var(--widget-shadow);
-}
-
-.menu_admin_front {
- position: fixed;
- top: 0;
- left: 0;
- z-index: 102;
-}
-
-.menu_admin_front > button,
-.menu_admin_front > div {
- transition: all 0.4s;
-}
-
-.menu_admin_front > div {
- overflow: hidden;
- width: 300px;
-}
-
-.menu_admin_front.hidden > div {
- margin-left: -300px;
- position: absolute;
-}
-
-.menu_admin_front > button {
- margin: 0;
- white-space: nowrap;
-}
-
-.menu_admin_front:not(.hidden) > button > img {
- transform: rotate(45deg);
-}
-
-.menu_admin_front .admin_menu_title,
-.menu_admin_front form tr,
-.menu_admin_front a {
- display: block;
- line-height: 2em;
-}
-
-.menu_admin_front a img {
- float: right;
- vertical-align: middle;
- padding-right: 1.5em;
-}
-
-.menu_admin_front ul,
-.menu_admin_front li {
- margin: 0 0 0 0.2em;
- padding: 0 0 0 0.2em;
- list-style: none;
-}
-
-.menu_admin_front [class*="deactivate"] {
- display: none;
-}
-
-.menu_admin_front fieldset {
- padding: 0;
- margin: 0;
-}
-
-.menu_admin_front .form td {
- display: inline-block;
- text-align: left !important;
-}
-
-.menu_admin_front form + .boutons {
- display: none;
-}
-
-.menu_admin_front .form {
- text-align: left;
-}
-
-.menu_admin_front .form * {
- display: block;
-}
-
-.menu_admin_front .form select {
- display: inline;
- height: 2em;
- 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;
-}
-
-.menu_admin_front a:hover,
-.menu_admin_front a:focus {
- text-decoration: underline;
-}
-
-.menu_admin_front a img {
- height: 18px;
-}
-
-.menu_admin_front .admin_menu_title {
- font-size: 1.17em;
- margin: 1em 0 1em 0;
- font-weight: bold;
-}
+@import url('../../css/front_nav.css');
\ No newline at end of file
diff --git a/public/admin/skins/bokeh74/front_nav.css b/public/admin/skins/bokeh74/front_nav.css
index 5214189aa087316a706a9c2df78e359cf4b71949..0f2066cd19c0ea1be164ee7b70381382586e6d9c 100644
--- a/public/admin/skins/bokeh74/front_nav.css
+++ b/public/admin/skins/bokeh74/front_nav.css
@@ -1,155 +1 @@
-.menu_admin_front * {
- box-sizing: content-box;
- font-family: arial, sans-serif;
-}
-
-.menu_admin_front .form select,
-.menu_admin_front > div {
- background-color: var(--widget-background);
-}
-
-.menu_admin_front .admin_menu_title,
-.menu_admin_front .form select,
-.menu_admin_front label {
- color: var(--main-text);
-}
-
-.menu_admin_front a {
- color: var(--anchor);
-}
-
-.menu_admin_front .form select {
- border: 1px solid var(--border-highlight);
-}
-
-.menu_admin_front > div {
- box-shadow: 1px 1px 5px var(--widget-shadow);
-}
-
-.menu_admin_front {
- font-size: 12px;
- position: fixed;
- top: 0;
- left: 0;
- z-index: 102;
-}
-
-.menu_admin_front > button,
-.menu_admin_front > div {
- transition: all 0.4s;
-}
-
-.menu_admin_front > div {
- overflow: hidden;
- width: 300px;
-}
-
-.menu_admin_front.hidden > div {
- margin-left: -300px;
- position: absolute;
-}
-
-.menu_admin_front > button {
- margin: 0;
- white-space: nowrap;
-}
-
-.menu_admin_front:not(.hidden) > button > img {
- transform: rotate(45deg);
-}
-
-.menu_admin_front .amdin_menu_title,
-.menu_admin_front form tr,
-.menu_admin_front a {
- display: block;
- line-height: 2em;
-}
-
-.menu_admin_front a img {
- float: right;
- vertical-align: middle;
- padding-right: 1.5em;
-}
-
-.menu_admin_front ul,
-.menu_admin_front li {
- margin: 0 0 0 0.2em;
- padding: 0 0 0 0.2em;
- list-style: none;
-}
-
-.menu_admin_front [class*="deactivate"] {
- display: none;
-}
-
-.menu_admin_front fieldset {
- padding: 0;
- margin: 0;
-}
-
-.menu_admin_front .form td {
- display: inline-block;
- text-align: left !important;
-}
-
-.menu_admin_front form + .boutons {
- display: none;
-}
-
-.menu_admin_front .form {
- text-align: left;
-}
-
-.menu_admin_front .form * {
- display: block;
-}
-
-.menu_admin_front .form select {
- display: inline;
- height: 2em;
- width: 270px;
-}
-
-#site_web_wrapper[data-show_admin_icons="true"] a[href*="/admin"] {
- display: inline-block !important;
-}
-
-.menu_admin_front a img {
- height: 18px;
-}
-
-.menu_admin_front a[href$="/admin"] img {
- filter: invert(1);
-}
-
-#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;
-}
-
-.menu_admin_front a:hover,
-.menu_admin_front a:focus {
- text-decoration: underline;
-}
-
-.menu_admin_front > div {
- padding-bottom: 1em;
-}
-
-.menu_admin_front .admin_menu_title {
- font-size: 1.17em;
- margin: 1em 0 1em 0;
- font-weight: bold;
-}
-
-.menu_admin_front .admin_menu_title label {
- font-weight: bold;
-}
+@import url('../../css/front_nav.css');
\ 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 d1f11a3ed337e56b39be10f735ff0b508b2c81db..b8ebbecc18cf630d087dc490c15ad84ba7997137 100644
--- a/public/admin/skins/retro/front_nav.css
+++ b/public/admin/skins/retro/front_nav.css
@@ -1,3 +1,5 @@
+@import url('../../css/front_nav.css');
+
@font-face{
font-family:minecraft;
src:url(Minecraft.ttf) format("truetype");
@@ -23,138 +25,4 @@
.menu_admin_front > div > ul > li {
margin-top: 1em;
-}
-
-.menu_admin_front .admin_menu_title,
-.menu_admin_front .form select,
-.menu_admin_front label {
- color: var(--main-text);
-}
-
-.menu_admin_front a {
- color: var(--anchor);
-}
-
-.menu_admin_front .form select {
- border: 1px solid var(--border-highlight);
-}
-
-.menu_admin_front > div {
- box-shadow: 1px 1px 5px var(--widget-shadow);
-}
-
-.menu_admin_front {
- position: fixed;
- top: 0;
- left: 0;
- z-index: 102;
-}
-
-.menu_admin_front > button,
-.menu_admin_front > div {
- transition: all 0.4s;
-}
-
-.menu_admin_front > div {
- overflow: hidden;
- width: 300px;
-}
-
-.menu_admin_front.hidden > div {
- margin-left: -300px;
- position: absolute;
-}
-
-.menu_admin_front > button {
- margin: 0;
- white-space: nowrap;
-}
-
-.menu_admin_front:not(.hidden) > button > img {
- transform: rotate(45deg);
-}
-
-.menu_admin_front .admin_menu_title,
-.menu_admin_front form tr,
-.menu_admin_front a {
- display: block;
- line-height: 2em;
-}
-
-.menu_admin_front a img {
- float: right;
- vertical-align: middle;
- padding-right: 1.5em;
-}
-
-.menu_admin_front ul,
-.menu_admin_front li {
- margin: 0;
- padding: 0 0.2em 0 0.2em;
- list-style: none;
-}
-
-.menu_admin_front [class*="deactivate"] {
- display: none;
-}
-
-.menu_admin_front fieldset {
- padding: 0;
- margin: 0;
-}
-
-.menu_admin_front .form td {
- display: inline-block;
- text-align: left !important;
-}
-
-.menu_admin_front form + .boutons {
- display: none;
-}
-
-.menu_admin_front .form {
- text-align: left;
-}
-
-.menu_admin_front .form * {
- display: block;
-}
-
-.menu_admin_front .form select {
- height: 2em;
- 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;
-}
-
-.menu_admin_front a:hover,
-.menu_admin_front a:focus {
- text-decoration: underline;
-}
-
-.menu_admin_front a[href$="/admin"] img {
- height: 18px;
- filter: invert(1);
-}
-
-.menu_admin_front .admin_menu_title {
- font-size: 1.17em;
- margin: 1em 0 1em 0;
- font-weight: bold;
-}
+}
\ No newline at end of file
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index 481e0d4a31a825b4ef07bcfb4432874bf43ccbda..b14fcc8a308b32e159d5c4dda54316b5e321c274 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -35,13 +35,6 @@ a {
/* Boites bannière*/
-.configuration_module {
- z-index: 101;
- position: relative;
- height: 0px;
- float: right;
- cursor:pointer;
-}
.select_kiosque_form {
margin-right:25px;
@@ -412,9 +405,6 @@ table.calendar_table td {
position: relative;
}
-ul.menuGauche {
- overflow: hidden;
-}
ul.menuGauche li {
white-space: nowrap;
@@ -976,10 +966,6 @@ ul.view-raw-rss li {
margin-top: 10px;
}
-.edit_menu {
- left: 0;
- top: 0;
-}
.edit_album {
float: right;
@@ -1070,7 +1056,6 @@ ul.view-raw-rss li {
article,
.colContenu,
.kiosque .titre,
-.kiosque .contenu,
.boite.kiosque {
position: relative;
}
@@ -3175,6 +3160,10 @@ a.loan-export {
padding: 0 20px;
}
+.boite.library section {
+ position: relative;
+}
+
.dilicom-action {
padding: 5px;
margin: 10px;
@@ -3563,70 +3552,4 @@ th.actions {
.boutons {
text-align: center;
padding: 1em;
-}
-
-a.newsadd,
-a.default_filters,
-a[class*="edit_"]:not(.edit_profil) {
- position: absolute;
-}
-
-a.newsadd,
-a.default_filters,
-.configuration_module a,
-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;
-}
-
-a.newsadd:hover,
-a.default_filters:hover,
-.configuration_module a:hover,
-a[class*="edit_"]:not(.edit_profil):hover {
- border-color: black !important;
- background-color: white !important;
-}
-
-a.newsadd img,
-a.default_filters img,
-.configuration_module a img,
-a[class*="edit_"] img {
- height: 16px !important;
- width: 16px !important;
- margin: 0 !important;
- padding: 0 !important;
- border-radius: 0 !important;
- vertical-align: middle;
-}
-
-.edit_profil {
- margin: 0 5px;
-}
-
-.configuration_module + a.edit_menu:focus,
-.configuration_module + a.edit_menu,
-a.newsadd,
-a.newsadd:focus,
-a.default_filters,
-a.default_filters:focus {
- top: auto;
- left: auto;
- right: 80px !important;
-}
-
-.menu_horizontal > a.edit_menu:focus,
-.menu_horizontal > a.edit_menu {
- left: auto;
- right: 0;
}
\ No newline at end of file
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php b/tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php
index a8c69d0746da0dae16f5a25104118c42de312ebf..e1ef547edbcc43141c530bafd4ee9e4962070631 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php
@@ -303,9 +303,6 @@ class ZendAfi_View_Helper_Accueil_KiosqueRequetesAsRedacteurTest extends ZendAfi
public function setUp() {
parent::setUp();
-// Storm_Test_ObjectWrapper::onLoaderOfModel('Class_PanierNotice')
-// ->whenCalled('findAllBy')
-// ->answers([$this->panier_films, $this->panier_livres]);
$redacteur = Class_Users::newInstanceWithId(54)
->beModoBib()
@@ -324,7 +321,7 @@ class ZendAfi_View_Helper_Accueil_KiosqueRequetesAsRedacteurTest extends ZendAfi
/** @test **/
public function boiteKiosqueWithAdminLoggedShouldContainsLinkToChange() {
- $this->assertXPath($this->_html, '//div[@class="boite kiosque"]//div[@class="change_kiosque_data configuration_module"]/a[contains(@href,"admin/modules/kiosque-change-data")]');
+ $this->assertXPath($this->_html, '//div[@class="boite kiosque"]//div[@class="configuration_module"]/a[contains(@href,"admin/modules/kiosque-change-data")]');
}