diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index ee6003d0119712c9c86ff4a55c7b18a7d6c4cdcb..4af1815c7676e11b5d9aa7864fb87bc0a6eed1be 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -50,8 +50,7 @@ function printBookmarksList($aDb, $aLangs)
$ret.= '</td><td align="right">';
if ($user->rights->bookmark->creer)
{
- $ret.= '<a class="vsmenu" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=create&urlsource='.urlencode($url).'&url='.urlencode($url).'">';
- //$ret.=img_picto($langs->trans('AddThisPageToBookmarks'),'edit_add').' ';
+ $ret.= '<a class="vsmenu addbookmarkpicto" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=create&urlsource='.urlencode($url).'&url='.urlencode($url).'">';
$ret.=img_object($langs->trans('AddThisPageToBookmarks'),'bookmark');
$ret.= '</a>';
}
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 5083ec3b495674aa4071916bf9ac424aa20f402f..56b44845e3bf7c598a81bb5aea9915d95fa1b135 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 '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 40px; background-color: #'.$color.'" value="'.$color.'">';
else print $langs->trans("Default");
}
- print ' ('.$langs->trans("Default").': <strong>6e7896</strong>, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print ' ('.$langs->trans("Default").': <strong>7882aa</strong>, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
print '</td>';
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d27df85f4ac9cbfc73839c1de8d2935770e7aa61..a3c647a5e47cfcbde71a373f13699ffaf29fcc43 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").'<br>';
$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
- $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 .='</a>';
}
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 '<div class="login_block">'."\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 ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
- $text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer.png', 'class="printer"');
+ $text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
$text.='</a>';
$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.='</a>';
diff --git a/htdocs/theme/eldy/img/1updownarrow.png b/htdocs/theme/eldy/img/1updownarrow.png
deleted file mode 100644
index 871ac1c1f290dd7098702eba8b5bf707b71b49e8..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..fc58e0bd174e0896d425fa321f7307b0a010444e
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 0fa4283476b0da9b026b8b26a2226ae30a9abd2f..148928d397d562a0d193a81e4c28c830410d6e9a 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 0000000000000000000000000000000000000000..0526eef7be48ec3e69dc11a5b82e77df2df90112
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 25edfa85b45b03ac727df4e3f8f93a037a5c6801..0000000000000000000000000000000000000000
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 f571504b24677f54c02299d6eb3435fcf1118788..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..c58d7456dc442e90dea22c1cfa2d79a42bda9034
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 f82a4feac45700dc6e4db23d78d2d0fcafdf8f27..0c7781796068c9d0d9ba3b3bc74f051e09c0b346 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:<?php print
{
border-top: 1px solid #BBB;
}
+a.vsmenu.addbookmarkpicto {
+ padding-right: 10px;
+}
.vmenu div.blockvmenubookmarks, .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo
{
border-bottom: 1px solid #BBB;
diff --git a/htdocs/theme/md/img/1updownarrow.png b/htdocs/theme/md/img/1updownarrow.png
deleted file mode 100644
index 871ac1c1f290dd7098702eba8b5bf707b71b49e8..0000000000000000000000000000000000000000
Binary files a/htdocs/theme/md/img/1updownarrow.png and /dev/null differ
diff --git a/htdocs/theme/md/img/help.png b/htdocs/theme/md/img/help.png
index 12e6cd655d6630345cd24c74b5e85bec38524c1a..2c56e645a01cb767febeb54c59743603f8c21d88 100644
Binary files a/htdocs/theme/md/img/help.png and b/htdocs/theme/md/img/help.png differ
diff --git a/htdocs/theme/md/img/helpdoc_top.png b/htdocs/theme/md/img/helpdoc_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d194e23ec2bf3e3c45233091d06f25c21006610
Binary files /dev/null and b/htdocs/theme/md/img/helpdoc_top.png differ
diff --git a/htdocs/theme/md/img/logout_top.png b/htdocs/theme/md/img/logout_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2e2e5d973d4b80a0942b92f9cc079cdf0fb89a9
Binary files /dev/null and b/htdocs/theme/md/img/logout_top.png differ
diff --git a/htdocs/theme/md/img/object_action_rdv.png b/htdocs/theme/md/img/object_action_rdv.png
deleted file mode 100644
index f29c713022cf3ca48e607fc9382921acb2081111..0000000000000000000000000000000000000000
Binary files a/htdocs/theme/md/img/object_action_rdv.png and /dev/null differ
diff --git a/htdocs/theme/md/img/object_contact_all.png b/htdocs/theme/md/img/object_contact_all.png
deleted file mode 100644
index cc204fdcaf1f376df619bf444699ec4123df7d9b..0000000000000000000000000000000000000000
Binary files a/htdocs/theme/md/img/object_contact_all.png and /dev/null differ
diff --git a/htdocs/theme/md/img/object_group.png b/htdocs/theme/md/img/object_group.png
index cc204fdcaf1f376df619bf444699ec4123df7d9b..be0255f7ec2679667491349672d653bfaea6ab89 100644
Binary files a/htdocs/theme/md/img/object_group.png and b/htdocs/theme/md/img/object_group.png differ
diff --git a/htdocs/theme/md/img/object_phoning.png b/htdocs/theme/md/img/object_phoning.png
index 0bfd66d818ed353dae9362de2760565767aa02af..23a4e0b1dbbc3749b03c45864b52f7d12f907520 100644
Binary files a/htdocs/theme/md/img/object_phoning.png and b/htdocs/theme/md/img/object_phoning.png differ
diff --git a/htdocs/theme/md/img/object_user.png b/htdocs/theme/md/img/object_user.png
index 599e87b3ab83c621f919b124054165edfe13692a..efd446a1a4c05b50932240855227fec33c4564c2 100644
Binary files a/htdocs/theme/md/img/object_user.png and b/htdocs/theme/md/img/object_user.png differ
diff --git a/htdocs/theme/md/img/printer_top.png b/htdocs/theme/md/img/printer_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e8bcbf98a57f1c6e80aa31b21e15677e3796778
Binary files /dev/null and b/htdocs/theme/md/img/printer_top.png differ
diff --git a/htdocs/theme/md/img/switch_off.png b/htdocs/theme/md/img/switch_off.png
index ad7e703ccac95afb2a7078f244ab47c1a47c26ac..28a4376fb438b41bee3481e229439c14b55f8e1a 100644
Binary files a/htdocs/theme/md/img/switch_off.png and b/htdocs/theme/md/img/switch_off.png differ
diff --git a/htdocs/theme/md/img/switch_off_old.png b/htdocs/theme/md/img/switch_off_old.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad7e703ccac95afb2a7078f244ab47c1a47c26ac
Binary files /dev/null and b/htdocs/theme/md/img/switch_off_old.png differ
diff --git a/htdocs/theme/md/img/switch_on.png b/htdocs/theme/md/img/switch_on.png
index 0f72bfaccd50450154b10e9563966bf74a8d68ab..d4e32d98f57ff37c78bdf1e6b4235e7fb4cefc17 100644
Binary files a/htdocs/theme/md/img/switch_on.png and b/htdocs/theme/md/img/switch_on.png differ
diff --git a/htdocs/theme/md/img/switch_on_old.png b/htdocs/theme/md/img/switch_on_old.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f72bfaccd50450154b10e9563966bf74a8d68ab
Binary files /dev/null and b/htdocs/theme/md/img/switch_on_old.png differ
diff --git a/htdocs/theme/md/img/title_generic.png b/htdocs/theme/md/img/title_generic.png
index ffb07138f9669b5e595a3ec4a405f62a4e3de894..4f90c63104aba086b4dc5c6a69a7720fc5c262b9 100644
Binary files a/htdocs/theme/md/img/title_generic.png and b/htdocs/theme/md/img/title_generic.png differ
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index b40c0f3d6c180d991ebadd076ca7e1973ed7aae7..4695403aeff18dc338f9dfca65e70fc57bb4c8a1 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -568,12 +568,12 @@ td.showDragHandle {
#id-left {
min-height: 100%;
position: relative;
- width: 193px;
+ width: 213px;
}
#id-right { /* This must stay id-right and not be replaced with echo $right */
width: 100%;
<?php if (GETPOST("optioncss") != 'print') { ?>
- padding-left: 194px;
+ padding-left: 224px;
padding-top: 12px;
<?php } ?>
}
@@ -620,7 +620,7 @@ td.showDragHandle {
<?php } ?>
}
.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;
<?php if (GETPOST("optioncss") == 'print') { ?>
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
{