From 022469d981bbe5801ed99d82f15b0ea37bb57248 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 30 Sep 2024 22:30:50 +0200
Subject: [PATCH] Publish 3.0.6 (#166)

* Fix CSS (badges & Areatabaction)

* ChangeLog

* fix print_oblyon_menu with noout (#165)

Co-authored-by: Ulysse Valdenaire <uvaldenaire@easya.solutions>

* ChangeLog

---------

Co-authored-by: UltraViolet33 <93035200+UltraViolet33@users.noreply.github.com>
Co-authored-by: Ulysse Valdenaire <uvaldenaire@easya.solutions>
---
 CHANGELOG.md                       |   5 +
 VERSION                            |   2 +-
 core/menus/standard/oblyon.lib.php |   6 +-
 themeoblyon/badges.inc.php         | 179 ++++++++++++++++-------------
 themeoblyon/global.inc.php         |   4 +-
 5 files changed, 109 insertions(+), 87 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d6db4b..c0656ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog ##
 
+### Version 3.0.6 - Compatibility 14.0.x - 20.0.x (2024/09/30)
+- Fix CSS badges
+- Fix CSS for FIX_AREAREF_TABACTION
+- Fix print_oblyon_menu function with $noout=1 still prints something (Thanks UltraViolet33 from Easya Solutions)
+
 ### Version 3.0.5 - Compatibility 14.0.x - 20.0.x (2024/09/01)
 - Fix Z-index with option FIX_AREAREF_TABACTION activated
 - Add Use specific landing page to home menu entry (Thanks Christophe from Altairis)
diff --git a/VERSION b/VERSION
index 7da3c16..8ffc1ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.5
\ No newline at end of file
+3.0.6
\ No newline at end of file
diff --git a/core/menus/standard/oblyon.lib.php b/core/menus/standard/oblyon.lib.php
index dbf63e5..582caa3 100644
--- a/core/menus/standard/oblyon.lib.php
+++ b/core/menus/standard/oblyon.lib.php
@@ -116,7 +116,7 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
     }
     */
 
-    if (is_array($moredata) && ! empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page
+    if (is_array($moredata) && ! empty($moredata['searchform']) && empty($noout))	// searchform can contains select2 code or link to show old search form or link to switch on search page
     {
         print "\n";
         print "<!-- Begin SearchForm -->\n";
@@ -126,7 +126,7 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
         print "<!-- End SearchForm -->\n";
     }
 
-    if (is_array($moredata) && ! empty($moredata['bookmarks']))
+    if (is_array($moredata) && ! empty($moredata['bookmarks']) && empty($noout))
     {
         print "\n";
         print "<!-- Begin Bookmarks -->\n";
@@ -136,7 +136,7 @@ function print_oblyon_menu($db, $atarget, $type_user = 0, &$tabMenu, &$menu, $no
         print "<!-- End Bookmarks -->\n";
     }
 
-	if ( empty($menu_invert) && (getDolGlobalInt('OBLYON_HIDE_LEFTMENU') || $conf->dol_optimize_smallscreen) ) {
+	if ( empty($menu_invert) && (getDolGlobalInt('OBLYON_HIDE_LEFTMENU') || $conf->dol_optimize_smallscreen) && empty($noout) ) {
 		print '<div class="pushy-btn" title="'.$langs->trans("ShowLeftMenu").'">&#8801;</div>';
 	}
 
diff --git a/themeoblyon/badges.inc.php b/themeoblyon/badges.inc.php
index f246315..88252e5 100644
--- a/themeoblyon/badges.inc.php
+++ b/themeoblyon/badges.inc.php
@@ -1,29 +1,30 @@
 <?php
-if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
-/* <style type="text/css" > */
-/*
- Badge style is based on boostrap framework
- */
+if (!defined('ISLOADEDBYSTEELSHEET')) {
+	die('Must be call by steelsheet');
+}
+?>
+/* Badge style is based on boostrap framework */
 
 .badge {
-    display: inline-block;
-    font-size: 80%;
-    font-weight: 700 !important;
-    line-height: 1;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: baseline;
-    border-radius: .25rem;
-    transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
-    border-width: 2px;
-    border-style: solid;
-    border-color: rgba(255,255,255,0);
-    box-sizing: border-box;
+	display: inline-block;
+	padding: .1em .35em;
+	font-size: 80%;
+	font-weight: 700 !important;
+	line-height: 1;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	border-radius: .25rem;
+	transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+	border-width: 2px;
+	border-style: solid;
+	border-color: rgba(255,255,255,0);
+	box-sizing: border-box;
 }
 
 .badge-status {
-    font-size: 1em;
-    padding: .19em .35em;			/* more than 0.19 generate a change into heigth of lines */
+	font-size: 0.95em;
+	padding: .19em .35em;			/* more than 0.19 generate a change into heigth of lines */
 }
 .tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
 	font-size: 1.1em;
@@ -39,81 +40,90 @@
 }
 
 .badge-pill, .tabs .badge {
-    padding-right: .5em;
-    padding-left: .5em;
-    border-radius: 0.25rem;
+	padding-right: .5em;
+	padding-left: .5em;
+	border-radius: 0.25rem;
 }
 
 .badge-dot {
-    border-radius: 50%;
-    padding: 0.45em;
-    vertical-align: text-top;
+	padding: 0;
+	border-radius: 50%;
+	padding: 0.45em;
+	vertical-align: text-top;
 }
 
 a.badge:focus, a.badge:hover {
-    text-decoration: none;
+	text-decoration: none;
 }
 
 .liste_titre .badge:not(.nochangebackground) {
-    background-color: <?php print $badgeSecondary; ?>;
-    color: #fff;
+	background-color: <?php print $badgeSecondary; ?>;
+	color: #fff;
+}
+
+span.badgeneutral {
+	padding: 2px 7px 2px 7px;
+	background-color: #e4e4e4;
+	color: #666;
+	border-radius: 10px;
+	white-space: nowrap;
 }
 
 
 /* PRIMARY */
 .badge-primary{
-    color: #fff !important;
-    background-color: <?php print $badgePrimary; ?>;
+	color: #fff !important;
+	background-color: <?php print $badgePrimary; ?>;
 }
 a.badge-primary.focus, a.badge-primary:focus {
-    outline: 0;
-    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgePrimary, 0.5); ?>;
+	outline: 0;
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgePrimary, 0.5); ?>;
 }
 a.badge-primary:focus, a.badge-primary:hover {
-    color: #fff !important;
-    background-color: <?php print colorDarker($badgePrimary, 10); ?>;
+	color: #fff !important;
+	background-color: <?php print colorDarker($badgePrimary, 10); ?>;
 }
 
 /* SECONDARY */
 .badge-secondary, .tabs .badge {
-    color: #fff !important;
-    background-color: <?php print $badgeSecondary; ?>;
+	color: #fff !important;
+	background-color: <?php print $badgeSecondary; ?>;
 }
 a.badge-secondary.focus, a.badge-secondary:focus {
-    outline: 0;
-    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeSecondary, 0.5); ?>;
+	outline: 0;
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeSecondary, 0.5); ?>;
 }
 a.badge-secondary:focus, a.badge-secondary:hover {
-    color: #fff !important;
-    background-color: <?php print colorDarker($badgeSecondary, 10); ?>;
+	color: #fff !important;
+	background-color: <?php print colorDarker($badgeSecondary, 10); ?>;
 }
 
 /* SUCCESS */
 .badge-success {
-    color: #fff !important;
-    background-color: <?php print $badgeSuccess; ?>;
+	color: #fff !important;
+	background-color: <?php print $badgeSuccess; ?>;
 }
 a.badge-success.focus, a.badge-success:focus {
-    outline: 0;
-    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeSuccess, 0.5); ?>;
+	outline: 0;
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeSuccess, 0.5); ?>;
 }
 a.badge-success:focus, a.badge-success:hover {
-    color: #fff !important;
-    background-color: <?php print colorDarker($badgeSuccess, 10); ?>;
+	color: #fff !important;
+	background-color: <?php print colorDarker($badgeSuccess, 10); ?>;
 }
 
 /* DANGER */
 .badge-danger {
-    color: #fff !important;
-    background-color:  <?php print $badgeDanger; ?>;
+	color: #fff !important;
+	background-color: <?php print $badgeDanger; ?>;
 }
 a.badge-danger.focus, a.badge-danger:focus {
-    outline: 0;
-    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeDanger, 0.5); ?>;
+	outline: 0;
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeDanger, 0.5); ?>;
 }
 a.badge-danger:focus, a.badge-danger:hover {
-    color: #fff !important;
-    background-color: <?php print colorDarker($badgeDanger, 10); ?>;
+	color: #fff !important;
+	background-color: <?php print colorDarker($badgeDanger, 10); ?>;
 }
 
 /* WARNING */
