diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php index 282535818..40eadd85b 100644 --- a/application/dashlet.class.inc.php +++ b/application/dashlet.class.inc.php @@ -853,7 +853,7 @@ class DashletPlainText extends Dashlet $sId = 'plaintext_'.($bEditMode ? 'edit_' : '').$this->sId; - return DashletFactory::MakeForDashletText($sId, $sText); + return DashletFactory::MakeForDashletPlainText($sText, $sId); } /** diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 8bf5c1f9f..64778d58a 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -168,6 +168,7 @@ return array( 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletContainer' => $baseDir . '/sources/application/UI/Base/Component/Dashlet/DashletContainer.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletFactory' => $baseDir . '/sources/application/UI/Base/Component/Dashlet/DashletFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletHeaderStatic' => $baseDir . '/sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletPlainText' => $baseDir . '/sources/application/UI/Base/Component/Dashlet/DashletPlainText.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTable' => $baseDir . '/sources/application/UI/Base/Component/DataTable/DataTable.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableSettings' => $baseDir . '/sources/application/UI/Base/Component/DataTable/DataTableSettings.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableUIBlockFactory' => $baseDir . '/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 67fce22e5..0e6806744 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -398,6 +398,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletContainer' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Dashlet/DashletContainer.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Dashlet/DashletFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletHeaderStatic' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletPlainText' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Dashlet/DashletPlainText.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTable' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/DataTable.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableSettings' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/DataTableSettings.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableUIBlockFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php', diff --git a/sources/application/UI/Base/Component/Dashlet/DashletFactory.php b/sources/application/UI/Base/Component/Dashlet/DashletFactory.php index a9f6163e8..1f57228e2 100644 --- a/sources/application/UI/Base/Component/Dashlet/DashletFactory.php +++ b/sources/application/UI/Base/Component/Dashlet/DashletFactory.php @@ -23,9 +23,9 @@ class DashletFactory return new DashletHeaderStatic(null, $sTitle, $sIconUrl); } - public static function MakeForDashletText(string $sId, string $sText) + public static function MakeForDashletPlainText(string $sText, string $sId = null): DashletPlainText { - return new DashletHeaderStatic($sId, '', '', $sText); + return new DashletPlainText($sText, $sId); } } \ No newline at end of file diff --git a/sources/application/UI/Base/Component/Dashlet/DashletPlainText.php b/sources/application/UI/Base/Component/Dashlet/DashletPlainText.php new file mode 100644 index 000000000..cd170daf7 --- /dev/null +++ b/sources/application/UI/Base/Component/Dashlet/DashletPlainText.php @@ -0,0 +1,59 @@ + + * @since 3.0.0 + * @package Combodo\iTop\Application\UI\Base\Component\Dashlet + */ +class DashletPlainText extends DashletContainer +{ + // Overloaded constants + public const BLOCK_CODE = 'ibo-dashlet-plain-text'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/dashlet/dashlet-plain-text'; + + /** @var string */ + protected $sText; + + /** + * DashletPlainText constructor. + * + * @param string $sText + */ + public function __construct(string $sText, string $sId = null) + { + parent::__construct($sId); + + $this->sText = $sText; + } + + /** + * @return string + */ + public function GetText(): string + { + return $this->sText; + } + + /** + * @param string $sText + * + * @return $this + */ + public function SetText(string $sText) + { + $this->sText = $sText; + + return $this; + } +} \ No newline at end of file diff --git a/templates/base/components/dashlet/dashlet-plain-text.html.twig b/templates/base/components/dashlet/dashlet-plain-text.html.twig new file mode 100644 index 000000000..c4e372de6 --- /dev/null +++ b/templates/base/components/dashlet/dashlet-plain-text.html.twig @@ -0,0 +1,5 @@ +{# @copyright Copyright (C) 2010-2021 Combodo SARL #} +{# @license http://opensource.org/licenses/AGPL-3.0 #} +{% apply spaceless %} +
{{ oUIBlock.GetText() }}
+{% endapply %} \ No newline at end of file