From ab17eaad27aa4832c19d76f4e7329a2fd434a69f Mon Sep 17 00:00:00 2001 From: acognet Date: Tue, 21 Sep 2021 10:56:55 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B04260=20-=20Fix=20display=20of=20log=20at?= =?UTF-8?q?tributes=20in=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/cmdbabstract.class.inc.php | 6 ++-- css/backoffice/blocks-integrations/_all.scss | 3 +- ...llapsible-section-within-caselog-list.scss | 29 +++++++++++++++++++ .../layout/activity-panel/_caselog-entry.scss | 22 -------------- .../DataTable/DataTableUIBlockFactory.php | 11 +++++-- 5 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 css/backoffice/blocks-integrations/_collapsible-section-within-caselog-list.scss diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 39a72d19f..323a10ccd 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -3242,8 +3242,10 @@ EOF { if ($oAttDef instanceof \AttributeCaseLog) { // Add JS file for display caselog - foreach (CollapsibleSection::DEFAULT_JS_FILES_REL_PATH as $sJSFile) { - $oPage->add_linked_script('../'.$sJSFile); + //collapsible Section create in order to get JS files + $sCollapsibleSection = new CollapsibleSection(''); + foreach ($sCollapsibleSection->GetJsFilesUrlRecursively(true) as $sJSFile) { + $oPage->add_linked_script($sJSFile); } } $aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, $aArgs); diff --git a/css/backoffice/blocks-integrations/_all.scss b/css/backoffice/blocks-integrations/_all.scss index bb3a23d4a..3feece020 100644 --- a/css/backoffice/blocks-integrations/_all.scss +++ b/css/backoffice/blocks-integrations/_all.scss @@ -14,4 +14,5 @@ @import "medallion-with-blocklist"; @import "input-within-datatable"; @import "jquery-blockui-within-dialog"; -@import "jquery-blockui-within-datatable"; \ No newline at end of file +@import "jquery-blockui-within-datatable"; +@import "_collapsible-section-within-caselog-list"; \ No newline at end of file diff --git a/css/backoffice/blocks-integrations/_collapsible-section-within-caselog-list.scss b/css/backoffice/blocks-integrations/_collapsible-section-within-caselog-list.scss new file mode 100644 index 000000000..c64d92619 --- /dev/null +++ b/css/backoffice/blocks-integrations/_collapsible-section-within-caselog-list.scss @@ -0,0 +1,29 @@ +/* + * @copyright Copyright (C) 2010-2021 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ + +/* SCSS variables */ +$ibo-caselog-entry-in-collapsible-section--body--background-color: transparentize($ibo-color-grey-100,0.5) !default; +$ibo-caselog-entry-in-collapsible-section--body--padding: 8px !default; +$ibo-caselog-entry-in-collapsible-section--body--color: $ibo-color-grey-900 !default; + +/* - caselog display in ormcaselog */ +.ibo-caselog-list { + .ibo-collapsible-section { + margin: 0; + min-width: 22em; + + .ibo-collapsible-section--header .ibo-collapsible-section--title { + @extend %ibo-font-size-100; + } + + .ibo-collapsible-section--body { + @extend %ibo-font-size-100; + color: $ibo-caselog-entry-in-collapsible-section--body--color; + padding: $ibo-caselog-entry-in-collapsible-section--body--padding; + background-color: $ibo-caselog-entry-in-collapsible-section--body--background-color; + } + } +} + \ No newline at end of file diff --git a/css/backoffice/layout/activity-panel/_caselog-entry.scss b/css/backoffice/layout/activity-panel/_caselog-entry.scss index 1c00dacb0..f61d4113b 100644 --- a/css/backoffice/layout/activity-panel/_caselog-entry.scss +++ b/css/backoffice/layout/activity-panel/_caselog-entry.scss @@ -8,10 +8,6 @@ $ibo-caselog-entry--highlight-colors: $ibo-caselog-highlight-colors !default; $ibo-caselog-entry--main-information--padding-y: 12px !default; $ibo-caselog-entry--main-information--decoration--width: 3px !default; -$ibo-caselog-entry-in-collapsible-section--body--background-color: #F9F9F9AA !default; -$ibo-caselog-entry-in-collapsible-section--body--padding: 8px !default; -$ibo-caselog-entry-in-collapsible-section--body--color: black !default; - /* Main information */ .ibo-caselog-entry{ .ibo-activity-entry--main-information{ @@ -77,22 +73,4 @@ $ibo-caselog-entry-in-collapsible-section--body--color: black !default; } } } -/* - caselog display vio ormcaselog */ -.ibo-caselog-list { - .ibo-collapsible-section { - margin: 0; - min-width: 22em; - - .ibo-collapsible-section--header .ibo-collapsible-section--title { - @extend %ibo-font-size-100; - } - - .ibo-collapsible-section--body { - @extend %ibo-font-size-100; - color: $ibo-caselog-entry-in-collapsible-section--body--color; - padding: $ibo-caselog-entry-in-collapsible-section--body--padding; - background-color: $ibo-caselog-entry-in-collapsible-section--body--background-color; - } - } -} \ No newline at end of file diff --git a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php index 9e1d55356..2f6acd92b 100644 --- a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php +++ b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php @@ -372,7 +372,8 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory $oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode); if ($oAttDef instanceof \AttributeCaseLog) { // Add JS file for display caselog - $oDataTable->AddMultipleJsFilesRelPaths(CollapsibleSection::DEFAULT_JS_FILES_REL_PATH); + $sCollapsibleSection = new CollapsibleSection(''); + $oDataTable->AddMultipleJsFilesRelPaths($sCollapsibleSection->GetJsFilesUrlRecursively()); } $sAttDefClass = get_class($oAttDef); $sAttLabel = $oAttDef->GetLabel(); @@ -619,7 +620,9 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory $oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode); if ($oAttDef instanceof \AttributeCaseLog) { // Removed from the display list - $oDataTable->AddMultipleJsFilesRelPaths(CollapsibleSection::DEFAULT_JS_FILES_REL_PATH); + //collapsible Section create in order to get JS files + $sCollapsibleSection = new CollapsibleSection(''); + $oDataTable->AddMultipleJsFilesRelPaths($sCollapsibleSection->GetJsFilesUrlRecursively()); } $sAttDefClass = get_class($oAttDef); $sAttLabel = MetaModel::GetLabel($sClassName, $sAttCode); @@ -765,7 +768,9 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory $oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode); if ($oAttDef instanceof \AttributeCaseLog) { // Get JS files - $aJsFiles = array_merge($aJsFiles, CollapsibleSection::DEFAULT_JS_FILES_REL_PATH); + //collapsible Section create in order to get JS files + $sCollapsibleSection = new CollapsibleSection(''); + $aJsFiles = array_merge($aJsFiles, $sCollapsibleSection->GetJsFilesUrlRecursively()); } $sAttDefClass = get_class($oAttDef); $sAttLabel = MetaModel::GetLabel($sClassName, $sAttCode);