@@ -122,67 +132,68 @@
     background-color: <?php print $badgeWarning; ?>;
 }
 a.badge-warning.focus, a.badge-warning:focus {
-    outline: 0;
-    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeWarning, 0.5); ?>;
+	outline: 0;
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeWarning, 0.5); ?>;
 }
 a.badge-warning:focus, a.badge-warning:hover {
-    color: #212529 !important;
-    background-color: <?php print colorDarker($badgeWarning, 10); ?>;
+	color: #212529 !important;
+	background-color: <?php print colorDarker($badgeWarning, 10); ?>;
 }
 
 /* WARNING colorblind */
-body[class^="colorblind-"] .badge-warning {
+body[class*="colorblind-"] .badge-warning {
 	  background-color: <?php print $colorblind_deuteranopes_badgeWarning; ?>;
   }
-body[class^="colorblind-"] a.badge-warning.focus,body[class^="colorblind-"] a.badge-warning:focus {
+body[class*="colorblind-"] a.badge-warning.focus,body[class^="colorblind-"] a.badge-warning:focus {
 	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($colorblind_deuteranopes_badgeWarning, 0.5); ?>;
 }
-body[class^="colorblind-"] a.badge-warning:focus, a.badge-warning:hover {
+body[class*="colorblind-"] a.badge-warning:focus, a.badge-warning:hover {
 	background-color: <?php print colorDarker($colorblind_deuteranopes_badgeWarning, 10); ?>;
 }
 
 /* INFO */
 .badge-info {
-    color: #fff !important;
-    background-color: <?php print $badgeInfo; ?>;
+	color: #fff !important;
+	background-color: <?php print $badgeInfo; ?>;
 }
 a.badge-info.focus, a.badge-info:focus {
-    outline: 0;
-    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeInfo, 0.5); ?>;
+	outline: 0;
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeInfo, 0.5); ?>;
 }
 a.badge-info:focus, a.badge-info:hover {
-    color: #fff !important;
-    background-color: <?php print colorDarker($badgeInfo, 10); ?>;
+	color: #fff !important;
+	background-color: <?php print colorDarker($badgeInfo, 10); ?>;
 }
 
 /* LIGHT */
 .badge-light {
-    color: #212529 !important;
-    background-color: <?php print $badgeLight; ?>;
+	color: #212529 !important;
+	background-color: <?php print $badgeLight; ?>;
 }
 a.badge-light.focus, a.badge-light:focus {
-    outline: 0;
-    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeLight, 0.5); ?>;
+	outline: 0;
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeLight, 0.5); ?>;
 }
 a.badge-light:focus, a.badge-light:hover {
-    color: #212529 !important;
-    background-color: <?php print colorDarker($badgeLight, 10); ?>;
+	color: #212529 !important;
+	background-color: <?php print colorDarker($badgeLight, 10); ?>;
 }
 
 /* DARK */
 .badge-dark {
-    color: #fff !important;
-    background-color: <?php print $badgeDark; ?>;
+	color: #fff !important;
+	background-color: <?php print $badgeDark; ?>;
 }
 a.badge-dark.focus, a.badge-dark:focus {
-    outline: 0;
-    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeDark, 0.5); ?>;
+	outline: 0;
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeDark, 0.5); ?>;
 }
 a.badge-dark:focus, a.badge-dark:hover {
-    color: #fff !important;
-    background-color: <?php print colorDarker($badgeDark, 10); ?>;
+	color: #fff !important;
+	background-color: <?php print colorDarker($badgeDark, 10); ?>;
 }
 
