From 38fbc49e51b8a257f3c94aee69bc2cc4e7064e3b Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 10 Nov 2020 15:41:33 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B02844=20-=20Fix=20layout=20for=20object?= =?UTF-8?q?=20creation=20and=20edition=20pages=20(activity=20panel,=20titl?= =?UTF-8?q?e,=20...)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/cmdbabstract.class.inc.php | 1 + css/light-grey.scss | 5 +++-- pages/UI.php | 21 ++++----------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index ddb035dad..26f31e2f2 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -4277,6 +4277,7 @@ EOF * @throws \MySQLException * @throws \OQLException * @throws \Exception + * @deprecated 3.0.0, will be removed in 3.1.0 */ public function DisplayCaseLog(WebPage $oPage, $sAttCode, $sComment = '', $sPrefix = '', $bEditMode = false) { diff --git a/css/light-grey.scss b/css/light-grey.scss index 9e9e37d34..90c702926 100644 --- a/css/light-grey.scss +++ b/css/light-grey.scss @@ -866,9 +866,10 @@ } .wizContainer { - border: 5px solid $complement-color; + border-left: 3px solid $complement-color; background: $complement-light; - padding: 5px; + padding: 10px 16px; + border-radius: 3px; } .wizContainer table tr td { diff --git a/pages/UI.php b/pages/UI.php index ffcc8ba71..64fe6c820 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -714,8 +714,9 @@ EOF { throw new SecurityException('User not allowed to modify this object', array('class' => $sClass, 'id' => $id)); } + $oP->SetContentLayout(PageContentFactory::MakeForObjectDetails($oObj)); // Note: code duplicated to the case 'apply_modify' when a data integrity issue has been found - $oObj->DisplayModifyForm($oP, array('wizard_container' => 1)); // wizard_container: Display the blue borders and the title above the form + $oObj->DisplayModifyForm($oP, array('wizard_container' => 1)); // wizard_container: Display the title above the form } break; @@ -847,22 +848,8 @@ EOF $sHeaderTitle = Dict::Format('UI:CreationTitle_Class', $sClassLabel); // Note: some code has been duplicated to the case 'apply_new' when a data integrity issue has been found $oP->set_title(Dict::Format('UI:CreationPageTitle_Class', $sClassLabel)); - $oP->add(<< -
-
-

$sClassIcon $sHeaderTitle

-
- -
-HTML - ); - cmdbAbstractObject::DisplayCreationForm($oP, $sRealClass, $oObjToClone, array()); - $oP->add(<< -
-HTML - ); + $oP->SetContentLayout(PageContentFactory::MakeForObjectDetails($oObjToClone)); + cmdbAbstractObject::DisplayCreationForm($oP, $sRealClass, $oObjToClone, array(), array('wizard_container' => 1)); // wizard_container: Display the title above the form } else {