From 05e397a32b6c9f8c92fa14ff54d76536683ded9c Mon Sep 17 00:00:00 2001
From: Eduardo Mozart de Oliveira
 <2974895+eduardomozart@users.noreply.github.com>
Date: Thu, 6 Feb 2025 23:15:34 -0300
Subject: [PATCH 1/4] Fix fields positioning on 'General settings' page

---
 inc/config.class.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/inc/config.class.php b/inc/config.class.php
index 37fdbf8311..7244746e4d 100644
--- a/inc/config.class.php
+++ b/inc/config.class.php
@@ -318,6 +318,11 @@ public function showConfigForm($options = [])
         echo "<td width='20%'>";
         Dropdown::showYesNo("ssl_only", $this->isFieldActive('ssl_only'));
         echo "</td>";
+
+        echo "<td>" . __('Agent port', 'glpiinventory') . "</td>";
+        echo "<td>";
+        echo "<input type='text' class='form-control' name='agent_port' value='" . $this->getValue('agent_port') . "'/>";
+        echo "</td>";
         echo "</tr>";
 
         echo "<tr class='tab_bg_1'>";
@@ -334,9 +339,9 @@ public function showConfigForm($options = [])
         );
         echo "</td>";
 
-        echo "<td>" . __('Agent port', 'glpiinventory') . "</td>";
+        echo "<td>" . __('Re-prepare successful jobs', 'glpiinventory') . "</td>";
         echo "<td>";
-        echo "<input type='text' class='form-control' name='agent_port' value='" . $this->getValue('agent_port') . "'/>";
+        Dropdown::showYesNo("reprepare_job", $this->isFieldActive('reprepare_job'));
         echo "</td>";
         echo "</tr>";
 
@@ -346,14 +351,6 @@ public function showConfigForm($options = [])
         Dropdown::showYesNo("extradebug", $this->isFieldActive('extradebug'));
         echo "</td>";
 
-        echo "<td>" . __('Re-prepare successful jobs', 'glpiinventory') . "</td>";
-        echo "<td>";
-        Dropdown::showYesNo("reprepare_job", $this->isFieldActive('reprepare_job'));
-        echo "</td>";
-        echo "</tr>";
-
-        echo "<tr class='tab_bg_1'>";
-        echo "<td colspan =2></td>";
         echo "<td>" . __('Maximum number of agents to wake up in a task', 'glpiinventory') . "</td>";
         echo "<td width='20%'>";
         Dropdown::showNumber(
@@ -365,7 +362,6 @@ public function showConfigForm($options = [])
                            ]
         );
         echo "</td>";
-
         echo "</tr>";
 
         $options['candel'] = false;

From a6e1fc5cfea8136d7bbda06ab59c1c56342179f5 Mon Sep 17 00:00:00 2001
From: Eduardo Mozart de Oliveira
 <2974895+eduardomozart@users.noreply.github.com>
Date: Thu, 6 Feb 2025 23:16:28 -0300
Subject: [PATCH 2/4] Update config.class.php

---
 inc/config.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/config.class.php b/inc/config.class.php
index 7244746e4d..0a0c40a4c2 100644
--- a/inc/config.class.php
+++ b/inc/config.class.php
@@ -362,6 +362,7 @@ public function showConfigForm($options = [])
                            ]
         );
         echo "</td>";
+
         echo "</tr>";
 
         $options['candel'] = false;

From de087401f17fe3384a750d4f4b989fa0af102b7a Mon Sep 17 00:00:00 2001
From: Eduardo Mozart de Oliveira
 <2974895+eduardomozart@users.noreply.github.com>
Date: Fri, 7 Feb 2025 00:09:52 -0300
Subject: [PATCH 3/4] Update config.class.php

---
 inc/config.class.php | 126 ++++++++++++++++++++++++++-----------------
 1 file changed, 78 insertions(+), 48 deletions(-)

diff --git a/inc/config.class.php b/inc/config.class.php
index 0a0c40a4c2..038905073f 100644
--- a/inc/config.class.php
+++ b/inc/config.class.php
@@ -314,20 +314,19 @@ public function showConfigForm($options = [])
         $this->showFormHeader($options);
 
         echo "<tr class='tab_bg_1'>";
