Look: Minor style enhancement

htdocs/comm/action/fiche.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
@@ -663,7 +663,6 @@ if ($id > 0)
 	 */
 
 	$head=actions_prepare_head($act);
-	dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
 
 	$now=dol_now();
 	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
@@ -711,6 +710,8 @@ if ($id > 0)
 		print '<input type="hidden" name="ref_ext" value="'.$act->ref_ext.'">';
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1'? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 
+		dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
+		
 		print '<table class="border" width="100%">';
 
 		// Ref
@@ -836,7 +837,9 @@ if ($id > 0)
 
 		print '</table>';
 
-		print '<center><br><input type="submit" class="button" name="edit" value="'.$langs->trans("Save").'">';
+		dol_fiche_end();
+		
+		print '<center><input type="submit" class="button" name="edit" value="'.$langs->trans("Save").'">';
 		print ' &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</center>';
 
@@ -844,6 +847,8 @@ if ($id > 0)
 	}
 	else
 	{
+		dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
+		
 		// Affichage fiche action en mode visu
 		print '<table class="border" width="100%">';
 
@@ -1021,14 +1026,13 @@ if ($id > 0)
 			}
 			print '</table><br><br>';
 		}
-	}
 
-	print "</div>\n";
+		dol_fiche_end();
+	}
 
 
 	/*
 	 * Barre d'actions
-	 *
 	 */
 
 	print '<div class="tabsAction">';

htdocs/core/lib/functions.lib.php

@@ -814,13 +814,14 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	}
 	if (! is_object($outputlangs)) $outputlangs=$langs;
 	if (! $format) $format='daytextshort';
-
+	$reduceformat=(! empty($conf->dol_optimize_smallscreen) && in_array($format,array('day','hour')))?1:0;
+	
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
-	if ($format == 'day')					 $format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
+	if ($format == 'day')				$format=($outputlangs->trans("FormatDateShort")!="FormatDateShort"?$outputlangs->trans("FormatDateShort"):$conf->format_date_short);
-	else if ($format == 'hour')			 $format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
+	else if ($format == 'hour')			$format=($outputlangs->trans("FormatHourShort")!="FormatHourShort"?$outputlangs->trans("FormatHourShort"):$conf->format_hour_short);
-	else if ($format == 'hourduration')	 $format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
+	else if ($format == 'hourduration')	$format=($outputlangs->trans("FormatHourShortDuration")!="FormatHourShortDuration"?$outputlangs->trans("FormatHourShortDuration"):$conf->format_hour_short_duration);
 	else if ($format == 'daytext')			 $format=($outputlangs->trans("FormatDateText")!="FormatDateText"?$outputlangs->trans("FormatDateText"):$conf->format_date_text);
-	else if ($format == 'daytextshort')	 $format=($outputlangs->trans("FormatDateTextShort")!="FormatDateTextShort"?$outputlangs->trans("FormatDateTextShort"):$conf->format_date_text_short);
+	else if ($format == 'daytextshort')	$format=($outputlangs->trans("FormatDateTextShort")!="FormatDateTextShort"?$outputlangs->trans("FormatDateTextShort"):$conf->format_date_text_short);
 	else if ($format == 'dayhour')			 $format=($outputlangs->trans("FormatDateHourShort")!="FormatDateHourShort"?$outputlangs->trans("FormatDateHourShort"):$conf->format_date_hour_short);
 	else if ($format == 'dayhoursec')		 $format=($outputlangs->trans("FormatDateHourSecShort")!="FormatDateHourSecShort"?$outputlangs->trans("FormatDateHourSecShort"):$conf->format_date_hour_sec_short);
 	else if ($format == 'dayhourtext')		 $format=($outputlangs->trans("FormatDateHourText")!="FormatDateHourText"?$outputlangs->trans("FormatDateHourText"):$conf->format_date_hour_text);
@@ -828,12 +829,18 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	// Format not sensitive to language
 	else if ($format == 'dayhourlog')		 $format='%Y%m%d%H%M%S';
 	else if ($format == 'dayhourldap')		 $format='%Y%m%d%H%M%SZ';
-	else if ($format == 'dayhourxcard')	 $format='%Y%m%dT%H%M%SZ';
+	else if ($format == 'dayhourxcard')	$format='%Y%m%dT%H%M%SZ';
-	else if ($format == 'dayxcard')	 	 $format='%Y%m%d';
+	else if ($format == 'dayxcard')	 	$format='%Y%m%d';
 	else if ($format == 'dayrfc')			 $format='%Y-%m-%d';             // DATE_RFC3339
 	else if ($format == 'dayhourrfc')		 $format='%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339
