From ee683049a6dd095e6fc5e14dc77d72fe59b69309 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Sep 2015 11:24:31 +0200
Subject: [PATCH] Enhance CSS capabilities

---
 htdocs/admin/ihm.php                       |  2 +-
 htdocs/core/menus/standard/auguria.lib.php |  2 +-
 htdocs/core/menus/standard/eldy.lib.php    | 15 +++---
 htdocs/langs/en_US/admin.lang              |  3 +-
 htdocs/main.inc.php                        |  4 +-
 htdocs/theme/eldy/style.css.php            | 58 ++++++++++++++++------
 htdocs/theme/md_exp/style.css.php          | 13 +++--
 7 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 20e05482685..f3260070fd7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -343,7 +343,7 @@ else	// Show
     print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
     print '</td>';
 	print '<td width="20">';
-    if ($user->admin && $conf->global->MAIN_LANG_DEFAULT!='auto') print info_admin($langs->trans("SubmitTranslation",$conf->global->MAIN_LANG_DEFAULT),1);
+    if ($user->admin && $conf->global->MAIN_LANG_DEFAULT!='auto') print info_admin($langs->trans("SubmitTranslation".($conf->global->MAIN_LANG_DEFAULT=='en_US'?'ENUS':''),$conf->global->MAIN_LANG_DEFAULT),1);
 	print '</td>';
 	print "</tr>";
 
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 9624bf66341..1cafd091521 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -235,7 +235,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		}
 		$title=$langs->trans("GoIntoSetupToChangeLogo");
 		print "\n".'<!-- Show logo on menu -->'."\n";
-		print '<div class="blockvmenuimpair">'."\n";
+		print '<div class="blockvmenuimpair blockvmenulogo">'."\n";
 		print '<div class="menu_titre" id="menu_titre_logo"></div>';
 		print '<div class="menu_top" id="menu_top_logo"></div>';
 		print '<div class="menu_contenu" id="menu_contenu_logo">';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3dda4f6df7a..e4949b1d973 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -439,7 +439,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		}
 		$title=$langs->trans("GoIntoSetupToChangeLogo");
 		print "\n".'<!-- Show logo on menu -->'."\n";
-		print '<div class="blockvmenuimpair">'."\n";
+		print '<div class="blockvmenuimpair blockvmenulogo">'."\n";
 		print '<div class="menu_titre" id="menu_titre_logo"></div>';
 		print '<div class="menu_top" id="menu_top_logo"></div>';
 		print '<div class="menu_contenu" id="menu_contenu_logo">';
@@ -1395,7 +1395,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 	$invert=empty($conf->global->MAIN_MENU_INVERT)?"":"invert";
 	if (empty($noout))
 	{
-		$alt=0; $blockvmenuopened=false;
+		$alt=0; $altok=0; $blockvmenuopened=false;
 		$num=count($menu_array);
 		for ($i = 0; $i < $num; $i++)
 		{
@@ -1405,14 +1405,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			$alt++;
 			if (empty($menu_array[$i]['level']) && $showmenu)
 			{
+			    $altok++;
 				$blockvmenuopened=true;
-				if (($alt%2==0))
+				if ($altok % 2 == 0)
 				{
-					print '<div class="blockvmenuimpair'.$invert.'">'."\n";
+					print '<div class="blockvmenuimpair'.$invert.($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 				}
 				else
 				{
-					print '<div class="blockvmenupair'.$invert.'">'."\n";
+					print '<div class="blockvmenupair'.$invert.($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 				}
 			}
 
@@ -1478,9 +1479,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				if ($showmenu)
 					print '<div class="menu_end"></div>'."\n";
-				if ($blockvmenuopened) { print "</div>\n"; $blockvmenuopened=false; }
+				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened=false; }
 			}
 		}
+		
+		if ($altok) print '<div class="blockvmenuend"></div>';
 	}
 
 	return count($menu_array);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 74947e5e0d9..062beed5760 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -279,7 +279,8 @@ MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
 MAIN_SMS_SENDMODE=Method to use to send SMS
 MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on www.dolibarr.org forum.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
 ModuleSetup=Module setup
 ModulesSetup=Modules setup
 ModuleFamilyBase=System
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 003ed350243..74a75b234ea 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1460,11 +1460,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
 	    // User photo
 	    $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem" style="padding: 0px;">';
-	    $toprightmenu.=$user->getPhotoUrl(16,16,'loginphoto');
+	    $toprightmenu.=$user->getPhotoUrl(0,0,'loginphoto');
 	    $toprightmenu.='</div></div>';
 
 	    // Login name with tooltip
-		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem" style="padding: 0px;">';
+		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
         $toprightmenu.=$user->getNomurl(0, '', true, 0, 11, 0, 'firstname','alogin');
         $toprightmenu.='</div></div>';
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 1ddfc921438..b756f383957 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -557,9 +557,9 @@ td.showDragHandle {
 	width: 100%;
 }
 #id-left {