+
 @media only screen and (max-width: 570px)
 {
 	span.badge.badge-status {
@@ -192,6 +203,7 @@
 	}
 }
 
+
 /* STATUS BADGES */
 <?php
 for ($i = 0; $i <= 10; $i++) {
@@ -217,7 +229,6 @@
  */
 function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentLabel = '', $cssPrefix = '')
 {
-
 	global ${$statusVarNamePrefix.'badgeStatus'.$statusName}, ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
 
 	if (!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
@@ -244,16 +255,21 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 			$thisBadgeTextColor = '#777777';
 		}
 
+		// badge-statusX
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";
 		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
 			print "        border-color: ".$thisBadgeBorderColor." !important;\n";
 		}
-		print "        background-color: ".$thisBadgeBackgroundColor." !important;\n";
+		if ($thisBadgeBackgroundColor != '') {
+			print "        background-color: ".$thisBadgeBackgroundColor." !important;\n";
+		}
 		print "}\n";
 
 		print $cssPrefix.".font-status".$statusName." {\n";
-		print "        color: ".$thisBadgeBackgroundColor." !important;\n";
+		if ($thisBadgeBackgroundColor != '') {
+			print "        color: ".$thisBadgeBackgroundColor." !important;\n";
+		}
 		print "}\n";
 
 		print $cssPrefix.".badge-status".$statusName.".focus, ".$cssPrefix.".badge-status".$statusName.":focus {\n";
@@ -261,6 +277,7 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5)." !important;\n";
 		print "}\n";
 
+		// badge-statusX:focus
 		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
 		print "    color: ".$thisBadgeTextColor." !important;\n";
 		//print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
diff --git a/themeoblyon/global.inc.php b/themeoblyon/global.inc.php
index b89437e..3c63e83 100644
--- a/themeoblyon/global.inc.php
+++ b/themeoblyon/global.inc.php
@@ -2755,9 +2755,9 @@
 	position: sticky;
     z-index: 4;
 	<?php if (!empty($conf->global->MAIN_MENU_INVERT)) { ?>
-	top: 40px;
+	top: 42px;
 	<?php } else { ?>
-	top: 52px;
+	top: 42px;
 	<?php } ?>
 	background: inherit;
     padding-bottom: 20px;