-        echo "<td>" . __('SSL-only for agent', 'glpiinventory') . "</td>";
-        echo "<td width='20%'>";
-        Dropdown::showYesNo("ssl_only", $this->isFieldActive('ssl_only'));
-        echo "</td>";
+        echo "<td colspan='4'>";
+        echo "<div class='row flex-row align-items-start flex-grow-1'>";
 
-        echo "<td>" . __('Agent port', 'glpiinventory') . "</td>";
-        echo "<td>";
-        echo "<input type='text' class='form-control' name='agent_port' value='" . $this->getValue('agent_port') . "'/>";
-        echo "</td>";
-        echo "</tr>";
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-4 col-form-label text-sm-end'>" . __('SSL-only for agent', 'glpiinventory') . "</label>";
+        echo "<div class='col-sm-6 d-flex align-items-center'>";
+        Dropdown::showYesNo("ssl_only", $this->isFieldActive('ssl_only'));
+        echo "</div>";
+        echo "</div>";
 
-        echo "<tr class='tab_bg_1'>";
-        echo "<td>" . __('Delete tasks logs after', 'glpiinventory') . "</td>";
-        echo "<td>";
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-4 col-form-label text-sm-end'>" . __('Delete tasks logs after', 'glpiinventory') . "</label>";
+        echo "<div class='col-sm-6 d-flex align-items-center'>";
         Dropdown::showNumber(
             "delete_task",
             [
@@ -337,22 +336,33 @@ public function showConfigForm($options = [])
                             'unit'  => 'day'
                            ]
         );
-        echo "</td>";
+        echo "</div>";
+        echo "</div>";
 
-        echo "<td>" . __('Re-prepare successful jobs', 'glpiinventory') . "</td>";
-        echo "<td>";
-        Dropdown::showYesNo("reprepare_job", $this->isFieldActive('reprepare_job'));
-        echo "</td>";
-        echo "</tr>";
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-4 col-form-label text-sm-end'>" . __('Agent port', 'glpiinventory') . "</label>";
+        echo "<div class='col-sm-6 d-flex align-items-center'>";
+        echo "<input type='text' class='form-control' name='agent_port' value='" . $this->getValue('agent_port') . "'/>";
+        echo "</div>";
+        echo "</div>";
 
-        echo "<tr class='tab_bg_1'>";
-        echo "<td>" . __('Extra-debug', 'glpiinventory') . "</td>";
-        echo "<td>";
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-4 col-form-label text-sm-end'>" . __('Extra-debug', 'glpiinventory') . "</label>";
+        echo "<div class='col-sm-6 d-flex align-items-center'>";
         Dropdown::showYesNo("extradebug", $this->isFieldActive('extradebug'));
-        echo "</td>";
+        echo "</div>";
+        echo "</div>";
 
-        echo "<td>" . __('Maximum number of agents to wake up in a task', 'glpiinventory') . "</td>";
-        echo "<td width='20%'>";
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-4 col-form-label text-sm-end'>" . __('Re-prepare successful jobs', 'glpiinventory') . "</label>";
+        echo "<div class='col-sm-6 d-flex align-items-center'>";
+        Dropdown::showYesNo("reprepare_job", $this->isFieldActive('reprepare_job'));
+        echo "</div>";
+        echo "</div>";
+
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-4 col-form-label text-sm-end'>" . __('Maximum number of agents to wake up in a task', 'glpiinventory') . "</label>";
+        echo "<div class='col-sm-6 d-flex align-items-center'>";
         Dropdown::showNumber(
             "wakeup_agent_max",
             [
@@ -361,8 +371,11 @@ public function showConfigForm($options = [])
                             'max' => 100
                            ]
         );
-        echo "</td>";
+        echo "</div>";
+        echo "</div>";
 
+        echo "</div>";
+        echo "</td>";
         echo "</tr>";
 
         $options['candel'] = false;
