From 456f7f7c7d4976fd8a2bb021ac09e31fc3e87505 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Wed, 24 Mar 2021 11:23:22 +0100 Subject: [PATCH] Rename test-red variables --- css/backoffice/themes/page-banner.scss | 12 ++++++------ .../2.x/itop-structure/datamodel.itop-structure.xml | 6 +++--- setup/itopdesignformat.class.inc.php | 12 ++++++------ test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml | 2 +- test/setup/iTopDesignFormat/3.0_to_1.7.input.xml | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/css/backoffice/themes/page-banner.scss b/css/backoffice/themes/page-banner.scss index 3aee1b64e..da84833b5 100644 --- a/css/backoffice/themes/page-banner.scss +++ b/css/backoffice/themes/page-banner.scss @@ -17,9 +17,9 @@ * * You should have received a copy of the GNU Affero General Public License * */ -$ibo-page-banner-background-color: $ibo-color-red-600 !default; -$ibo-page-banner-text-color: $ibo-color-red-100 !default; -$ibo-page-banner-text-content: "THIS IS NOT PRODUCTION INSTANCE" !default; +$ibo-page-banner--background-color: $ibo-color-red-600 !default; +$ibo-page-banner--text-color: $ibo-color-red-100 !default; +$ibo-page-banner--text-content: "THIS IS NOT PRODUCTION INSTANCE" !default; #ibo-page-banner::before { @@ -28,7 +28,7 @@ $ibo-page-banner-text-content: "THIS IS NOT PRODUCTION INSTANCE" !default; padding: 0.2rem; text-align: center; font-size: 1rem; - background: $ibo-page-banner-background-color; - color: $ibo-page-banner-text-color; - content: $ibo-page-banner-text-content; + background: $ibo-page-banner--background-color; + color: $ibo-page-banner--text-color; + content: $ibo-page-banner--text-content; } \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml index 64ee6cde3..3a7fdb06b 100644 --- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml +++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml @@ -1859,9 +1859,9 @@ - $ibo-color-red-600 - $ibo-color-red-100 - "THIS IS A TEST INSTANCE" + $ibo-color-red-600 + $ibo-color-red-100 + "THIS IS A TEST INSTANCE" diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php index 45e4595c3..8c7089780 100644 --- a/setup/itopdesignformat.class.inc.php +++ b/setup/itopdesignformat.class.inc.php @@ -827,17 +827,17 @@ class iTopDesignFormat $oNodeList = $oXPath->query('/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="backoffice-environment-banner-background-color"]'); foreach ($oNodeList as $oNode) { - $oNode->setAttribute('id', 'ibo-page-banner-background-color'); + $oNode->setAttribute('id', 'ibo-page-banner--background-color'); } $oNodeList = $oXPath->query( '/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="backoffice-environment-banner-text-color"]'); foreach ($oNodeList as $oNode) { - $oNode->setAttribute('id', 'ibo-page-banner-text-color'); + $oNode->setAttribute('id', 'ibo-page-banner--text-color'); } $oNodeList = $oXPath->query( '/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="backoffice-environment-banner-text-content"]'); foreach ($oNodeList as $oNode) { - $oNode->setAttribute('id', 'ibo-page-banner-text-content'); + $oNode->setAttribute('id', 'ibo-page-banner--text-content'); } // Add new attribute to theme import nodes @@ -935,17 +935,17 @@ class iTopDesignFormat // N°3516 Bring back legacy themes // Update test-red theme - $oNodeList = $oXPath->query('/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="ibo-page-banner-background-color"]'); + $oNodeList = $oXPath->query('/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="ibo-page-banner--background-color"]'); foreach ($oNodeList as $oNode) { $oNode->setAttribute('id', 'backoffice-environment-banner-background-color'); } - $oNodeList = $oXPath->query('/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="ibo-page-banner-text-color"]'); + $oNodeList = $oXPath->query('/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="ibo-page-banner--text-color"]'); foreach ($oNodeList as $oNode) { $oNode->setAttribute('id', 'backoffice-environment-banner-text-color'); } - $oNodeList = $oXPath->query( '/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="ibo-page-banner-text-content"]'); + $oNodeList = $oXPath->query( '/itop_design/branding/themes/theme[@id="test-red"]/variables/variable[@id="ibo-page-banner--text-content"]'); foreach ($oNodeList as $oNode) { $oNode->setAttribute('id', 'backoffice-environment-banner-text-content'); } diff --git a/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml b/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml index 9f8e9a6a6..dbd8af7ee 100644 --- a/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml +++ b/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml @@ -4,7 +4,7 @@ - #C53030 + #C53030 #C53030 diff --git a/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml b/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml index f7cf8306d..c4a9b427a 100644 --- a/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml +++ b/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml @@ -4,7 +4,7 @@ - #C53030 + #C53030 #C53030