diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index fbc62083b97..5c7e825671c 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2175,83 +2175,46 @@ class Adherent extends CommonObject
// phpcs:enable
global $langs;
$langs->load("members");
- if ($mode == 0)
+
+ if ($statut == -1)
{
- if ($statut == -1) return $langs->trans("MemberStatusDraft");
- elseif ($statut >= 1) {
- if ($need_subscription == 0) return $langs->trans("MemberStatusNoSubscription");
- elseif (! $date_end_subscription) return $langs->trans("MemberStatusActive");
- elseif ($date_end_subscription < time()) return $langs->trans("MemberStatusActiveLate");
- else return $langs->trans("MemberStatusPaid");
- }
- elseif ($statut == 0) return $langs->trans("MemberStatusResiliated");
+ $statusType = 'status0';
+ $labelstatut = $langs->trans("MemberStatusDraft");
+ $labelstatutShort = $langs->trans("MemberStatusDraftShort");
}
- elseif ($mode == 1)
+ elseif ($statut >= 1) {
+ if ($need_subscription == 0)
+ {
+ $statusType = 'status4';
+ $labelstatut = $langs->trans("MemberStatusNoSubscription");
+ $labelstatutShort = $langs->trans("MemberStatusNoSubscriptionShort");
+ }
+ elseif (! $date_end_subscription)
+ {
+ $statusType = 'status1';
+ $labelstatut = $langs->trans("MemberStatusActive");
+ $labelstatutShort = $langs->trans("MemberStatusActiveShort");
+ }
+ elseif ($date_end_subscription < time())
+ {
+ $statusType = 'status3';
+ $labelstatut = $langs->trans("MemberStatusActiveLate");
+ $labelstatutShort = $langs->trans("MemberStatusActiveLateShort");
+ }
+ else {
+ $statusType = 'status4';
+ $labelstatut = $langs->trans("MemberStatusPaid");
+ $labelstatutShort = $langs->trans("MemberStatusPaidShort");
+ }
+ }
+ elseif ($statut == 0)
{
- if ($statut == -1) return $langs->trans("MemberStatusDraftShort");
- elseif ($statut >= 1) {
- if ($need_subscription == 0) return $langs->trans("MemberStatusNoSubscription");
- elseif (! $date_end_subscription) return $langs->trans("MemberStatusActiveShort");
- elseif ($date_end_subscription < time()) return $langs->trans("MemberStatusActiveLateShort");
- else return $langs->trans("MemberStatusPaidShort");
- }
- elseif ($statut == 0) return $langs->trans("MemberStatusResiliatedShort");
- }
- elseif ($mode == 2)
- {
- if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'), 'statut0').' '.$langs->trans("MemberStatusDraftShort");
- elseif ($statut >= 1) {
- if ($need_subscription == 0) return img_picto($langs->trans('MemberStatusNoSubscription'), 'statut4').' '.$langs->trans("MemberStatusNoSubscriptionShort");
- elseif (! $date_end_subscription) return img_picto($langs->trans('MemberStatusActive'), 'statut1').' '.$langs->trans("MemberStatusActiveShort");
- elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'), 'statut3').' '.$langs->trans("MemberStatusActiveLateShort");
- else return img_picto($langs->trans('MemberStatusPaid'), 'statut4').' '.$langs->trans("MemberStatusPaidShort");
- }
- elseif ($statut == 0) return img_picto($langs->trans('MemberStatusResiliated'), 'statut5').' '.$langs->trans("MemberStatusResiliatedShort");
- }
- elseif ($mode == 3)
- {
- if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'), 'statut0');
- elseif ($statut >= 1) {
- if ($need_subscription == 0) return img_picto($langs->trans('MemberStatusNoSubscription'), 'statut4');
- elseif (! $date_end_subscription) return img_picto($langs->trans('MemberStatusActive'), 'statut1');
- elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'), 'statut3');
- else return img_picto($langs->trans('MemberStatusPaid'), 'statut4');
- }
- elseif ($statut == 0) return img_picto($langs->trans('MemberStatusResiliated'), 'statut5');
- }
- elseif ($mode == 4)
- {
- if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'), 'statut0').' '.$langs->trans("MemberStatusDraft");
- elseif ($statut >= 1) {
- if ($need_subscription == 0) return img_picto($langs->trans('MemberStatusNoSubscription'), 'statut4').' '.$langs->trans("MemberStatusNoSubscription");
- elseif (! $date_end_subscription) return img_picto($langs->trans('MemberStatusActive'), 'statut1').' '.$langs->trans("MemberStatusActive");
- elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'), 'statut3').' '.$langs->trans("MemberStatusActiveLate");
- else return img_picto($langs->trans('MemberStatusPaid'), 'statut4').' '.$langs->trans("MemberStatusPaid");
- }
- if ($statut == 0) return img_picto($langs->trans('MemberStatusResiliated'), 'statut5').' '.$langs->trans("MemberStatusResiliated");
- }
- elseif ($mode == 5)
- {
- if ($statut == -1) return ''.$langs->trans("MemberStatusDraftShort").' '.img_picto($langs->trans('MemberStatusDraft'), 'statut0');
- elseif ($statut >= 1) {
- if ($need_subscription == 0) return ''.$langs->trans("MemberStatusNoSubscriptionShort").' '.img_picto($langs->trans('MemberStatusNoSubscription'), 'statut4');
- elseif (! $date_end_subscription) return ''.$langs->trans("MemberStatusActiveShort").' '.img_picto($langs->trans('MemberStatusActive'), 'statut1');
- elseif ($date_end_subscription < time()) return ''.$langs->trans("MemberStatusActiveLateShort").' '.img_picto($langs->trans('MemberStatusActiveLate'), 'statut3');
- else return ''.$langs->trans("MemberStatusPaidShort").' '.img_picto($langs->trans('MemberStatusPaid'), 'statut4');
- }
- if ($statut == 0) return ''.$langs->trans("MemberStatusResiliated").' '.img_picto($langs->trans('MemberStatusResiliated'), 'statut5');
- }
- elseif ($mode == 6)
- {
- if ($statut == -1) return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'), 'statut0');
- if ($statut >= 1) {
- if ($need_subscription == 0) return $langs->trans("MemberStatusNoSubscription").' '.img_picto($langs->trans('MemberStatusNoSubscription'), 'statut4');
- elseif (! $date_end_subscription) return $langs->trans("MemberStatusActive").' '.img_picto($langs->trans('MemberStatusActive'), 'statut1');
- elseif ($date_end_subscription < time()) return $langs->trans("MemberStatusActiveLate").' '.img_picto($langs->trans('MemberStatusActiveLate'), 'statut3');
- else return $langs->trans("MemberStatusPaid").' '.img_picto($langs->trans('MemberStatusPaid'), 'statut4');
- }
- if ($statut == 0) return $langs->trans("MemberStatusResiliated").' '.img_picto($langs->trans('MemberStatusResiliated'), 'statut5');
+ $statusType = 'status0';
+ $labelstatut = $langs->trans("MemberStatusResiliated");
+ $labelstatutShort = $langs->trans("MemberStatusResiliatedShort");
}
+
+ return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index d834fcfe943..98a40c73c0b 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -538,7 +538,6 @@ abstract class CommonInvoice extends CommonObject
}
}
-
return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
}
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 1c73e2399d6..8c4d5be5a9e 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2250,13 +2250,16 @@ function colorValidateHex($color, $allow_white = true)
/**
* Change color to make it less aggressive (ratio is negative) or more aggressive (ratio is positive)
*
- * @param string $hex Color in hex ('#AA1122' or 'AA1122' or '#a12' or 'a12')
- * @param integer $ratio Default=-50. Note: 0=Component color is unchanged, -100=Component color become 88, +100=Component color become 00 or FF
+ * @param string $hex Color in hex ('#AA1122' or 'AA1122' or '#a12' or 'a12')
+ * @param integer $ratio Default=-50. Note: 0=Component color is unchanged, -100=Component color become 88, +100=Component color become 00 or FF
+ * @param integer $brigthness Default=0. Adjust brightness. -100=Decrease brightness by 100%, +100=Increase of 100%.
* @return string New string of color
* @see colorAdjustBrightness()
*/
-function colorAgressiveness($hex, $ratio = -50)
+function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
{
+ if (empty($ratio)) $ratio = 0; // To avoid null
+
// Steps should be between -255 and 255. Negative = darker, positive = lighter
$ratio = max(-100, min(100, $ratio));
@@ -2282,7 +2285,16 @@ function colorAgressiveness($hex, $ratio = -50)
if ($color > 128) $color -= (($color - 128) * (abs($ratio) / 100));
if ($color < 127) $color += ((128 - $color) * (abs($ratio) / 100));
}
- $color = max(0, min(255, $color)); // Adjust color
+ if ($brightness > 0)
+ {
+ $color = ($color * (100 + abs($brightness)) / 100);
+ }
+ else
+ {
+ $color = ($color * (100 - abs($brightness)) / 100);
+ }
+
+ $color = max(0, min(255, $color)); // Adjust color to stay into valid range
$return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
}
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index d1adc2ed4e8..2ceaa70911a 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -149,46 +149,56 @@ a.info-box-text{ text-decoration: none;}
/* ICONS INFO BOX */
-.info-box-icon {
- color: #fff !important;
-}
-
global->THEME_AGRESSIVENESS_RATIO='.$conf->global->THEME_AGRESSIVENESS_RATIO.' */'."\n";
-if (! isset($conf->global->THEME_AGRESSIVENESS_RATIO)) $conf->global->THEME_AGRESSIVENESS_RATIO=-40;
+
+$prefix='';
+$prefix = 'background-';
+if (! empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-';
+
+if (! isset($conf->global->THEME_AGRESSIVENESS_RATIO) && $prefix) $conf->global->THEME_AGRESSIVENESS_RATIO=-50;
if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENESS_RATIO=GETPOST('THEME_AGRESSIVENESS_RATIO', 'int');
+//var_dump($conf->global->THEME_AGRESSIVENESS_RATIO);
?>
+.info-box-icon {
+
+ color: #fff !important;
+
+ background-color: #eee !important;
+
+ opacity: 0.95;
+}
+
.bg-infoxbox-project{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}
.bg-infoxbox-action{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}
.bg-infoxbox-propal,
.bg-infoxbox-facture,
.bg-infoxbox-commande{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}
.bg-infoxbox-supplier_proposal,
.bg-infoxbox-invoice_supplier,
.bg-infoxbox-order_supplier{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}
.bg-infoxbox-contrat{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}
.bg-infoxbox-bank_account{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}
.bg-infoxbox-adherent{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}
.bg-infoxbox-expensereport{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}
.bg-infoxbox-holiday{
- background-color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+ color: global->THEME_AGRESSIVENESS_RATIO); ?> !important;
}