-	else if ($format == 'standard')		 $format='%Y-%m-%d %H:%M:%S';
+	else if ($format == 'standard')		$format='%Y-%m-%d %H:%M:%S';
 
+	if ($reduceformat)
+	{
+		$format=str_replace('%Y','%y',$format);
+		$format=str_replace('yyyy','yy',$format);
+	}
+	
 	// If date undefined or "", we return ""
 	if (dol_strlen($time) == 0) return '';		// $time=0 allowed (it means 01/01/1970 00:00:00)
 

htdocs/fourn/fiche.php

@@ -85,8 +85,9 @@ if ($object->fetch($id))
 	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"),0,'company');
 
 
-	print '<table width="100%" class="notopnoleftnoright">';
+	print '<div class="fichecenter"><div class="fichehalfleft">';
-	print '<tr><td valign="top" width="50%" class="notopnoleft">';
+	//print '<table width="100%" class="notopnoleftnoright">';
+	//print '<tr><td valign="top" width="50%" class="notopnoleft">';
 
 	print '<table width="100%" class="border">';
 	print '<tr><td width="20%">'.$langs->trans("ThirdPartyName").'</td><td width="80%" colspan="3">';
@@ -216,7 +217,11 @@ if ($object->fetch($id))
 
 	print '</table>';
 
-	print '</td><td valign="top" width="50%" class="notopnoleftnoright">';
+	
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	//print '</td><td valign="top" width="50%" class="notopnoleftnoright">';
+
+	
 	$var=true;
 
 	$MAXLIST=5;
@@ -367,9 +372,12 @@ if ($object->fetch($id))
 		}
 	}
 
-	print '</td></tr>';
+	print '</div></div></div>';
-	print '</table>' . "\n";
+	print '<div style="clear:both"></div>';
-	print '</div>';
+	//print '</td></tr>';
+	//print '</table>' . "\n";
+	
+	dol_fiche_end();
 
 
 	/*

htdocs/holiday/index.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011	Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2013	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -228,7 +228,6 @@ if ($id > 0)
 	print "</tr>\n";
 
 	print '</table><br>';
-
 }
 else
 {
@@ -242,7 +241,15 @@ $nbaquis=$holiday->getCPforUser($user_id);
 $nbdeduced=$holiday->getConfCP('nbHolidayDeducted');
 $nb_holiday = $nbaquis / $nbdeduced;
 print $langs->trans('SoldeCPUser',round($nb_holiday,2)).($nbdeduced != 1 ? ' ('.$nbaquis.' / '.$nbdeduced.')' : '');
-print '</div>';
+
+if ($id > 0)
+{
+	dol_fiche_end();
+	print '</br>';
+}
+else {
+	print '</div>';
+} 
 
 print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 print '<table class="noborder" width="100%;">';

htdocs/langs/en_US/agenda.lang

@@ -32,7 +32,7 @@ ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
 ViewWithPredefinedFilters= View with predefined filters
-AutoActions= Automatic filling of agenda
+AutoActions= Automatic filling
 AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
 AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.

htdocs/langs/fr_FR/agenda.lang

@@ -32,7 +32,7 @@ ViewCal=Vue mois
 ViewDay=Vue jour
 ViewWeek=Vue semaine
 ViewWithPredefinedFilters=Vues avec filtres prédéfinis
-AutoActions=Alimentation automatique de l'agenda
+AutoActions=Alimentation automatique
 AgendaAutoActionDesc=Définissez dans cet onglet les événements pour lesquels dolibarr créera automatiquement une action dans l'agenda. Si aucune case n'est cochée (par défaut), seules les actions manuelles seront incluses dans l'agenda.
 AgendaSetupOtherDesc=Cette page permet de configurer quelques options permettant d'exporter une vue de votre agenda Dolibarr vers un calendrier externe (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=Cette page permet d'ajouter des sources de calendriers externes pour les visualiser au sein de l'agenda Dolibarr.

htdocs/langs/fr_FR/main.lang

@@ -3,9 +3,9 @@ CHARSET=UTF-8
 DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand= 
-FormatDateShort=%d/%m/%y
+FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yy
+FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy

htdocs/theme/amarok/graph-color.php

@@ -22,10 +22,10 @@
  *      \ingroup    core
  */
 
