Skip to content

Make the fields on 'General settings' page responsive #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Make the fields on 'General settings' page responsive #636

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05e397a
Fix fields positioning on 'General settings' page
eduardomozart Feb 7, 2025
a6e1fc5
Update config.class.php
eduardomozart Feb 7, 2025
de08740
Update config.class.php
eduardomozart Feb 7, 2025
7b18bca
Fix tests
eduardomozart Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 75 additions & 48 deletions inc/config.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,15 +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%'>";
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-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 "</td>";
echo "</tr>";
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",
[
Expand All @@ -332,30 +336,33 @@ public function showConfigForm($options = [])
'unit' => 'day'
]
);
echo "</td>";
echo "</div>";
echo "</div>";

echo "<td>" . __('Agent port', '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'>" . __('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 "</td>";
echo "</tr>";
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>" . __('Re-prepare successful jobs', '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'>" . __('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 "</td>";
echo "</tr>";
echo "</div>";
echo "</div>";

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%'>";
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",
[
Expand All @@ -364,8 +371,11 @@ public function showConfigForm($options = [])
'max' => 100
]
);
echo "</td>";
echo "</div>";
echo "</div>";

echo "</div>";
echo "</td>";
echo "</tr>";

$options['candel'] = false;
Expand Down Expand Up @@ -418,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>";

Expand All @@ -479,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' />";
Expand All @@ -488,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'),
Expand All @@ -511,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", [
Expand Down