From e8a3cb698d538fb4c2a6ba248ebcaeebb567e4ce Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 26 May 2020 11:26:49 +0200
Subject: [PATCH] Time selector adjustment

---
 pandora_console/include/functions_html.php    | 16 ++++++++--------
 pandora_console/include/javascript/pandora.js |  8 ++++----
 pandora_console/include/styles/wizard.css     |  3 +--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index adf978d13f..2a4e8aff92 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -1088,8 +1088,8 @@ function html_print_extended_select_for_time(
     }
 
     ob_start();
-    // Use the no_meta parameter because this image is only in the base console
-    echo '<div id="'.$uniq_name.'_default" style="width:100%;display:flex;align-items: baseline;">';
+    // Use the no_meta parameter because this image is only in the base console.
+    echo '<div id="'.$uniq_name.'_default" style="width:100%;display:inline">';
         html_print_select(
             $fields,
             $uniq_name.'_select',
@@ -1104,7 +1104,7 @@ function html_print_extended_select_for_time(
             $readonly,
             'font-size: xx-small;'.$select_style
         );
-        // The advanced control is only for admins
+        // The advanced control is only for admins.
     if ($admin) {
         echo ' <a href="javascript:">'.html_print_image(
             'images/pencil.png',
@@ -1123,7 +1123,7 @@ function html_print_extended_select_for_time(
 
     echo '</div>';
 
-    echo '<div id="'.$uniq_name.'_manual" style="width:100%;display:flex;">';
+    echo '<div id="'.$uniq_name.'_manual" style="width:100%;display:inline;">';
         html_print_input_text($uniq_name.'_text', $selected, '', $size, 255, false, $readonly, false, '', $class);
 
         html_print_input_hidden($name, $selected, false, $uniq_name);
@@ -1154,15 +1154,15 @@ function html_print_extended_select_for_time(
     echo '</div>';
     echo "<script type='text/javascript'>
 		$(document).ready (function () {
-			period_select_init('$uniq_name', $allow_zero);
-			period_select_events('$uniq_name');
+			period_select_init('".$uniq_name."', ".(($allow_zero) ? 'true' : 'null').");
+			period_select_events('".$uniq_name."');
 		});
 		function period_select_".$name."_update(seconds) {
 			$('#text-".$uniq_name."_text').val(seconds);
 			adjustTextUnits('".$uniq_name."');
 			calculateSeconds('".$uniq_name."');
-			$('#".$uniq_name."_manual').css('display', 'flex');
-			$('#".$uniq_name."_default').css('display', 'none');
+			$('#".$uniq_name."_manual').show();
+			$('#".$uniq_name."_default').hide();
 		}
 	</script>";
     $returnString = ob_get_clean();
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index c91339f0c6..89fa9c63f3 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -838,7 +838,7 @@ function post_process_select_events(name) {
 function period_select_init(name, allow_zero) {
   // Manual mode is hidden by default
   $("#" + name + "_manual").css("display", "none");
-  $("#" + name + "_default").css("display", "flex");
+  $("#" + name + "_default").css("display", "inline");
 
   // If the text input is empty, we put on it 5 minutes by default
   if ($("#text-" + name + "_text").val() == "") {
@@ -852,7 +852,7 @@ function period_select_init(name, allow_zero) {
     }
   } else if ($("#text-" + name + "_text").val() == 0 && allow_zero != true) {
     $("#" + name + "_units option:last").prop("selected", false);
-    $("#" + name + "_manual").css("display", "flex");
+    $("#" + name + "_manual").css("display", "inline");
     $("#" + name + "_default").css("display", "none");
   }
 }
@@ -941,13 +941,13 @@ function selectFirst(name) {
  */
 function toggleBoth(name) {
   if ($("#" + name + "_default").css("display") == "none") {
-    $("#" + name + "_default").css("display", "flex");
+    $("#" + name + "_default").css("display", "inline");
   } else {
     $("#" + name + "_default").css("display", "none");
   }
 
   if ($("#" + name + "_manual").css("display") == "none") {
-    $("#" + name + "_manual").css("display", "flex");
+    $("#" + name + "_manual").css("display", "inline");
   } else {
     $("#" + name + "_manual").css("display", "none");
   }
diff --git a/pandora_console/include/styles/wizard.css b/pandora_console/include/styles/wizard.css
index 69209ce17c..b2e9b044b1 100644
--- a/pandora_console/include/styles/wizard.css
+++ b/pandora_console/include/styles/wizard.css
@@ -70,9 +70,8 @@ ul.wizard li > textarea {
 }
 
 .wizard .discovery_inline_input {
-  display: flex;
+  display: inline;
   align-content: end;
-  flex: 0;
   align-self: flex-start;
 }