-global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
+global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
-$theme_bordercolor = array(235,235,224);
+$theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(125,135,150), array(200,160,180), array(190,190,220), array(170,140,190), array(190,190,170));
+$theme_datacolor = array(array(190,190,220), array(200,160,180), array(125,135,150), array(170,140,190), array(190,190,170));
-$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
+$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
-$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
+$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 
 ?>

htdocs/theme/amarok/style.css.php

@@ -21,25 +21,28 @@
 
 /**
  *		\file       htdocs/theme/amarok/style.css.php
- *		\brief      Fichier de style CSS du theme amarok
+ *		\brief      File for CSS style sheet Amarok
  */
 
 
 
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
 if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
 if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
 if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN'))         define('NOLOGIN',1);
+if (! defined('NOLOGIN'))         define('NOLOGIN',1);			// File must be accessed by logon page so without login
 if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
 
 session_cache_limiter(FALSE);
 
-require_once("../../main.inc.php");
+require_once '../../main.inc.php';
+
+// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
+if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']);
 
 // Define css type
 header('Content-type: text/css');
@@ -69,12 +72,55 @@ $fontlist='helvetica,arial,tahoma,verdana';    //$fontlist='Verdana,Helvetica,Ar
 $img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
 $img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
 $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
+
+// Define reference colors
+// Example: Light grey: $colred=235;$colgreen=235;$colblue=235;
+// Example: Pink:       $colred=230;$colgreen=210;$colblue=230;
+// Example: Green:      $colred=210;$colgreen=230;$colblue=210;
+// Example: Ocean:      $colred=220;$colgreen=220;$colblue=240;
+//$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
+//$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
+//var_dump($user->conf->THEME_ELDY_RGB);
+$colred  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,0,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,0,2)));
+$colgreen=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,2,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,2,2)));
+$colblue =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,4,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,4,2)));
+
+// Colors
+$isred=max(0,(2*$colred-$colgreen-$colblue)/2);        // 0 - 255
+$isgreen=max(0,(2*$colgreen-$colred-$colblue)/2);      // 0 - 255
+$isblue=max(0,(2*$colblue-$colred-$colgreen)/2);       // 0 - 255
+$colorback1=($colred-3).','.($colgreen-3).','.($colblue-3);         // topmenu
+$colorback2=($colred+5).','.($colgreen+5).','.($colblue+5);
+$colorbacktab1=($colred+15).','.($colgreen+16).','.($colblue+17);      // vmenu
+$colorbacktab1b=($colred+5).','.($colgreen+6).','.($colblue+7);        // vmenu (not menu)
+$colorbacktab2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5);    // title of array
+$colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17);  // card
+$colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line impair
+$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line impair
+$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line impair
+$colorbacklinepair1='255,255,255';    // line pair
+$colorbacklinepair2='255,255,255';    // line pair
+$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
+$colorbackbody='#f5f5f5';
+$colortext='40,40,40';
+$fontsize=empty($conf->dol_optimize_smallscreen)?'12':'14';
+$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14';
 
 ?>
 
 
 /* ============================================================================== */
-/* Styles par défaut                                                              */
+/* Default styles                                                                 */
 /* ============================================================================== */
 
 *, html {
@@ -84,31 +130,17 @@ font-size:100%;
 }
 
 body {
-	background-color:#f5f5f5;
+<?php if (GETPOST("optioncss") == 'print' || ! empty($conf->dol_optimize_smallscreen)) {  ?>
-	<?php if ($_SESSION['dol_login'] != '') {?>
+	background-color: #FFFFFF;
-	<?php if (GETPOST("optioncss") != 'print') {?>
+<?php } else { ?>
-	background-image:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/vmenu.png',1); ?>);
+	background-color: <?php print $colorbackbody; ?>;
-	background-repeat:repeat-y;
+<?php } ?>
-	margin:0px;
-	<?php } ?>
-	<?php } else {?>
-	background-image:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/background_login.png',1); ?>);
-	margin:100px;
-	<?php } ?>
 	color:#232323;
 	font-size:<?php print $fontsize ?>px;
    	font-family:<?php print $fontlist ?>;
-
     <?php print 'direction:'.$langs->trans("DIRECTION").";\n"; ?>
 }
 
