diff --git a/sources/application/UI/Component/Html/Html.php b/sources/application/UI/Component/Html/Html.php index 316d82a83..78f86ff45 100644 --- a/sources/application/UI/Component/Html/Html.php +++ b/sources/application/UI/Component/Html/Html.php @@ -35,7 +35,7 @@ class Html extends UIBlock const BLOCK_CODE = 'ibo-html'; const HTML_TEMPLATE_REL_PATH = 'components/html/layout'; - /** @var string $sHtml */ + /** @var string $sHtml The raw HTML, must be already sanitized */ protected $sHtml; /** @@ -51,6 +51,8 @@ class Html extends UIBlock } /** + * Return the raw HTML, should have been sanitized + * * @return string */ public function GetHtml() @@ -59,7 +61,10 @@ class Html extends UIBlock } /** + * Set the raw HTML, must be already sanitized + * * @param string $sHtml + * * @return $this */ public function SetHtml($sHtml) diff --git a/sources/application/UI/Layout/PageContent/PageContentFactory.php b/sources/application/UI/Layout/PageContent/PageContentFactory.php index beb1da69c..04d41edae 100644 --- a/sources/application/UI/Layout/PageContent/PageContentFactory.php +++ b/sources/application/UI/Layout/PageContent/PageContentFactory.php @@ -57,6 +57,8 @@ class PageContentFactory $oLayout = new PageContentWithSideContent(); // Add object details layout + // TODO + // Add object activity layout $oActivityPanel = ActivityPanelFactory::MakeForObjectDetails($oObject); $oLayout->AddSideBlock($oActivityPanel); diff --git a/sources/application/UI/UIBlock.php b/sources/application/UI/UIBlock.php index 03b630d4c..75514ed13 100644 --- a/sources/application/UI/UIBlock.php +++ b/sources/application/UI/UIBlock.php @@ -149,7 +149,7 @@ abstract class UIBlock implements iUIBlock /** * @inheritDoc - * @return \Combodo\iTop\Application\UI\UIBlock[] + * @return \Combodo\iTop\Application\UI\iUIBlock[] */ public function GetSubBlocks() { diff --git a/sources/application/UI/iUIBlock.php b/sources/application/UI/iUIBlock.php index 1062585b3..bc71dbc04 100644 --- a/sources/application/UI/iUIBlock.php +++ b/sources/application/UI/iUIBlock.php @@ -80,6 +80,7 @@ interface iUIBlock /** * Return an array iUIBlock embedded in this iUIBlock + * Must be an associative array ( => ) * * @return \Combodo\iTop\Application\UI\iUIBlock[] */