diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 8023c202f56..bb8ad9404d1 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -80,7 +80,7 @@ function print_auguria_menu($db,$atarget,$type_user) else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"'; else $classname='class="tmenu"'; - print_start_menu_entry_auguria($idsel); + print_start_menu_entry_auguria($idsel,$classname); print ''; print ''; print_text_menu_entry_auguria($newTabMenu[$i]['titre']); @@ -91,7 +91,7 @@ function print_auguria_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry_auguria($idsel); + print_start_menu_entry_auguria($idsel,'class="tmenu"'); print ''; print ''; print_text_menu_entry_auguria($newTabMenu[$i]['titre']); @@ -109,28 +109,27 @@ function print_auguria_menu($db,$atarget,$type_user) /** - * Output start menu entry + * Output start menu array * * @return void */ function print_start_menu_array_auguria() { global $conf; - if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print ''; - else print ''; - else print ''; + print ''; + print ''; print "\n"; } @@ -167,9 +164,8 @@ function print_end_menu_entry_auguria() */ function print_end_menu_array_auguria() { - global $conf; - if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '
'; - else print ''; + print ''; + print ''; print "\n"; } diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index e249311631f..9bb5ae22814 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -55,7 +55,7 @@ function print_eldy_menu($db,$atarget,$type_user) $classname = 'class="tmenu"'; } $idsel='home'; - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print '
'; print '
'; @@ -85,7 +85,7 @@ function print_eldy_menu($db,$atarget,$type_user) if (($conf->societe->enabled && $user->rights->societe->lire) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -98,7 +98,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print ''; print_text_menu_entry($langs->trans("ThirdParties")); @@ -131,7 +131,7 @@ function print_eldy_menu($db,$atarget,$type_user) $idsel='products'; if ($user->rights->produit->lire || $user->rights->service->lire) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -144,7 +144,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print ''; print_text_menu_entry($chaine); @@ -178,7 +178,7 @@ function print_eldy_menu($db,$atarget,$type_user) $idsel='commercial'; if($user->rights->societe->lire || $user->rights->societe->contact->lire) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -191,7 +191,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print ''; print print_text_menu_entry($langs->trans("Commercial")); @@ -221,7 +221,7 @@ function print_eldy_menu($db,$atarget,$type_user) if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire || $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -234,7 +234,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print ''; print_text_menu_entry($langs->trans("MenuFinancial")); @@ -263,7 +263,7 @@ function print_eldy_menu($db,$atarget,$type_user) $idsel='bank'; if ($user->rights->banque->lire) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -276,7 +276,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print ''; print_text_menu_entry($langs->trans("MenuBankCash")); @@ -304,7 +304,7 @@ function print_eldy_menu($db,$atarget,$type_user) $idsel='project'; if ($user->rights->projet->lire) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -317,7 +317,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print ''; print_text_menu_entry($langs->trans("Projects")); @@ -345,7 +345,7 @@ function print_eldy_menu($db,$atarget,$type_user) $idsel='tools'; if ($user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -358,7 +358,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print ''; print_text_menu_entry($langs->trans("Tools")); @@ -384,7 +384,7 @@ function print_eldy_menu($db,$atarget,$type_user) } $idsel='shop'; - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -412,7 +412,7 @@ function print_eldy_menu($db,$atarget,$type_user) $idsel='members'; if ($user->rights->adherent->lire) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -425,7 +425,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print '
'; print ''; print_text_menu_entry($langs->trans("MenuMembers")); @@ -475,7 +475,7 @@ function print_eldy_menu($db,$atarget,$type_user) else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"'; else $classname='class="tmenu"'; - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,$classname); print ''; print '
'; print '
'; @@ -488,7 +488,7 @@ function print_eldy_menu($db,$atarget,$type_user) { if (! $type_user) { - print_start_menu_entry($idsel); + print_start_menu_entry($idsel,'class="tmenu"'); print '
'; print ''; print_text_menu_entry($newTabMenu[$i]['titre']); @@ -503,12 +503,15 @@ function print_eldy_menu($db,$atarget,$type_user) } - +/** + * Output start menu array + * + * @return void + */ function print_start_menu_array() { - global $conf; - if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print ''; - else print ''; - else print ''; + print ''; print "\n"; } @@ -558,9 +557,8 @@ function print_end_menu_entry() */ function print_end_menu_array() { - global $conf; - if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '
'; - else print ''; + print ''; + print ''; print "\n"; } diff --git a/htdocs/theme/eldy/img/menutab-active.png b/htdocs/theme/eldy/img/menutab-active.png new file mode 100644 index 00000000000..9fbb9ba634d Binary files /dev/null and b/htdocs/theme/eldy/img/menutab-active.png differ diff --git a/htdocs/theme/eldy/img/menutab-r.png b/htdocs/theme/eldy/img/menutab-r.png new file mode 100644 index 00000000000..9db9b9d9b88 Binary files /dev/null and b/htdocs/theme/eldy/img/menutab-r.png differ diff --git a/htdocs/theme/eldy/img/nav-overlay.png b/htdocs/theme/eldy/img/nav-overlay.png new file mode 100644 index 00000000000..595f026cc24 Binary files /dev/null and b/htdocs/theme/eldy/img/nav-overlay.png differ diff --git a/htdocs/theme/eldy/img/nav-overlay3.png b/htdocs/theme/eldy/img/nav-overlay3.png new file mode 100644 index 00000000000..f252f5f51a5 Binary files /dev/null and b/htdocs/theme/eldy/img/nav-overlay3.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d9e6c6095f8..01ca6507a03 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -353,12 +353,28 @@ if (! empty($conf->browser->phone)) } else { - $minwidthtmenu=64; - $heightmenu=48; + $minwidthtmenu=66; +// $heightmenu=48; + $heightmenu=54; } ?> -div.tmenu { + +div#tmenu_tooltip { +global->THEME_ELDY_ENABLE_PERSONALIZED) || ! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) { + $colortexttopmenu=$colortextmain; +?> + background: rgb(); + + background: #305582; /* 2C68A3 */ + +} + +div.tmenudiv { display:none; @@ -370,17 +386,18 @@ div.tmenu { border-: 0px solid #555555; border-bottom: 1px solid #FFFFFF; padding: 0px 0px 0px 0px; /* t r b l */ - margin: 0px 0px 7px 0px; /* t r b l */ + margin: 0px 0px 0px 0px; /* t r b l */ font-size: 13px; font-weight: normal; height: px; - background-image: -o-linear-gradient(bottom, rgb() 75%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 75%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 40%, rgb() 60%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%); + /* background-image: -o-linear-gradient(bottom, rgb() 75%, rgb() 100%); */ + /* background-image: -moz-linear-gradient(bottom, rgb() 75%, rgb() 100%);*/ + /* background-image: -webkit-linear-gradient(bottom, rgb() 40%, rgb() 60%, rgb() 100%);*/ + /* background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%);*/ + /* background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%); */ + background: url() 50% 0% repeat-x; background-image: url(); background-position:top; @@ -391,20 +408,8 @@ div.tmenu { } -table.tmenu { - padding: 0px 0px 10px 0px; /* t r b l */ - margin: 0px 0px 0px 0px; /* t r b l */ - text-align: center; -} -td.tmenu { - - text-align: center; - vertical-align: bottom; - white-space: nowrap; -} - a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudisabled:active { - color: #757575; + color: #808080; font-weight: normal; padding: 0px 5px 0px 5px; margin: 0px 1px 2px 1px; @@ -416,49 +421,46 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { font-weight: normal; padding: 0px 5px 0px 5px; - margin: 0px 1px 2px 1px; white-space: nowrap; - text-shadow: 1px 1px 1px #FFFFFF; + /* text-shadow: 1px 1px 1px #000000; */ + color: #; } a.tmenu:link, a.tmenu:visited { - color: #; + color: #; } a.tmenu:hover, a.tmenu:active { - color: #233030; margin: 0px 0px 0px 0px; - border-: 1px solid #555555; - border-: 1px solid #D8D8D8; - border-top: 1px solid #D8D8D8; - border-bottom: 2px solid #F4F4F4; - background: #F4F4F4; - text-shadow: 1px 1px 1px #FFFFFF; + /* border-: 1px solid #555555; */ + /* border-: 1px solid #D8D8D8; */ + /* border-top: 1px solid #D8D8D8; */ + /* border-bottom: 2px solid #F4F4F4; */ + /* background: #F4F4F4; */ + /* text-shadow: 1px 1px 1px #FFFFFF !important; */ + color: #; } a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; - color: #233030; padding: 0px 5px 0px 5px; margin: 0px 0px 0px 0px; - background: #F4F4F4; - border-: 1px solid #555555; - border-top: 1px solid #D8D8D8; - border-: 1px solid #D8D8D8; - border-bottom: 2px solid #F4F4F4; + /* background: #F4F4F4; */ + /* border-: 1px solid #555555; */ + /* border-top: 1px solid #D8D8D8; */ + /* border-: 1px solid #D8D8D8; */ + /* border-bottom: 2px solid #F4F4F4; */ white-space: nowrap; - text-shadow: 1px 1px 1px #FFFFFF; -} - - -* html li.tmenu a { - min-width:60px; + /* text-shadow: 1px 1px 1px #FFFFFF;*/ + color: #; } ul.tmenu { /* t r b l */ - padding: 0px 0px 10px 0px; - margin: 0px 0px 0px 6px; + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; list-style: none; + height: px; + background: url() 0 0 repeat-x !important; } -li.tmenu { +li.tmenu, li.tmenusel { text-align: center; vertical-align: bottom; @@ -466,10 +468,33 @@ li.tmenu { height: px; position:relative; display: block; - padding: 2px 5px 0px 5px; - margin: 0px 0px 0px 0px; + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; font-weight: normal; } +li.tmenu:hover, li.tmenusel { + + /* background-image: -o-linear-gradient(bottom, rgb() 75%, rgb() 100%); */ + /* background-image: -moz-linear-gradient(bottom, rgb() 75%, rgb() 100%);*/ + /* background-image: -webkit-linear-gradient(bottom, rgb() 40%, rgb() 60%, rgb() 100%); */ + /* background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%);*/ + /* background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%); */ + background: url() 50% 0 repeat-x; + +} +div.tmenuleft +{ + width: 5px; + float: ; + height: px; + background: url() 100% 0 no-repeat; +} +div.tmenucenter +{ + padding-top: 2px; + padding-right: 5px; + height: px; +} div.mainmenu { @@ -619,7 +644,6 @@ foreach($mainmenuusedarray as $key => $val) { print "div.mainmenu.".$val." {\n"; print " background-image: url(".$url.");\n"; - print " height:28px;\n"; print "}\n"; } } @@ -700,10 +724,10 @@ div.login { font-weight: bold; } div.login a { - color: #233030; + color: #; } div.login a:hover { - color: black; + color: #; text-decoration:underline; } @@ -1704,6 +1728,13 @@ div.error { background: #EFCFCF; } +div.jnotify-background { + opacity : 0.95 !important; + -moz-box-shadow: 4px 4px 4px #888 !important; + -webkit-box-shadow: 4px 4px 4px #888 !important; + box-shadow: 4px 4px 4px #888 !important; +} + /* Info admin */ div.info { color: #807050;