@@ -415,41 +428,58 @@ public static function showFormNetworkInventory($options = [])
         echo "</tr>";
 
         echo "<tr class='tab_bg_1'>";
-        echo "<td>" . __('Threads number', 'glpiinventory') . "&nbsp;" .
-              "(" . strtolower(__('Network discovery', 'glpiinventory')) . ")</td>";
-        echo "<td align='center'>";
+        echo "<td colspan='4'>";
+        echo "<div class='row flex-row align-items-start flex-grow-1'>";
+
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" . 
+            __('Threads number', 'glpiinventory') . "&nbsp;" .
+            "(" . strtolower(__('Network discovery', 'glpiinventory')) . ")" . "</label>";
+        echo "<div class='col-sm-1 d-flex align-items-center'>";
         Dropdown::showNumber("threads_networkdiscovery", [
              'value' => $pfConfig->getValue('threads_networkdiscovery'),
              'min'   => 1,
              'max'   => 400]);
-        echo "</td>";
-
-        echo "<td>" . __('Threads number', 'glpiinventory') . "&nbsp;" .
-              "(" . strtolower(__('Network inventory (SNMP)', 'glpiinventory')) . ")</td>";
-        echo "<td align='center'>";
+        echo "</div>";
+        echo "</div>";
+
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" . 
+            __('Threads number', 'glpiinventory') . "&nbsp;" .
+            "(" . strtolower(__('Network inventory (SNMP)', 'glpiinventory')) . ")" . "</label>";
+        echo "<div class='col-sm-1 d-flex align-items-center'>";
         Dropdown::showNumber("threads_networkinventory", [
              'value' => $pfConfig->getValue('threads_networkinventory'),
              'min'   => 1,
              'max'   => 400]);
-        echo "</td>";
-        echo "</tr>";
-
-        echo "<tr class='tab_bg_1'>";
-        echo "<td>" . __('SNMP timeout', 'glpiinventory') . "&nbsp;" .
-              "(" . strtolower(__('Network discovery', 'glpiinventory')) . ")</td>";
-        echo "<td align='center'>";
+        echo "</div>";
+        echo "</div>";
+        
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" . 
+            __('SNMP timeout', 'glpiinventory') . "&nbsp;" .
+            "(" . strtolower(__('Network discovery', 'glpiinventory')) . ")" . "</label>";
+        echo "<div class='col-sm-1 d-flex align-items-center'>";
         Dropdown::showNumber("timeout_networkdiscovery", [
              'value' => $pfConfig->getValue('timeout_networkdiscovery'),
              'min'   => 1,
              'max'   => 60]);
-        echo "</td>";
-        echo "<td>" . __('SNMP timeout', 'glpiinventory') . "&nbsp;" .
-              "(" . strtolower(__('Network inventory (SNMP)', 'glpiinventory')) . ")</td>";
-        echo "<td align='center'>";
+        echo "</div>";
+        echo "</div>";
+
+        echo "<div class='mb-2 row col-12 col-sm-6'>";
+        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" . 
+            __('SNMP timeout', 'glpiinventory') . "&nbsp;" .
+            "(" . strtolower(__('Network inventory (SNMP)', 'glpiinventory')) . ")" . "</label>";
+        echo "<div class='col-sm-1 d-flex align-items-center'>";
         Dropdown::showNumber("timeout_networkinventory", [
              'value' => $pfConfig->getValue('timeout_networkinventory'),
              'min'   => 1,
              'max'   => 60]);
+        echo "</div>";
+        echo "</div>";
+
+        echo "</div>";
         echo "</td>";
         echo "</tr>";
 
@@ -476,7 +506,7 @@ public static function showFormDeploy($options = [])
 
         if (GLPI_INSTALL_MODE !== 'CLOUD') {
             echo "<tr class='tab_bg_1'>";
-            echo "<td>" . __('Root folder for sending files from server', 'glpiinventory') . "</td>";
+            echo "<td class='right form-label'>" . __('Root folder for sending files from server', 'glpiinventory') . "</td>";
             echo "<td>";
             echo "<input type='text' class='form-control' name='server_upload_path' value='" .
             $pfConfig->getValue('server_upload_path') . "' size='60' />";
@@ -485,14 +515,14 @@ public static function showFormDeploy($options = [])
         }
 
         echo "<tr>";
