From 9a9b7ecb95c9e6557b18ebacfccc2ed4fea02579 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Sep 2020 12:07:15 +0200
Subject: [PATCH] CSS

---
 htdocs/admin/delais.php            | 244 +++++++++++++++--------------
 htdocs/theme/eldy/info-box.inc.php |  12 +-
 htdocs/theme/md/info-box.inc.php   |  13 +-
 3 files changed, 136 insertions(+), 133 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 2ece442d74f..11cd1dc3623 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -229,7 +229,7 @@ if ($action == 'edit')
 				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
     			print '<tr class="oddeven">';
     			print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-    			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td>';
+    			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
     			print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
     		}
     	}
@@ -290,148 +290,150 @@ if ($action == 'edit')
 
 print '<br>';
 
-// Show logo for weather
-print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
 
-if ($action == 'edit') {
-	$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
-	$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
-	if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
-	else $str_mode_enabled = $str_mode_percentage;
-	print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
-	print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
+if ($conf->global->MAIN_DISABLE_METEO != 1) {
+	// Show logo for weather
+	print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
 
-	print '<br><br>';
-} else {
-	if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
-	else print $langs->trans('MeteoPercentageModEnabled');
-	print '<br><br>';
-}
+	if ($action == 'edit') {
+		$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
+		$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
+		if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
+		else $str_mode_enabled = $str_mode_percentage;
+		print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
+		print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
 
-$offset = 0;
-$cursor = 10; // By default
-//if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
-//if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
-$level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
-$level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
-$level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
-$level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
-$text = ''; $options = 'class="valignmiddle" height="60px"';
+		print '<br><br>';
+	} else {
+		if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
+		else print $langs->trans('MeteoPercentageModEnabled');
+		print '<br><br>';
+	}
+
+	$offset = 0;
+	$cursor = 10; // By default
+	//if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
+	//if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
+	$level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
+	$level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
+	$level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
+	$level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
+	$text = ''; $options = 'class="valignmiddle" height="60px"';
 
 
-if ($action == 'edit') {
-	print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
+	if ($action == 'edit') {
+		print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
 
-	print '<div>';
-	print '<div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 0, $options);
-	print '= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 1, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 2, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 3, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
-	print '</div>';
-	print '</div>';
+		print '<div>';
+		print '<div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 0, $options);
+		print ' = <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 1, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 2, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 3, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
+		print '</div>';
+		print '</div>';
 
-	print '</div>';
+		print '</div>';
 
-	print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
+		print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
 
-	print '<div>';
-	print '<div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 0, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 1, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 2, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 3, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
-	print '</div>';
-	print '</div>';
+		print '<div>';
+		print '<div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 0, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 1, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 2, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 3, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
+		print '</div>';
+		print '</div>';
 
-	print '</div>';
+		print '</div>';
 
-	?>
+		?>
 
-	<script type="text/javascript">
+		<script type="text/javascript">
 
-		$(document).ready(function() {
+			$(document).ready(function() {
 
-			$("#change_mode").click(function() {
-				var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
-				var str_mode_std = "<?php print $str_mode_std; ?>";
-				var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
+				$("#change_mode").click(function() {
+					var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
+					var str_mode_std = "<?php print $str_mode_std; ?>";
+					var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
+
+					if(use_percent.val() == 1) {
+						use_percent.val(0);
+						$("#standard").show();
+						$("#percentage").hide();
+						$(this).html(str_mode_std);
+					} else {
+						use_percent.val(1);
+						$("#standard").hide();
+						$("#percentage").show();
+						$(this).html(str_mode_percentage);
+					}
+				});
 
-				if(use_percent.val() == 1) {
-					use_percent.val(0);
-					$("#standard").show();
-					$("#percentage").hide();
-					$(this).html(str_mode_std);
-				} else {
-					use_percent.val(1);
-					$("#standard").hide();
-					$("#percentage").show();
-					$(this).html(str_mode_percentage);
-				}
 			});
 
-		});
+		</script>
 
-	</script>
-
-	<?php
-} else {
-	if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-		print '<div>';
-		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 0, $options);
-		print '= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 1, $options);
-		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 2, $options);
-		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 3, $options);
-		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 4, $options);
-		print '&gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
-		print '</div>';
-		print '</div>';
+		<?php
 	} else {
-		print '<div>';
-		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 0, $options);
-		print '= '.$level0;
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 1, $options);
-		print '&lt;= '.$level1;
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 2, $options);
-		print '&lt;= '.$level2;
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 3, $options);
-		print '&lt;= '.$level3;
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 4, $options);
-		print '&gt; '.$level3;
-		print '</div>';
-		print '</div>';
+		if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+			print '<div>';
+			print '<div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 0, $options);
+			print ' = '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 1, $options);
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 2, $options);
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 3, $options);
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 4, $options);
+			print ' &gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+			print '</div>';
+			print '</div>';
+		} else {
+			print '<div>';
+			print '<div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 0, $options);
+			print ' = '.$level0;
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 1, $options);
+			print ' &lt;= '.$level1;
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 2, $options);
+			print ' &lt;= '.$level2;
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 3, $options);
+			print ' &lt;= '.$level3;
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 4, $options);
+			print ' &gt; '.$level3;
+			print '</div>';
+			print '</div>';
+		}
 	}
 }
 
-print '</div>';
 
 if ($action == 'edit') {
 	print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 4bc6a6595fc..26ba9fac867 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -379,23 +379,23 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 }
 .fa-weather-level0:before{
 	content: "\f185";
-	color : #ffbf00;
+	color : #cfbf00;
 }
 .fa-weather-level1:before{
 	content: "\f6c4";
-	color : #b0b0b0;
+	color : #bc9526;
 }
 .fa-weather-level2:before{
-	content: "\f0c2";
-	color : #9b9b9b;
+	content: "\f743";
+	color : #b16000;
 }
 .fa-weather-level3:before{
 	content: "\f740";
-	color : #888888;
+	color : #b04000;
 }
 .fa-weather-level4:before{
 	content: "\f0e7";
-	color : #b91f1f;
+	color : #b01000;
 }
 
 
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 1297a99bf99..d024d824ea8 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -388,25 +388,26 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 }
 .fa-weather-level0:before{
 	content: "\f185";
-	color : #000000;
+	color : #cfbf00;
 }
 .fa-weather-level1:before{
 	content: "\f6c4";
-	color : #000000;
+	color : #bc9526;
 }
 .fa-weather-level2:before{
-	content: "\f0c2";
-	color : #000000;
+	content: "\f743";
+	color : #b16000;
 }
 .fa-weather-level3:before{
 	content: "\f740";
-	color : #000000;
+	color : #b04000;
 }
 .fa-weather-level4:before{
 	content: "\f0e7";
-	color : #000000;
+	color : #b01000;
 }
 
+
 /* USING IMAGES FOR WEATHER INTEAD OF FONT AWESOME */
 /* For other themes just uncomment this part */
 /*.info-box-weather-level0,