Merge pull request #7 from itsmng/fix-whitelabel-update

Fix whitelabel update
itsmng · Feb 27, 2023 · 6a4c5e6 · 6a4c5e6
2 parents 0434d55 + 29cd14d
commit 6a4c5e6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/hook.php b/hook.php
@@ -187,19 +187,19 @@ function plugin_whitelabel_install() {
         // Add column header_icons_color
         if(!$DB->fieldExists('glpi_plugin_whitelabel_brand', 'header_icons_color')) {
             $query = "ALTER TABLE `glpi_plugin_whitelabel_brand` ADD COLUMN `header_icons_color` varchar(7) COLLATE utf8_unicode_ci NOT NULL DEFAULT '#ffffff'";
-        $DB->queryOrDie($query, $DB->error());
+            $DB->queryOrDie($query, $DB->error());
         }
 
         // Add column menu_color
         if(!$DB->fieldExists('glpi_plugin_whitelabel_brand', 'menu_color')) {
             $query = "ALTER TABLE `glpi_plugin_whitelabel_brand` ADD COLUMN `menu_color` varchar(7) COLLATE utf8_unicode_ci NOT NULL DEFAULT '#ae0c2a'";
-        $DB->queryOrDie($query, $DB->error());
+            $DB->queryOrDie($query, $DB->error());
         }
 
         // Add column menu_text_color
-        if(!$DB->fieldExists('glpi_plugin_whitelabel_brand', 'menu_color')) {
-            $query = "ALTER TABLE `glpi_plugin_whitelabel_brand` ADD COLUMN `menu_color` varchar(7) COLLATE utf8_unicode_ci NOT NULL DEFAULT '#ffffff'";
-        $DB->queryOrDie($query, $DB->error());
+        if(!$DB->fieldExists('glpi_plugin_whitelabel_brand', 'menu_text_color')) {
+            $query = "ALTER TABLE `glpi_plugin_whitelabel_brand` ADD COLUMN `menu_text_color` varchar(7) COLLATE utf8_unicode_ci NOT NULL DEFAULT '#ffffff'";
+            $DB->queryOrDie($query, $DB->error());
         }
 
         // Add column menu_active_color
@@ -256,6 +256,12 @@ function plugin_whitelabel_install() {
             $DB->queryOrDie($query, $DB->error());
         }
 
+        // Add column table_header_background_color
+        if(!$DB->fieldExists('glpi_plugin_whitelabel_brand', 'table_header_background_color')) {
+            $query = "ALTER TABLE `glpi_plugin_whitelabel_brand` ADD COLUMN `table_header_background_color` varchar(7) COLLATE utf8_unicode_ci NOT NULL DEFAULT '#f8f8f8'";
+            $DB->queryOrDie($query, $DB->error());
+        }
+
         // Add column table_header_text_color
         if(!$DB->fieldExists('glpi_plugin_whitelabel_brand', 'table_header_text_color')) {
             $query = "ALTER TABLE `glpi_plugin_whitelabel_brand` ADD COLUMN `table_header_text_color` varchar(7) COLLATE utf8_unicode_ci NOT NULL DEFAULT '#ae0c2a'";

diff --git a/setup.php b/setup.php
@@ -51,7 +51,7 @@ function plugin_init_whitelabel() {
 function plugin_version_whitelabel() {
     return array(
         'name'           => "White Label",
-        'version'        => '2.1.0',
+        'version'        => '2.2.0',
         'author'         => 'ITSM Dev Team, Théodore Clément',
         'license'        => 'GPLv3+',
         'homepage'       => 'https://github.com/itsmng/whitelabel',

diff --git a/styles/template.scss b/styles/template.scss
@@ -49,10 +49,6 @@ $break_tablets: 1300px;
   color: %primary_color% !important;
 }
 
-.itilstatus {
-  color: %primary_color% !important;
-}
-
 #logo_login {
   background: %menu_color% !important;
 }