diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 268e2adc2..68423c6f4 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -1110,7 +1110,7 @@ EOF break; case 'HTML': - $oWidget = new UIHTMLEditorWidget($iId, $sAttCode, $sNameSuffix, $sHelpText, $sValidationField, $value, $bMandatory); + $oWidget = new UIHTMLEditorWidget($iId, $sAttCode, $sNameSuffix, $sFieldPrefix, $sHelpText, $sValidationField, $value, $bMandatory); $sHTMLValue = $oWidget->Display($oPage, $aArgs); break; diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php index ab25a98ea..ae5b2fa95 100644 --- a/application/itopwebpage.class.inc.php +++ b/application/itopwebpage.class.inc.php @@ -67,6 +67,8 @@ class iTopWebPage extends NiceWebPage $this->add_linked_script("../js/jquery.blockUI.js"); $this->add_linked_script("../js/utils.js"); $this->add_linked_script("../js/swfobject.js"); + $this->add_linked_script("../js/ckeditor/ckeditor.js"); + $this->add_linked_script("../js/ckeditor/adapters/jquery.js"); $this->add_ready_script( <<m_iId = $iInputId; $this->m_sAttCode = $sAttCode; @@ -43,6 +44,7 @@ class UIHTMLEditorWidget $this->m_sValidationField = $sValidationField; $this->m_sValue = $sValue; $this->m_sMandatory = $sMandatory; + $this->m_sFieldPrefix = $sFieldPrefix; } /** @@ -53,16 +55,13 @@ class UIHTMLEditorWidget */ public function Display(WebPage $oPage, $aArgs = array()) { - $oPage->add_linked_script("../js/ckeditor/ckeditor.js"); - $oPage->add_linked_script("../js/ckeditor/adapters/jquery.js"); - $iId = $this->m_iId; $sCode = $this->m_sAttCode.$this->m_sNameSuffix; $sValue = $this->m_sValue; $sHelpText = $this->m_sHelpText; $sValidationField = $this->m_sValidationField; - $sHtmlValue = "
$sValidationField
"; + $sHtmlValue = "
$sValidationField
"; // Replace the text area with CKEditor // To change the default settings of the editor,