-.checkVatPopup {
-	background-color:#f5f5f5;
-	background-image:none;
-	margin:10px;
-	line-height:16px;
-}
-
 a {
 	font-family:<?php print $fontlist ?>;
 	font-weight:bold;
@@ -194,6 +226,15 @@ div.inline-block
 	display:inline-block;
 }
 
+th .button {
+    -moz-box-shadow: none !important;
+    -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+	-moz-border-radius:0px !important;
+	-webkit-border-radius:0px !important;
+	border-radius:0px !important;
+}
+
 .valignmiddle {
 	vertical-align: middle;
 }
@@ -211,11 +252,102 @@ div.inline-block
 }
 
 
+.blockvmenubookmarks .menu_contenu {
+	background-color: transparent;
+}
+
+/* ! Message d'erreur lors du login : */
+center .error { padding:8px !important; padding-left:26px !important; padding-right:20px; width:inherit; max-width:450px;color:#552323 !important; font-size:14px; border-radius:8px; text-align: left;}
+
+
+
 /* ============================================================================== */
-/* Login																		  */
+/* Styles to hide objects                                                         */
 /* ============================================================================== */
 
-body.body center{color:white;}
+.hideobject { display:none; }
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
+.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
+<?php } ?>
+.linkobject { cursor:pointer; }
+
+
+/* ============================================================================== */
+/* Styles for dragging lines                                                      */
+/* ============================================================================== */
+
+.dragClass {
+	color: #333333;
+}
+td.showDragHandle {
+	cursor: move;
+}
+.tdlineupdown {
+	white-space: nowrap;
+}
+
+/* ============================================================================== */
+/* Menu top et 1ere ligne tableau                                                 */
+/* ============================================================================== */
+
+div.tmenu {
+	<?php if (GETPOST("optioncss") == 'print') {?>
+	display:none;
+	<?php } else {?>
+	position:relative;
+	display:block;
+	margin:0;
+	padding:0;
+	padding-left:1em;
+	top:0;
+	left:0;
+	right:0;
+    white-space:nowrap;
+	height:36px;
+	<?php if ($conf->browser->name != 'ie') echo "line-height:36px; /* disabled for ie9 */ \n"; ?>
+	background:#333333;
+    background-image:linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+	background-image:-o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+	background-image:-moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+	background-image:-webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+	background-image:-ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+	background-image:-webkit-gradient(
+		linear,
+		left top,
+		left bottom,
+		color-stop(0, rgba(255,255,255,.3)),
+		color-stop(1, rgba(0,0,0,.3))
+	);
+	border-bottom:solid 1px rgba(0,0,0,.8);
+	box-shadow:0 0 6px rgba(0,0,0,.4) !important;
+	z-index:100;
+	<?php } ?>
+}
+
+div.tmenu a {
+	font-weight:normal;
+}
+
+div.tmenu li {
+	display:inline-table;
+	margin-right:1em;
+	text-transform:uppercase;
+}
+
+div.tmenu li a {color:#cccccc;}
+div.tmenu li a:hover { color:rgba(255,255,255,1);}
+
+div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */
+	color:#ffffff;
+	font-weight:bold;
+}
+
+.tmenudisabled { color:#808080 !important; cursor: not-allowed; }
+
+
+
+/* Login */
 
 form#login {
 	display:block;
@@ -329,96 +461,6 @@ table.login_table .vmenu {
 	font-size:120%;
 }
 
-.blockvmenubookmarks .menu_contenu {
-	background-color: transparent;
-}
-
-/* ! Message d'erreur lors du login : */
-center .error { padding:8px !important; padding-left:26px !important; padding-right:20px; width:inherit; max-width:450px;color:#552323 !important; font-size:14px; border-radius:8px; text-align: left;}
-
-
-
-/* ============================================================================== */
-/* Styles to hide objects                                                         */
-/* ============================================================================== */
-
-.hideobject { display:none; }
-<?php if (! empty($dol_optimize_smallscreen)) { ?>
-.hideonsmartphone { display: none; }
-.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
-<?php } ?>
-.linkobject { cursor:pointer; }
-
-
-/* For dragging lines */
-
-.dragClass {color:#333333;}
-td.showDragHandle {cursor:move;}
-.tdlineupdown {white-space:nowrap;}
-
-
-/* ============================================================================== */
-/* Menu top et 1ère ligne tableau                                                 */
-/* ============================================================================== */
-
-div.tmenu {
-	<?php if (GETPOST("optioncss") == 'print') {?>
-	display:none;
-	<?php } else {?>
-	position:relative;
-	display:block;
-	margin:0;
-	padding:0;
-	padding-left:1em;
-	top:0;
-	left:0;
-	right:0;
-    white-space:nowrap;
-	height:36px;
-	<?php if ($conf->browser->name != 'ie') echo "line-height:36px; /* disabled for ie9 */ \n"; ?>
-	background:#333333;
-    background-image:linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
-	background-image:-o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
-	background-image:-moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
-	background-image:-webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
-	background-image:-ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
-	background-image:-webkit-gradient(
-		linear,
-		left top,
-		left bottom,
-		color-stop(0, rgba(255,255,255,.3)),
-		color-stop(1, rgba(0,0,0,.3))
-	);
-	border-bottom:solid 1px rgba(0,0,0,.8);
-	box-shadow:0 0 6px rgba(0,0,0,.4) !important;
-	z-index:100;
-	<?php } ?>
-}
-
-div.tmenu a {
-	font-weight:normal;
-}
-
-div.tmenu li {
-	display:inline-table;
-	margin-right:1em;
-	text-transform:uppercase;
-}
-
-div.tmenu li a {color:#cccccc;}
-div.tmenu li a:hover {color:rgba(255,255,255,.2);}
-
-div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */
-	color:#ffffff;
-	font-weight:bold;
-}
-
-.tmenudisabled { color:#808080 !important; cursor: not-allowed; }
-
-/* --- end nav --- */
-
-/* Login */
-
 div.login_block {
 	position:absolute;
 	top:5px;
@@ -438,16 +480,16 @@ div.login_block table {
 
 div.login {
 	white-space:nowrap;
-	padding:8px 0px 0px 0px;
+	padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
 	margin:0px 0px 0px 8px;
 	font-weight:bold;
 }
 
 img.login, img.printer, img.entity {
-	padding:8px 0px 0px 0px;
+	padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px;
 	margin:0px 0px 0px 8px;
 	text-decoration:none;
-	color:#ffffff;
+	color: white;
 	font-weight:bold;
 }
 
@@ -461,6 +503,9 @@ div.vmenu {
 	display:none;
 	<?php } else {?>
 	width:170px;
+	-moz-box-shadow: 4px 4px 4px #CCC;
+	-webkit-box-shadow: 4px 4px 4px #CCC;
+	box-shadow: 4px 4px 4px #CCC;
 	<?php } ?>
 }
 
@@ -773,8 +818,11 @@ div.tabs {
 div.tabBar {
     background-color:#ffffff;
     padding:6px;
-    margin:3px 0px 5px;
+    margin:3px 0px 14px 0px;
     border:1px solid #bbbbbb;
+    -moz-box-shadow: 4px 4px 4px #DDD;
+	-webkit-box-shadow: 4px 4px 4px #DDD;
+	box-shadow: 4px 4px 4px #DDD;
 }
 
 div.tabBar table.notopnoleftnoright {
@@ -1066,7 +1114,7 @@ table.liste {
 
 table.liste td {padding:1px 2px 1px 0px;}
 
-tr.liste_titre, tr.box_titre {
+div.liste_titre, tr.liste_titre, tr.box_titre {
 	padding:4px;
 	background-color:rgba(0,0,0,.2);
 	background-image:linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
@@ -1116,13 +1164,13 @@ tr.impair td, tr.pair td {padding:1px 1px 1px 2px;}
 tr.impair table.nobordernopadding td, tr.pair table.nobordernopadding td {padding:1px 0px;}
 
 .impair {
-	background:#f4f4f4;
+	background:#fdfdfd;
 	font-family:<?php print $fontlist ?>;
 	border:0px;
 }
 
 .pair {
-	background:#eaeaea;
+	background:#f4f4f4;
 	font-family:<?php print $fontlist ?>;
 	border:0px;
 }
@@ -1147,12 +1195,12 @@ tr.impair table.nobordernopadding td, tr.pair table.nobordernopadding td {paddin
 }
 
 tr.box_impair {
-	background:#f4f4f4;
+	background:#fdfdfd;
 	font-family:<?php print $fontlist ?>;
 }
 
 tr.box_pair {
-	background:#eaeaea;
+	background:#f4f4f4;
 	font-family:<?php print $fontlist ?>;
 }
 
@@ -1423,7 +1471,7 @@ td.dpHead {
 
 /* Jour courant */
 .dpSelected {
-	background-color:#a61111;
+	background-color:#0B63A2;
 	color:#ffffff;
 	font-weight:bold;
 }
@@ -1468,7 +1516,7 @@ td.dpHead {
 	padding:0px 2px;
 	font-size:9px;
 	border-width:0px;
-	color:#a61111;
+	color:#0B63A2;
 	vertical-align:middle;
 	cursor:pointer;
 }
@@ -1499,17 +1547,9 @@ table.cal_month    { border-spacing: 0px; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
 .cal_other_month_right   { border-right: solid 1px #C0C0C0; }
 
-.cal_other_month {
+.cal_other_month   { opacity: 0.6; background: #EAEAEA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-	background:#dddddd;
+.cal_past_month    { opacity: 0.6; background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-}
+.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-
-.cal_past_month {
-	background:#eeeeee;
-}
-
-.cal_current_month {
-	background:#ffffff;
-}
 
 .cal_today {
 	background:#ffffff;
@@ -1518,37 +1558,19 @@ table.cal_month    { border-spacing: 0px; }
 
 div.dayevent table.nobordernopadding tr td {padding:1px;}
 
-table.cal_event {
+table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px;
-	border-collapse:collapse;
+						-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-	margin-bottom:1px;
+						moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-}
+						box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
-
+						background: -webkit-gradient(linear, left top, left bottom, from(#006aac), to(#00438d));
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
+						}
+table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -moz-padding-start: 0px; -webkit-padding-start: 0px; }
 li.cal_event       { border: none; list-style-type: none; }
-
+.cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
-.cal_event a:link {
+.cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
-	color:#232323;
+.cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
-	font-size:11px;
+.cal_event a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
-	font-weight:normal !important;
-}
-
-.cal_event a:visited {
-	color:#232323;
-	font-size:11px;
-	font-weight:normal !important;
-}
-
-.cal_event a:active {
-	color:#232323;
-	font-size:11px;
-	font-weight:normal !important;
-}
-
-.cal_event a:hover {
-	color:rgba(255,255,255,.75);
-	font-size:11px;
-	font-weight:normal !important;
-}
 
 
 /* ============================================================================== */

htdocs/theme/eldy/style.css.php

@@ -58,6 +58,8 @@ if (GETPOST('theme')) $conf->theme=GETPOST('theme');  // If theme was forced on
 $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12';
+$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
 
 $path='';    	// This value may be used in future for external module to overwrite theme
 $theme='eldy';	// Value of theme
@@ -198,7 +200,7 @@ if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
 ?>
 
 /* ============================================================================== */
-/* Styles par defaut                                                              */
+/* Default styles                                                                 */
 /* ============================================================================== */
 
 body {
@@ -304,8 +306,8 @@ input[type=image] { background-color: transparent; border: none; box-shadow: non
     box-shadow: 4px 4px 4px #CCC;
 }
 form {
-    padding: 0em 0em 0em 0em;
+    padding:0px;
-    margin: 0em 0em 0em 0em;
+    margin:0px;
 }
 div.float
 {
@@ -852,9 +854,9 @@ td.vmenu {
 
 .vmenu {
 	margin-left: 4px;
-<?php if (GETPOST("optioncss") == 'print') { ?>
+	<?php if (GETPOST("optioncss") == 'print') { ?>
     display: none;
-<?php } ?>
+	<?php } ?>
 }
 
 .menu_contenu { padding-top: 1px; }
@@ -1317,11 +1319,14 @@ div.tabsAction {
 
 
 a.tabTitle {
-    background: #657090;
+/*    background: #657090;
-    color: white;
+    color: white;*/
+    color:rgba(0,0,0,.5);
+    margin-right:10px;
+    text-shadow:1px 1px 1px #ffffff;
 	font-family: <?php print $fontlist ?>;
 	font-weight: normal;
-    padding: 0px 6px 2px 6px;
+    padding: 5px 6px 2px 6px;
     margin: 0px 6px;
     text-decoration: none;
     white-space: nowrap;
@@ -1329,7 +1334,7 @@ a.tabTitle {
 
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: <?php print $fontlist ?>;
-    padding: 2px 6px 2px 6px;
+    padding: 5px 6px 2px 6px;
     margin: 0em 0.2em;
     text-decoration: none;
     white-space: nowrap;
@@ -1364,6 +1369,7 @@ a.tab#active {
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active
 {
     color: #<?php echo $colortextmain; ?>;
+	font-weight: normal !important;
 }
 
 a.tabimage {