From 9b4ab63c7d61237596678ae0a62b8a3eb75f37c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 30 May 2015 20:07:44 +0200
Subject: [PATCH] Fix style

---
 htdocs/main.inc.php              |  9 +++++----
 htdocs/theme/eldy/style.css.php  | 10 ++++++++--
 htdocs/user/card.php             |  2 +-
 htdocs/user/class/user.class.php |  2 ++
 htdocs/user/note.php             | 16 ++++++++--------
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1e9f418a594..d44d54fa72d 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1459,9 +1459,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 		}
 		else $toprightmenu.=$result;	// For backward compatibility
 
-		// Logout link
-	    $toprightmenu.=$form->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
-
 	    // Link to print main content area
 	    if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
 	    {
@@ -1472,7 +1469,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	        $text.='</a>';
 	        $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
 	    }
-		$toprightmenu.='</div>';
+
+		// Logout link
+	    $toprightmenu.=$form->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+
+	    $toprightmenu.='</div>';
 
 	    print $toprightmenu;
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5b7b1f8dcf3..3d272f0aaf8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -544,8 +544,8 @@ div.ficheaddleft {
 	else print "margin-top: 10px;\n"; ?>
 }
 .containercenter {
-display : table;
-margin : 0px auto;
+	display : table;
+	margin : 0px auto;
 }
 
 #pictotitle {
@@ -559,6 +559,12 @@ margin : 0px auto;
 .pictowarning {
     padding-left: 3px;
 }
+.colorthumb {
+	padding-left: 1px !important;
+	padding-right: 1px;
+	padding-top: 1px;
+	padding-bottom: 1px;
+}
 
 
 /* ============================================================================== */
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 544b584e525..523474ea132 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1377,7 +1377,7 @@ else
             {
 				print '<tr><td>'.$langs->trans("ColorUser").'</td>';
 				print '<td colspan="2">';
-				if ($object->color) print '<input type="text" disabled style="padding: 0; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">';
+				if ($object->color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">';
 				print '</td>';
 				print "</tr>\n";
 			}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 408a6c75145..0f81a861a81 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1795,6 +1795,8 @@ class User extends CommonObject
 	{
 		global $form;
 
+		if (! is_object($form)) $form=new Form($this->db);
+
 		$result='';
 
 		$result.='<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 7fb4ae06ed6..2fd827fb639 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -131,22 +131,22 @@ if ($id)
 
     print "</table>";
 
+	dol_fiche_end();
+
 	if ($action == 'edit')
 	{
-		print '<br><div class="center">';
+		print '<div class="center">';
 		print '<input type="submit" class="button" name="update" value="'.$langs->trans("Save").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 	}
 
-	print "</form>\n";
 
+	/*
+     * Actions
+     */
 
-    /*
-    * Actions
-    */
-    print '</div>';
     print '<div class="tabsAction">';
 
     if ($user->rights->user->user->creer && $action != 'edit')
@@ -156,7 +156,7 @@ if ($id)
 
     print "</div>";
 
-
+	print "</form>\n";
 }
 
 $db->close();