| '.$langs->trans("Declaration")." | \n";
@@ -164,8 +164,8 @@ if ($action == 'create') {
print $langs->trans("AnalysisPeriod");
print ' | ';
print '';
- print $formother->select_month($month ? date('M') : $month, 'month', 0, 1, 'widthauto valignmiddle ');
- print $formother->select_year($year ? date('Y') : $year, 'year', 0, 3, 3);
+ print $formother->select_month($month ? date('M') : $month, 'month', 0, 1, 'widthauto valignmiddle ', true);
+ print $formother->selectyear($year ? date('Y') : $year, 'year', 0, 3, 3, 0, 0, '', '', true);
print ' | ';
print '
';
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 6bd8ede6331..6ef8706f476 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -197,7 +197,7 @@ button.dropdown-item.global-search-item {
}
div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-quickadd-dropdown {
- global->THEME_TOPMENU_DISABLE_IMAGE)) { ?>
+
line-height: 46px;
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 68bad918155..d132a742899 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2587,8 +2587,7 @@ button.ui-button.ui-corner-all.ui-widget:focus {
/* For mainmenu, we always load the img */
div.mainmenu.menu {
- background-image: url();
-
+
}
#mainmenutd_menu a.tmenuimage {
display: unset;
@@ -2601,20 +2600,40 @@ a.tmenuimage:hover{
text-decoration: none;
}
-/*
+
+/* To show text of top menu on hover only (THEME_TOPMENU_DISABLE_IMAGE == 2) */
+
+
.tmenulabel:not(.menuhider), .tmenulabel:not(.menuhider):before {
display: none;
}
-.tmenuimage:not(.menuhider), .tmenuimage:not(.menuhider):before {
- font-size: 1.5em;
+a.tmenuimage:not(.menuhider), a.tmenuimage:not(.menuhider):before,
+div.tmenuimage:not(.menuhider), div.tmenuimage:not(.menuhider):before,
+span.tmenuimage:not(.menuhider), span.tmenuimage:not(.menuhider):before {
+ font-size: 1.3em;
+ margin-top: 10px !important;
}
+
+
.tmenudiv:hover .tmenulabel:not(.menuhider), .tmenudiv:hover .tmenulabel:not(.menuhider):before {
display: initial !important;
}
-.tmenudiv:hover .tmenuimage:not(.menuhider), .tmenudiv:hover .tmenulabel:not(.menuhider):before {
+.tmenudiv:hover .tmenuimage:not(.menuhider), .tmenudiv:hover .tmenuimage:not(.menuhider):before {
font-size: 1.1em !important;
+ margin-top: 0px !important;
}
-*/
+
+
+li.tmenu:hover .tmenulabel:not(.menuhider), li.tmenu:hover .tmenulabel:not(.menuhider):before {
+ display: initial !important;
+}
+li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menuhider):before {
+ font-size: 1.1em !important;
+ margin-top: 0px !important;
+}
+
+
+
/* Do not load menu img for other if hidden to save bandwidth */
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index dc94669d54f..40a03a0db5b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -276,7 +276,7 @@ $heightmenu = 50; /* height of top menu, part with image */
$heightmenu2 = 49; /* height of top menu, part with login */
$disableimages = 0;
$maxwidthloginblock = 180;
-if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
+if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1) {
$disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu = 0;
}
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index a95f8a0be34..4bf13e52384 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -201,7 +201,7 @@ button.dropdown-item.global-search-item {
}
div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
- line-height: global->THEME_TOPMENU_DISABLE_IMAGE) ? '46' : '35' ); ?>px;
+ line-height: px;
}
a.top-menu-dropdown-link {
padding: 8px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d5619f362fb..0dbec9bc073 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2438,7 +2438,7 @@ $heightmenu = 48; /* height of top menu, part with image */
$heightmenu2 = 48; /* height of top menu, ârt with login */
$disableimages = 0;
$maxwidthloginblock = 110;
-if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
+if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1) {
$heightmenu = 30; $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu = 0;
}
?>
@@ -2623,98 +2623,21 @@ a.tmenuimage:focus, .mainmenu.topmenuimage:focus {
outline: none;
}
-/* Do not load menu img if hidden to save bandwidth */
-
-
-
-
div.mainmenu.home{
- background-image: url();
background-position-x: center;
}
-div.mainmenu.billing {
- background-image: url();
-}
-
-div.mainmenu.accountancy {
- background-image: url();
-}
-
-div.mainmenu.agenda {
- background-image: url();
-}
-
-div.mainmenu.bank {
- background-image: url();
-}
-
-div.mainmenu.cashdesk {
- background-image: url();
-}
-
-div.mainmenu.takepos {
- background-image: url();
-}
-
-div.mainmenu.companies {
- background-image: url();
-}
-
-div.mainmenu.commercial {
- background-image: url();
-}
-
-div.mainmenu.ecm {
- background-image: url();
-}
-
-div.mainmenu.externalsite {
- background-image: url();
-}
-
-div.mainmenu.ftp {
- background-image: url();
-}
-
-div.mainmenu.hrm {
- background-image: url();
-}
-
-div.mainmenu.members {
- background-image: url();
-}
-
div.mainmenu.menu {
- background-image: url();
top: 10px;
left: 1px;
}
-div.mainmenu.products {
- background-image: url();
-}
-div.mainmenu.mrp {
- background-image: url();
-}
-div.mainmenu.project {
- background-image: url();
-}
-
-div.mainmenu.ticket {
- background-image: url();
-}
-
-div.mainmenu.tools {
- background-image: url();
-}
-
-div.mainmenu.website {
- background-image: url();
-}
+/* Do not load menu img if hidden to save bandwidth */
+
+
'name of class for div')