diff --git a/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss b/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss index 9e55c5f13..d5bb5e5f7 100644 --- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss +++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss @@ -276,4 +276,9 @@ $ibo-datamodel-viewer--schema--tooltip--fill: $ibo-color-grey-600; $ibo-csv-import--row-error--background-color: $ibo-color-red-950; $ibo-csv-import--cell-error--color: $ibo-color-red-500; -$ibo-csv-import--cell-modified--color: $ibo-color-blue-500; \ No newline at end of file +$ibo-csv-import--cell-modified--color: $ibo-color-blue-500; + +$ibo-welcome-popup--messages-stack--background-color: $ibo-color-grey-700; +$ibo-welcome-popup--stack-item--background-color: $ibo-color-grey-600; +$ibo-welcome-popup--stack-item--border-color: $ibo-color-grey-800; +$ibo-welcome-popup--stack-item--is-active--border-color: $ibo-color-grey-900; diff --git a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/scss-variables.scss b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/scss-variables.scss index 8ce98a5b9..b4f660aa0 100644 --- a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/scss-variables.scss +++ b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/scss-variables.scss @@ -61,4 +61,7 @@ $ibo-popover-menu--item-separator--background-color: $ibo-color-grey-900; $ibo-alert-colors: ('primary': ($ibo-color-primary-100, $ibo-color-primary-900, $ibo-color-primary-900),'secondary': ($ibo-color-secondary-100, $ibo-color-secondary-900, $ibo-color-secondary-900),'neutral': ($ibo-color-secondary-100, $ibo-color-secondary-900, $ibo-color-secondary-900),'information': ($ibo-color-information-100, $ibo-color-information-950, $ibo-color-information-950),'success': ($ibo-color-success-100, $ibo-color-success-950, $ibo-color-success-950),'failure': ($ibo-color-danger-100, $ibo-color-danger-950, $ibo-color-danger-950),'warning': ($ibo-color-warning-100, $ibo-color-warning-950, $ibo-color-warning-950),'danger': ($ibo-color-danger-100, $ibo-color-danger-950, $ibo-color-danger-950),'grey' : ($ibo-color-grey-100, $ibo-color-grey-900, $ibo-color-grey-900),'blue-grey': ($ibo-color-blue-grey-100, $ibo-color-blue-grey-900, $ibo-color-blue-grey-900),'blue': ($ibo-color-blue-100, $ibo-color-blue-950, $ibo-color-blue-950),'cyan': ($ibo-color-cyan-100, $ibo-color-blue-950, $ibo-color-cyan-900),'green': ($ibo-color-green-100, $ibo-color-green-950, $ibo-color-green-950),'orange' : ($ibo-color-orange-100, $ibo-color-orange-900, $ibo-color-orange-900),'red': ($ibo-color-red-100, $ibo-color-red-950, $ibo-color-red-950),'pink': ($ibo-color-pink-100, $ibo-color-pink-900, $ibo-color-pink-900),); $ibo-button-colors: ( 'regular': ( /* Semantics */ 'neutral': ( '': ( $ibo-color-secondary-100, $ibo-color-grey-900, $ibo-button--box-shadow-bottom $ibo-color-secondary-200, $ibo-color-secondary-200, ), ':hover': ( $ibo-color-secondary-200, $ibo-color-grey-900, $ibo-button--box-shadow-bottom $ibo-color-secondary-300, $ibo-color-secondary-300, ), ':active': ( $ibo-color-secondary-200, $ibo-color-grey-900, $ibo-button--box-shadow-top $ibo-color-secondary-300 #{','} $ibo-button--box-shadow-bottom $ibo-color-secondary-200, $ibo-color-secondary-200, ), ':disabled': ( $ibo-color-grey-300, $ibo-color-grey-700, $ibo-button--box-shadow-top $ibo-color-grey-300, $ibo-color-grey-500, ), ), /* Primary action does not have the colors from the primary brand color, at least not for now */ 'primary': ( '': ( $ibo-color-cyan-900, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-cyan-950, $ibo-color-cyan-900, ), ':hover': ( $ibo-color-cyan-950, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-cyan-900, $ibo-color-cyan-950, ), ':active': ( $ibo-color-cyan-950, $ibo-color-white-100, $ibo-button--box-shadow-top $ibo-color-cyan-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-cyan-950, $ibo-color-cyan-950, ), ':disabled': ( $ibo-color-grey-300, $ibo-color-grey-700, $ibo-button--box-shadow-top $ibo-color-grey-300, $ibo-color-grey-500, ), ), 'secondary': ( '': ( $ibo-color-secondary-100, $ibo-color-grey-900, $ibo-button--box-shadow-bottom $ibo-color-secondary-200, $ibo-color-secondary-200, ), ':hover': ( $ibo-color-secondary-200, $ibo-color-grey-900, $ibo-button--box-shadow-bottom $ibo-color-secondary-300, $ibo-color-secondary-300, ), ':active': ( $ibo-color-secondary-200, $ibo-color-grey-900, $ibo-button--box-shadow-top $ibo-color-secondary-300 #{','} $ibo-button--box-shadow-bottom $ibo-color-secondary-200, $ibo-color-secondary-200, ), ':disabled': ( $ibo-color-grey-300, $ibo-color-grey-700, $ibo-button--box-shadow-top $ibo-color-grey-300, $ibo-color-grey-500, ), ), 'danger': ( '': ( $ibo-color-danger-900, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-danger-950, $ibo-color-danger-950, ), ':hover': ( $ibo-color-danger-950, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-danger-900, $ibo-color-danger-900, ), ':active': ( $ibo-color-danger-950, $ibo-color-white-100, $ibo-button--box-shadow-top $ibo-color-danger-950 #{','} $ibo-button--box-shadow-bottom $ibo-color-danger-900, $ibo-color-danger-900, ), ':disabled': ( $ibo-color-grey-300, $ibo-color-grey-700, $ibo-button--box-shadow-top $ibo-color-grey-300, $ibo-color-grey-500, ), ), 'success': ( '': ( $ibo-color-success-900, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-success-950, $ibo-color-success-900, ), ':hover': ( $ibo-color-success-950, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-success-900, $ibo-color-success-950, ), ':active': ( $ibo-color-success-950, $ibo-color-white-100, $ibo-button--box-shadow-top $ibo-color-success-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-success-950, $ibo-color-success-950, ), ':disabled': ( $ibo-color-grey-300, $ibo-color-grey-700, $ibo-button--box-shadow-top $ibo-color-grey-300, $ibo-color-grey-500, ), ), /* Colors */ 'red': ( '': ( $ibo-color-red-900, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-red-900, $ibo-color-red-950, ), ':hover': ( $ibo-color-red-950, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-red-900, $ibo-color-red-950, ), ':active': ( $ibo-color-red-950, $ibo-color-white-100, $ibo-button--box-shadow-top $ibo-color-red-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-red-950, $ibo-color-red-950, ), ':disabled': ( $ibo-color-grey-300, $ibo-color-grey-700, $ibo-button--box-shadow-top $ibo-color-grey-300, $ibo-color-grey-500, ), ), 'green': ( '': ( $ibo-color-green-900, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-green-950, $ibo-color-green-950, ), ':hover': ( $ibo-color-green-950, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-green-950, $ibo-color-green-950, ), ':active': ( $ibo-color-green-950, $ibo-color-white-100, $ibo-button--box-shadow-top $ibo-color-green-950 #{','} $ibo-button--box-shadow-bottom $ibo-color-green-950, $ibo-color-green-950, ), ':disabled': ( $ibo-color-grey-300, $ibo-color-grey-700, $ibo-button--box-shadow-top $ibo-color-grey-300, $ibo-color-grey-500, ), ), 'cyan': ( '': ( $ibo-color-cyan-900, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-cyan-950, $ibo-color-cyan-950, ), ':hover': ( $ibo-color-cyan-950, $ibo-color-white-100, $ibo-button--box-shadow-bottom $ibo-color-cyan-950, $ibo-color-cyan-950, ), ':active': ( $ibo-color-cyan-950, $ibo-color-white-100, $ibo-button--box-shadow-top $ibo-color-cyan-950 #{','} $ibo-button--box-shadow-bottom $ibo-color-cyan-950, $ibo-color-cyan-950, ), ':disabled': ( $ibo-color-grey-300, $ibo-color-grey-700, $ibo-button--box-shadow-top $ibo-color-grey-300, $ibo-color-grey-500, ), ) ), 'alternative': ( /* Semantics */ 'neutral': ( '': ( transparent, $ibo-color-grey-900, $ibo-button--box-shadow-bottom transparent, $ibo-color-grey-800, ), ':hover': ( $ibo-color-secondary-100, $ibo-color-grey-900, $ibo-button--box-shadow-bottom $ibo-color-secondary-100, $ibo-color-grey-800, ), ':active': ( $ibo-color-secondary-100, $ibo-color-grey-900, $ibo-button--box-shadow-top $ibo-color-secondary-200 #{','} $ibo-button--box-shadow-bottom $ibo-color-secondary-100, $ibo-color-grey-800, ), ':disabled': ( transparent, $ibo-color-grey-600, $ibo-button--box-shadow-top transparent, $ibo-color-grey-500, ), ), /* Primary action does not have the colors from the primary brand color, at least not for now */ 'primary': ( '': ( transparent, $ibo-color-cyan-950, $ibo-button--box-shadow-bottom transparent, $ibo-color-cyan-900, ), ':hover': ( $ibo-color-white-100, $ibo-color-grey-900, $ibo-button--box-shadow-bottom $ibo-color-white-100, $ibo-color-grey-800, ), ':active': ( $ibo-color-white-100, $ibo-color-grey-900, $ibo-button--box-shadow-top $ibo-color-white-100 #{','} $ibo-button--box-shadow-bottom $ibo-color-white-100, $ibo-color-grey-800, ), ':disabled': ( transparent, $ibo-color-grey-600, $ibo-button--box-shadow-top transparent, $ibo-color-grey-500, ), ), 'secondary': ( '': ( transparent, $ibo-color-grey-900, $ibo-button--box-shadow-bottom transparent, $ibo-color-grey-800, ), ':hover': ( $ibo-color-secondary-100, $ibo-color-grey-900, $ibo-button--box-shadow-bottom $ibo-color-secondary-100, $ibo-color-grey-800, ), ':active': ( $ibo-color-secondary-100, $ibo-color-grey-900, $ibo-button--box-shadow-top $ibo-color-secondary-200 #{','} $ibo-button--box-shadow-bottom $ibo-color-secondary-100, $ibo-color-grey-800, ), ':disabled': ( transparent, $ibo-color-grey-600, $ibo-button--box-shadow-top transparent, $ibo-color-grey-500, ), ), 'danger': ( '': ( transparent, $ibo-color-danger-950, $ibo-button--box-shadow-bottom transparent, $ibo-color-danger-600, ), ':hover': ( $ibo-color-danger-100, $ibo-color-danger-950, $ibo-button--box-shadow-bottom $ibo-color-danger-200, $ibo-color-danger-800, ), ':active': ( $ibo-color-danger-200, $ibo-color-danger-900, $ibo-button--box-shadow-top $ibo-color-danger-950 #{','} $ibo-button--box-shadow-bottom $ibo-color-danger-200, $ibo-color-danger-800, ), ':disabled': ( transparent, $ibo-color-grey-600, $ibo-button--box-shadow-top transparent, $ibo-color-grey-500, ), ), 'success': ( '': ( transparent, $ibo-color-success-950, $ibo-button--box-shadow-bottom transparent, $ibo-color-success-800, ), ':hover': ( $ibo-color-success-100, $ibo-color-success-950, $ibo-button--box-shadow-bottom $ibo-color-success-100, $ibo-color-success-950, ), ':active': ( $ibo-color-success-100, $ibo-color-success-900, $ibo-button--box-shadow-top $ibo-color-success-700 #{','} $ibo-button--box-shadow-bottom $ibo-color-success-100, $ibo-color-success-800, ), ':disabled': ( transparent, $ibo-color-grey-600, $ibo-button--box-shadow-top transparent, $ibo-color-grey-500, ), ), /* Colors */ 'red': ( '': ( transparent, $ibo-color-red-900, $ibo-button--box-shadow-bottom transparent, $ibo-color-red-600, ), ':hover': ( $ibo-color-red-200, $ibo-color-red-900, $ibo-button--box-shadow-bottom $ibo-color-red-200, $ibo-color-red-950, ), ':active': ( $ibo-color-red-200, $ibo-color-red-900, $ibo-button--box-shadow-top $ibo-color-red-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-red-200, $ibo-color-red-950, ), ':disabled': ( transparent, $ibo-color-grey-600, $ibo-button--box-shadow-top transparent, $ibo-color-grey-500, ), ), 'green': ( '': ( transparent, $ibo-color-green-950, $ibo-button--box-shadow-bottom transparent, $ibo-color-green-900, ), ':hover': ( $ibo-color-green-100, $ibo-color-green-950, $ibo-button--box-shadow-bottom $ibo-color-green-100, $ibo-color-green-900, ), ':active': ( $ibo-color-green-100, $ibo-color-green-950, $ibo-button--box-shadow-top $ibo-color-green-700 #{','} $ibo-button--box-shadow-bottom $ibo-color-green-100, $ibo-color-green-900, ), ':disabled': ( transparent, $ibo-color-grey-600, $ibo-button--box-shadow-top transparent, $ibo-color-grey-500, ), ), 'cyan': ( '': ( transparent, $ibo-color-cyan-950, $ibo-button--box-shadow-bottom transparent, $ibo-color-cyan-900, ), ':hover': ( $ibo-color-cyan-100, $ibo-color-cyan-950, $ibo-button--box-shadow-bottom $ibo-color-cyan-100, $ibo-color-cyan-900, ), ':active': ( $ibo-color-cyan-100, $ibo-color-cyan-950, $ibo-button--box-shadow-top $ibo-color-cyan-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-cyan-100, $ibo-color-cyan-900, ), ':disabled': ( transparent, $ibo-color-grey-600, $ibo-button--box-shadow-top transparent, $ibo-color-grey-500, ), ), )) !default; -$ibo-panel-colors: ('primary': $ibo-color-primary-800,'secondary': $ibo-color-secondary-800,'neutral': $ibo-color-grey-800,'information': $ibo-color-information-800,'success': $ibo-color-success-800,'failure': $ibo-color-danger-800,'warning': $ibo-color-warning-800,'danger': $ibo-color-danger-800,'grey' : $ibo-color-grey-800,'blue-grey': $ibo-color-blue-grey-800,'blue': $ibo-color-blue-800,'cyan': $ibo-color-cyan-800,'green': $ibo-color-green-800,'orange' : $ibo-color-orange-800,'red': $ibo-color-red-800,'pink': $ibo-color-pink-800,); \ No newline at end of file +$ibo-panel-colors: ('primary': $ibo-color-primary-800,'secondary': $ibo-color-secondary-800,'neutral': $ibo-color-grey-800,'information': $ibo-color-information-800,'success': $ibo-color-success-800,'failure': $ibo-color-danger-800,'warning': $ibo-color-warning-800,'danger': $ibo-color-danger-800,'grey' : $ibo-color-grey-800,'blue-grey': $ibo-color-blue-grey-800,'blue': $ibo-color-blue-800,'cyan': $ibo-color-cyan-800,'green': $ibo-color-green-800,'orange' : $ibo-color-orange-800,'red': $ibo-color-red-800,'pink': $ibo-color-pink-800,); + +$ibo-welcome-popup--stack-item--border-color: $ibo-color-grey-950; +$ibo-welcome-popup--stack-item--is-active--border-color: $ibo-color-grey-900; \ No newline at end of file diff --git a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/stylesheet.scss b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/stylesheet.scss index e253c53b4..366647266 100644 --- a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/stylesheet.scss +++ b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/stylesheet.scss @@ -142,4 +142,8 @@ $ibo-toast--icon--left: $ibo-spacing-400 !default; .ibo-popover-menu--item:not(:last-child){ border-bottom: $ibo-high-contrast--thin-border; +} + +.ibo-welcome-popup--stack-item.ibo-is-active { + border-width: 2px; } \ No newline at end of file diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 848ba8cb4..3fe68ed5b 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -1120,7 +1120,7 @@ EOF if ($oDashlet->IsFormRedrawNeeded()) { $oForm = $oDashlet->GetForm(); // Rebuild the form since the values/content changed $oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams)); - $sHtml = addslashes($oForm->RenderAsPropertySheet($oPage, true, '.itop-dashboard')); + $sHtml = $oForm->RenderAsPropertySheet($oPage, true, '.itop-dashboard'); $sHtml= json_encode($sHtml); $oPage->add_script("$('#dashlet_$sDashletId').html({$sHtml});"); } diff --git a/tests/php-unit-tests/unitary-tests/application/applicationextension/Delta/application-extension-usages-in-snippets.xml b/tests/php-unit-tests/unitary-tests/application/applicationextension/Delta/application-extension-usages-in-snippets.xml index e881069eb..c50abe52b 100644 --- a/tests/php-unit-tests/unitary-tests/application/applicationextension/Delta/application-extension-usages-in-snippets.xml +++ b/tests/php-unit-tests/unitary-tests/application/applicationextension/Delta/application-extension-usages-in-snippets.xml @@ -291,7 +291,6 @@ class ExampleFor_iQueryModifier implements \iQueryModifier public function GetFieldExpression(QueryBuilderContext &$oBuild, $sClass, $sAttCode, $sColId, Expression $oFieldSQLExp, SQLQuery &$oSelect) { - // Do nothing, we just need the class to exists for the unit test return $oFieldSQLExp; } }