From 2575fd6f4d267b098c1aec26b948bc892e86bb47 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 2 Dec 2020 13:22:43 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B03123=20-=20Refactor=20default=20constant?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Base/Component/Alert/Alert.php | 6 ++--- .../Component/Breadcrumbs/Breadcrumbs.php | 6 ++--- .../UI/Base/Component/Button/Button.php | 4 ++-- .../Base/Component/Dashlet/DashletBadge.php | 2 +- .../Component/Dashlet/DashletContainer.php | 2 +- .../Component/Dashlet/DashletHeaderStatic.php | 2 +- .../UI/Base/Component/DataTable/DataTable.php | 4 ++-- .../DataTableConfig/DataTableConfig.php | 2 +- .../StaticTable/FormTable/FormTable.php | 4 ++-- .../StaticTable/FormTableRow/FormTableRow.php | 4 ++-- .../DataTable/StaticTable/StaticTable.php | 4 ++-- .../UI/Base/Component/Field/Field.php | 2 +- .../UI/Base/Component/FieldSet/FieldSet.php | 2 +- .../UI/Base/Component/Form/Form.php | 2 +- .../Component/GlobalSearch/GlobalSearch.php | 6 ++--- .../UI/Base/Component/Html/Html.php | 2 +- .../UI/Base/Component/Input/Input.php | 2 +- .../Base/Component/Input/InputWithLabel.php | 2 +- .../Component/Input/RichText/RichText.php | 4 ++-- .../UI/Base/Component/Input/Select/Select.php | 2 +- .../Component/Input/Select/SelectOption.php | 2 +- .../UI/Base/Component/Panel/Panel.php | 2 +- .../UI/Base/Component/Panel/PanelEnhanced.php | 2 +- .../PopoverMenu/NewsroomMenu/NewsroomMenu.php | 6 ++--- .../Component/PopoverMenu/PopoverMenu.php | 4 ++-- .../PopoverMenuItem/JsPopoverMenuItem.php | 2 +- .../PopoverMenuItem/PopoverMenuItem.php | 2 +- .../SeparatorPopoverMenuItem.php | 2 +- .../PopoverMenuItem/UrlPopoverMenuItem.php | 2 +- .../Component/QuickCreate/QuickCreate.php | 8 +++---- .../UI/Base/Component/Title/Title.php | 2 +- .../Component/Title/TitleForObjectDetails.php | 2 +- .../UI/Base/Component/Toolbar/Toolbar.php | 2 +- .../ActivityEntry/ActivityEntry.php | 2 +- .../ActivityEntry/CaseLogEntry.php | 2 +- .../ActivityEntry/EditsEntry.php | 2 +- .../ActivityEntry/TransitionEntry.php | 2 +- .../Layout/ActivityPanel/ActivityPanel.php | 6 ++--- .../CaseLogEntryForm/CaseLogEntryForm.php | 6 ++--- .../Base/Layout/Dashboard/DashboardColumn.php | 2 +- .../Base/Layout/Dashboard/DashboardLayout.php | 2 +- .../UI/Base/Layout/Dashboard/DashboardRow.php | 2 +- .../Base/Layout/MultiColumn/Column/Column.php | 2 +- .../Base/Layout/MultiColumn/MultiColumn.php | 2 +- .../Layout/NavigationMenu/NavigationMenu.php | 6 ++--- .../UI/Base/Layout/Object/ObjectDetails.php | 2 +- .../Base/Layout/PageContent/PageContent.php | 2 +- .../PageContentWithSideContent.php | 2 +- .../UI/Base/Layout/TabContainer/Tab/Tab.php | 2 +- .../Base/Layout/TabContainer/TabContainer.php | 6 ++--- .../UI/Base/Layout/TopBar/TopBar.php | 2 +- .../UI/Base/Layout/UIContentBlock.php | 2 +- sources/application/UI/Base/UIBlock.php | 24 +++++++++---------- .../UI/DisplayBlock/BlockChart/BlockChart.php | 4 ++-- .../BlockChartAjaxBars/BlockChartAjaxBars.php | 2 +- .../BlockChartAjaxPie/BlockChartAjaxPie.php | 2 +- .../UI/DisplayBlock/BlockList/BlockList.php | 4 ++-- 57 files changed, 96 insertions(+), 96 deletions(-) diff --git a/sources/application/UI/Base/Component/Alert/Alert.php b/sources/application/UI/Base/Component/Alert/Alert.php index 98a0df6c8..b6f5a4552 100644 --- a/sources/application/UI/Base/Component/Alert/Alert.php +++ b/sources/application/UI/Base/Component/Alert/Alert.php @@ -33,9 +33,9 @@ class Alert extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-alert'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/alert/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/alert/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/alert/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/alert/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/components/alert.js', ]; diff --git a/sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php b/sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php index c748e03d3..cbaf9d057 100644 --- a/sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php +++ b/sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php @@ -36,9 +36,9 @@ class Breadcrumbs extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-breadcrumbs'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/breadcrumbs/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/breadcrumbs/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/breadcrumbs/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/breadcrumbs/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/components/breadcrumbs.js', ]; diff --git a/sources/application/UI/Base/Component/Button/Button.php b/sources/application/UI/Base/Component/Button/Button.php index 2620a12ea..51dd043a5 100644 --- a/sources/application/UI/Base/Component/Button/Button.php +++ b/sources/application/UI/Base/Component/Button/Button.php @@ -33,8 +33,8 @@ class Button extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-button'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/button/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/button/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/button/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/button/layout'; // Specific constants /** @var string ENUM_TYPE_BUTTON */ diff --git a/sources/application/UI/Base/Component/Dashlet/DashletBadge.php b/sources/application/UI/Base/Component/Dashlet/DashletBadge.php index da36bd03d..acc434e1a 100644 --- a/sources/application/UI/Base/Component/Dashlet/DashletBadge.php +++ b/sources/application/UI/Base/Component/Dashlet/DashletBadge.php @@ -11,7 +11,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\Dashlet; class DashletBadge extends DashletContainer { public const BLOCK_CODE = 'ibo-dashlet-badge'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/dashlet/dashletbadge'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/dashlet/dashletbadge'; /** @var string */ protected $sClassIconUrl; diff --git a/sources/application/UI/Base/Component/Dashlet/DashletContainer.php b/sources/application/UI/Base/Component/Dashlet/DashletContainer.php index f5445d80e..8cc5d5382 100644 --- a/sources/application/UI/Base/Component/Dashlet/DashletContainer.php +++ b/sources/application/UI/Base/Component/Dashlet/DashletContainer.php @@ -13,5 +13,5 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; class DashletContainer extends UIContentBlock { public const BLOCK_CODE = 'ibo-dashlet'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/content-block/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/content-block/layout'; } \ No newline at end of file diff --git a/sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php b/sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php index d2b64c627..7f77aa90e 100644 --- a/sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php +++ b/sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php @@ -11,7 +11,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\Dashlet; class DashletHeaderStatic extends DashletContainer { public const BLOCK_CODE = 'ibo-dashlet-header-static'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/dashlet/dashletheaderstatic'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/dashlet/dashletheaderstatic'; /** @var string */ protected $sTitle; diff --git a/sources/application/UI/Base/Component/DataTable/DataTable.php b/sources/application/UI/Base/Component/DataTable/DataTable.php index bd86c057f..7ac81d0cb 100644 --- a/sources/application/UI/Base/Component/DataTable/DataTable.php +++ b/sources/application/UI/Base/Component/DataTable/DataTable.php @@ -20,8 +20,8 @@ class DataTableBlock extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-datatable'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/datatable/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/datatable/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/datatable/layout'; protected $aOptions;//list of specific options for display datatable protected $sAjaxUrl; diff --git a/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php b/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php index 37fe9b08a..868e33b8d 100644 --- a/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php +++ b/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php @@ -11,7 +11,7 @@ class DataTableConfig extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-datatableconfig'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/config/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/datatable/config/layout'; /** @var DataTableBlock */ private $oDataTable; diff --git a/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php b/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php index 260f5e61f..c9f02d790 100644 --- a/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php +++ b/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php @@ -20,8 +20,8 @@ class FormTable extends StaticTable { // Overloaded constants public const BLOCK_CODE = 'ibo-formtable'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtable/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtable/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtable/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtable/layout'; /** @var string */ private $sRef; diff --git a/sources/application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php b/sources/application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php index 2dc930403..a68b64158 100644 --- a/sources/application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php +++ b/sources/application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php @@ -18,8 +18,8 @@ class FormTableRow extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-formtablerow'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtablerow/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtablerow/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtablerow/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtablerow/layout'; /** @var string */ private $sRef; diff --git a/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php b/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php index 3eb895c57..bf5881389 100644 --- a/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php +++ b/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php @@ -17,8 +17,8 @@ class StaticTable extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-datatable'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/layout'; /** * @var array of 'entry name' => [ diff --git a/sources/application/UI/Base/Component/Field/Field.php b/sources/application/UI/Base/Component/Field/Field.php index 4b7d5f3c8..df2296c57 100644 --- a/sources/application/UI/Base/Component/Field/Field.php +++ b/sources/application/UI/Base/Component/Field/Field.php @@ -23,7 +23,7 @@ class Field extends UIBlock /** @inheritdoc */ public const BLOCK_CODE = 'ibo-field'; /** @inheritdoc */ - public const HTML_TEMPLATE_REL_PATH = 'base/components/field/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/field/layout'; /** @var array Array of various parameters of the field. This should be exploded in dedicated properties instead of a grey array. */ protected $aParams; diff --git a/sources/application/UI/Base/Component/FieldSet/FieldSet.php b/sources/application/UI/Base/Component/FieldSet/FieldSet.php index 033743681..9f83a3049 100644 --- a/sources/application/UI/Base/Component/FieldSet/FieldSet.php +++ b/sources/application/UI/Base/Component/FieldSet/FieldSet.php @@ -18,7 +18,7 @@ class FieldSet extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-fieldset'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/fieldset/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/fieldset/layout'; /** @var string */ protected $sLegend; diff --git a/sources/application/UI/Base/Component/Form/Form.php b/sources/application/UI/Base/Component/Form/Form.php index ed084db46..5a2348370 100644 --- a/sources/application/UI/Base/Component/Form/Form.php +++ b/sources/application/UI/Base/Component/Form/Form.php @@ -18,7 +18,7 @@ class Form extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-form'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/form/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/form/layout'; /** @var string */ protected $sOnSubmitJsCode; diff --git a/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php index fda8a1835..5f835f6a7 100644 --- a/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php +++ b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php @@ -36,9 +36,9 @@ class GlobalSearch extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-global-search'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/global-search/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/global-search/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/global-search/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/global-search/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/components/global-search.js', ]; diff --git a/sources/application/UI/Base/Component/Html/Html.php b/sources/application/UI/Base/Component/Html/Html.php index 291eda223..6a0560304 100644 --- a/sources/application/UI/Base/Component/Html/Html.php +++ b/sources/application/UI/Base/Component/Html/Html.php @@ -33,7 +33,7 @@ class Html extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-html'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/html/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/html/layout'; /** @var string $sHtml The raw HTML, must be already sanitized */ protected $sHtml; diff --git a/sources/application/UI/Base/Component/Input/Input.php b/sources/application/UI/Base/Component/Input/Input.php index 05dc11245..f5d56275e 100644 --- a/sources/application/UI/Base/Component/Input/Input.php +++ b/sources/application/UI/Base/Component/Input/Input.php @@ -18,7 +18,7 @@ class Input extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-input'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/input/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/input/layout'; public const INPUT_HIDDEN = 'hidden'; diff --git a/sources/application/UI/Base/Component/Input/InputWithLabel.php b/sources/application/UI/Base/Component/Input/InputWithLabel.php index e067347e5..d7f772454 100644 --- a/sources/application/UI/Base/Component/Input/InputWithLabel.php +++ b/sources/application/UI/Base/Component/Input/InputWithLabel.php @@ -12,7 +12,7 @@ use Combodo\iTop\Application\UI\Base\UIBlock; class InputWithLabel extends UIBlock { - public const HTML_TEMPLATE_REL_PATH = 'base/components/input/inputwithlabel'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/input/inputwithlabel'; /** @var string */ protected $sLabel; diff --git a/sources/application/UI/Base/Component/Input/RichText/RichText.php b/sources/application/UI/Base/Component/Input/RichText/RichText.php index 73b40c28b..0c04dfd7c 100644 --- a/sources/application/UI/Base/Component/Input/RichText/RichText.php +++ b/sources/application/UI/Base/Component/Input/RichText/RichText.php @@ -15,6 +15,6 @@ class RichText extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-richtext'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/input/richtext/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/input/richtext/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/input/richtext/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/input/richtext/layout'; } \ No newline at end of file diff --git a/sources/application/UI/Base/Component/Input/Select/Select.php b/sources/application/UI/Base/Component/Input/Select/Select.php index 4f9b03707..474ce67c4 100644 --- a/sources/application/UI/Base/Component/Input/Select/Select.php +++ b/sources/application/UI/Base/Component/Input/Select/Select.php @@ -12,7 +12,7 @@ use Combodo\iTop\Application\UI\Base\Component\Input\Input; class Select extends Input { - public const HTML_TEMPLATE_REL_PATH = 'base/components/input/select/select'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/input/select/select'; /** @var array */ protected $aOptions; diff --git a/sources/application/UI/Base/Component/Input/Select/SelectOption.php b/sources/application/UI/Base/Component/Input/Select/SelectOption.php index 253f134ef..0dff9064c 100644 --- a/sources/application/UI/Base/Component/Input/Select/SelectOption.php +++ b/sources/application/UI/Base/Component/Input/Select/SelectOption.php @@ -12,7 +12,7 @@ use Combodo\iTop\Application\UI\Base\UIBlock; class SelectOption extends UIBlock { - public const HTML_TEMPLATE_REL_PATH = 'base/components/input/select/selectoption'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/input/select/selectoption'; /** @var string */ protected $sValue; diff --git a/sources/application/UI/Base/Component/Panel/Panel.php b/sources/application/UI/Base/Component/Panel/Panel.php index 7171685e0..021183652 100644 --- a/sources/application/UI/Base/Component/Panel/Panel.php +++ b/sources/application/UI/Base/Component/Panel/Panel.php @@ -39,7 +39,7 @@ class Panel extends UIContentBlock // Overloaded constants public const BLOCK_CODE = 'ibo-panel'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/panel/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/panel/layout'; // Specific constants /** @var string ENUM_COLOR_PRIMARY */ diff --git a/sources/application/UI/Base/Component/Panel/PanelEnhanced.php b/sources/application/UI/Base/Component/Panel/PanelEnhanced.php index 5f8caa7fa..95a7e79d9 100644 --- a/sources/application/UI/Base/Component/Panel/PanelEnhanced.php +++ b/sources/application/UI/Base/Component/Panel/PanelEnhanced.php @@ -13,7 +13,7 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; class PanelEnhanced extends Panel { public const BLOCK_CODE = 'ibo-panel-enhanced'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/panel/panelenhanced'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/panel/panelenhanced'; /** @var UIContentBlock */ protected $sSubTitle; diff --git a/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php index 7fe1f9bac..92eaa994b 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php +++ b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php @@ -33,9 +33,9 @@ use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; class NewsroomMenu extends PopoverMenu { // Overloaded constants - public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/newsroom-menu/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/popover-menu/newsroom-menu/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/newsroom-menu/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/popover-menu/newsroom-menu/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/components/newsroom-menu.js', ]; diff --git a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php index 166c33ac5..518ca1ae1 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php @@ -36,8 +36,8 @@ class PopoverMenu extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-popover-menu'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/components/popover-menu.js', ]; diff --git a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php index 2321fa1ed..a046094dd 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php @@ -33,7 +33,7 @@ use JSPopupMenuItem; class JsPopoverMenuItem extends PopoverMenuItem { // Overloaded constants - public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_js'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_js'; /** * @see \JSPopupMenuItem::GetJsCode() diff --git a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php index 82e422a19..56a316c96 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php @@ -35,7 +35,7 @@ class PopoverMenuItem extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-popover-menu--item'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/layout'; /** @var \ApplicationPopupMenuItem $oPopupMenuItem We decorate the class with the original \ApplicationPopupMenuItem as it is used among the application (backoffice, portal, extensions) and cannot be refactored without BC breaks */ protected $oPopupMenuItem; diff --git a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php index b70c49787..96dd94a4a 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php @@ -30,6 +30,6 @@ namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem */ class SeparatorPopoverMenuItem extends PopoverMenuItem { - public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_separator'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_separator'; } \ No newline at end of file diff --git a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php index a19d32919..d97319b76 100644 --- a/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php @@ -31,7 +31,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem class UrlPopoverMenuItem extends PopoverMenuItem { // Overloaded constants - public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_url'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_url'; /** * @see \URLPopupMenuItem::GetUrl() diff --git a/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php b/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php index 6df964139..5aa7251bf 100644 --- a/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php +++ b/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php @@ -36,13 +36,13 @@ class QuickCreate extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-quick-create'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/quick-create/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/components/quick-create/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/quick-create/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/quick-create/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/selectize.min.js', 'js/components/quick-create.js', ]; - public const CSS_FILES_REL_PATH = [ + public const DEFAULT_CSS_FILES_REL_PATH = [ 'css/selectize.default.css', ]; diff --git a/sources/application/UI/Base/Component/Title/Title.php b/sources/application/UI/Base/Component/Title/Title.php index 63b207418..1f05f13c8 100644 --- a/sources/application/UI/Base/Component/Title/Title.php +++ b/sources/application/UI/Base/Component/Title/Title.php @@ -20,7 +20,7 @@ class Title extends UIBlock /** @inheritDoc */ public const BLOCK_CODE = 'ibo-title'; /** @inheritDoc */ - public const HTML_TEMPLATE_REL_PATH = 'base/components/title/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/title/layout'; /** @var string Icon should cover all the space, best for icons with filled background */ public const ENUM_ICON_COVER_METHOD_COVER = 'cover'; diff --git a/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php b/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php index 7848a8d2d..e36b7fb78 100644 --- a/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php +++ b/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php @@ -10,7 +10,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\Title; class TitleForObjectDetails extends Title { - public const HTML_TEMPLATE_REL_PATH = 'base/components/title/titleforobjectdetails'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/title/titleforobjectdetails'; /** @var string */ protected $sClassName; diff --git a/sources/application/UI/Base/Component/Toolbar/Toolbar.php b/sources/application/UI/Base/Component/Toolbar/Toolbar.php index 5c132197a..a031f7cd4 100644 --- a/sources/application/UI/Base/Component/Toolbar/Toolbar.php +++ b/sources/application/UI/Base/Component/Toolbar/Toolbar.php @@ -18,5 +18,5 @@ class Toolbar extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-toolbar'; - public const HTML_TEMPLATE_REL_PATH = 'base/components/toolbar/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/toolbar/layout'; } \ No newline at end of file diff --git a/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php index 82e730dae..9b44fc3fd 100644 --- a/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php @@ -37,7 +37,7 @@ class ActivityEntry extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-activity-entry'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/layout'; // Specific constants /** @var string DEFAULT_ORIGIN */ diff --git a/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php index 928f0d905..e16d26da4 100644 --- a/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php @@ -34,7 +34,7 @@ class CaseLogEntry extends ActivityEntry { // Overloaded constants public const BLOCK_CODE = 'ibo-caselog-entry'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/caselog-entry'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/caselog-entry'; public const DEFAULT_TYPE = 'caselog'; public const DEFAULT_DECORATION_CLASSES = 'fas fa-fw fa-quote-left'; diff --git a/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php index 8d73f8739..d18065c96 100644 --- a/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php @@ -37,7 +37,7 @@ class EditsEntry extends ActivityEntry { // Overloaded constants public const BLOCK_CODE = 'ibo-edits-entry'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/edits-entry'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/edits-entry'; public const DEFAULT_TYPE = 'edits'; public const DEFAULT_DECORATION_CLASSES = 'fas fa-fw fa-pen'; diff --git a/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php index 8e1541873..cc891c743 100644 --- a/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php @@ -35,7 +35,7 @@ class TransitionEntry extends ActivityEntry { // Overloaded constants public const BLOCK_CODE = 'ibo-transition-entry'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/transition-entry'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/transition-entry'; public const DEFAULT_TYPE = 'transition'; public const DEFAULT_DECORATION_CLASSES = 'fas fa-fw fa-map-signs'; diff --git a/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php index 7175a2dcc..d42da9aaf 100644 --- a/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php @@ -42,9 +42,9 @@ class ActivityPanel extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-activity-panel'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/layouts/activity-panel/activity-panel.js', ]; diff --git a/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php b/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php index 7a40b4a43..8319abd4c 100644 --- a/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php @@ -20,9 +20,9 @@ class CaseLogEntryForm extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-caselog-entry-form'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/caselog-entry-form/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/caselog-entry-form/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/caselog-entry-form/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/caselog-entry-form/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/layouts/activity-panel/caselog-entry-form.js', ]; diff --git a/sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php b/sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php index d32d274ff..e41b7602b 100644 --- a/sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php +++ b/sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php @@ -13,7 +13,7 @@ use Combodo\iTop\Application\UI\Base\UIBlock; class DashboardColumn extends UIBlock { public const BLOCK_CODE = 'ibo-dashboard-column'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/column/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/column/layout'; /** @var UIBlock[] */ protected $aUIBlocks; diff --git a/sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php b/sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php index 1c5175aa7..fd146fe48 100644 --- a/sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php +++ b/sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php @@ -12,7 +12,7 @@ use Combodo\iTop\Application\UI\Base\UIBlock; class DashboardLayout extends UIBlock { public const BLOCK_CODE = 'ibo-dashboard'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/layout'; /** @var DashboardRow[] */ protected $aDashboardRows; diff --git a/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php b/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php index bce52378c..2a40c294b 100644 --- a/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php +++ b/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php @@ -12,7 +12,7 @@ use Combodo\iTop\Application\UI\Base\UIBlock; class DashboardRow extends UIBlock { public const BLOCK_CODE = 'ibo-dashboard-row'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/row/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/row/layout'; /** @var DashboardColumn[] */ protected $aDashboardColumns; diff --git a/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php b/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php index 14d24cb14..d43b0965d 100644 --- a/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php +++ b/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php @@ -19,5 +19,5 @@ use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; class Column extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-column'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/multi-column/column/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/multi-column/column/layout'; } \ No newline at end of file diff --git a/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php b/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php index 7cabc2a71..b91d70359 100644 --- a/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php +++ b/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php @@ -20,7 +20,7 @@ use Combodo\iTop\Application\UI\Base\UIBlock; class MultiColumn extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-multi-column'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/multi-column/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/multi-column/layout'; /** @var \Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\Column[] */ protected $aColumns; diff --git a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php index f64c4d3d7..8c0969b14 100644 --- a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php +++ b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php @@ -47,9 +47,9 @@ class NavigationMenu extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-navigation-menu'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/navigation-menu/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/layouts/navigation-menu/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/navigation-menu/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/layouts/navigation-menu/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/layouts/navigation-menu.js', 'js/extkeywidget.js', 'js/forms-json-utils.js', diff --git a/sources/application/UI/Base/Layout/Object/ObjectDetails.php b/sources/application/UI/Base/Layout/Object/ObjectDetails.php index 17eb0b729..45b595219 100644 --- a/sources/application/UI/Base/Layout/Object/ObjectDetails.php +++ b/sources/application/UI/Base/Layout/Object/ObjectDetails.php @@ -16,7 +16,7 @@ class ObjectDetails extends Panel { // Overloaded constants public const BLOCK_CODE = 'ibo-object-details'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/object/object-details/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/object/object-details/layout'; /** @var string */ protected $sClassName; diff --git a/sources/application/UI/Base/Layout/PageContent/PageContent.php b/sources/application/UI/Base/Layout/PageContent/PageContent.php index f9b2f22f8..674e176c0 100644 --- a/sources/application/UI/Base/Layout/PageContent/PageContent.php +++ b/sources/application/UI/Base/Layout/PageContent/PageContent.php @@ -39,7 +39,7 @@ class PageContent extends UIBlock implements iUIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-page-content'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/page-content/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/page-content/layout'; /** @var string ENUM_CONTENT_AREA_MAIN The main content area */ public const ENUM_CONTENT_AREA_MAIN = 'main'; diff --git a/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php b/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php index 274172e77..b4015f34e 100644 --- a/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php +++ b/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php @@ -33,7 +33,7 @@ use Combodo\iTop\Application\UI\Base\iUIBlock; class PageContentWithSideContent extends PageContent { // Overloaded constants public const BLOCK_CODE = 'ibo-page-content-with-side-content'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/page-content/with-side-content'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/page-content/with-side-content'; // Specific constants public const ENUM_CONTENT_AREA_SIDE = 'side'; diff --git a/sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php b/sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php index 7e87928e8..a2053a1a9 100644 --- a/sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php +++ b/sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php @@ -34,7 +34,7 @@ class Tab extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-tab'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/tab-container/tab/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/tab-container/tab/layout'; /** @var string */ public const TAB_TYPE = TabManager::ENUM_TAB_TYPE_HTML; diff --git a/sources/application/UI/Base/Layout/TabContainer/TabContainer.php b/sources/application/UI/Base/Layout/TabContainer/TabContainer.php index 3d09f721a..9a04f68cd 100644 --- a/sources/application/UI/Base/Layout/TabContainer/TabContainer.php +++ b/sources/application/UI/Base/Layout/TabContainer/TabContainer.php @@ -38,9 +38,9 @@ class TabContainer extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-tab-container'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/tab-container/layout'; - public const JS_TEMPLATE_REL_PATH = 'base/layouts/tab-container/layout'; - public const JS_FILES_REL_PATH = [ + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/tab-container/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/layouts/tab-container/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ 'js/layouts/tab-container.js' ]; diff --git a/sources/application/UI/Base/Layout/TopBar/TopBar.php b/sources/application/UI/Base/Layout/TopBar/TopBar.php index e43259103..9254379aa 100644 --- a/sources/application/UI/Base/Layout/TopBar/TopBar.php +++ b/sources/application/UI/Base/Layout/TopBar/TopBar.php @@ -38,7 +38,7 @@ class TopBar extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-top-bar'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/top-bar/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/top-bar/layout'; /** @var QuickCreate|null $oQuickCreate */ protected $oQuickCreate; diff --git a/sources/application/UI/Base/Layout/UIContentBlock.php b/sources/application/UI/Base/Layout/UIContentBlock.php index fa8045c59..4be26762a 100644 --- a/sources/application/UI/Base/Layout/UIContentBlock.php +++ b/sources/application/UI/Base/Layout/UIContentBlock.php @@ -26,7 +26,7 @@ class UIContentBlock extends UIBlock implements iUIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-content-block'; - public const HTML_TEMPLATE_REL_PATH = 'base/layouts/content-block/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/content-block/layout'; /** @var array */ protected $aCSSClasses; diff --git a/sources/application/UI/Base/UIBlock.php b/sources/application/UI/Base/UIBlock.php index dc7b639aa..a9371a04f 100644 --- a/sources/application/UI/Base/UIBlock.php +++ b/sources/application/UI/Base/UIBlock.php @@ -40,17 +40,17 @@ abstract class UIBlock implements iUIBlock public const BLOCK_CODE = 'ibo-block'; /** @var string|null GLOBAL_TEMPLATE_REL_PATH Relative path (from /templates/) to the "global" TWIG template which contains HTML, JS inline, JS files, CSS inline, CSS files. Should not be used too often as JS/CSS files would be duplicated making browser parsing time way longer. */ - public const GLOBAL_TEMPLATE_REL_PATH = null; + public const DEFAULT_GLOBAL_TEMPLATE_REL_PATH = null; /** @var string|null HTML_TEMPLATE_REL_PATH Relative path (from /templates/) to the HTML template */ - public const HTML_TEMPLATE_REL_PATH = null; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = null; /** @var array JS_FILES_REL_PATH Relative paths (from /) to the JS files */ - public const JS_FILES_REL_PATH = []; + public const DEFAULT_JS_FILES_REL_PATH = []; /** @var string|null JS_TEMPLATE_REL_PATH Relative path (from /templates/) to the JS template */ - public const JS_TEMPLATE_REL_PATH = null; + public const DEFAULT_JS_TEMPLATE_REL_PATH = null; /** @var array CSS_FILES_REL_PATH Relative paths (from /) to the CSS files */ - public const CSS_FILES_REL_PATH = []; + public const DEFAULT_CSS_FILES_REL_PATH = []; /** @var string|null CSS_TEMPLATE_REL_PATH Relative path (from /templates/) to the CSS template */ - public const CSS_TEMPLATE_REL_PATH = null; + public const DEFAULT_CSS_TEMPLATE_REL_PATH = null; /** @var string ENUM_BLOCK_FILES_TYPE_JS */ public const ENUM_BLOCK_FILES_TYPE_JS = 'js'; @@ -85,12 +85,12 @@ abstract class UIBlock implements iUIBlock public function __construct(?string $sId = null) { $this->sId = $sId ?? $this->GenerateId(); - $this->aJsFilesRelPath = static::JS_FILES_REL_PATH; - $this->aCssFilesRelPath = static::CSS_FILES_REL_PATH; - $this->sHtmlTemplateRelPath = static::HTML_TEMPLATE_REL_PATH; - $this->sJsTemplateRelPath = static::JS_TEMPLATE_REL_PATH; - $this->sCssTemplateRelPath = static::CSS_TEMPLATE_REL_PATH; - $this->sGlobalTemplateRelPath = static::GLOBAL_TEMPLATE_REL_PATH; + $this->aJsFilesRelPath = static::DEFAULT_JS_FILES_REL_PATH; + $this->aCssFilesRelPath = static::DEFAULT_CSS_FILES_REL_PATH; + $this->sHtmlTemplateRelPath = static::DEFAULT_HTML_TEMPLATE_REL_PATH; + $this->sJsTemplateRelPath = static::DEFAULT_JS_TEMPLATE_REL_PATH; + $this->sCssTemplateRelPath = static::DEFAULT_CSS_TEMPLATE_REL_PATH; + $this->sGlobalTemplateRelPath = static::DEFAULT_GLOBAL_TEMPLATE_REL_PATH; } /** diff --git a/sources/application/UI/DisplayBlock/BlockChart/BlockChart.php b/sources/application/UI/DisplayBlock/BlockChart/BlockChart.php index 559b518ac..4ab4869a2 100644 --- a/sources/application/UI/DisplayBlock/BlockChart/BlockChart.php +++ b/sources/application/UI/DisplayBlock/BlockChart/BlockChart.php @@ -18,8 +18,8 @@ class BlockChart extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-blockchart'; - public const HTML_TEMPLATE_REL_PATH = 'application/display-block/block-chart/layout'; - public const JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'application/display-block/block-chart/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart/layout'; /** @var int */ public $iChartCounter; diff --git a/sources/application/UI/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php b/sources/application/UI/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php index bcec067ef..ff6b1c1b9 100644 --- a/sources/application/UI/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php +++ b/sources/application/UI/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php @@ -18,7 +18,7 @@ class BlockChartAjaxBars extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-blockchartajaxbars'; - public const JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart-ajax-bars/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart-ajax-bars/layout'; /** @var string */ public $sJSNames; diff --git a/sources/application/UI/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php b/sources/application/UI/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php index 88fd9a633..aab43f1c7 100644 --- a/sources/application/UI/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php +++ b/sources/application/UI/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php @@ -18,7 +18,7 @@ class BlockChartAjaxPie extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-blockchartajaxpie'; - public const JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart-ajax-pie/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart-ajax-pie/layout'; /** @var string */ public $sId; diff --git a/sources/application/UI/DisplayBlock/BlockList/BlockList.php b/sources/application/UI/DisplayBlock/BlockList/BlockList.php index fa85b5de5..3396f0d5c 100644 --- a/sources/application/UI/DisplayBlock/BlockList/BlockList.php +++ b/sources/application/UI/DisplayBlock/BlockList/BlockList.php @@ -18,8 +18,8 @@ class BlockList extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-blocklist'; - public const HTML_TEMPLATE_REL_PATH = 'application/display-block/block-list/layout'; - public const JS_TEMPLATE_REL_PATH = 'application/display-block/block-list/layout'; + public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'application/display-block/block-list/layout'; + public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/display-block/block-list/layout'; /** @var bool */ public $bEmptySet = false;