Work on md theme

htdocs/main.inc.php

@@ -1391,6 +1391,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
     if (empty($conf->dol_hide_topmenu))
     {
+    	print '<div class="side-nav-vert"><div id="id-top">';
+
 	    // Show menu entries
     	print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
 	    $menumanager->atarget=$target;
@@ -1431,8 +1433,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
 	    print '<div class="login_block">'."\n";
 
-	    $toprightmenu.='<div class="login_block_user">';
 	    // Add login user link
+	    $toprightmenu.='<div class="login_block_user">';
 	    //$toprightmenu.=$form->textwithtooltip('',$loginhtmltext,2,1,$logintext,'login_block_elem2',2);	// This include div class="login"
         $toprightmenu.= $user->getNomurl(0, '', true, 0, 11);
 		$toprightmenu.='</div>';
@@ -1466,6 +1468,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    print $toprightmenu;
 
 	    print "</div>\n";
+		print '</div></div>';
 
 	    unset($form);
     }

htdocs/theme/eldy/style.css.php

@@ -2203,6 +2203,13 @@ div.dolgraph div.legend table tbody tr { height: auto; }
 	margin-bottom: 2px;
 	margin-top: 2px;
 }
+.photointooltip {
+	-webkit-box-shadow: -1px -1px 5px #777;
+	-moz-box-shadow: -1px -1px 5px #777;
+	box-shadow: -1px -1px 5px #777;
+	margin-top: 6px;
+	float: left;
+}
 
 .logo_setup
 {
@@ -2323,6 +2330,7 @@ border-radius: 6px;
 #tiptip_content {
     background-color: rgb(252,248,246);
 	background-color: rgba(252,248,246,0.95);
+	line-height: 1.4em;
 }
 
 /* ============================================================================== */

htdocs/theme/md_exp/style.css.php

@@ -114,14 +114,15 @@ $fontsizesmaller='11';
 // Eldy colors
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
+	// 90A4AE, 607D8B, 455A64, 37474F
 	//$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474f'));    // topmenu #607D8B
-	$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#607D8B'));    // topmenu #607D8B
+	$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F'));    // topmenu #607D8B
 	//$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('000'));    // topmenu #607D8B
     $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
     $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232';   // vmenu (not menu)
     $conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240';
-    $conf->global->THEME_ELDY_BACKTITLE1=join(',',colorStringToArray('607D8B'));       // title of arrays
+    $conf->global->THEME_ELDY_BACKTITLE1=join(',',colorStringToArray('#607D8B'));       // title of arrays
     $conf->global->THEME_ELDY_BACKTITLE2='230,230,230';
     $conf->global->THEME_ELDY_BACKTABCARD2='255,255,255';     // card
     $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234';
@@ -512,19 +513,25 @@ td.showDragHandle {
 	table-layout: fixed;
 }
 #id-right, #id-left {
-    padding-top: 8px;
 	display: table-cell;
 	float: none;
 	vertical-align: top;
 }
+#id-top {
+/*	min-width: 100%;
+	position: relative;
+	heigth: 52px;
+	background: #f00;*/
+}
 #id-left {
 	min-height: 100%;
 	position: relative;
-	width: 184px;
+	width: 183px;
 }
-#id-right {	/* This must stay id-right ant not be replaced with echo $right */
+#id-right {	/* This must stay id-right and not be replaced with echo $right */
 	width: 100%;
 	padding-left: 184px;
+	padding-top: 12px;
 }
 
 .side-nav {
@@ -537,7 +544,6 @@ td.showDragHandle {
 	left: 0;
 	position: fixed;
 	top: 50px;
-	width: 192px;
 	z-index: 4;
 	-webkit-transform: translateZ(0);
 	-moz-transform: translateZ(0);
@@ -565,10 +571,13 @@ td.showDragHandle {
 	overflow-x: hidden;
 	overflow-y: auto;
 }
+.side-nav-vert {
+	margin-left: 184px;
+}
 
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'12'):'24')); ?>px;
 	margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'4')); ?>px;
 	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 }
@@ -619,7 +628,7 @@ div#tmenu_tooltip {
 <?php if (GETPOST("optioncss") == 'print') {  ?>
 	display:none;
 <?php } else { ?>
-	padding-<?php echo $right; ?>: 100px;
+	/* padding-<?php echo $right; ?>: 100px; */
 	background: <?php echo $colorbackvmenu; ?>;
 	/*box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;*/
     <?php if ($usecss3) { ?>
@@ -978,11 +987,19 @@ table.login_table_securitycode tr td {
 }
 
 div.login_block {
+    padding-top: 8px;
 	position: absolute;
-	<?php print $right; ?>: 5px;
+	<?php print $left; ?>: 5px;
-	top: 3px;
+	left: 0;
+	top: 0px;
+	position: fixed;
 	font-weight: bold;
-	max-width: 110px;
+	z-index: 10;
+	text-align: center;
+	vertical-align: middle;
+	background: #FFF;
+	width: 183px;
+	height: 42px;
 	<?php if (GETPOST("optioncss") == 'print') { ?>
 	display: none;
 	<?php } ?>
@@ -1049,7 +1066,7 @@ div.vmenu, td.vmenu {
     float: left;
     padding: 0px;
     padding-bottom: 0px;
-    padding-top: 1px;
+    padding-top: 0px;
     width: 174px;
 }
 
@@ -1516,7 +1533,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
     text-decoration: none;
     white-space: nowrap;
 
-    -moz-border-radius:6px 6px 0px 0px;
+    /*-moz-border-radius:6px 6px 0px 0px;
 	-webkit-border-radius:6px 6px 0px 0px;
 	border-radius:6px 6px 0px 0px;
 
@@ -1524,7 +1541,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	-webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
 	box-shadow: 0 -1px 4px rgba(0,0,0,.1);
 
-	/*border-bottom: none;
+	border-bottom: none;
 	border-right: 1px solid #CCCCCC;
 	border-left: 1px solid #D0D0D0;
 	border-top: 1px solid #D8D8D8;
@@ -1901,7 +1918,7 @@ table.liste {
 	border-left-width: 1px;
 	border-left-color: #CCC;
 	border-left-style: solid;
-	
+
 	margin-bottom: 2px;
 	margin-top: 0px;
 
@@ -2299,6 +2316,13 @@ div.dolgraph div.legend table tbody tr { height: auto; }
 	margin-bottom: 2px;
 	margin-top: 2px;
 }
+.photointooltip {
+	-webkit-box-shadow: 0px 0px 5px #777;
+	-moz-box-shadow: 0px 0px 5px #777;
+	box-shadow: 0px 0px 6px #777;
+	margin-top: 8px;
+	float: left;
+}
 
 .logo_setup
 {
@@ -2419,6 +2443,7 @@ border-radius: 6px;
 #tiptip_content {
     background-color: rgb(252,248,246);
 	background-color: rgba(252,248,246,0.95);
+	line-height: 1.4em;
 }
 
 /* ============================================================================== */

htdocs/user/class/user.class.php

@@ -1808,12 +1808,13 @@ class User extends CommonObject
         }
         $type=($this->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
         $label.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
+        $label.='</div>';
         if (! empty($this->photo))
         {
-        	$label.= '</div><div class="photointooltip" style="padding-top: 6px">';
+        	$label.= '<div class="photointooltip">';
             $label.= Form::showphoto('userphoto', $this, 80);
+        	$label.= '</div><div style="clear: both;"></div>';
         }
-        $label.= '</div>';
 
         // Info Login
         if ($infologin)