diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index ee6003d0119..4af1815c767 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -50,8 +50,7 @@ function printBookmarksList($aDb, $aLangs) $ret.= ''; if ($user->rights->bookmark->creer) { - $ret.= ''; - //$ret.=img_picto($langs->trans('AddThisPageToBookmarks'),'edit_add').' '; + $ret.= ''; $ret.=img_object($langs->trans('AddThisPageToBookmarks'),'bookmark'); $ret.= ''; } diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 5083ec3b495..56b44845e3b 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -477,7 +477,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) if ($color) print ''; else print $langs->trans("Default"); } - print '   ('.$langs->trans("Default").': 6e7896, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; + print '   ('.$langs->trans("Default").': 7882aa, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; print ''; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index d27df85f4ac..a3c647a5e47 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1461,13 +1461,13 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $logouthtmltext.=$langs->trans("Logout").'
'; $logouttext .=''; - $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1); + $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1); $logouttext .=''; } else { $logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]); - $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1); + $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1); } print '
'."\n"; @@ -1500,7 +1500,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a $qs=$_SERVER["QUERY_STRING"]; $qs.=(($qs && $morequerystring)?'&':'').$morequerystring; $text =''; - $text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer.png', 'class="printer"'); + $text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"'); $text.=''; $toprightmenu.=Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2); } @@ -1534,7 +1534,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage))); else $text.=sprintf($helpbaseurl,$helppage); $text.='">'; - $text.=img_picto('', 'helpdoc').' '; + $text.=img_picto('', 'helpdoc_top').' '; //$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help'); //if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')'; $text.=''; diff --git a/htdocs/theme/eldy/img/1updownarrow.png b/htdocs/theme/eldy/img/1updownarrow.png deleted file mode 100644 index 871ac1c1f29..00000000000 Binary files a/htdocs/theme/eldy/img/1updownarrow.png and /dev/null differ diff --git a/htdocs/theme/eldy/img/helpdoc_top.png b/htdocs/theme/eldy/img/helpdoc_top.png new file mode 100644 index 00000000000..fc58e0bd174 Binary files /dev/null and b/htdocs/theme/eldy/img/helpdoc_top.png differ diff --git a/htdocs/theme/eldy/img/history.png b/htdocs/theme/eldy/img/history.png index 0fa4283476b..148928d397d 100644 Binary files a/htdocs/theme/eldy/img/history.png and b/htdocs/theme/eldy/img/history.png differ diff --git a/htdocs/theme/eldy/img/logout_top.png b/htdocs/theme/eldy/img/logout_top.png new file mode 100644 index 00000000000..0526eef7be4 Binary files /dev/null and b/htdocs/theme/eldy/img/logout_top.png differ diff --git a/htdocs/theme/eldy/img/object_action_rdv.png b/htdocs/theme/eldy/img/object_action_rdv.png deleted file mode 100644 index 25edfa85b45..00000000000 Binary files a/htdocs/theme/eldy/img/object_action_rdv.png and /dev/null differ diff --git a/htdocs/theme/eldy/img/object_contact_all.png b/htdocs/theme/eldy/img/object_contact_all.png deleted file mode 100644 index f571504b246..00000000000 Binary files a/htdocs/theme/eldy/img/object_contact_all.png and /dev/null differ diff --git a/htdocs/theme/eldy/img/printer_top.png b/htdocs/theme/eldy/img/printer_top.png new file mode 100644 index 00000000000..c58d7456dc4 Binary files /dev/null and b/htdocs/theme/eldy/img/printer_top.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f82a4feac45..0c778179606 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -79,7 +79,7 @@ $dol_use_jmobile=$conf->dol_use_jmobile; //var_dump($user->conf->THEME_ELDY_RGB); // Colors -$colorbackhmenu1='140,150,180'; // topmenu +$colorbackhmenu1='120,130,170'; // topmenu $colorbackvmenu1='255,255,255'; // vmenu $colorbacktitle1='230,230,230'; // title of array $colorbacktabcard1='255,255,255'; // card @@ -101,7 +101,7 @@ $useboldtitle=1; // Case of option always editable if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY='255,255,255'; -if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180'; +if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='120,130,170'; if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=='238,246,252'; if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK='0,0,120'; @@ -1184,6 +1184,9 @@ a.help:link, a.help:visited, a.help:hover, a.help:active { font-size: - padding-left: 194px; + padding-left: 224px; padding-top: 12px; } @@ -620,7 +620,7 @@ td.showDragHandle { } .side-nav-vert { - margin-left: 194px; + margin-left: 228px; } @@ -1106,7 +1106,7 @@ div.login_block { text-align: center; vertical-align: middle; background: #FFF; - width: 193px; + width: 228px; height: 42px; display: none; @@ -1188,7 +1188,7 @@ div.vmenu, td.vmenu { padding: 0px; padding-bottom: 0px; padding-top: 0px; - width: 174px; + width: 222px; } .vmenu { @@ -1199,7 +1199,7 @@ div.vmenu, td.vmenu { } .vmenusearchselectcombo { - width: 170px; + width: 202px; } .menu_contenu { padding-top: 4px; padding-bottom: 3px;} @@ -1234,6 +1234,9 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks padding-bottom: 10px; border-bottom: 1px solid #e0e0e0; } +a.vsmenu.addbookmarkpicto { + padding-right: 10px; +} div.blockvmenusearch {