-	background-color: #fff;
+/*	background-color: #fff;
 	border-right: 1px #888 solid;
-/*	height: calc(100% - 50px);*/
+	height: calc(100% - 50px);*/
 }
 
 
@@ -778,6 +778,9 @@ div.tmenucenter
 	<?php } ?>
     width: 100%;
 }
+div.menu_titre {
+	padding-top: 5px;
+}
 .mainmenuaspan
 {
 	padding-right: 4px;
@@ -1064,6 +1067,8 @@ img.login, img.printer, img.entity {
 }
 img.loginphoto {
 	border-radius: 2px;
+	width: 16px;
+    height: 16px;
 }
 .span-icon-user {
 	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>) no-repeat scroll 7px 7px;
@@ -1113,8 +1118,31 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
 
-
-div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
+.vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenubookmarks
+{
+    border-top: 1px solid #BBB;
+}
+.vmenu div.blockvmenubookmarks, .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo
+{
+	border-bottom: 1px solid #BBB;
+}
+.vmenu div.blockvmenuend, .vmenu div.blockvmenulogo
+{
+	margin: 0 0 8px 2px;
+}
+.vmenu div.blockvmenuend, div.blockvmenusearch
+{
+	padding-bottom: 5px;
+}
+.vmenu div.blockvmenulogo
+{
+	padding-bottom: 10px;
+}
+div.blockvmenubookmarks
+{
+	padding-bottom: 6px !important;
+}
+div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend
 {
 	font-family: <?php print $fontlist ?>;
 	color: #000000;
@@ -1124,20 +1152,21 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
     padding-right: 1px;
     padding-top: 3px;
     padding-bottom: 3px;
-    margin: 1px 0px 8px 2px;
+    /* margin: 1px 0 8px 2px; */
+    margin: 0 0 0 2px;
 
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
 
-    /*border-left: 1px solid #AAA;
+    border-left: 1px solid #AAA;
     border-right: 1px solid #BBB;
-    border-bottom: 1px solid #BBB;
+/*    border-bottom: 1px solid #BBB;
     border-top: 1px solid #BBB;
     border-radius: 4px;
 	-moz-border-radius: 4px;
     -moz-box-shadow: 3px 3px 4px #DDD;
     -webkit-box-shadow: 3px 3px 4px #DDD;
     box-shadow: 3px 3px 4px #DDD;
-    */
+  */  
 }
 
 div.blockvmenusearch
@@ -1152,17 +1181,16 @@ div.blockvmenusearch
     padding-bottom: 3px;
     margin: 1px 0px 8px 2px;
 	background: rgb(<?php echo $colorbackvmenu2; ?>);
-/*
+
     border-left: 1px solid #AAA;
-    border-right: 1px solid #CCC;
-    border-bottom: 1px solid #CCC;
-    border-top: 1px solid #CCC;
-    border-radius: 4px;
+    border-right: 1px solid #BBB;
+    border-bottom: 1px solid #BBB;
+    border-top: 1px solid #BBB;
+    /*border-radius: 4px;
 	-moz-border-radius: 4px;
     -moz-box-shadow: 3px 3px 4px #DDD;
     -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;
-    */
+    box-shadow: 3px 3px 4px #DDD;*/
 }
 
 div.blockvmenusearch > form > div {
diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php
index e20bb51c97b..272531958bb 100644
--- a/htdocs/theme/md_exp/style.css.php
+++ b/htdocs/theme/md_exp/style.css.php
@@ -1050,8 +1050,8 @@ table.login_table_securitycode tr td {
 
 div.login_block {
 	border-right: 1px solid rgba(0,0,0,0.3);
-    padding-top: 8px;
-	position: absolute;
+    padding-top: 5px;
+    padding-bottom: 3px;
 	<?php print $left; ?>: 0;
 	top: 0px;
 	position: fixed;
@@ -1089,6 +1089,9 @@ div.login_block_other { padding-top: 3px; }
 	padding: 0px 0px 0px 4px !important;
 	height: 16px;
 }
+.login_block_elem_name {
+	margin-top: 5px;
+}
 .alogin, .alogin:hover {
 	color: #888 !important;
 	font-weight: normal !important;
@@ -1105,7 +1108,10 @@ img.login, img.printer, img.entity {
 	font-weight: bold;
 }
 img.loginphoto {
-	border-radius: 2px;
+	border-radius: 5px;
+	margin-top: -4px;
+	width: 20px;
+	height: 20px;
 }
 
 .span-icon-user {
@@ -2167,7 +2173,6 @@ tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre
     font-weight: normal;
     border-bottom: 1px solid #FDFFFF;
     text-decoration: underline;
-	text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
 }
 input.liste_titre {
     background: transparent;