From bccdb1bc3ac4fa7b4cf75adadd19bb4455060c6a Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 15:45:02 +0100 Subject: [PATCH 01/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20=20contrast?= =?UTF-8?q?=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/scss-variables.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 690d3af8b..124808cc2 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 @@ -50,8 +50,8 @@ $text : $ibo-color-grey-100; $text-invert: $ibo-color-grey-800; $text-light : $ibo-color-grey-200; $text-strong: inherit; -$code: $ibo-color-primary-800; -$code-background: $ibo-color-grey-300; +$code: $ibo-color-primary-400; +$code-background: $ibo-color-grey-700; $pre-background: $ibo-color-grey-600; $ibo-scrollbar--scrollbar-track-background-color: $ibo-color-grey-700; @@ -192,6 +192,8 @@ $ibo-activity-panel--tab-toolbar--background-color: $ibo-activity-panel--tab-tog $ibo-caselog-entry-form--background-color: $ibo-activity-panel--tab-toolbar--background-color; $ibo-object-details--tag--separator--background-color: $ibo-color-grey-300; +$ibo-tab--temporary-remote-content--button--hover--color: $ibo-color-grey-200; + $ibo-activity-panel--tab-toolbar--text-color: $ibo-color-grey-800; $ibo-activity-panel--tab-toolbar-action--color: $ibo-color-grey-800; From 3021234895bbb4aadf2687a2ca7e153a1ce7abee Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 15:45:36 +0100 Subject: [PATCH 02/18] =?UTF-8?q?N=C2=B04460=20-=20Allow=20to=20customize?= =?UTF-8?q?=20skeleton=20placeholders=20colors=20using=20CSS3=20variables?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/backoffice/utils/variables/colors/_all.scss | 3 ++- .../variables/colors/_skeleton-palette.scss | 17 +++++++++++++++++ images/placeholders/skeleton-dashboard.svg | 6 +++--- images/placeholders/skeleton-list.svg | 6 +++--- images/placeholders/skeleton-object.svg | 6 +++--- images/placeholders/skeleton.svg | 6 +++--- 6 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 css/backoffice/utils/variables/colors/_skeleton-palette.scss diff --git a/css/backoffice/utils/variables/colors/_all.scss b/css/backoffice/utils/variables/colors/_all.scss index bc56d42e5..d2dab10ad 100644 --- a/css/backoffice/utils/variables/colors/_all.scss +++ b/css/backoffice/utils/variables/colors/_all.scss @@ -6,4 +6,5 @@ @import "base"; @import "base-palette"; @import "semantic-palette"; -@import "lifecycle-palette"; \ No newline at end of file +@import "lifecycle-palette"; +@import "skeleton-palette"; \ No newline at end of file diff --git a/css/backoffice/utils/variables/colors/_skeleton-palette.scss b/css/backoffice/utils/variables/colors/_skeleton-palette.scss new file mode 100644 index 000000000..9b73f95bf --- /dev/null +++ b/css/backoffice/utils/variables/colors/_skeleton-palette.scss @@ -0,0 +1,17 @@ +/* + * @copyright Copyright (C) 2010-2023 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ + +/* Skeleton palette */ +/* - Colors used by skeletons svg to display placeholders */ + +$ibo-skeleton-start-color: $ibo-color-grey-200 !default; +$ibo-skeleton-stop-color: $ibo-color-blue-grey-100 !default; + +/* CSS variables */ +/* Skeleton CSS3 variables are not ibo prefixed as they are not iTop backoffice exclusives*/ +:root { + --skeleton-start-color: #{$ibo-skeleton-start-color}; + --skeleton-stop-color: #{$ibo-skeleton-stop-color}; +} \ No newline at end of file diff --git a/images/placeholders/skeleton-dashboard.svg b/images/placeholders/skeleton-dashboard.svg index d36062b96..3a6bca4df 100644 --- a/images/placeholders/skeleton-dashboard.svg +++ b/images/placeholders/skeleton-dashboard.svg @@ -38,7 +38,7 @@ Date: Thu, 2 Mar 2023 15:50:35 +0100 Subject: [PATCH 03/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20skeletons=20place?= =?UTF-8?q?holders=20contrast=20issue=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/scss-variables.scss | 5 +++++ 1 file changed, 5 insertions(+) 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 124808cc2..569ddc6b2 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 @@ -192,7 +192,12 @@ $ibo-activity-panel--tab-toolbar--background-color: $ibo-activity-panel--tab-tog $ibo-caselog-entry-form--background-color: $ibo-activity-panel--tab-toolbar--background-color; $ibo-object-details--tag--separator--background-color: $ibo-color-grey-300; +$ibo-skeleton-start-color: $ibo-color-grey-500; +$ibo-skeleton-stop-color: $ibo-color-grey-400; + +$ibo-tab--temporary-remote-content--button--color: $ibo-color-grey-200; $ibo-tab--temporary-remote-content--button--hover--color: $ibo-color-grey-200; +$ibo-tab--temporary-remote-content--button--hover--background-color: $ibo-color-grey-800; $ibo-activity-panel--tab-toolbar--text-color: $ibo-color-grey-800; $ibo-activity-panel--tab-toolbar-action--color: $ibo-color-grey-800; From 05753f174a22c31a30e61b720b082d3ebf0934f4 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 15:54:19 +0100 Subject: [PATCH 04/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20"load=20more=20en?= =?UTF-8?q?tries"=20activity=20panel=20buttons=20contrast=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combodo-backoffice-darkmoon-theme/scss/scss-variables.scss | 1 + 1 file changed, 1 insertion(+) 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 569ddc6b2..3cd893e79 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 @@ -189,6 +189,7 @@ $ibo-tab-container--extra-tab-toggler--background-color--on-hover: $ibo-color-gr $ibo-activity-panel--header--background-color: $ibo-color-grey-400; $ibo-activity-panel--tab-toggler--is-active--background-color: $ibo-color-grey-200; $ibo-activity-panel--tab-toolbar--background-color: $ibo-activity-panel--tab-toggler--is-active--background-color; +$ibo-activity-panel--load-entries-button--background-color: $ibo-color-grey-500; $ibo-caselog-entry-form--background-color: $ibo-activity-panel--tab-toolbar--background-color; $ibo-object-details--tag--separator--background-color: $ibo-color-grey-300; From a34d3f91be9b5c418b212d863a6faae57e88e577 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 16:04:39 +0100 Subject: [PATCH 05/18] Fix tabular fields selector SCSS variables --- .../_tabular-fields-selector.scss | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/css/backoffice/application/tabular-fields/_tabular-fields-selector.scss b/css/backoffice/application/tabular-fields/_tabular-fields-selector.scss index d42242cb2..8215a0e89 100644 --- a/css/backoffice/application/tabular-fields/_tabular-fields-selector.scss +++ b/css/backoffice/application/tabular-fields/_tabular-fields-selector.scss @@ -1,46 +1,60 @@ /* - * @copyright Copyright (C) 2010-2021 Combodo SARL + * @copyright Copyright (C) 2010-2023 Combodo SARL * @license http://opensource.org/licenses/AGPL-3.0 */ +$ibo-table-preview--header-cell--padding: $ibo-spacing-200 $ibo-spacing-600 $ibo-spacing-200 $ibo-spacing-200 !default; +$ibo-table-preview--header-cell--background-color: $ibo-color-white-200 !default; +$ibo-table-preview--header-cell--border-width: 1px 1px 0 !default; + +$ibo-table-preview--body-cell--padding-x: $ibo-spacing-200 !default; +$ibo-table-preview--body-cell--border-width: 0 1px !default; +$ibo-table-preview--body-cell--last--border-bottom-width: 1px !default; + +$ibo-preview-header--margin-bottom: $ibo-spacing-200 !default; +$ibo-table-preview--remove-column--top: $ibo-spacing-300 !default; +$ibo-table-preview--remove-column--right: $ibo-spacing-300 !default; +$ibo-table-preview--remove-column--font-size: 8px !default; + +$ibo-form-part-interactive-fields--margin-top: $ibo-spacing-600 !default; + .ibo-table-preview { margin-top: 20px; overflow-x: auto; th { position: relative; - padding: 5px; - padding-right: $ibo-spacing-600; - border-width: 1px 1px 0; + padding: $ibo-table-preview--header-cell--padding; + border-width: $ibo-table-preview--header-cell--border-width; border-style: groove groove none; - background: $ibo-color-white-200; + background: $ibo-table-preview--header-cell--background-color; } td { - padding-right: 5px; - padding-left: 5px; - border-width: 0 1px; + padding-right: $ibo-table-preview--body-cell--padding-x; + padding-left: $ibo-table-preview--body-cell--padding-x; + border-width: $ibo-table-preview--body-cell--border-width; border-style: none groove; } tr:last-child td { - border-bottom-width: 1px; + border-bottom-width: $ibo-table-preview--body-cell--last--border-bottom-width; border-bottom-style: groove; } } .ibo-preview-header { - margin-bottom: 5px; + margin-bottom: $ibo-preview-header--margin-bottom; } .ibo-table-preview--remove-column { position: absolute; - top: $ibo-spacing-300; - right: $ibo-spacing-300; + top: $ibo-table-preview--remove-column--top; + right: $ibo-table-preview--remove-column--right; display: inline-block; cursor: pointer; - font-size: 8px; + font-size: $ibo-table-preview--remove-column--font-size; } #form_part_interactive_fields_xlsx, #form_part_interactive_fields_csv, #form_part_interactive_fields_pdf { - margin-top: $ibo-spacing-600; + margin-top: $ibo-form-part-interactive-fields--margin-top; } From 03bff9f2c285a1ee7d8f91651eac691e3118c9c6 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 16:04:59 +0100 Subject: [PATCH 06/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20export=20header?= =?UTF-8?q?=20contrast=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combodo-backoffice-darkmoon-theme/scss/scss-variables.scss | 2 ++ 1 file changed, 2 insertions(+) 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 3cd893e79..602e05ead 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 @@ -145,6 +145,8 @@ $ibo-vendors-datatables--row--background-color--is-even: $ibo-color-grey-800; $ibo-datatable--row--background-color--is-hover: $ibo-color-blue-900; $ibo-datatable--row--background-color--is-selected: $ibo-color-blue-700; +$ibo-table-preview--header-cell--background-color: $ibo-color-grey-500; + $ibo-field--value--color: $ibo-body-text-color; $ibo-title--text-color: $ibo-body-text-color; From 58497b380b979c62f20d4ce5198ff042ef0a0f56 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 16:17:46 +0100 Subject: [PATCH 07/18] Allow to overload datamodel viewer autocomplete style --- css/backoffice/pages/_datamodel-viewer.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/css/backoffice/pages/_datamodel-viewer.scss b/css/backoffice/pages/_datamodel-viewer.scss index 1aec4cce7..fe6f85e7a 100644 --- a/css/backoffice/pages/_datamodel-viewer.scss +++ b/css/backoffice/pages/_datamodel-viewer.scss @@ -6,6 +6,10 @@ $ibo-datamodel-viewer--parent--spacer--padding-y: $ibo-spacing-0 !default; $ibo-datamodel-viewer--parent--spacer--padding-x: $ibo-spacing-300 !default; +$ibo-datamodel-viewer--classes-list--selectize-input--background-color: $ibo-color-white-100 !default; +$ibo-datamodel-viewer--classes-list--selectize-input--color: $ibo-color-grey-800 !default; +$ibo-datamodel-viewer--classes-list--selectize-input--border-color: $ibo-color-grey-500 !default; + $ibo-datamodel-viewer--attributes-table--first-column--width: 3px !default; $ibo-datamodel-viewer--origin-cell--diameter: 8px !default; @@ -45,6 +49,15 @@ $ibo-datamodel-viewer--lifecycle-image--margin-bottom: $ibo-spacing-500 !default padding: $ibo-datamodel-viewer--parent--spacer--padding-y $ibo-datamodel-viewer--parent--spacer--padding-x; } +// Overwrite selectize rules with !important +.ibo-datamodel-viewer--classes-list .selectize-input{ + background-color: $ibo-datamodel-viewer--classes-list--selectize-input--background-color !important; + background-image: none !important; + color: $ibo-datamodel-viewer--classes-list--selectize-input--color; + box-shadow: none !important; + border-color: $ibo-datamodel-viewer--classes-list--selectize-input--border-color !important; +} + #ibo-datamodel-viewer--attributes-table{ > tbody tr td:first-child{ width: $ibo-datamodel-viewer--attributes-table--first-column--width; From f91dfbcf23487b31a7ef26873b479ef5803e1a1b Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 16:20:44 +0100 Subject: [PATCH 08/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20datamodel=20viewe?= =?UTF-8?q?r=20autocomplete=20contrast=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/scss-variables.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 602e05ead..f33c39e3f 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 @@ -261,4 +261,12 @@ $ibo-vendors-c3--legend--background-color: $ibo-color-white-100; $ibo-vendors-c3--legend-item--fill: $ibo-color-grey-100; $ibo-vendors-c3--axis--fill: $ibo-color-grey-200; -$ibo-run-query--highlight--background-color: $ibo-color-primary-700; \ No newline at end of file +$ibo-run-query--highlight--background-color: $ibo-color-primary-700; + +$ibo-datamodel-viewer--classes-list--selectize-input--background-color: $ibo-color-grey-700; +$ibo-datamodel-viewer--classes-list--selectize-input--border-color: $ibo-color-grey-500; +$ibo-datamodel-viewer--classes-list--selectize-input--color: $ibo-color-grey-200; +$ibo-datamodel-viewer--lifecycle--code--color: $ibo-color-grey-300; +$ibo-datamodel-viewer--lifecycle--stimuli--color: $ibo-color-blue-300; +$ibo-datamodel-viewer--lifecycle--attribute-option--color: $ibo-color-pink-300; +$ibo-datamodel-viewer--schema--tooltip--fill: $ibo-color-grey-600; \ No newline at end of file From 4c117d1a3301113d8cc5dd08ff802c887d4e69b7 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 16:29:17 +0100 Subject: [PATCH 09/18] Fix hardcoded orange in backoffice style --- css/backoffice/components/_datatable.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/backoffice/components/_datatable.scss b/css/backoffice/components/_datatable.scss index 63d5e3186..8f247b24d 100644 --- a/css/backoffice/components/_datatable.scss +++ b/css/backoffice/components/_datatable.scss @@ -20,7 +20,7 @@ $ibo-datatable--row--background-color--is-selected: $ibo-color-primary-300 !defa $ibo-datatable--selection-validation-buttons-toolbar--margin-top: 10px !default; $ibo-list-column--max-height: 150px !default; -$ibo-datatable--sort-order--color: $ibo-color-orange-600 !default; +$ibo-datatable--sort-order--color: $ibo-color-primary-600 !default; $ibo-fieldsorter--selected--background-color: $ibo-color-blue-200 !default; From 08f1e5a04140215d8311ad3e70313be59ddafd86 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 16:29:42 +0100 Subject: [PATCH 10/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20configure=20this?= =?UTF-8?q?=20list=20contrast=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combodo-backoffice-darkmoon-theme/scss/scss-variables.scss | 2 ++ 1 file changed, 2 insertions(+) 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 f33c39e3f..555546384 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 @@ -145,6 +145,8 @@ $ibo-vendors-datatables--row--background-color--is-even: $ibo-color-grey-800; $ibo-datatable--row--background-color--is-hover: $ibo-color-blue-900; $ibo-datatable--row--background-color--is-selected: $ibo-color-blue-700; +$ibo-fieldsorter--selected--background-color: $ibo-color-blue-800; + $ibo-table-preview--header-cell--background-color: $ibo-color-grey-500; $ibo-field--value--color: $ibo-body-text-color; From 14cd60dd1757114b92f349cab39dbaaa3c05f17e Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 2 Mar 2023 16:35:26 +0100 Subject: [PATCH 11/18] Fix hardcoded white color in markup --- application/ui.searchformforeignkeys.class.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php index 703781654..3a2f0ceca 100644 --- a/application/ui.searchformforeignkeys.class.inc.php +++ b/application/ui.searchformforeignkeys.class.inc.php @@ -60,7 +60,7 @@ class UISearchFormForeignKeys $oPage->add(<< -
+

{$sEmptyList}

From 75b350f638a1cc72d9fbfc451444e8915976a92c Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Fri, 3 Mar 2023 10:06:47 +0100 Subject: [PATCH 12/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20ace=20editor=20st?= =?UTF-8?q?yle=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...odel.combodo-backoffice-darkmoon-theme.xml | 1 + .../scss/ace_editor.scss | 90 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss diff --git a/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml b/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml index c1e105723..e7accad79 100644 --- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml +++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml @@ -12,6 +12,7 @@ ../css/backoffice/main.scss combodo-backoffice-darkmoon-theme/scss/editor.scss + combodo-backoffice-darkmoon-theme/scss/ace_editor.scss combodo-backoffice-darkmoon-theme/precompiled-themes/main.css diff --git a/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss b/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss new file mode 100644 index 000000000..41c542db7 --- /dev/null +++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss @@ -0,0 +1,90 @@ +.ace-eclipse .ace_gutter { + background: unset !important; + border-right: unset !important; + color: $ibo-color-grey-400 !important; +} +.ace-eclipse .ace_print-margin { + width: 1px !important; + background: $ibo-color-grey-500 !important; +} +.ace-eclipse { + background-color: $ibo-color-grey-800 !important; + color: $ibo-color-grey-200 !important; +} +.ace-eclipse .ace_entity.ace_other.ace_attribute-name, +.ace-eclipse .ace_storage { + color: $ibo-color-grey-200 !important; +} +.ace-eclipse .ace_cursor { + color: $ibo-color-grey-200 !important; +} +.ace-eclipse .ace_string.ace_regexp { + color: $ibo-color-red-600 !important; +} +.ace-eclipse .ace_marker-layer .ace_active-line { + background: $ibo-color-grey-600 !important; +} +.ace-eclipse .ace_marker-layer .ace_selection { + background: $ibo-color-grey-600 !important; +} +.ace-eclipse.ace_multiselect .ace_selection.ace_start { + box-shadow: 0 0 3px 0px $ibo-color-grey-800 !important; +} +.ace-eclipse .ace_marker-layer .ace_step { + background: $nord13 !important; +} +.ace-eclipse .ace_marker-layer .ace_bracket { + margin: -1px 0 0 -1px !important; + border: 1px solid $ibo-color-primary-300 !important; +} +.ace-eclipse .ace_gutter-active-line { + background-color: $ibo-color-grey-600 !important; +} +.ace-eclipse .ace_marker-layer .ace_selected-word { + border: 1px solid $ibo-color-primary-300 !important; +} +.ace-eclipse .ace_invisible { + color: $ibo-color-grey-500 !important; +} +.ace-eclipse .ace_keyword, +.ace-eclipse .ace_meta, +.ace-eclipse .ace_support.ace_class, +.ace-eclipse .ace_support.ace_type { + color: $ibo-color-primary-500 !important; +} +.ace-eclipse .ace_constant.ace_character, +.ace-eclipse .ace_constant.ace_other { + color: $ibo-color-grey-200 !important; +} +.ace-eclipse .ace_constant.ace_language { + color: $ibo-color-primary-800 !important; +} +.ace-eclipse .ace_constant.ace_escape { + color: $nord13 !important; +} +.ace-eclipse .ace_constant.ace_numeric { + color: $nord15 !important; +} +.ace-eclipse .ace_fold { + background-color: $ibo-color-grey-500 !important; + border-color: $ibo-color-grey-200 !important; +} +.ace-eclipse .ace_entity.ace_name.ace_function, +.ace-eclipse .ace_entity.ace_name.ace_tag, +.ace-eclipse .ace_support.ace_function, +.ace-eclipse .ace_variable, +.ace-eclipse .ace_variable.ace_language { + color: #8fbcbb !important; +} +.ace-eclipse .ace_string { + color: $nord14 !important; +} +.ace-eclipse .ace_comment { + color: $nord7 !important; +} +.ace-eclipse .ace_indent-guide { + box-shadow: inset -1px 0 0 0 $ibo-color-grey-600 !important; +} +.ace-eclipse .ace_indent-guide-active { + box-shadow: inset -1px 0 0 0 $ibo-color-grey-400 !important; +} \ No newline at end of file From 94e81515190de466fba00b5c89ff6385e3287f8a Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Fri, 3 Mar 2023 10:24:52 +0100 Subject: [PATCH 13/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20popover=20menu=20?= =?UTF-8?q?icons=20and=20separators=20style=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combodo-backoffice-darkmoon-theme/scss/scss-variables.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 555546384..b53444f6d 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 @@ -177,8 +177,9 @@ $ibo-input-select-selectize--item--active--text-color: $ibo-color-grey-100; $ibo-input-select-selectize--item--active--background-color: $ibo-color-grey-500; $ibo-vendors-selectize-input--color: $ibo-body-text-color; -$ibo-popover-menu--separator--background-color: $ibo-color-grey-500; +$ibo-popover-menu--item-separator--background-color: $ibo-color-grey-500; $ibo-popover-menu--item--text-color: $ibo-color-grey-200; +$ibo-popover-menu--item--icon--color: $ibo-color-grey-300; $ibo-popover-menu--background-color: $ibo-color-grey-700; $ibo-popover-menu--item--hover-background-color: $ibo-color-grey-500; From 6bed56b34ed4f75ec31ebafc51f2cb1dcd386cf4 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Fri, 3 Mar 2023 10:43:17 +0100 Subject: [PATCH 14/18] Fix csv import SCSS file --- css/backoffice/pages/_csv-import.scss | 31 ++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/css/backoffice/pages/_csv-import.scss b/css/backoffice/pages/_csv-import.scss index 55357e3f4..de7a079c6 100644 --- a/css/backoffice/pages/_csv-import.scss +++ b/css/backoffice/pages/_csv-import.scss @@ -3,7 +3,14 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -$ibo-csv-import--cell-message-padding:3px; +$ibo-csv-import--cell-message--padding-top: 3px !default; +$ibo-csv-import--cell-modified--color: $ibo-color-blue-700 !default; +$ibo-csv-import--cell-error--color: $ibo-color-red-700 !default; +$ibo-csv-import--row--border-color: $ibo-color-grey-400 !default; +$ibo-csv-import--row-error--background-color: $ibo-color-red-200 !default; +$ibo-csv-import--download-file--color: $ibo-color-primary-400 !default; +$ibo-csv-import--download-file--font-size: 4em !default; +$ibo-csv-import--download-file--margin: 20px !default; #tabs1-import .ibo-field--label { max-width: 50%; @@ -11,37 +18,37 @@ $ibo-csv-import--cell-message-padding:3px; div.ibo-csv-import--cell-modified { font-weight: bold; - color: $ibo-color-blue-700; + color: $ibo-csv-import--cell-modified--color; } div.ibo-csv-import--cell-error { font-weight: bold; - color: $ibo-color-red-700; + color: $ibo-csv-import--cell-error--color; } div.ibo-csv-import--cell-message { - padding-top: $ibo-csv-import--cell-message-padding; + padding-top: $ibo-csv-import--cell-message--padding-top; } tr.ibo-csv-import--row-unchanged td { - border-bottom: 1px $ibo-color-grey-400 solid; + border-bottom: 1px $ibo-csv-import--row--border-color solid; } .wizContainer table tr.ibo-csv-import--row-error td { - border-bottom: 1px $ibo-color-grey-400 solid; - background-color: $ibo-color-red-200; + border-bottom: 1px $ibo-csv-import--row--border-color solid; + background-color: $ibo-csv-import--row-error--background-color; } tr.ibo-csv-import--row-modified td { - border-bottom: 1px $ibo-color-grey-400 solid; + border-bottom: 1px $ibo-csv-import--row--border-color solid; } tr.ibo-csv-import--row-added td { - border-bottom: 1px $ibo-color-grey-400 solid; + border-bottom: 1px $ibo-csv-import--row--border-color solid; } .ibo-csv-import--download-file { - font-size: 4em; - color: $ibo-color-primary-400; - margin: 20px; + font-size: $ibo-csv-import--download-file--font-size; + color: $ibo-csv-import--download-file--color; + margin: $ibo-csv-import--download-file--margin; } \ No newline at end of file From 65940726170726ac096bb185d94ab359e76218dc Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Fri, 3 Mar 2023 10:43:39 +0100 Subject: [PATCH 15/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20import=20contrast?= =?UTF-8?q?=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/scss-variables.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 b53444f6d..684876b38 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 @@ -272,4 +272,8 @@ $ibo-datamodel-viewer--classes-list--selectize-input--color: $ibo-color-grey-200 $ibo-datamodel-viewer--lifecycle--code--color: $ibo-color-grey-300; $ibo-datamodel-viewer--lifecycle--stimuli--color: $ibo-color-blue-300; $ibo-datamodel-viewer--lifecycle--attribute-option--color: $ibo-color-pink-300; -$ibo-datamodel-viewer--schema--tooltip--fill: $ibo-color-grey-600; \ No newline at end of file +$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 From f117a2912b6770667ba89ddab103940673e88601 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Fri, 3 Mar 2023 10:50:02 +0100 Subject: [PATCH 16/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20minor=20contrast?= =?UTF-8?q?=20issue=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combodo-backoffice-darkmoon-theme/scss/scss-variables.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 684876b38..849d558fb 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 @@ -57,6 +57,7 @@ $pre-background: $ibo-color-grey-600; $ibo-scrollbar--scrollbar-track-background-color: $ibo-color-grey-700; $ibo-scrollbar--scrollbar-thumb-background-color: $ibo-color-grey-900; +$ibo-navigation-menu--drawer--background-color: $ibo-color-grey-700; $ibo-navigation-menu--body--background-color: $ibo-color-grey-900; $ibo-navigation-menu--bottom-part--background-color: $ibo-color-grey-850; @@ -229,7 +230,7 @@ $ibo-search-form-panel--criteria--color: $ibo-color-grey-100; $ibo-search-form-panel--more-criteria--background-color: $ibo-color-grey-800; $ibo-search-form-panel--more-criteria--color: $ibo-color-grey-100; $ibo-search-form-panel--more-criteria--icon--color: $ibo-color-primary-500; -$ibo-search-form-panel--criteria--border-color: $ibo-color-grey-500; +$ibo-search-form-panel--criteria--border-color: $ibo-color-grey-900; $ibo-search-form-panel--multiple-choice--hover--color: $ibo-color-grey-500; $ibo-search-form-panel--items--hover--color: $ibo-search-form-panel--multiple-choice--hover--color; From 98ab5aa1a47d63be734548e67cf9e106421eddb8 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Fri, 3 Mar 2023 10:59:49 +0100 Subject: [PATCH 17/18] =?UTF-8?q?N=C2=B04460=20-=20Fix=20menu=20drawer=20c?= =?UTF-8?q?olor=20in=20Darkmoon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combodo-backoffice-darkmoon-theme/scss/scss-variables.scss | 1 - 1 file changed, 1 deletion(-) 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 849d558fb..9e55c5f13 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 @@ -57,7 +57,6 @@ $pre-background: $ibo-color-grey-600; $ibo-scrollbar--scrollbar-track-background-color: $ibo-color-grey-700; $ibo-scrollbar--scrollbar-thumb-background-color: $ibo-color-grey-900; -$ibo-navigation-menu--drawer--background-color: $ibo-color-grey-700; $ibo-navigation-menu--body--background-color: $ibo-color-grey-900; $ibo-navigation-menu--bottom-part--background-color: $ibo-color-grey-850; From 93c0b98eb756848b761959f47dc6778fcd27eb2e Mon Sep 17 00:00:00 2001 From: Denis Date: Fri, 3 Mar 2023 14:12:09 +0100 Subject: [PATCH 18/18] =?UTF-8?q?N=C2=B05922=20-=20Fix=20plus=20button=20s?= =?UTF-8?q?emantic=20on=20ext.=20key=20widget=20(#448)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * N°5922 - Enhance plus button on extkeywidget * Properly reset the target class when closing the dialog * Make icon buttons as actual clickable links for BeHat * Apply suggestions from code review Review by Guillaume. Thanks! Co-authored-by: Molkobain --- application/ui.extkeywidget.class.inc.php | 12 +++++++----- css/backoffice/components/_field.scss | 3 +++ js/extkeywidget.js | 16 +++++++++++----- pages/ajax.render.php | 5 +++-- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php index 22f12f736..15871a260 100644 --- a/application/ui.extkeywidget.class.inc.php +++ b/application/ui.extkeywidget.class.inc.php @@ -5,6 +5,7 @@ */ use Combodo\iTop\Application\UI\Base\Component\Form\FormUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; use Combodo\iTop\Core\MetaModel\FriendlyNameType; @@ -323,12 +324,12 @@ EOF EOF ); $sHTMLValue .= "
"; - $sHTMLValue .= "
iId}\" onClick=\"oACWidget_{$this->iId}.Clear();\" data-tooltip-content='".Dict::S('UI:Button:Clear')."'>
"; + $sHTMLValue .= " iId}\" onClick=\"oACWidget_{$this->iId}.Clear();\" data-tooltip-content='".Dict::S('UI:Button:Clear')."'>"; } if ($bCreate && $bExtensions) { $sCallbackName = (MetaModel::IsAbstract($this->sTargetClass)) ? 'SelectObjectClass' : 'CreateObject'; - $sHTMLValue .= "
iId}\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\" data-tooltip-content='".Dict::S('UI:Button:Create')."'>
"; + $sHTMLValue .= "iId}\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\" data-tooltip-content='".Dict::S('UI:Button:Create')."'>"; $oPage->add_ready_script( <<iId}').length == 0) @@ -339,7 +340,7 @@ JS ); } if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false) { - $sHTMLValue .= "
iId}\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\" data-tooltip-content='".Dict::S('UI:Button:SearchInHierarchy')."'>
"; + $sHTMLValue .= "iId}\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\" data-tooltip-content='".Dict::S('UI:Button:SearchInHierarchy')."'>"; $oPage->add_ready_script( <<iId}').length == 0) @@ -350,7 +351,7 @@ JS ); } if ($oAllowedValues->CountExceeds($iMaxComboLength)) { - $sHTMLValue .= "
iId}\" onClick=\"oACWidget_{$this->iId}.Search();\" data-tooltip-content='".Dict::S('UI:Button:Search')."'>
"; + $sHTMLValue .= " iId}\" onClick=\"oACWidget_{$this->iId}.Search();\" data-tooltip-content='".Dict::S('UI:Button:Search')."'>"; } $sHTMLValue .= "
"; $sHTMLValue .= "
"; @@ -904,7 +905,7 @@ JS { // For security reasons: check that the "proposed" class is actually a subclass of the linked class // and that the current user is allowed to create objects of this class - $aSubClasses = MetaModel::EnumChildClasses($this->sTargetClass); + $aSubClasses = MetaModel::EnumChildClasses($this->sTargetClass, ENUM_CHILD_CLASSES_ALL); $aPossibleClasses = array(); foreach($aSubClasses as $sCandidateClass) { @@ -924,6 +925,7 @@ JS $sDialogTitleEscaped = addslashes($sDialogTitle); $oPage->add_ready_script("$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true, title: '$sDialogTitleEscaped'});\n"); $oPage->add_ready_script("$('#ac_create_{$this->iId} form').removeAttr('onsubmit');"); + $oPage->add_ready_script("$('#ac_create_{$this->iId} form').find('select').attr('id', 'ac_create_{$this->iId}_select');"); $oPage->add_ready_script("$('#ac_create_{$this->iId} form').on('submit.uilinksWizard', oACWidget_{$this->iId}.DoSelectObjectClass);"); } diff --git a/css/backoffice/components/_field.scss b/css/backoffice/components/_field.scss index 736a756b3..daa40251e 100644 --- a/css/backoffice/components/_field.scss +++ b/css/backoffice/components/_field.scss @@ -253,3 +253,6 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default; margin-left: $ibo-field--enable-bulk--checkbox--margin-left; } +.ibo-input-select--action-buttons a { + @extend %ibo-hyperlink-inherited-colors; +} \ No newline at end of file diff --git a/js/extkeywidget.js b/js/extkeywidget.js index 62210f4d0..38862366f 100644 --- a/js/extkeywidget.js +++ b/js/extkeywidget.js @@ -634,7 +634,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper // will force it be of the same class as the previous call) me.sTargetClass = me.sOriginalTargetClass; - me.CreateObject(oWizHelper); + me.CreateObject(); }; this.DoSelectObjectClass = function () { @@ -646,13 +646,12 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper // Setting new target class me.sTargetClass = oSelectedClass.val(); - // Opening real creation form + me.CreateObject(true); $('#ac_create_'+me.id).dialog('close'); - me.CreateObject(); }; - this.CreateObject = function (oWizHelper) { + this.CreateObject = function (bTargetClassSelected) { if ($('#'+me.id).prop('disabled')) { return; } // Disabled, do nothing @@ -670,7 +669,8 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper sAttCode: me.sAttCode, 'json': me.oWizardHelper.ToJSON(), operation: 'objectCreationForm', - ajax_promise_id: sPromiseId + ajax_promise_id: sPromiseId, + bTargetClassSelected: bTargetClassSelected }; // Make sure that we cancel any pending request before issuing another @@ -678,6 +678,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper me.StopPendingRequest(); // Run the query and get the result back directly in HTML + var sLocalTargetClass = me.sTargetClass; // Remember the target class since it will be reset when closing the dialog me.ajax_request = $.post(AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap, function (data) { $('#ajax_'+me.id).html(data); @@ -687,6 +688,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper // Modify the action of the cancel button $('#ac_create_'+me.id+' button.cancel').off('click').on('click', me.CloseCreateObject); me.ajax_request = null; + me.sTargetClass = sLocalTargetClass; // Adjust the dialog's size to fit into the screen if ($('#ac_create_'+me.id).width() > ($(window).width()-40)) { $('#ac_create_'+me.id).width($(window).width()-40); @@ -714,6 +716,10 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper $('#ac_create_'+me.id).dialog("destroy"); $('#ac_create_'+me.id).remove(); $('#ajax_'+me.id).html(''); + // Resetting target class to its original value + // (If not done, closing the dialog and trying to create a object again + // will force it be of the same class as the previous call) + me.sTargetClass = me.sOriginalTargetClass; }; this.DoCreateObject = function () { diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 3b871f467..1bc92412a 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -410,9 +410,10 @@ try $iInputId = utils::ReadParam('iInputId', ''); $sAttCode = utils::ReadParam('sAttCode', ''); $sJson = utils::ReadParam('json', '', false, 'raw_data'); - // Building form, if target class is abstract we ask the user for the desired leaf class + $bTargetClassSelected = utils::ReadParam('bTargetClassSelected', '', false, 'raw_data'); + // Building form, if target class has child classes we ask the user for the desired leaf class, unless we've already done just that $oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false); - if(MetaModel::IsAbstract($sTargetClass)) + if(!$bTargetClassSelected && MetaModel::HasChildrenClasses($sTargetClass)) { $oWidget->GetClassSelectionForm($oPage); }