-        echo "<td>" . __('Use this GLPI server as a mirror server', 'glpiinventory') . "</td>";
+        echo "<td class='right form-label'>" . __('Use this GLPI server as a mirror server', 'glpiinventory') . "</td>";
         echo "<td>";
         Dropdown::showYesNo("server_as_mirror", $pfConfig->getValue('server_as_mirror'));
         echo "</td>";
         echo "</tr>";
 
         echo "<tr>";
-        echo "<td>" . __('Match mirrors to agents', 'glpiinventory') . "</td>";
+        echo "<td class='right form-label'>" . __('Match mirrors to agents', 'glpiinventory') . "</td>";
         echo "<td>";
         $mirror_options = [
          PluginGlpiinventoryDeployMirror::MATCH_LOCATION => __('with location', 'glpiinventory'),
@@ -508,7 +538,7 @@ public static function showFormDeploy($options = [])
         echo "</tr>";
 
         echo "<tr>";
-        echo "<td>" . __('Delete successful on demand tasks after (in days)', 'glpiinventory') . "</td>";
+        echo "<td class='right form-label'>" . __('Delete successful on demand tasks after (in days)', 'glpiinventory') . "</td>";
         echo "<td width='20%'>";
         $toadd = [-1 => __('Never')];
         Dropdown::showNumber("clean_on_demand_tasks", [

From 7b18bca9b55408e246c29a5a593e9e00d3a52881 Mon Sep 17 00:00:00 2001
From: Eduardo Mozart de Oliveira
 <2974895+eduardomozart@users.noreply.github.com>
Date: Fri, 7 Feb 2025 00:17:22 -0300
Subject: [PATCH 4/4] Fix tests

---
 inc/config.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/config.class.php b/inc/config.class.php
index 038905073f..340975d49d 100644
--- a/inc/config.class.php
+++ b/inc/config.class.php
@@ -432,7 +432,7 @@ public static function showFormNetworkInventory($options = [])
         echo "<div class='row flex-row align-items-start flex-grow-1'>";
 
         echo "<div class='mb-2 row col-12 col-sm-6'>";
-        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" . 
+        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" .
             __('Threads number', 'glpiinventory') . "&nbsp;" .
             "(" . strtolower(__('Network discovery', 'glpiinventory')) . ")" . "</label>";
         echo "<div class='col-sm-1 d-flex align-items-center'>";
@@ -444,7 +444,7 @@ public static function showFormNetworkInventory($options = [])
         echo "</div>";
 
         echo "<div class='mb-2 row col-12 col-sm-6'>";
-        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" . 
+        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" .
             __('Threads number', 'glpiinventory') . "&nbsp;" .
             "(" . strtolower(__('Network inventory (SNMP)', 'glpiinventory')) . ")" . "</label>";
         echo "<div class='col-sm-1 d-flex align-items-center'>";
@@ -454,9 +454,9 @@ public static function showFormNetworkInventory($options = [])
              'max'   => 400]);
         echo "</div>";
         echo "</div>";
-        
+
         echo "<div class='mb-2 row col-12 col-sm-6'>";
-        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" . 
+        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" .
             __('SNMP timeout', 'glpiinventory') . "&nbsp;" .
             "(" . strtolower(__('Network discovery', 'glpiinventory')) . ")" . "</label>";
         echo "<div class='col-sm-1 d-flex align-items-center'>";
@@ -468,7 +468,7 @@ public static function showFormNetworkInventory($options = [])
         echo "</div>";
 
         echo "<div class='mb-2 row col-12 col-sm-6'>";
-        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" . 
+        echo "<label class='form-label col-sm-9 col-form-label text-sm-end'>" .
             __('SNMP timeout', 'glpiinventory') . "&nbsp;" .
             "(" . strtolower(__('Network inventory (SNMP)', 'glpiinventory')) . ")" . "</label>";
         echo "<div class='col-sm-1 d-flex align-items-center'>";