diff --git a/www/controllers/Host.php b/www/controllers/Host.php index b3922b35..de91c2b2 100644 --- a/www/controllers/Host.php +++ b/www/controllers/Host.php @@ -587,7 +587,7 @@ public function setPackagesInventory(string $packagesInventory) if (!empty($packageDetails[1])) { $this->setPackageVersion($packageDetails[1]); } else { - $this->setPackageVersion('unknow'); + $this->setPackageVersion('unknown'); } /** @@ -707,7 +707,7 @@ public function setPackagesAvailable(string $packagesAvailable) if (!empty($packageDetails[1])) { $this->setPackageVersion($packageDetails[1]); } else { - $this->setPackageVersion('unknow'); + $this->setPackageVersion('unknown'); } /** @@ -1054,9 +1054,9 @@ public function register() $this->token = bin2hex(openssl_random_pseudo_bytes(16)); /** - * The agent status is set to 'unknow' when we register a new host for the first time + * The agent status is set to 'unknown' when we register a new host for the first time */ - $this->onlineStatus = 'unknow'; + $this->onlineStatus = 'unknown'; /** * Ajout en BDD diff --git a/www/controllers/Layout/Container/Render.php b/www/controllers/Layout/Container/Render.php index e3740ccf..f2025887 100644 --- a/www/controllers/Layout/Container/Render.php +++ b/www/controllers/Layout/Container/Render.php @@ -12,7 +12,7 @@ public static function render(string $container) * Check if container exists */ if (!file_exists(ROOT . '/views/includes/containers/' . $container . '.inc.php')) { - throw new Exception('Could not retrieve content: unknow container ' . $container); + throw new Exception('Could not retrieve content: unknown container ' . $container); } /** diff --git a/www/controllers/Layout/Table/Render.php b/www/controllers/Layout/Table/Render.php index c8d66c58..3efdd05f 100644 --- a/www/controllers/Layout/Table/Render.php +++ b/www/controllers/Layout/Table/Render.php @@ -13,7 +13,7 @@ public static function render(string $table, int $offset = 0) * Check if table exists */ if (!file_exists(ROOT . '/views/includes/tables/' . $table . '.inc.php')) { - throw new Exception('Could not retrieve content: unknow table ' . $table); + throw new Exception('Could not retrieve content: unknown table ' . $table); } /** diff --git a/www/controllers/Task/Repo/Package/Sync.php b/www/controllers/Task/Repo/Package/Sync.php index 2e037df2..6ec44d35 100644 --- a/www/controllers/Task/Repo/Package/Sync.php +++ b/www/controllers/Task/Repo/Package/Sync.php @@ -25,7 +25,7 @@ private function syncPackage() * Task action must be specified ('create' or 'update') */ if (empty($this->task->getAction())) { - throw new Exception('Task action unknow (empty)'); + throw new Exception('Empty task action'); } if ($this->task->getAction() != 'create' and $this->task->getAction() != 'update') { throw new Exception('Task action is invalid'); diff --git a/www/models/Connection.php b/www/models/Connection.php index 2d13c502..f6a3f237 100644 --- a/www/models/Connection.php +++ b/www/models/Connection.php @@ -594,7 +594,7 @@ private function generateMainTables() 'false', 'repomanager-', 'Europe/Paris', - '512', + '1024', '300', 'true', 'true', @@ -931,7 +931,7 @@ public function generateHostTables() Date_end DATE NOT NULL, Time_end TIME NOT NULL, Report VARCHAR(255), - Status VARCHAR(7))"); /* error / warning / unknow / done */ + Status VARCHAR(7))"); /* error / warning / unknown / done */ /** * Create indexes diff --git a/www/public/assets/icons/unknow.svg b/www/public/assets/icons/unknown.svg similarity index 100% rename from www/public/assets/icons/unknow.svg rename to www/public/assets/icons/unknown.svg diff --git a/www/public/resources/styles/common.css b/www/public/resources/styles/common.css index f338d7f8..5bd9f342 100644 --- a/www/public/resources/styles/common.css +++ b/www/public/resources/styles/common.css @@ -184,6 +184,7 @@ pre.codeblock { .row-gap-1 {row-gap: 1px}.row-gap-2 {row-gap: 2px}.row-gap-4 {row-gap: 4px}.row-gap-5 {row-gap: 5px}.row-gap-6 {row-gap: 6px}.row-gap-7 {row-gap: 7px}.row-gap-8 {row-gap: 8px}.row-gap-9{row-gap: 9px}.row-gap-10{row-gap: 10px}.row-gap-15{row-gap: 15px}.row-gap-20{row-gap: 20px} .padding-left-15{padding-left:15px !important}.padding-left-20{padding-left:20px !important}.padding-left-30{padding-left:30px !important}.padding-left-40{padding-left:40px !important} .padding-right-15{padding-right:15px !important}.padding-right-20{padding-right:20px !important}.padding-right-30{padding-right:30px !important}.padding-right-40{padding-right:40px !important} +.margin-10{margin:10px !important}.margin-15{margin:15px !important} .margin-left-0 {margin-left: 0px !important}.margin-left-5 {margin-left: 5px !important}.margin-left-10 {margin-left: 10px !important}.margin-left-15 {margin-left: 15px !important}.margin-left-20 {margin-left: 20px !important}.margin-left-30 {margin-left: 30px !important}.margin-left-40 {margin-left: 40px !important} .margin-right-0 {margin-right: 0px !important}.margin-right-5 {margin-right: 5px !important}.margin-right-10 {margin-right: 10px !important}.margin-right-15 {margin-right: 15px !important}.margin-right-20 {margin-right: 20px !important}.margin-right-30 {margin-right: 30px !important}.margin-right-40 {margin-right: 40px !important} .margin-top-0 {margin-top: 0px !important}.margin-top-5 {margin-top: 5px !important}.margin-top-10 {margin-top: 10px !important}.margin-top-15 {margin-top: 15px !important}.margin-top-20 {margin-top: 20px !important}.margin-top-30 {margin-top: 30px !important}.margin-top-40 {margin-top: 40px !important} diff --git a/www/public/resources/styles/stats-hosts.css b/www/public/resources/styles/stats-hosts.css index 7aeb94c7..211969bd 100644 --- a/www/public/resources/styles/stats-hosts.css +++ b/www/public/resources/styles/stats-hosts.css @@ -130,21 +130,10 @@ td:last-child { } .hosts-chart-sub-container { - height: 250px; + min-height: 230px; position: relative; } -.hosts-charts-list-column-container { - column-count: 2; -} - -.hosts-charts-list-container { - width: 80%; - margin: auto; - padding-top: 3px; - padding-bottom: 3px; -} - .hosts-charts-list-label > div > span:first-child { display: inline-block; width: 10px; @@ -170,8 +159,9 @@ td:last-child { #hosts-requiring-reboot-chart { position: relative; - height: 150px; + height: 80%; } + #hosts-requiring-reboot-chart p { font-size: 35px; } diff --git a/www/templates/source-repositories/rpm/almalinux.yml b/www/templates/source-repositories/rpm/almalinux.yml index 90f948f9..d9ecbb29 100644 --- a/www/templates/source-repositories/rpm/almalinux.yml +++ b/www/templates/source-repositories/rpm/almalinux.yml @@ -92,7 +92,7 @@ repositories: - name: almalinux-crb type: rpm description: Alma Linux CRB - url: https://repo.almalinux.org/almalinux/$releasever/crb/$basearch/os + url: https://repo.almalinux.org/almalinux/$releasever/CRB/$basearch/os releasever: - name: 9 description: Alma Linux 9 diff --git a/www/version b/www/version index bcd250ed..2efddba7 100644 --- a/www/version +++ b/www/version @@ -1 +1 @@ -4.12.0 \ No newline at end of file +4.12.1 \ No newline at end of file diff --git a/www/views/includes/containers/host/summary.inc.php b/www/views/includes/containers/host/summary.inc.php index 43ce3770..d7d0655e 100644 --- a/www/views/includes/containers/host/summary.inc.php +++ b/www/views/includes/containers/host/summary.inc.php @@ -85,7 +85,7 @@ if ($agentStatus == "seems-stopped") { echo ' Seems stopped'; } - if ($agentStatus == "unknow") { + if ($agentStatus == "unknown") { echo ' Unknown'; } ?>
diff --git a/www/views/includes/containers/hosts/list.inc.php b/www/views/includes/containers/hosts/list.inc.php index d81b0405..b00c0c4c 100644 --- a/www/views/includes/containers/hosts/list.inc.php +++ b/www/views/includes/containers/hosts/list.inc.php @@ -144,62 +144,62 @@ if (!empty($host['Hostname'])) { $hostname = $host['Hostname']; } else { - $hostname = 'unknow'; + $hostname = 'unknown'; } if (!empty($host['Ip'])) { $ip = $host['Ip']; } else { - $ip = 'unknow'; + $ip = 'unknown'; } if (!empty($host['Os'])) { $os = $host['Os']; } else { - $os = 'unknow'; + $os = 'unknown'; } if (!empty($host['Os_version'])) { $os_version = $host['Os_version']; } else { - $os_version = 'unknow'; + $os_version = 'unknown'; } if (!empty($host['Os_family'])) { $os_family = $host['Os_family']; } else { - $os_family = 'unknow'; + $os_family = 'unknown'; } if (!empty($host['Type'])) { $type = $host['Type']; } else { - $type = 'unknow'; + $type = 'unknown'; } if (!empty($host['Kernel'])) { $kernel = $host['Kernel']; } else { - $kernel = 'unknow'; + $kernel = 'unknown'; } if (!empty($host['Arch'])) { $arch = $host['Arch']; } else { - $arch = 'unknow'; + $arch = 'unknown'; } if (!empty($host['Profile'])) { $profile = $host['Profile']; } else { - $profile = 'unknow'; + $profile = 'unknown'; } if (!empty($host['Env'])) { $env = $host['Env']; } else { - $env = 'unknow'; + $env = 'unknown'; } if (!empty($host['Linupdate_version'])) { $agentVersion = $host['Linupdate_version']; } else { - $agentVersion = 'unknow'; + $agentVersion = 'unknown'; } if (!empty($host['Reboot_required'])) { $rebootRequired = $host['Reboot_required']; } else { - $rebootRequired = 'unknow'; + $rebootRequired = 'unknown'; } /** @@ -267,8 +267,8 @@ if ($agentStatus == "seems-stopped") { echo ''; } - if ($agentStatus == "unknow") { - echo ''; + if ($agentStatus == "unknown") { + echo ''; } ?> diff --git a/www/views/includes/containers/hosts/overview.inc.php b/www/views/includes/containers/hosts/overview.inc.php index b037a9ca..49acf217 100644 --- a/www/views/includes/containers/hosts/overview.inc.php +++ b/www/views/includes/containers/hosts/overview.inc.php @@ -18,16 +18,16 @@ = 1) : ?>= $kernelName ?>
= $kernel['Kernel_count'] ?>
= $profileName ?>
= $profile['Profile_count'] ?>
= $distributionDetails['name'] ?>
= $distributionDetails['description'] ?>
@@ -135,7 +135,7 @@ if (!empty($releasevers)) : foreach ($releasevers as $releaseverId => $releaseverDefinition) : ?> -= $releaseverDefinition['name'] ?>
= $releaseverDefinition['description'] ?>