From a94aedb171ab7a24d6be516202a8e4a49b0ea568 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Nov 2015 12:33:56 +0100 Subject: [PATCH] Minor css fix --- htdocs/comm/action/card.php | 28 +++++++++++++++++++++++++--- htdocs/comm/action/document.php | 9 ++++++++- htdocs/theme/md/style.css.php | 5 +++++ 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 955e8d9e0f1..84a36dec8b9 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -719,8 +719,15 @@ if ($action == 'create') $listofuserid=json_decode($_SESSION['assignedtouser'], true); } } + print '
'; print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0'); - if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.$langs->trans("Busy"); + print '
'; + if (in_array($user->id,array_keys($listofuserid))) + { + print '
'; + print $langs->trans("MyAvailability").': '.$langs->trans("Busy"); + print '
'; + } print ''; // Realised by @@ -1052,8 +1059,16 @@ if ($id > 0) $listofuserid=json_decode($_SESSION['assignedtouser'], true); } } + + print '
'; print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0'); - if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': id]['transparency']?' checked':'').'>'.$langs->trans("Busy"); + print '
'; + if (in_array($user->id,array_keys($listofuserid))) + { + print '
'; + print $langs->trans("MyAvailability").': id]['transparency']?' checked':'').'>'.$langs->trans("Busy"); + print '
'; + } print ''; // Realised by @@ -1231,8 +1246,15 @@ if ($id > 0) $listofuserid=json_decode($_SESSION['assignedtouser'], true); } } + print '
'; print $form->select_dolusers_forevent('view','assignedtouser',1); - if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody + print '
'; + if (in_array($user->id,array_keys($listofuserid))) + { + print '
'; + print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody + print '
'; + } print ' '; // Done by diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index d45a18e3e8c..f3bda0281da 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -195,8 +195,15 @@ if ($object->id > 0) $listofuserid=json_decode($_SESSION['assignedtouser'], true); } } + print '
'; print $form->select_dolusers_forevent('view','assignedtouser',1); - if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody + print '
'; + if (in_array($user->id,array_keys($listofuserid))) + { + print '
'; + print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody + print '
'; + } print ' '; print '

'; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 7a42ab1f3bb..e316f078b24 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2464,6 +2464,7 @@ div.ok { color: #114466; } +/* Warning message */ div.warning { color: #302020; padding: 0.3em 0.3em 0.3em 0.3em; @@ -2476,6 +2477,7 @@ div.warning { text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } +/* Error message */ div.error { color: #550000; font-weight: bold; padding: 0.3em 0.3em 0.3em 0.3em; @@ -2500,6 +2502,9 @@ div.info { text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } +div.warning a, div.info a, div.error a { + color: rgb(); +} /* * Liens Payes/Non payes