From 49824a0e563df78ebd5435ad56b93ef5c67e21fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Mar 2015 18:17:25 +0100
Subject: [PATCH] Method colorStringToArray can accept the # Method monthArray
 can return short label of month

---
 htdocs/core/class/html.formother.class.php |  2 +-
 htdocs/core/lib/date.lib.php               | 25 +++++++++++++++++++---
 htdocs/core/lib/functions2.lib.php         |  2 +-
 htdocs/main.inc.php                        |  4 ++--
 htdocs/societe/consumption.php             |  2 +-
 htdocs/user/class/user.class.php           | 13 ++++++-----
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 4ea60dbf2c1..786d2c53a34 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -782,7 +782,7 @@ class FormOther
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        $montharray = monthArray($langs);	// Get array
+        $montharray = monthArray($langs, 1);	// Get array
 
         $select_month = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
         if ($useempty)
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index e5b60f4094c..4a8ae857a2d 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -813,11 +813,12 @@ function num_open_day($timestampStart, $timestampEnd, $inhour=0, $lastday=0, $ha
  *  This replace old function monthArrayOrSelected.
  *
  *	@param	Translate	$outputlangs	Object langs
+ *  @param	int			$short			1=Return short label
  *	@return array						Month string or array if selected < 0
  */
-function monthArray($outputlangs)
+function monthArray($outputlangs,$short=0)
 {
-    $montharray = array (
+	$montharray = array (
 	    1  => $outputlangs->trans("January"),
 	    2  => $outputlangs->trans("February"),
 	    3  => $outputlangs->trans("March"),
@@ -832,6 +833,24 @@ function monthArray($outputlangs)
 	    12 => $outputlangs->trans("December")
     );
 
-    return $montharray;
+	if (! empty($short))
+	{
+		$montharray = array (
+		    1  => $outputlangs->trans("Jan"),
+		    2  => $outputlangs->trans("Feb"),
+		    3  => $outputlangs->trans("Mar"),
+		    4  => $outputlangs->trans("Apr"),
+		    5  => $outputlangs->trans("May"),
+		    6  => $outputlangs->trans("Jun"),
+		    7  => $outputlangs->trans("Jul"),
+		    8  => $outputlangs->trans("Aug"),
+		    9  => $outputlangs->trans("Sep"),
+		    10 => $outputlangs->trans("Oct"),
+		    11 => $outputlangs->trans("Nov"),
+		    12 => $outputlangs->trans("Dec")
+			);
+	}
+
+	return $montharray;
 }
 
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index aaff80233b1..f2b105242de 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1885,7 +1885,7 @@ function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 {
 	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
-	$tmp=preg_match('/^([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
 	if (! $tmp)
 	{
 		$tmp=explode(',',$stringcolor);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2db246797fe..cf5df4eb21c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1505,7 +1505,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    $hookmanager->initHooks(array('searchform','leftblock'));
 
     	if (empty($conf->dol_use_jmobile) && ! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<!-- Begin left layout -->'."\n".'<div class="ui-layout-west">'."\n";
-		else print "\n".'<!-- Begin id-left -->'."\n".'<div id="id-left">'."\n";
+		else print "\n".'<!-- Begin id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
 	    print "\n";
 
@@ -1691,7 +1691,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    print $hookmanager->resPrint;
 
 	    if (empty($conf->dol_use_jmobile) && ! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print '</div> <!-- End left layout -->'."\n";
-	    else print '</div> <!-- end id-left -->';	// End div id="id-left"
+	    else print '</div></div> <!-- end id-left -->';	// End div id="id-left"
     }
 
     print "\n";
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index e581b6b8c29..8b8f3755fff 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -313,7 +313,7 @@ print '<tr class="liste_titre">';
 print '<td class="liste_titre" align="left">';
 print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
 print '</td>';
-print '<td class="liste_titre">'; // date
+print '<td class="liste_titre nowrap">'; // date
 print $formother->select_month($month?$month:-1,'month',1);
 $formother->select_year($year?$year:-1,'year',1, 20, 1);
 print '</td>';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e8f3487a32c..9ffa762afd1 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1793,13 +1793,13 @@ class User extends CommonObject
 
         $label = '<u>' . $langs->trans("User") . '</u>';
         $label.= '<div width="100%">';
-        $label .= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
+        $label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
         if (! empty($this->login))
-        $label .= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
+        $label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
         if (! empty($this->email))
-        $label .= '<br><b>' . $langs->trans("EMail").':</b> '.$this->email;
+        $label.= '<br><b>' . $langs->trans("EMail").':</b> '.$this->email;
         if (! empty($this->admin))
-        $label .= '<br><b>' . $langs->trans("Administrator").'</b>: '.yn($this->admin);
+        $label.= '<br><b>' . $langs->trans("Administrator").'</b>: '.yn($this->admin);
         if (! empty($this->societe_id)) {
             $thirdpartystatic = new Societe($db);
             $thirdpartystatic->fetch($this->societe_id);
@@ -1807,11 +1807,10 @@ class User extends CommonObject
             $company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
         }
         $type=($this->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
-        $label .= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
+        $label.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
         if (! empty($this->photo))
         {
-        	$label.= '</div><div style="padding: 10px">';
-        	//if (! is_object($form)) $form = new Form($db);
+        	$label.= '</div><div class="photointooltip" style="padding-top: 6px">';
             $label.= Form::showphoto('userphoto', $this, 80);
         }
         $label.= '</div>';