From 15aa9e508cc3f500ef8d431ee7372013e8d2c2b3 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 2 Dec 2020 13:18:01 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B03123=20-=20Refactor=20Directories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/applicationcontext.class.inc.php | 6 +- application/applicationextension.inc.php | 2 +- application/cmdbabstract.class.inc.php | 32 +-- application/dashboard.class.inc.php | 7 +- application/dashboardlayout.class.inc.php | 8 +- application/dashlet.class.inc.php | 12 +- application/displayblock.class.inc.php | 38 ++-- application/menunode.class.inc.php | 2 +- application/shortcut.class.inc.php | 2 +- application/ui.linkswidget.class.inc.php | 4 +- application/utils.inc.php | 4 +- .../{specific => application}/_all.scss | 2 +- .../display-block}/_all.scss | 0 css/backoffice/base/_all.scss | 4 +- .../{ => base}/components/_alert.scss | 0 .../{ => base}/components/_all.scss | 0 .../{ => base}/components/_badge.scss | 0 .../{ => base}/components/_breadcrumbs.scss | 0 .../{ => base}/components/_button.scss | 0 .../{ => base}/components/_datatable.scss | 0 .../{ => base}/components/_field.scss | 0 .../{ => base}/components/_fieldset.scss | 0 .../{ => base}/components/_form.scss | 0 .../{ => base}/components/_formtable.scss | 0 .../{ => base}/components/_formtablerow.scss | 0 .../{ => base}/components/_global-search.scss | 0 .../{ => base}/components/_modal.scss | 0 .../{ => base}/components/_newsroom-menu.scss | 0 .../{ => base}/components/_panel.scss | 0 .../{ => base}/components/_quick-create.scss | 0 .../{ => base}/components/_richtext.scss | 0 .../{ => base}/components/_search-form.scss | 0 .../{ => base}/components/_title.scss | 0 .../{ => base}/components/_toolbar.scss | 0 .../{ => base}/components/dashlet/_all.scss | 0 .../components/dashlet/_dashlet-badge.scss | 0 .../dashlet/_dashlet-header-dynamic.scss | 0 .../dashlet/_dashlet-header-static.scss | 0 .../components/dashlet/_dashlet.scss | 0 .../{ => base}/components/input/_all.scss | 0 .../components/input/_input-date.scss | 0 .../components/input/_input-datetime.scss | 0 .../components/input/_input-duration.scss | 0 .../components/input/_input-select.scss | 0 .../components/input/_input-string.scss | 0 .../components/input/_input-tagset.scss | 0 .../{ => base}/components/input/_input.scss | 0 .../popover-menu/_popover-menu-item.scss | 0 .../popover-menu/_popover-menu.scss | 0 css/backoffice/{ => base}/layout/_all.scss | 0 .../{ => base}/layout/_content.scss | 0 .../{ => base}/layout/_navigation-menu.scss | 0 .../{ => base}/layout/_object-details.scss | 0 .../{ => base}/layout/_top-bar.scss | 0 .../activity-panel/_activity-entry.scss | 0 .../activity-panel/_activity-panel.scss | 0 .../activity-panel/_caselog-entry-form.scss | 0 .../layout/activity-panel/_caselog-entry.scss | 0 .../layout/activity-panel/_edits-entry.scss | 0 .../activity-panel/_transition-entry.scss | 0 .../_panel-with-tab-container.scss | 0 .../layout/dashboard/_dashboard.scss | 0 .../layout/multi-column/_column.scss | 0 .../layout/multi-column/_multi-column.scss | 0 .../layout/tab-container/_tab-container.scss | 0 .../{ => base}/layout/tab-container/_tab.scss | 0 css/backoffice/main.scss | 4 +- datamodels/2.x/itop-config/config.php | 12 +- lib/composer/autoload_classmap.php | 188 +++++++++--------- lib/composer/autoload_static.php | 188 +++++++++--------- pages/UI.php | 12 +- pages/ajax.render.php | 6 +- pages/preferences.php | 19 +- sources/Renderer/BlockRenderer.php | 8 +- .../application/TwigBase/Twig/Extension.php | 2 +- .../UI/{ => Base}/Component/Alert/Alert.php | 10 +- .../Component/Alert/AlertFactory.php | 20 +- .../UI/{ => Base}/Component/Badge/Badge.php | 4 +- .../Component/Badge/BadgeFactory.php | 2 +- .../Component/Breadcrumbs/Breadcrumbs.php | 10 +- .../UI/{ => Base}/Component/Button/Button.php | 10 +- .../Component/Button/ButtonFactory.php | 30 +-- .../Component/Dashlet/DashletBadge.php | 4 +- .../Component/Dashlet/DashletContainer.php | 6 +- .../Component/Dashlet/DashletFactory.php | 2 +- .../Component/Dashlet/DashletHeaderStatic.php | 4 +- .../Component/DataTable/DataTable.php | 10 +- .../DataTableConfig/DataTableConfig.php | 8 +- .../Component/DataTable/DataTableFactory.php | 20 +- .../Component/DataTable/DataTableSettings.php | 2 +- .../StaticTable/FormTable/FormTable.php | 14 +- .../StaticTable/FormTableRow/FormTableRow.php | 10 +- .../DataTable/StaticTable/StaticTable.php | 8 +- .../UI/{ => Base}/Component/Field/Field.php | 8 +- .../Component/FieldSet/FieldSet.php | 8 +- .../UI/{ => Base}/Component/Form/Form.php | 8 +- .../Component/GlobalSearch/GlobalSearch.php | 10 +- .../GlobalSearch/GlobalSearchFactory.php | 6 +- .../GlobalSearch/GlobalSearchHelper.php | 4 +- .../UI/{ => Base}/Component/Html/Html.php | 8 +- .../UI/{ => Base}/Component/Input/Input.php | 8 +- .../Component/Input/InputFactory.php | 6 +- .../Component/Input/InputWithLabel.php | 20 +- .../Component/Input/RichText/RichText.php | 20 ++ .../Component/Input/Select/Select.php | 6 +- .../Component/Input/Select/SelectOption.php | 6 +- .../UI/{ => Base}/Component/Panel/Panel.php | 32 +-- .../Component/Panel/PanelEnhanced.php | 6 +- .../Component/Panel/PanelFactory.php | 24 +-- .../PopoverMenu/NewsroomMenu/NewsroomMenu.php | 10 +- .../NewsroomMenu/NewsroomMenuFactory.php | 6 +- .../Component/PopoverMenu/PopoverMenu.php | 12 +- .../PopoverMenu/PopoverMenuFactory.php | 14 +- .../PopoverMenuItem/JsPopoverMenuItem.php | 6 +- .../PopoverMenuItem/PopoverMenuItem.php | 8 +- .../PopoverMenuItemFactory.php | 10 +- .../SeparatorPopoverMenuItem.php | 6 +- .../PopoverMenuItem/UrlPopoverMenuItem.php | 6 +- .../Component/QuickCreate/QuickCreate.php | 10 +- .../QuickCreate/QuickCreateFactory.php | 6 +- .../QuickCreate/QuickCreateHelper.php | 4 +- .../UI/{ => Base}/Component/Title/Title.php | 8 +- .../Component/Title/TitleFactory.php | 2 +- .../Component/Title/TitleForObjectDetails.php | 4 +- .../{ => Base}/Component/Toolbar/Toolbar.php | 8 +- .../ActivityEntry/ActivityEntry.php | 8 +- .../ActivityEntry/ActivityEntryFactory.php | 10 +- .../CMDBChangeOpAttachmentAddedFactory.php | 4 +- .../CMDBChangeOpAttachmentRemovedFactory.php | 4 +- .../CMDBChangeOpCreateFactory.php | 4 +- .../CMDBChangeOpDeleteFactory.php | 4 +- .../CMDBChangeOp/CMDBChangeOpFactory.php | 10 +- .../CMDBChangeOpSetAttributeFactory.php | 8 +- .../CMDBChangeOpSetAttributeScalarFactory.php | 8 +- .../ActivityEntry/CaseLogEntry.php | 6 +- .../ActivityEntry/EditsEntry.php | 8 +- .../ActivityEntry/TransitionEntry.php | 6 +- .../Layout/ActivityPanel/ActivityPanel.php | 34 ++-- .../ActivityPanel/ActivityPanelFactory.php | 12 +- .../CaseLogEntryForm/CaseLogEntryForm.php | 36 ++-- .../CaseLogEntryFormFactory.php | 22 +- .../Layout/Dashboard/DashboardColumn.php | 6 +- .../Layout/Dashboard/DashboardLayout.php | 8 +- .../Layout/Dashboard/DashboardRow.php | 8 +- .../Layout/MultiColumn/Column/Column.php | 8 +- .../Layout/MultiColumn/MultiColumn.php | 14 +- .../Layout/NavigationMenu/NavigationMenu.php | 26 +-- .../NavigationMenu/NavigationMenuFactory.php | 10 +- .../Layout/Object/ObjectDetails.php | 6 +- .../Layout/Object/ObjectFactory.php | 7 +- .../Layout/PageContent/PageContent.php | 26 +-- .../Layout/PageContent/PageContentFactory.php | 10 +- .../PageContentWithSideContent.php | 14 +- .../Layout/TabContainer/Tab/AjaxTab.php | 12 +- .../Layout/TabContainer/Tab/Tab.php | 8 +- .../Layout/TabContainer/TabContainer.php | 34 ++-- .../UI/{ => Base}/Layout/TopBar/TopBar.php | 34 ++-- .../Layout/TopBar/TopBarFactory.php | 12 +- .../UI/{ => Base}/Layout/UIContentBlock.php | 13 +- .../UI/{ => Base}/Layout/iUIContentBlock.php | 22 +- sources/application/UI/{ => Base}/UIBlock.php | 6 +- .../application/UI/{ => Base}/UIException.php | 2 +- .../application/UI/{ => Base}/iUIBlock.php | 6 +- .../UI/{ => Base}/tUIContentAreas.php | 20 +- .../UI/Component/Input/RichText/RichText.php | 19 -- .../DisplayBlock/BlockChart/BlockChart.php | 10 +- .../BlockChartAjaxBars/BlockChartAjaxBars.php | 8 +- .../BlockChartAjaxPie/BlockChartAjaxPie.php | 8 +- .../DisplayBlock/BlockList/BlockList.php | 10 +- sources/application/WebPage/AjaxPage.php | 4 +- sources/application/WebPage/CLIPage.php | 2 +- sources/application/WebPage/CSVPage.php | 2 +- sources/application/WebPage/Page.php | 2 +- sources/application/WebPage/TabManager.php | 18 +- sources/application/WebPage/WebPage.php | 20 +- sources/application/WebPage/XMLPage.php | 2 +- sources/application/WebPage/iTabbedPage.php | 4 +- sources/application/WebPage/iTopWebPage.php | 32 +-- .../search/searchform.class.inc.php | 10 +- .../block-chart-ajax-bars}/layout.js.twig | 0 .../block-chart-ajax-pie}/layout.js.twig | 0 .../block-chart}/layout.html.twig | 0 .../display-block/block-chart}/layout.js.twig | 0 .../block-list}/layout.html.twig | 0 .../display-block/block-list}/layout.js.twig | 0 .../components/alert/layout.html.twig | 0 .../components/alert/layout.js.twig | 0 .../components/badge/layout.html.twig | 2 +- .../components/breadcrumbs/layout.html.twig | 0 .../components/breadcrumbs/layout.js.twig | 0 .../components/button/layout.html.twig | 0 .../components/button/layout.js.twig | 0 .../components/dashlet/dashletbadge.html.twig | 0 .../dashlet/dashletheaderstatic.html.twig | 0 .../components/dashlet/layout.html.twig | 0 .../datatable/config/layout.html.twig | 0 .../components/datatable/layout.html.twig | 0 .../components/datatable/layout.js.twig | 0 .../static/formtable/layout.html.twig | 0 .../datatable/static/formtable/layout.js.twig | 0 .../static/formtablerow/layout.html.twig | 0 .../static/formtablerow/layout.js.twig | 0 .../datatable/static/layout.html.twig | 0 .../datatable/static/layout.js.twig | 0 .../components/field/layout.html.twig | 0 .../components/fieldset/layout.html.twig | 0 .../components/form/layout.html.twig | 0 .../components/global-search/layout.html.twig | 0 .../components/global-search/layout.js.twig | 0 .../components/html/layout.html.twig | 0 .../components/input/inputwithlabel.html.twig | 0 .../components/input/layout.html.twig | 0 .../input/richtext/layout.html.twig | 2 +- .../components/input/richtext/layout.js.twig | 0 .../components/input/select/select.html.twig | 2 +- .../input/select/selectoption.html.twig | 0 .../components/panel/layout.html.twig | 0 .../components/panel/panelenhanced.html.twig | 2 +- .../popover-menu/item/layout.html.twig | 0 .../popover-menu/item/mode_js.html.twig | 2 +- .../item/mode_separator.html.twig | 2 +- .../popover-menu/item/mode_url.html.twig | 2 +- .../components/popover-menu/layout.html.twig | 0 .../newsroom-menu/layout.html.twig | 0 .../popover-menu/newsroom-menu/layout.js.twig | 0 .../components/quick-create/layout.html.twig | 0 .../components/quick-create/layout.js.twig | 0 .../components/title/layout.html.twig | 0 .../title/titleforobjectdetails.html.twig | 2 +- .../base/components/toolbar/layout.html.twig | 1 + .../activity-entry/caselog-entry.html.twig | 2 +- .../activity-entry/edits-entry.html.twig | 2 +- .../activity-entry/layout.html.twig | 0 .../activity-entry/transition-entry.html.twig | 2 +- .../caselog-entry-form/layout.html.twig | 0 .../caselog-entry-form/layout.js.twig | 0 .../activity-panel/entry-group.html.twig | 0 .../layouts/activity-panel/layout.html.twig | 2 +- .../layouts/activity-panel/layout.js.twig | 0 .../layouts/content-block/layout.html.twig | 0 .../layouts/dashboard/column/layout.html.twig | 0 .../layouts/dashboard/layout.html.twig | 0 .../layouts/dashboard/row/layout.html.twig | 0 .../multi-column/column/layout.html.twig | 0 .../layouts/multi-column/layout.html.twig | 0 .../layouts/navigation-menu/layout.html.twig | 4 +- .../layouts/navigation-menu/layout.js.twig | 0 .../navigation-menu/menu-group.html.twig | 0 .../navigation-menu/menu-node.html.twig | 2 +- .../navigation-menu/menu-nodes.html.twig | 2 +- .../object/object-details/layout.html.twig | 2 +- .../layouts/page-content/layout.html.twig | 0 .../page-content/with-side-content.html.twig | 2 +- .../layouts/tab-container/layout.html.twig | 0 .../layouts/tab-container/layout.js.twig | 0 .../tab-container/tab/layout.html.twig | 0 .../layouts/top-bar/layout.html.twig | 0 templates/components/toolbar/layout.html.twig | 1 - .../Backoffice/RenderAllUiBlocks.php | 10 +- 259 files changed, 862 insertions(+), 869 deletions(-) rename css/backoffice/{specific => application}/_all.scss (80%) rename css/backoffice/{specific/displayblock => application/display-block}/_all.scss (100%) rename css/backoffice/{ => base}/components/_alert.scss (100%) rename css/backoffice/{ => base}/components/_all.scss (100%) rename css/backoffice/{ => base}/components/_badge.scss (100%) rename css/backoffice/{ => base}/components/_breadcrumbs.scss (100%) rename css/backoffice/{ => base}/components/_button.scss (100%) rename css/backoffice/{ => base}/components/_datatable.scss (100%) rename css/backoffice/{ => base}/components/_field.scss (100%) rename css/backoffice/{ => base}/components/_fieldset.scss (100%) rename css/backoffice/{ => base}/components/_form.scss (100%) rename css/backoffice/{ => base}/components/_formtable.scss (100%) rename css/backoffice/{ => base}/components/_formtablerow.scss (100%) rename css/backoffice/{ => base}/components/_global-search.scss (100%) rename css/backoffice/{ => base}/components/_modal.scss (100%) rename css/backoffice/{ => base}/components/_newsroom-menu.scss (100%) rename css/backoffice/{ => base}/components/_panel.scss (100%) rename css/backoffice/{ => base}/components/_quick-create.scss (100%) rename css/backoffice/{ => base}/components/_richtext.scss (100%) rename css/backoffice/{ => base}/components/_search-form.scss (100%) rename css/backoffice/{ => base}/components/_title.scss (100%) rename css/backoffice/{ => base}/components/_toolbar.scss (100%) rename css/backoffice/{ => base}/components/dashlet/_all.scss (100%) rename css/backoffice/{ => base}/components/dashlet/_dashlet-badge.scss (100%) rename css/backoffice/{ => base}/components/dashlet/_dashlet-header-dynamic.scss (100%) rename css/backoffice/{ => base}/components/dashlet/_dashlet-header-static.scss (100%) rename css/backoffice/{ => base}/components/dashlet/_dashlet.scss (100%) rename css/backoffice/{ => base}/components/input/_all.scss (100%) rename css/backoffice/{ => base}/components/input/_input-date.scss (100%) rename css/backoffice/{ => base}/components/input/_input-datetime.scss (100%) rename css/backoffice/{ => base}/components/input/_input-duration.scss (100%) rename css/backoffice/{ => base}/components/input/_input-select.scss (100%) rename css/backoffice/{ => base}/components/input/_input-string.scss (100%) rename css/backoffice/{ => base}/components/input/_input-tagset.scss (100%) rename css/backoffice/{ => base}/components/input/_input.scss (100%) rename css/backoffice/{ => base}/components/popover-menu/_popover-menu-item.scss (100%) rename css/backoffice/{ => base}/components/popover-menu/_popover-menu.scss (100%) rename css/backoffice/{ => base}/layout/_all.scss (100%) rename css/backoffice/{ => base}/layout/_content.scss (100%) rename css/backoffice/{ => base}/layout/_navigation-menu.scss (100%) rename css/backoffice/{ => base}/layout/_object-details.scss (100%) rename css/backoffice/{ => base}/layout/_top-bar.scss (100%) rename css/backoffice/{ => base}/layout/activity-panel/_activity-entry.scss (100%) rename css/backoffice/{ => base}/layout/activity-panel/_activity-panel.scss (100%) rename css/backoffice/{ => base}/layout/activity-panel/_caselog-entry-form.scss (100%) rename css/backoffice/{ => base}/layout/activity-panel/_caselog-entry.scss (100%) rename css/backoffice/{ => base}/layout/activity-panel/_edits-entry.scss (100%) rename css/backoffice/{ => base}/layout/activity-panel/_transition-entry.scss (100%) rename css/backoffice/{ => base}/layout/blocks-integrations/_panel-with-tab-container.scss (100%) rename css/backoffice/{ => base}/layout/dashboard/_dashboard.scss (100%) rename css/backoffice/{ => base}/layout/multi-column/_column.scss (100%) rename css/backoffice/{ => base}/layout/multi-column/_multi-column.scss (100%) rename css/backoffice/{ => base}/layout/tab-container/_tab-container.scss (100%) rename css/backoffice/{ => base}/layout/tab-container/_tab.scss (100%) rename sources/application/UI/{ => Base}/Component/Alert/Alert.php (92%) rename sources/application/UI/{ => Base}/Component/Alert/AlertFactory.php (83%) rename sources/application/UI/{ => Base}/Component/Badge/Badge.php (83%) rename sources/application/UI/{ => Base}/Component/Badge/BadgeFactory.php (86%) rename sources/application/UI/{ => Base}/Component/Breadcrumbs/Breadcrumbs.php (86%) rename sources/application/UI/{ => Base}/Component/Button/Button.php (95%) rename sources/application/UI/{ => Base}/Component/Button/ButtonFactory.php (91%) rename sources/application/UI/{ => Base}/Component/Dashlet/DashletBadge.php (95%) rename sources/application/UI/{ => Base}/Component/Dashlet/DashletContainer.php (52%) rename sources/application/UI/{ => Base}/Component/Dashlet/DashletFactory.php (92%) rename sources/application/UI/{ => Base}/Component/Dashlet/DashletHeaderStatic.php (91%) rename sources/application/UI/{ => Base}/Component/DataTable/DataTable.php (86%) rename sources/application/UI/{ => Base}/Component/DataTable/DataTableConfig/DataTableConfig.php (71%) rename sources/application/UI/{ => Base}/Component/DataTable/DataTableFactory.php (97%) rename sources/application/UI/{ => Base}/Component/DataTable/DataTableSettings.php (99%) rename sources/application/UI/{ => Base}/Component/DataTable/StaticTable/FormTable/FormTable.php (61%) rename sources/application/UI/{ => Base}/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php (82%) rename sources/application/UI/{ => Base}/Component/DataTable/StaticTable/StaticTable.php (82%) rename sources/application/UI/{ => Base}/Component/Field/Field.php (77%) rename sources/application/UI/{ => Base}/Component/FieldSet/FieldSet.php (70%) rename sources/application/UI/{ => Base}/Component/Form/Form.php (79%) rename sources/application/UI/{ => Base}/Component/GlobalSearch/GlobalSearch.php (89%) rename sources/application/UI/{ => Base}/Component/GlobalSearch/GlobalSearchFactory.php (84%) rename sources/application/UI/{ => Base}/Component/GlobalSearch/GlobalSearchHelper.php (96%) rename sources/application/UI/{ => Base}/Component/Html/Html.php (87%) rename sources/application/UI/{ => Base}/Component/Input/Input.php (82%) rename sources/application/UI/{ => Base}/Component/Input/InputFactory.php (84%) rename sources/application/UI/{ => Base}/Component/Input/InputWithLabel.php (54%) create mode 100644 sources/application/UI/Base/Component/Input/RichText/RichText.php rename sources/application/UI/{ => Base}/Component/Input/Select/Select.php (70%) rename sources/application/UI/{ => Base}/Component/Input/Select/SelectOption.php (84%) rename sources/application/UI/{ => Base}/Component/Panel/Panel.php (88%) rename sources/application/UI/{ => Base}/Component/Panel/PanelEnhanced.php (85%) rename sources/application/UI/{ => Base}/Component/Panel/PanelFactory.php (82%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php (76%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php (92%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/PopoverMenu.php (91%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/PopoverMenuFactory.php (90%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php (85%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php (89%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php (81%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php (77%) rename sources/application/UI/{ => Base}/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php (82%) rename sources/application/UI/{ => Base}/Component/QuickCreate/QuickCreate.php (90%) rename sources/application/UI/{ => Base}/Component/QuickCreate/QuickCreateFactory.php (84%) rename sources/application/UI/{ => Base}/Component/QuickCreate/QuickCreateHelper.php (96%) rename sources/application/UI/{ => Base}/Component/Title/Title.php (89%) rename sources/application/UI/{ => Base}/Component/Title/TitleFactory.php (97%) rename sources/application/UI/{ => Base}/Component/Title/TitleForObjectDetails.php (89%) rename sources/application/UI/{ => Base}/Component/Toolbar/Toolbar.php (50%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php (95%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php (88%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php (83%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php (83%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php (83%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php (83%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php (85%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php (82%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php (87%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php (90%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/EditsEntry.php (93%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php (93%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityPanel.php (89%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/ActivityPanelFactory.php (90%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php (81%) rename sources/application/UI/{ => Base}/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php (86%) rename sources/application/UI/{ => Base}/Layout/Dashboard/DashboardColumn.php (91%) rename sources/application/UI/{ => Base}/Layout/Dashboard/DashboardLayout.php (74%) rename sources/application/UI/{ => Base}/Layout/Dashboard/DashboardRow.php (80%) rename sources/application/UI/{ => Base}/Layout/MultiColumn/Column/Column.php (50%) rename sources/application/UI/{ => Base}/Layout/MultiColumn/MultiColumn.php (67%) rename sources/application/UI/{ => Base}/Layout/NavigationMenu/NavigationMenu.php (89%) rename sources/application/UI/{ => Base}/Layout/NavigationMenu/NavigationMenuFactory.php (78%) rename sources/application/UI/{ => Base}/Layout/Object/ObjectDetails.php (91%) rename sources/application/UI/{ => Base}/Layout/Object/ObjectFactory.php (65%) rename sources/application/UI/{ => Base}/Layout/PageContent/PageContent.php (89%) rename sources/application/UI/{ => Base}/Layout/PageContent/PageContentFactory.php (82%) rename sources/application/UI/{ => Base}/Layout/PageContent/PageContentWithSideContent.php (83%) rename sources/application/UI/{ => Base}/Layout/TabContainer/Tab/AjaxTab.php (88%) rename sources/application/UI/{ => Base}/Layout/TabContainer/Tab/Tab.php (85%) rename sources/application/UI/{ => Base}/Layout/TabContainer/TabContainer.php (76%) rename sources/application/UI/{ => Base}/Layout/TopBar/TopBar.php (74%) rename sources/application/UI/{ => Base}/Layout/TopBar/TopBarFactory.php (80%) rename sources/application/UI/{ => Base}/Layout/UIContentBlock.php (92%) rename sources/application/UI/{ => Base}/Layout/iUIContentBlock.php (78%) rename sources/application/UI/{ => Base}/UIBlock.php (98%) rename sources/application/UI/{ => Base}/UIException.php (89%) rename sources/application/UI/{ => Base}/iUIBlock.php (95%) rename sources/application/UI/{ => Base}/tUIContentAreas.php (87%) delete mode 100644 sources/application/UI/Component/Input/RichText/RichText.php rename sources/application/UI/{Specific => }/DisplayBlock/BlockChart/BlockChart.php (51%) rename sources/application/UI/{Specific => }/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php (60%) rename sources/application/UI/{Specific => }/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php (60%) rename sources/application/UI/{Specific => }/DisplayBlock/BlockList/BlockList.php (64%) rename templates/{specific/displayblock/blockchartajaxbars => application/display-block/block-chart-ajax-bars}/layout.js.twig (100%) rename templates/{specific/displayblock/blockchartajaxpie => application/display-block/block-chart-ajax-pie}/layout.js.twig (100%) rename templates/{specific/displayblock/blockchart => application/display-block/block-chart}/layout.html.twig (100%) rename templates/{specific/displayblock/blockchart => application/display-block/block-chart}/layout.js.twig (100%) rename templates/{specific/displayblock/blocklist => application/display-block/block-list}/layout.html.twig (100%) rename templates/{specific/displayblock/blocklist => application/display-block/block-list}/layout.js.twig (100%) rename templates/{ => base}/components/alert/layout.html.twig (100%) rename templates/{ => base}/components/alert/layout.js.twig (100%) rename templates/{ => base}/components/badge/layout.html.twig (66%) rename templates/{ => base}/components/breadcrumbs/layout.html.twig (100%) rename templates/{ => base}/components/breadcrumbs/layout.js.twig (100%) rename templates/{ => base}/components/button/layout.html.twig (100%) rename templates/{ => base}/components/button/layout.js.twig (100%) rename templates/{ => base}/components/dashlet/dashletbadge.html.twig (100%) rename templates/{ => base}/components/dashlet/dashletheaderstatic.html.twig (100%) rename templates/{ => base}/components/dashlet/layout.html.twig (100%) rename templates/{ => base}/components/datatable/config/layout.html.twig (100%) rename templates/{ => base}/components/datatable/layout.html.twig (100%) rename templates/{ => base}/components/datatable/layout.js.twig (100%) rename templates/{ => base}/components/datatable/static/formtable/layout.html.twig (100%) rename templates/{ => base}/components/datatable/static/formtable/layout.js.twig (100%) rename templates/{ => base}/components/datatable/static/formtablerow/layout.html.twig (100%) rename templates/{ => base}/components/datatable/static/formtablerow/layout.js.twig (100%) rename templates/{ => base}/components/datatable/static/layout.html.twig (100%) rename templates/{ => base}/components/datatable/static/layout.js.twig (100%) rename templates/{ => base}/components/field/layout.html.twig (100%) rename templates/{ => base}/components/fieldset/layout.html.twig (100%) rename templates/{ => base}/components/form/layout.html.twig (100%) rename templates/{ => base}/components/global-search/layout.html.twig (100%) rename templates/{ => base}/components/global-search/layout.js.twig (100%) rename templates/{ => base}/components/html/layout.html.twig (100%) rename templates/{ => base}/components/input/inputwithlabel.html.twig (100%) rename templates/{ => base}/components/input/layout.html.twig (100%) rename templates/{ => base}/components/input/richtext/layout.html.twig (71%) rename templates/{ => base}/components/input/richtext/layout.js.twig (100%) rename templates/{ => base}/components/input/select/select.html.twig (87%) rename templates/{ => base}/components/input/select/selectoption.html.twig (100%) rename templates/{ => base}/components/panel/layout.html.twig (100%) rename templates/{ => base}/components/panel/panelenhanced.html.twig (92%) rename templates/{ => base}/components/popover-menu/item/layout.html.twig (100%) rename templates/{ => base}/components/popover-menu/item/mode_js.html.twig (78%) rename templates/{ => base}/components/popover-menu/item/mode_separator.html.twig (62%) rename templates/{ => base}/components/popover-menu/item/mode_url.html.twig (77%) rename templates/{ => base}/components/popover-menu/layout.html.twig (100%) rename templates/{ => base}/components/popover-menu/newsroom-menu/layout.html.twig (100%) rename templates/{ => base}/components/popover-menu/newsroom-menu/layout.js.twig (100%) rename templates/{ => base}/components/quick-create/layout.html.twig (100%) rename templates/{ => base}/components/quick-create/layout.js.twig (100%) rename templates/{ => base}/components/title/layout.html.twig (100%) rename templates/{ => base}/components/title/titleforobjectdetails.html.twig (90%) create mode 100644 templates/base/components/toolbar/layout.html.twig rename templates/{ => base}/layouts/activity-panel/activity-entry/caselog-entry.html.twig (77%) rename templates/{ => base}/layouts/activity-panel/activity-entry/edits-entry.html.twig (92%) rename templates/{ => base}/layouts/activity-panel/activity-entry/layout.html.twig (100%) rename templates/{ => base}/layouts/activity-panel/activity-entry/transition-entry.html.twig (90%) rename templates/{ => base}/layouts/activity-panel/caselog-entry-form/layout.html.twig (100%) rename templates/{ => base}/layouts/activity-panel/caselog-entry-form/layout.js.twig (100%) rename templates/{ => base}/layouts/activity-panel/entry-group.html.twig (100%) rename templates/{ => base}/layouts/activity-panel/layout.html.twig (98%) rename templates/{ => base}/layouts/activity-panel/layout.js.twig (100%) rename templates/{ => base}/layouts/content-block/layout.html.twig (100%) rename templates/{ => base}/layouts/dashboard/column/layout.html.twig (100%) rename templates/{ => base}/layouts/dashboard/layout.html.twig (100%) rename templates/{ => base}/layouts/dashboard/row/layout.html.twig (100%) rename templates/{ => base}/layouts/multi-column/column/layout.html.twig (100%) rename templates/{ => base}/layouts/multi-column/layout.html.twig (100%) rename templates/{ => base}/layouts/navigation-menu/layout.html.twig (96%) rename templates/{ => base}/layouts/navigation-menu/layout.js.twig (100%) rename templates/{ => base}/layouts/navigation-menu/menu-group.html.twig (100%) rename templates/{ => base}/layouts/navigation-menu/menu-node.html.twig (91%) rename templates/{ => base}/layouts/navigation-menu/menu-nodes.html.twig (75%) rename templates/{ => base}/layouts/object/object-details/layout.html.twig (85%) rename templates/{ => base}/layouts/page-content/layout.html.twig (100%) rename templates/{ => base}/layouts/page-content/with-side-content.html.twig (86%) rename templates/{ => base}/layouts/tab-container/layout.html.twig (100%) rename templates/{ => base}/layouts/tab-container/layout.js.twig (100%) rename templates/{ => base}/layouts/tab-container/tab/layout.html.twig (100%) rename templates/{ => base}/layouts/top-bar/layout.html.twig (100%) delete mode 100644 templates/components/toolbar/layout.html.twig diff --git a/application/applicationcontext.class.inc.php b/application/applicationcontext.class.inc.php index e0e6f89a4..a39014ffc 100644 --- a/application/applicationcontext.class.inc.php +++ b/application/applicationcontext.class.inc.php @@ -24,9 +24,9 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -use Combodo\iTop\Application\UI\Component\Input\InputFactory; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Component\Input\InputFactory; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; require_once(APPROOT."/application/utils.inc.php"); diff --git a/application/applicationextension.inc.php b/application/applicationextension.inc.php index 0e226fc75..063e32d3a 100644 --- a/application/applicationextension.inc.php +++ b/application/applicationextension.inc.php @@ -18,7 +18,7 @@ * You should have received a copy of the GNU Affero General Public License */ -use Combodo\iTop\Application\UI\iUIBlock; +use Combodo\iTop\Application\UI\Base\iUIBlock; use Symfony\Component\DependencyInjection\Container; require_once(APPROOT.'application/newsroomprovider.class.inc.php'); diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 161a03a6d..776c95088 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -18,22 +18,22 @@ */ use Combodo\iTop\Application\Search\SearchForm; -use Combodo\iTop\Application\UI\Component\Alert\AlertFactory; -use Combodo\iTop\Application\UI\Component\Button\Button; -use Combodo\iTop\Application\UI\Component\Button\ButtonFactory; -use Combodo\iTop\Application\UI\Component\DataTable\DataTableFactory; -use Combodo\iTop\Application\UI\Component\DataTable\DataTableSettings; -use Combodo\iTop\Application\UI\Component\Field\Field; -use Combodo\iTop\Application\UI\Component\FieldSet\FieldSet; -use Combodo\iTop\Application\UI\Component\Form\Form; -use Combodo\iTop\Application\UI\Component\Input\InputFactory; -use Combodo\iTop\Application\UI\Component\Panel\Panel; -use Combodo\iTop\Application\UI\Component\Title\TitleFactory; -use Combodo\iTop\Application\UI\Component\Toolbar\Toolbar; -use Combodo\iTop\Application\UI\Layout\MultiColumn\Column\Column; -use Combodo\iTop\Application\UI\Layout\MultiColumn\MultiColumn; -use Combodo\iTop\Application\UI\Layout\Object\ObjectFactory; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Component\Alert\AlertFactory; +use Combodo\iTop\Application\UI\Base\Component\Button\Button; +use Combodo\iTop\Application\UI\Base\Component\Button\ButtonFactory; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableFactory; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings; +use Combodo\iTop\Application\UI\Base\Component\Field\Field; +use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSet; +use Combodo\iTop\Application\UI\Base\Component\Form\Form; +use Combodo\iTop\Application\UI\Base\Component\Input\InputFactory; +use Combodo\iTop\Application\UI\Base\Component\Panel\Panel; +use Combodo\iTop\Application\UI\Base\Component\Title\TitleFactory; +use Combodo\iTop\Application\UI\Base\Component\Toolbar\Toolbar; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\Column; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumn; +use Combodo\iTop\Application\UI\Base\Layout\Object\ObjectFactory; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use Combodo\iTop\Renderer\BlockRenderer; use Combodo\iTop\Renderer\Console\ConsoleFormRenderer; diff --git a/application/dashboard.class.inc.php b/application/dashboard.class.inc.php index 3539baa8d..9fe393c3d 100644 --- a/application/dashboard.class.inc.php +++ b/application/dashboard.class.inc.php @@ -17,10 +17,9 @@ * You should have received a copy of the GNU Affero General Public License */ -use Combodo\iTop\Application\UI\Component\Button\ButtonFactory; -use Combodo\iTop\Application\UI\Component\Toolbar\Toolbar; - -use Combodo\iTop\Application\UI\Component\DataTable\DataTableSettings; +use Combodo\iTop\Application\UI\Base\Component\Button\ButtonFactory; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings; +use Combodo\iTop\Application\UI\Base\Component\Toolbar\Toolbar; require_once(APPROOT.'application/dashboardlayout.class.inc.php'); require_once(APPROOT.'application/dashlet.class.inc.php'); diff --git a/application/dashboardlayout.class.inc.php b/application/dashboardlayout.class.inc.php index 6084d3293..0ae5ed152 100644 --- a/application/dashboardlayout.class.inc.php +++ b/application/dashboardlayout.class.inc.php @@ -15,10 +15,10 @@ // // You should have received a copy of the GNU Affero General Public License // along with iTop. If not, see -use Combodo\iTop\Application\UI\Component\Html\Html; -use Combodo\iTop\Application\UI\Layout\Dashboard\DashboardColumn; -use Combodo\iTop\Application\UI\Layout\Dashboard\DashboardLayout as UIDashboardLayout; -use Combodo\iTop\Application\UI\Layout\Dashboard\DashboardRow; +use Combodo\iTop\Application\UI\Base\Component\Html\Html; +use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardColumn; +use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as UIDashboardLayout; +use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardRow; /** * Dashboard presentation diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php index a01cc2873..f6fc7e22a 100644 --- a/application/dashlet.class.inc.php +++ b/application/dashlet.class.inc.php @@ -16,12 +16,12 @@ // You should have received a copy of the GNU Affero General Public License // along with iTop. If not, see -use Combodo\iTop\Application\UI\Component\Dashlet\DashletContainer; -use Combodo\iTop\Application\UI\Component\Dashlet\DashletFactory; -use Combodo\iTop\Application\UI\Component\Html\Html; -use Combodo\iTop\Application\UI\Component\Panel\PanelFactory; -use Combodo\iTop\Application\UI\iUIBlock; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Component\Dashlet\DashletContainer; +use Combodo\iTop\Application\UI\Base\Component\Dashlet\DashletFactory; +use Combodo\iTop\Application\UI\Base\Component\Html\Html; +use Combodo\iTop\Application\UI\Base\Component\Panel\PanelFactory; +use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; require_once(APPROOT.'application/forms.class.inc.php'); diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 034f8a344..a342f3fae 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -18,19 +18,19 @@ */ use Combodo\iTop\Application\Search\SearchForm; -use Combodo\iTop\Application\UI\Component\Alert\AlertFactory; -use Combodo\iTop\Application\UI\Component\Badge\BadgeFactory; -use Combodo\iTop\Application\UI\Component\Button\ButtonFactory; -use Combodo\iTop\Application\UI\Component\Dashlet\DashletFactory; -use Combodo\iTop\Application\UI\Component\DataTable\DataTableFactory; -use Combodo\iTop\Application\UI\Component\Html\Html; -use Combodo\iTop\Application\UI\Component\Toolbar\Toolbar; -use Combodo\iTop\Application\UI\iUIBlock; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; -use Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChart\BlockChart; -use Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChartAjaxBars\BlockChartAjaxBars; -use Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChartAjaxPie\BlockChartAjaxPie; -use Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockList\BlockList; +use Combodo\iTop\Application\UI\Base\Component\Alert\AlertFactory; +use Combodo\iTop\Application\UI\Base\Component\Badge\BadgeFactory; +use Combodo\iTop\Application\UI\Base\Component\Button\ButtonFactory; +use Combodo\iTop\Application\UI\Base\Component\Dashlet\DashletFactory; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableFactory; +use Combodo\iTop\Application\UI\Base\Component\Html\Html; +use Combodo\iTop\Application\UI\Base\Component\Toolbar\Toolbar; +use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\DisplayBlock\BlockChart\BlockChart; +use Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxBars\BlockChartAjaxBars; +use Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxPie\BlockChartAjaxPie; +use Combodo\iTop\Application\UI\DisplayBlock\BlockList\BlockList; require_once(APPROOT.'/application/utils.inc.php'); @@ -313,7 +313,7 @@ HTML; * @param array $aExtraParams * @param $sId * - * @return \Combodo\iTop\Application\UI\iUIBlock + * @return \Combodo\iTop\Application\UI\Base\iUIBlock * @throws ApplicationException * @throws CoreException * @throws CoreWarning @@ -868,7 +868,7 @@ JS * @param array $aExtraParams * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\iUIBlock + * @return \Combodo\iTop\Application\UI\Base\iUIBlock * @throws \ArchivedObjectException * @throws \CoreException * @throws \MissingQueryArgument @@ -944,7 +944,7 @@ JS * @param string|null $sId * @param array $aExtraParams * - * @return \Combodo\iTop\Application\UI\iUIBlock + * @return \Combodo\iTop\Application\UI\Base\iUIBlock */ protected function RenderSearch(WebPage $oPage, ?string $sId, array $aExtraParams): iUIBlock { @@ -1069,7 +1069,7 @@ JS * @param array $aExtraParams * @param \WebPage $oPage * - * @return \Combodo\iTop\Application\UI\Layout\UIContentBlock + * @return \Combodo\iTop\Application\UI\Base\Layout\UIContentBlock * @throws \ApplicationException * @throws \ArchivedObjectException * @throws \CoreException @@ -1215,7 +1215,7 @@ JS * * @param array $aExtraParams * - * @return \Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChart\BlockChart + * @return \Combodo\iTop\Application\UI\DisplayBlock\BlockChart\BlockChart * @throws \ArchivedObjectException * @throws \CoreException */ @@ -1480,7 +1480,7 @@ class MenuBlock extends DisplayBlock * @param array $aExtraParams * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\iUIBlock + * @return \Combodo\iTop\Application\UI\Base\iUIBlock * @throws \ArchivedObjectException * @throws \CoreException * @throws \CoreUnexpectedValue diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php index c2343cd01..65eb515d4 100644 --- a/application/menunode.class.inc.php +++ b/application/menunode.class.inc.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -use Combodo\iTop\Application\UI\Component\Title\TitleFactory; +use Combodo\iTop\Application\UI\Base\Component\Title\TitleFactory; require_once(APPROOT.'/application/utils.inc.php'); require_once(APPROOT.'/application/template.class.inc.php'); diff --git a/application/shortcut.class.inc.php b/application/shortcut.class.inc.php index 1453966c9..6332df7ab 100644 --- a/application/shortcut.class.inc.php +++ b/application/shortcut.class.inc.php @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU Affero General Public License // along with iTop. If not, see -use Combodo\iTop\Application\UI\Component\DataTable\DataTableSettings; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings; /** diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php index aab215339..7d7894468 100644 --- a/application/ui.linkswidget.class.inc.php +++ b/application/ui.linkswidget.class.inc.php @@ -24,8 +24,8 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -use Combodo\iTop\Application\UI\Component\DataTable\DataTableFactory; -use Combodo\iTop\Application\UI\Component\DataTable\StaticTable\FormTableRow\FormTableRow; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableFactory; +use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTableRow\FormTableRow; use Combodo\iTop\Renderer\BlockRenderer; require_once(APPROOT.'application/displayblock.class.inc.php'); diff --git a/application/utils.inc.php b/application/utils.inc.php index 52bf7ac24..78e848f09 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use ScssPhp\ScssPhp\Compiler; @@ -1180,7 +1180,7 @@ class utils * @param array $aActions * @param string|null $sDataTableId * - * @return \Combodo\iTop\Application\UI\Layout\UIContentBlock + * @return \Combodo\iTop\Application\UI\Base\Layout\UIContentBlock * @throws \ArchivedObjectException * @throws \CoreException */ diff --git a/css/backoffice/specific/_all.scss b/css/backoffice/application/_all.scss similarity index 80% rename from css/backoffice/specific/_all.scss rename to css/backoffice/application/_all.scss index 7becb69fc..2a658bc1a 100644 --- a/css/backoffice/specific/_all.scss +++ b/css/backoffice/application/_all.scss @@ -3,4 +3,4 @@ * license http://opensource.org/licenses/AGPL-3.0 */ -@import "displayblock/all"; \ No newline at end of file +@import "display-block/all"; \ No newline at end of file diff --git a/css/backoffice/specific/displayblock/_all.scss b/css/backoffice/application/display-block/_all.scss similarity index 100% rename from css/backoffice/specific/displayblock/_all.scss rename to css/backoffice/application/display-block/_all.scss diff --git a/css/backoffice/base/_all.scss b/css/backoffice/base/_all.scss index f8b845434..b4c1152e4 100644 --- a/css/backoffice/base/_all.scss +++ b/css/backoffice/base/_all.scss @@ -17,4 +17,6 @@ */ @import "base"; -@import "typography"; \ No newline at end of file +@import "typography"; +@import "components/all"; +@import "layout/all"; \ No newline at end of file diff --git a/css/backoffice/components/_alert.scss b/css/backoffice/base/components/_alert.scss similarity index 100% rename from css/backoffice/components/_alert.scss rename to css/backoffice/base/components/_alert.scss diff --git a/css/backoffice/components/_all.scss b/css/backoffice/base/components/_all.scss similarity index 100% rename from css/backoffice/components/_all.scss rename to css/backoffice/base/components/_all.scss diff --git a/css/backoffice/components/_badge.scss b/css/backoffice/base/components/_badge.scss similarity index 100% rename from css/backoffice/components/_badge.scss rename to css/backoffice/base/components/_badge.scss diff --git a/css/backoffice/components/_breadcrumbs.scss b/css/backoffice/base/components/_breadcrumbs.scss similarity index 100% rename from css/backoffice/components/_breadcrumbs.scss rename to css/backoffice/base/components/_breadcrumbs.scss diff --git a/css/backoffice/components/_button.scss b/css/backoffice/base/components/_button.scss similarity index 100% rename from css/backoffice/components/_button.scss rename to css/backoffice/base/components/_button.scss diff --git a/css/backoffice/components/_datatable.scss b/css/backoffice/base/components/_datatable.scss similarity index 100% rename from css/backoffice/components/_datatable.scss rename to css/backoffice/base/components/_datatable.scss diff --git a/css/backoffice/components/_field.scss b/css/backoffice/base/components/_field.scss similarity index 100% rename from css/backoffice/components/_field.scss rename to css/backoffice/base/components/_field.scss diff --git a/css/backoffice/components/_fieldset.scss b/css/backoffice/base/components/_fieldset.scss similarity index 100% rename from css/backoffice/components/_fieldset.scss rename to css/backoffice/base/components/_fieldset.scss diff --git a/css/backoffice/components/_form.scss b/css/backoffice/base/components/_form.scss similarity index 100% rename from css/backoffice/components/_form.scss rename to css/backoffice/base/components/_form.scss diff --git a/css/backoffice/components/_formtable.scss b/css/backoffice/base/components/_formtable.scss similarity index 100% rename from css/backoffice/components/_formtable.scss rename to css/backoffice/base/components/_formtable.scss diff --git a/css/backoffice/components/_formtablerow.scss b/css/backoffice/base/components/_formtablerow.scss similarity index 100% rename from css/backoffice/components/_formtablerow.scss rename to css/backoffice/base/components/_formtablerow.scss diff --git a/css/backoffice/components/_global-search.scss b/css/backoffice/base/components/_global-search.scss similarity index 100% rename from css/backoffice/components/_global-search.scss rename to css/backoffice/base/components/_global-search.scss diff --git a/css/backoffice/components/_modal.scss b/css/backoffice/base/components/_modal.scss similarity index 100% rename from css/backoffice/components/_modal.scss rename to css/backoffice/base/components/_modal.scss diff --git a/css/backoffice/components/_newsroom-menu.scss b/css/backoffice/base/components/_newsroom-menu.scss similarity index 100% rename from css/backoffice/components/_newsroom-menu.scss rename to css/backoffice/base/components/_newsroom-menu.scss diff --git a/css/backoffice/components/_panel.scss b/css/backoffice/base/components/_panel.scss similarity index 100% rename from css/backoffice/components/_panel.scss rename to css/backoffice/base/components/_panel.scss diff --git a/css/backoffice/components/_quick-create.scss b/css/backoffice/base/components/_quick-create.scss similarity index 100% rename from css/backoffice/components/_quick-create.scss rename to css/backoffice/base/components/_quick-create.scss diff --git a/css/backoffice/components/_richtext.scss b/css/backoffice/base/components/_richtext.scss similarity index 100% rename from css/backoffice/components/_richtext.scss rename to css/backoffice/base/components/_richtext.scss diff --git a/css/backoffice/components/_search-form.scss b/css/backoffice/base/components/_search-form.scss similarity index 100% rename from css/backoffice/components/_search-form.scss rename to css/backoffice/base/components/_search-form.scss diff --git a/css/backoffice/components/_title.scss b/css/backoffice/base/components/_title.scss similarity index 100% rename from css/backoffice/components/_title.scss rename to css/backoffice/base/components/_title.scss diff --git a/css/backoffice/components/_toolbar.scss b/css/backoffice/base/components/_toolbar.scss similarity index 100% rename from css/backoffice/components/_toolbar.scss rename to css/backoffice/base/components/_toolbar.scss diff --git a/css/backoffice/components/dashlet/_all.scss b/css/backoffice/base/components/dashlet/_all.scss similarity index 100% rename from css/backoffice/components/dashlet/_all.scss rename to css/backoffice/base/components/dashlet/_all.scss diff --git a/css/backoffice/components/dashlet/_dashlet-badge.scss b/css/backoffice/base/components/dashlet/_dashlet-badge.scss similarity index 100% rename from css/backoffice/components/dashlet/_dashlet-badge.scss rename to css/backoffice/base/components/dashlet/_dashlet-badge.scss diff --git a/css/backoffice/components/dashlet/_dashlet-header-dynamic.scss b/css/backoffice/base/components/dashlet/_dashlet-header-dynamic.scss similarity index 100% rename from css/backoffice/components/dashlet/_dashlet-header-dynamic.scss rename to css/backoffice/base/components/dashlet/_dashlet-header-dynamic.scss diff --git a/css/backoffice/components/dashlet/_dashlet-header-static.scss b/css/backoffice/base/components/dashlet/_dashlet-header-static.scss similarity index 100% rename from css/backoffice/components/dashlet/_dashlet-header-static.scss rename to css/backoffice/base/components/dashlet/_dashlet-header-static.scss diff --git a/css/backoffice/components/dashlet/_dashlet.scss b/css/backoffice/base/components/dashlet/_dashlet.scss similarity index 100% rename from css/backoffice/components/dashlet/_dashlet.scss rename to css/backoffice/base/components/dashlet/_dashlet.scss diff --git a/css/backoffice/components/input/_all.scss b/css/backoffice/base/components/input/_all.scss similarity index 100% rename from css/backoffice/components/input/_all.scss rename to css/backoffice/base/components/input/_all.scss diff --git a/css/backoffice/components/input/_input-date.scss b/css/backoffice/base/components/input/_input-date.scss similarity index 100% rename from css/backoffice/components/input/_input-date.scss rename to css/backoffice/base/components/input/_input-date.scss diff --git a/css/backoffice/components/input/_input-datetime.scss b/css/backoffice/base/components/input/_input-datetime.scss similarity index 100% rename from css/backoffice/components/input/_input-datetime.scss rename to css/backoffice/base/components/input/_input-datetime.scss diff --git a/css/backoffice/components/input/_input-duration.scss b/css/backoffice/base/components/input/_input-duration.scss similarity index 100% rename from css/backoffice/components/input/_input-duration.scss rename to css/backoffice/base/components/input/_input-duration.scss diff --git a/css/backoffice/components/input/_input-select.scss b/css/backoffice/base/components/input/_input-select.scss similarity index 100% rename from css/backoffice/components/input/_input-select.scss rename to css/backoffice/base/components/input/_input-select.scss diff --git a/css/backoffice/components/input/_input-string.scss b/css/backoffice/base/components/input/_input-string.scss similarity index 100% rename from css/backoffice/components/input/_input-string.scss rename to css/backoffice/base/components/input/_input-string.scss diff --git a/css/backoffice/components/input/_input-tagset.scss b/css/backoffice/base/components/input/_input-tagset.scss similarity index 100% rename from css/backoffice/components/input/_input-tagset.scss rename to css/backoffice/base/components/input/_input-tagset.scss diff --git a/css/backoffice/components/input/_input.scss b/css/backoffice/base/components/input/_input.scss similarity index 100% rename from css/backoffice/components/input/_input.scss rename to css/backoffice/base/components/input/_input.scss diff --git a/css/backoffice/components/popover-menu/_popover-menu-item.scss b/css/backoffice/base/components/popover-menu/_popover-menu-item.scss similarity index 100% rename from css/backoffice/components/popover-menu/_popover-menu-item.scss rename to css/backoffice/base/components/popover-menu/_popover-menu-item.scss diff --git a/css/backoffice/components/popover-menu/_popover-menu.scss b/css/backoffice/base/components/popover-menu/_popover-menu.scss similarity index 100% rename from css/backoffice/components/popover-menu/_popover-menu.scss rename to css/backoffice/base/components/popover-menu/_popover-menu.scss diff --git a/css/backoffice/layout/_all.scss b/css/backoffice/base/layout/_all.scss similarity index 100% rename from css/backoffice/layout/_all.scss rename to css/backoffice/base/layout/_all.scss diff --git a/css/backoffice/layout/_content.scss b/css/backoffice/base/layout/_content.scss similarity index 100% rename from css/backoffice/layout/_content.scss rename to css/backoffice/base/layout/_content.scss diff --git a/css/backoffice/layout/_navigation-menu.scss b/css/backoffice/base/layout/_navigation-menu.scss similarity index 100% rename from css/backoffice/layout/_navigation-menu.scss rename to css/backoffice/base/layout/_navigation-menu.scss diff --git a/css/backoffice/layout/_object-details.scss b/css/backoffice/base/layout/_object-details.scss similarity index 100% rename from css/backoffice/layout/_object-details.scss rename to css/backoffice/base/layout/_object-details.scss diff --git a/css/backoffice/layout/_top-bar.scss b/css/backoffice/base/layout/_top-bar.scss similarity index 100% rename from css/backoffice/layout/_top-bar.scss rename to css/backoffice/base/layout/_top-bar.scss diff --git a/css/backoffice/layout/activity-panel/_activity-entry.scss b/css/backoffice/base/layout/activity-panel/_activity-entry.scss similarity index 100% rename from css/backoffice/layout/activity-panel/_activity-entry.scss rename to css/backoffice/base/layout/activity-panel/_activity-entry.scss diff --git a/css/backoffice/layout/activity-panel/_activity-panel.scss b/css/backoffice/base/layout/activity-panel/_activity-panel.scss similarity index 100% rename from css/backoffice/layout/activity-panel/_activity-panel.scss rename to css/backoffice/base/layout/activity-panel/_activity-panel.scss diff --git a/css/backoffice/layout/activity-panel/_caselog-entry-form.scss b/css/backoffice/base/layout/activity-panel/_caselog-entry-form.scss similarity index 100% rename from css/backoffice/layout/activity-panel/_caselog-entry-form.scss rename to css/backoffice/base/layout/activity-panel/_caselog-entry-form.scss diff --git a/css/backoffice/layout/activity-panel/_caselog-entry.scss b/css/backoffice/base/layout/activity-panel/_caselog-entry.scss similarity index 100% rename from css/backoffice/layout/activity-panel/_caselog-entry.scss rename to css/backoffice/base/layout/activity-panel/_caselog-entry.scss diff --git a/css/backoffice/layout/activity-panel/_edits-entry.scss b/css/backoffice/base/layout/activity-panel/_edits-entry.scss similarity index 100% rename from css/backoffice/layout/activity-panel/_edits-entry.scss rename to css/backoffice/base/layout/activity-panel/_edits-entry.scss diff --git a/css/backoffice/layout/activity-panel/_transition-entry.scss b/css/backoffice/base/layout/activity-panel/_transition-entry.scss similarity index 100% rename from css/backoffice/layout/activity-panel/_transition-entry.scss rename to css/backoffice/base/layout/activity-panel/_transition-entry.scss diff --git a/css/backoffice/layout/blocks-integrations/_panel-with-tab-container.scss b/css/backoffice/base/layout/blocks-integrations/_panel-with-tab-container.scss similarity index 100% rename from css/backoffice/layout/blocks-integrations/_panel-with-tab-container.scss rename to css/backoffice/base/layout/blocks-integrations/_panel-with-tab-container.scss diff --git a/css/backoffice/layout/dashboard/_dashboard.scss b/css/backoffice/base/layout/dashboard/_dashboard.scss similarity index 100% rename from css/backoffice/layout/dashboard/_dashboard.scss rename to css/backoffice/base/layout/dashboard/_dashboard.scss diff --git a/css/backoffice/layout/multi-column/_column.scss b/css/backoffice/base/layout/multi-column/_column.scss similarity index 100% rename from css/backoffice/layout/multi-column/_column.scss rename to css/backoffice/base/layout/multi-column/_column.scss diff --git a/css/backoffice/layout/multi-column/_multi-column.scss b/css/backoffice/base/layout/multi-column/_multi-column.scss similarity index 100% rename from css/backoffice/layout/multi-column/_multi-column.scss rename to css/backoffice/base/layout/multi-column/_multi-column.scss diff --git a/css/backoffice/layout/tab-container/_tab-container.scss b/css/backoffice/base/layout/tab-container/_tab-container.scss similarity index 100% rename from css/backoffice/layout/tab-container/_tab-container.scss rename to css/backoffice/base/layout/tab-container/_tab-container.scss diff --git a/css/backoffice/layout/tab-container/_tab.scss b/css/backoffice/base/layout/tab-container/_tab.scss similarity index 100% rename from css/backoffice/layout/tab-container/_tab.scss rename to css/backoffice/base/layout/tab-container/_tab.scss diff --git a/css/backoffice/main.scss b/css/backoffice/main.scss index 53c1133ad..51f544094 100644 --- a/css/backoffice/main.scss +++ b/css/backoffice/main.scss @@ -19,8 +19,6 @@ @import "utils/all"; @import "vendors/all"; @import "base/all"; -@import "components/all"; -@import "layout/all"; @import "pages/all"; -@import "specific/all"; +@import "application/all"; @import "themes/all"; diff --git a/datamodels/2.x/itop-config/config.php b/datamodels/2.x/itop-config/config.php index b2ab4ff82..7e2107ccd 100644 --- a/datamodels/2.x/itop-config/config.php +++ b/datamodels/2.x/itop-config/config.php @@ -24,12 +24,12 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -use Combodo\iTop\Application\UI\Component\Alert\AlertFactory; -use Combodo\iTop\Application\UI\Component\Button\ButtonFactory; -use Combodo\iTop\Application\UI\Component\Form\Form; -use Combodo\iTop\Application\UI\Component\Html\Html; -use Combodo\iTop\Application\UI\Component\Input\InputFactory; -use Combodo\iTop\Application\UI\Component\Title\TitleFactory; +use Combodo\iTop\Application\UI\Base\Component\Alert\AlertFactory; +use Combodo\iTop\Application\UI\Base\Component\Button\ButtonFactory; +use Combodo\iTop\Application\UI\Base\Component\Form\Form; +use Combodo\iTop\Application\UI\Base\Component\Html\Html; +use Combodo\iTop\Application\UI\Base\Component\Input\InputFactory; +use Combodo\iTop\Application\UI\Base\Component\Title\TitleFactory; use Combodo\iTop\Config\Validator\iTopConfigAstValidator; use Combodo\iTop\Config\Validator\iTopConfigSyntaxValidator; diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 5b195a09c..a51db6265 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -147,105 +147,103 @@ return array( 'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToSearchForm' => $baseDir . '/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php', 'Combodo\\iTop\\Application\\Search\\CriterionParser' => $baseDir . '/sources/application/search/criterionparser.class.inc.php', 'Combodo\\iTop\\Application\\Search\\SearchForm' => $baseDir . '/sources/application/search/searchform.class.inc.php', - 'Combodo\\iTop\\Application\\Specific\\DisplayBlock\\DisplayBlockFactory' => $baseDir . '/sources/application/UI/Specific/DisplayBlock/DisplayBlockFactory.php', 'Combodo\\iTop\\Application\\TwigBase\\Controller\\Controller' => $baseDir . '/sources/application/TwigBase/Controller/Controller.php', 'Combodo\\iTop\\Application\\TwigBase\\Controller\\PageNotFoundException' => $baseDir . '/sources/application/TwigBase/Controller/Controller.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => $baseDir . '/sources/application/TwigBase/Twig/Extension.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\TwigHelper' => $baseDir . '/sources/application/TwigBase/Twig/TwigHelper.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Alert\\Alert' => $baseDir . '/sources/application/UI/Component/Alert/Alert.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Alert\\AlertFactory' => $baseDir . '/sources/application/UI/Component/Alert/AlertFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Badge\\Badge' => $baseDir . '/sources/application/UI/Component/Badge/Badge.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Badge\\BadgeFactory' => $baseDir . '/sources/application/UI/Component/Badge/BadgeFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Breadcrumbs\\Breadcrumbs' => $baseDir . '/sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Button\\Button' => $baseDir . '/sources/application/UI/Component/Button/Button.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Button\\ButtonFactory' => $baseDir . '/sources/application/UI/Component/Button/ButtonFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Dashlet\\DashletBadge' => $baseDir . '/sources/application/UI/Component/Dashlet/DashletBadge.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Dashlet\\DashletContainer' => $baseDir . '/sources/application/UI/Component/Dashlet/DashletContainer.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Dashlet\\DashletFactory' => $baseDir . '/sources/application/UI/Component/Dashlet/DashletFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Dashlet\\DashletHeaderStatic' => $baseDir . '/sources/application/UI/Component/Dashlet/DashletHeaderStatic.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\DataTableBlock' => $baseDir . '/sources/application/UI/Component/DataTable/DataTable.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\DataTableFactory' => $baseDir . '/sources/application/UI/Component/DataTable/DataTableFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\DataTableSettings' => $baseDir . '/sources/application/UI/Component/DataTable/DataTableSettings.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\StaticTable\\FormTableRow\\FormTableRow' => $baseDir . '/sources/application/UI/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\StaticTable\\FormTable\\FormTable' => $baseDir . '/sources/application/UI/Component/DataTable/StaticTable/FormTable/FormTable.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\StaticTable\\StaticTable' => $baseDir . '/sources/application/UI/Component/DataTable/StaticTable/StaticTable.php', - 'Combodo\\iTop\\Application\\UI\\Component\\FieldSet\\FieldSet' => $baseDir . '/sources/application/UI/Component/FieldSet/FieldSet.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Field\\Field' => $baseDir . '/sources/application/UI/Component/Field/Field.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Form\\Form' => $baseDir . '/sources/application/UI/Component/Form/Form.php', - 'Combodo\\iTop\\Application\\UI\\Component\\GlobalSearch\\GlobalSearch' => $baseDir . '/sources/application/UI/Component/GlobalSearch/GlobalSearch.php', - 'Combodo\\iTop\\Application\\UI\\Component\\GlobalSearch\\GlobalSearchFactory' => $baseDir . '/sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\GlobalSearch\\GlobalSearchHelper' => $baseDir . '/sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Html\\Html' => $baseDir . '/sources/application/UI/Component/Html/Html.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\Input' => $baseDir . '/sources/application/UI/Component/Input/Input.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\InputFactory' => $baseDir . '/sources/application/UI/Component/Input/InputFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\InputWithLabel' => $baseDir . '/sources/application/UI/Component/Input/InputWithLabel.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\RichText\\RichText' => $baseDir . '/sources/application/UI/Component/Input/RichText/RichText.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select\\Select' => $baseDir . '/sources/application/UI/Component/Input/Select/Select.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select\\SelectOption' => $baseDir . '/sources/application/UI/Component/Input/Select/SelectOption.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Panel\\Panel' => $baseDir . '/sources/application/UI/Component/Panel/Panel.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Panel\\PanelEnhanced' => $baseDir . '/sources/application/UI/Component/Panel/PanelEnhanced.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Panel\\PanelFactory' => $baseDir . '/sources/application/UI/Component/Panel/PanelFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenu' => $baseDir . '/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenuFactory' => $baseDir . '/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenu' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenu.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuFactory' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\JsPopoverMenuItem' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItem' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItemFactory' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\SeparatorPopoverMenuItem' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\UrlPopoverMenuItem' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php', - 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreate' => $baseDir . '/sources/application/UI/Component/QuickCreate/QuickCreate.php', - 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreateFactory' => $baseDir . '/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreateHelper' => $baseDir . '/sources/application/UI/Component/QuickCreate/QuickCreateHelper.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Title\\Title' => $baseDir . '/sources/application/UI/Component/Title/Title.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Title\\TitleFactory' => $baseDir . '/sources/application/UI/Component/Title/TitleFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Title\\TitleForObjectDetails' => $baseDir . '/sources/application/UI/Component/Title/TitleForObjectDetails.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Toolbar\\Toolbar' => $baseDir . '/sources/application/UI/Component/Toolbar/Toolbar.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Alert\\Alert' => $baseDir . '/sources/application/UI/Base/Component/Alert/Alert.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Alert\\AlertFactory' => $baseDir . '/sources/application/UI/Base/Component/Alert/AlertFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Badge\\Badge' => $baseDir . '/sources/application/UI/Base/Component/Badge/Badge.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Badge\\BadgeFactory' => $baseDir . '/sources/application/UI/Base/Component/Badge/BadgeFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Breadcrumbs\\Breadcrumbs' => $baseDir . '/sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\Button' => $baseDir . '/sources/application/UI/Base/Component/Button/Button.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonFactory' => $baseDir . '/sources/application/UI/Base/Component/Button/ButtonFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletBadge' => $baseDir . '/sources/application/UI/Base/Component/Dashlet/DashletBadge.php', + '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\\DataTable\\DataTableBlock' => $baseDir . '/sources/application/UI/Base/Component/DataTable/DataTable.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableFactory' => $baseDir . '/sources/application/UI/Base/Component/DataTable/DataTableFactory.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\\StaticTable\\FormTableRow\\FormTableRow' => $baseDir . '/sources/application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\StaticTable\\FormTable\\FormTable' => $baseDir . '/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\StaticTable\\StaticTable' => $baseDir . '/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\FieldSet\\FieldSet' => $baseDir . '/sources/application/UI/Base/Component/FieldSet/FieldSet.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Field\\Field' => $baseDir . '/sources/application/UI/Base/Component/Field/Field.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Form\\Form' => $baseDir . '/sources/application/UI/Base/Component/Form/Form.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\GlobalSearch\\GlobalSearch' => $baseDir . '/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\GlobalSearch\\GlobalSearchFactory' => $baseDir . '/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\GlobalSearch\\GlobalSearchHelper' => $baseDir . '/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Html\\Html' => $baseDir . '/sources/application/UI/Base/Component/Html/Html.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Input' => $baseDir . '/sources/application/UI/Base/Component/Input/Input.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\InputFactory' => $baseDir . '/sources/application/UI/Base/Component/Input/InputFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\InputWithLabel' => $baseDir . '/sources/application/UI/Base/Component/Input/InputWithLabel.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\RichText\\RichText' => $baseDir . '/sources/application/UI/Base/Component/Input/RichText/RichText.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\Select' => $baseDir . '/sources/application/UI/Base/Component/Input/Select/Select.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\SelectOption' => $baseDir . '/sources/application/UI/Base/Component/Input/Select/SelectOption.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Panel\\Panel' => $baseDir . '/sources/application/UI/Base/Component/Panel/Panel.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Panel\\PanelEnhanced' => $baseDir . '/sources/application/UI/Base/Component/Panel/PanelEnhanced.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Panel\\PanelFactory' => $baseDir . '/sources/application/UI/Base/Component/Panel/PanelFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenu' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenuFactory' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenu' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuFactory' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\JsPopoverMenuItem' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItem' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItemFactory' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\SeparatorPopoverMenuItem' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\UrlPopoverMenuItem' => $baseDir . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreate' => $baseDir . '/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreateFactory' => $baseDir . '/sources/application/UI/Base/Component/QuickCreate/QuickCreateFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreateHelper' => $baseDir . '/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\Title' => $baseDir . '/sources/application/UI/Base/Component/Title/Title.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\TitleFactory' => $baseDir . '/sources/application/UI/Base/Component/Title/TitleFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\TitleForObjectDetails' => $baseDir . '/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Toolbar\\Toolbar' => $baseDir . '/sources/application/UI/Base/Component/Toolbar/Toolbar.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\ActivityEntry' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\ActivityEntryFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpAttachmentAddedFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpAttachmentRemovedFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpCreateFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpDeleteFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpSetAttributeFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpSetAttributeScalarFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CaseLogEntry' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\EditsEntry' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\TransitionEntry' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanel' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryFormFactory\\CaseLogEntryFormFactory' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryForm\\CaseLogEntryForm' => $baseDir . '/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardColumn' => $baseDir . '/sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardLayout' => $baseDir . '/sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => $baseDir . '/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\Column' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumn' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenu' => $baseDir . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenuFactory' => $baseDir . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Object\\ObjectDetails' => $baseDir . '/sources/application/UI/Base/Layout/Object/ObjectDetails.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Object\\ObjectFactory' => $baseDir . '/sources/application/UI/Base/Layout/Object/ObjectFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\PageContent\\PageContent' => $baseDir . '/sources/application/UI/Base/Layout/PageContent/PageContent.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\PageContent\\PageContentFactory' => $baseDir . '/sources/application/UI/Base/Layout/PageContent/PageContentFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\PageContent\\PageContentWithSideContent' => $baseDir . '/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TabContainer\\TabContainer' => $baseDir . '/sources/application/UI/Base/Layout/TabContainer/TabContainer.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TabContainer\\Tab\\AjaxTab' => $baseDir . '/sources/application/UI/Base/Layout/TabContainer/Tab/AjaxTab.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TabContainer\\Tab\\Tab' => $baseDir . '/sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBar' => $baseDir . '/sources/application/UI/Base/Layout/TopBar/TopBar.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarFactory' => $baseDir . '/sources/application/UI/Base/Layout/TopBar/TopBarFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\UIContentBlock' => $baseDir . '/sources/application/UI/Base/Layout/UIContentBlock.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\iUIContentBlock' => $baseDir . '/sources/application/UI/Base/Layout/iUIContentBlock.php', + 'Combodo\\iTop\\Application\\UI\\Base\\UIBlock' => $baseDir . '/sources/application/UI/Base/UIBlock.php', + 'Combodo\\iTop\\Application\\UI\\Base\\UIException' => $baseDir . '/sources/application/UI/Base/UIException.php', + 'Combodo\\iTop\\Application\\UI\\Base\\iUIBlock' => $baseDir . '/sources/application/UI/Base/iUIBlock.php', + 'Combodo\\iTop\\Application\\UI\\Base\\tUIContentAreas' => $baseDir . '/sources/application/UI/Base/tUIContentAreas.php', + 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockChartAjaxBars\\BlockChartAjaxBars' => $baseDir . '/sources/application/UI/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php', + 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockChartAjaxPie\\BlockChartAjaxPie' => $baseDir . '/sources/application/UI/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php', + 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockChart\\BlockChart' => $baseDir . '/sources/application/UI/DisplayBlock/BlockChart/BlockChart.php', + 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockList\\BlockList' => $baseDir . '/sources/application/UI/DisplayBlock/BlockList/BlockList.php', 'Combodo\\iTop\\Application\\UI\\Helper\\UIHelper' => $baseDir . '/sources/application/UI/Helper/UIHelper.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\ActivityEntry' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\ActivityEntryFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpAttachmentAddedFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpAttachmentRemovedFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpCreateFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpDeleteFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpSetAttributeFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpSetAttributeScalarFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CaseLogEntry' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\EditsEntry' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\TransitionEntry' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityPanel' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityPanelFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\CaseLogEntryFormFactory\\CaseLogEntryFormFactory' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\CaseLogEntryForm\\CaseLogEntryForm' => $baseDir . '/sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Dashboard\\DashboardColumn' => $baseDir . '/sources/application/UI/Layout/Dashboard/DashboardColumn.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Dashboard\\DashboardLayout' => $baseDir . '/sources/application/UI/Layout/Dashboard/DashboardLayout.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Dashboard\\DashboardRow' => $baseDir . '/sources/application/UI/Layout/Dashboard/DashboardRow.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\MultiColumn\\Column\\Column' => $baseDir . '/sources/application/UI/Layout/MultiColumn/Column/Column.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\MultiColumn\\MultiColumn' => $baseDir . '/sources/application/UI/Layout/MultiColumn/MultiColumn.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\NavigationMenu\\NavigationMenu' => $baseDir . '/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\NavigationMenu\\NavigationMenuFactory' => $baseDir . '/sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Object\\ObjectDetails' => $baseDir . '/sources/application/UI/Layout/Object/ObjectDetails.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Object\\ObjectFactory' => $baseDir . '/sources/application/UI/Layout/Object/ObjectFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\PageContent\\PageContent' => $baseDir . '/sources/application/UI/Layout/PageContent/PageContent.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\PageContent\\PageContentFactory' => $baseDir . '/sources/application/UI/Layout/PageContent/PageContentFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\PageContent\\PageContentWithSideContent' => $baseDir . '/sources/application/UI/Layout/PageContent/PageContentWithSideContent.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TabContainer\\TabContainer' => $baseDir . '/sources/application/UI/Layout/TabContainer/TabContainer.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TabContainer\\Tab\\AjaxTab' => $baseDir . '/sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TabContainer\\Tab\\Tab' => $baseDir . '/sources/application/UI/Layout/TabContainer/Tab/Tab.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TopBar\\TopBar' => $baseDir . '/sources/application/UI/Layout/TopBar/TopBar.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TopBar\\TopBarFactory' => $baseDir . '/sources/application/UI/Layout/TopBar/TopBarFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\UIContentBlock' => $baseDir . '/sources/application/UI/Layout/UIContentBlock.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\iUIContentBlock' => $baseDir . '/sources/application/UI/Layout/iUIContentBlock.php', - 'Combodo\\iTop\\Application\\UI\\Specific\\DisplayBlock\\BlockChartAjaxBars\\BlockChartAjaxBars' => $baseDir . '/sources/application/UI/Specific/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php', - 'Combodo\\iTop\\Application\\UI\\Specific\\DisplayBlock\\BlockChartAjaxPie\\BlockChartAjaxPie' => $baseDir . '/sources/application/UI/Specific/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php', - 'Combodo\\iTop\\Application\\UI\\Specific\\DisplayBlock\\BlockChart\\BlockChart' => $baseDir . '/sources/application/UI/Specific/DisplayBlock/BlockChart/BlockChart.php', - 'Combodo\\iTop\\Application\\UI\\Specific\\DisplayBlock\\BlockList\\BlockList' => $baseDir . '/sources/application/UI/Specific/DisplayBlock/BlockList/BlockList.php', - 'Combodo\\iTop\\Application\\UI\\UIBlock' => $baseDir . '/sources/application/UI/UIBlock.php', - 'Combodo\\iTop\\Application\\UI\\UIException' => $baseDir . '/sources/application/UI/UIException.php', - 'Combodo\\iTop\\Application\\UI\\iUIBlock' => $baseDir . '/sources/application/UI/iUIBlock.php', - 'Combodo\\iTop\\Application\\UI\\tBlockParams' => $baseDir . '/sources/application/UI/tBlockParams.php', - 'Combodo\\iTop\\Application\\UI\\tUIContentAreas' => $baseDir . '/sources/application/UI/tUIContentAreas.php', 'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php', 'Combodo\\iTop\\Controller\\AjaxRenderController' => $baseDir . '/sources/Controller/AjaxRenderController.php', 'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php', @@ -345,7 +343,7 @@ return array( 'DashletProxy' => $baseDir . '/application/dashlet.class.inc.php', 'DashletUnknown' => $baseDir . '/application/dashlet.class.inc.php', 'DataTable' => $baseDir . '/application/datatable.class.inc.php', - 'DataTableConfig' => $baseDir . '/sources/application/UI/Component/DataTable/DataTableConfig/DataTableConfig.php', + 'DataTableConfig' => $baseDir . '/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php', 'Datamatrix' => $vendorDir . '/combodo/tcpdf/include/barcodes/datamatrix.php', 'DateTimeFormat' => $baseDir . '/core/datetimeformat.class.inc.php', 'DeadLockLog' => $baseDir . '/core/log.class.inc.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 280cc340e..babc52c82 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -377,105 +377,103 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToSearchForm' => __DIR__ . '/../..' . '/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php', 'Combodo\\iTop\\Application\\Search\\CriterionParser' => __DIR__ . '/../..' . '/sources/application/search/criterionparser.class.inc.php', 'Combodo\\iTop\\Application\\Search\\SearchForm' => __DIR__ . '/../..' . '/sources/application/search/searchform.class.inc.php', - 'Combodo\\iTop\\Application\\Specific\\DisplayBlock\\DisplayBlockFactory' => __DIR__ . '/../..' . '/sources/application/UI/Specific/DisplayBlock/DisplayBlockFactory.php', 'Combodo\\iTop\\Application\\TwigBase\\Controller\\Controller' => __DIR__ . '/../..' . '/sources/application/TwigBase/Controller/Controller.php', 'Combodo\\iTop\\Application\\TwigBase\\Controller\\PageNotFoundException' => __DIR__ . '/../..' . '/sources/application/TwigBase/Controller/Controller.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => __DIR__ . '/../..' . '/sources/application/TwigBase/Twig/Extension.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\TwigHelper' => __DIR__ . '/../..' . '/sources/application/TwigBase/Twig/TwigHelper.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Alert\\Alert' => __DIR__ . '/../..' . '/sources/application/UI/Component/Alert/Alert.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Alert\\AlertFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Alert/AlertFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Badge\\Badge' => __DIR__ . '/../..' . '/sources/application/UI/Component/Badge/Badge.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Badge\\BadgeFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Badge/BadgeFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Breadcrumbs\\Breadcrumbs' => __DIR__ . '/../..' . '/sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Button\\Button' => __DIR__ . '/../..' . '/sources/application/UI/Component/Button/Button.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Button\\ButtonFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Button/ButtonFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Dashlet\\DashletBadge' => __DIR__ . '/../..' . '/sources/application/UI/Component/Dashlet/DashletBadge.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Dashlet\\DashletContainer' => __DIR__ . '/../..' . '/sources/application/UI/Component/Dashlet/DashletContainer.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Dashlet\\DashletFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Dashlet/DashletFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Dashlet\\DashletHeaderStatic' => __DIR__ . '/../..' . '/sources/application/UI/Component/Dashlet/DashletHeaderStatic.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\DataTableBlock' => __DIR__ . '/../..' . '/sources/application/UI/Component/DataTable/DataTable.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\DataTableFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/DataTable/DataTableFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\DataTableSettings' => __DIR__ . '/../..' . '/sources/application/UI/Component/DataTable/DataTableSettings.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\StaticTable\\FormTableRow\\FormTableRow' => __DIR__ . '/../..' . '/sources/application/UI/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\StaticTable\\FormTable\\FormTable' => __DIR__ . '/../..' . '/sources/application/UI/Component/DataTable/StaticTable/FormTable/FormTable.php', - 'Combodo\\iTop\\Application\\UI\\Component\\DataTable\\StaticTable\\StaticTable' => __DIR__ . '/../..' . '/sources/application/UI/Component/DataTable/StaticTable/StaticTable.php', - 'Combodo\\iTop\\Application\\UI\\Component\\FieldSet\\FieldSet' => __DIR__ . '/../..' . '/sources/application/UI/Component/FieldSet/FieldSet.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Field\\Field' => __DIR__ . '/../..' . '/sources/application/UI/Component/Field/Field.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Form\\Form' => __DIR__ . '/../..' . '/sources/application/UI/Component/Form/Form.php', - 'Combodo\\iTop\\Application\\UI\\Component\\GlobalSearch\\GlobalSearch' => __DIR__ . '/../..' . '/sources/application/UI/Component/GlobalSearch/GlobalSearch.php', - 'Combodo\\iTop\\Application\\UI\\Component\\GlobalSearch\\GlobalSearchFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\GlobalSearch\\GlobalSearchHelper' => __DIR__ . '/../..' . '/sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Html\\Html' => __DIR__ . '/../..' . '/sources/application/UI/Component/Html/Html.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\Input' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/Input.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\InputFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/InputFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\InputWithLabel' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/InputWithLabel.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\RichText\\RichText' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/RichText/RichText.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select\\Select' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/Select/Select.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Input\\Select\\SelectOption' => __DIR__ . '/../..' . '/sources/application/UI/Component/Input/Select/SelectOption.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Panel\\Panel' => __DIR__ . '/../..' . '/sources/application/UI/Component/Panel/Panel.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Panel\\PanelEnhanced' => __DIR__ . '/../..' . '/sources/application/UI/Component/Panel/PanelEnhanced.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Panel\\PanelFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Panel/PanelFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenu' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenuFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenu' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenu.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\JsPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItemFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\SeparatorPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php', - 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\UrlPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php', - 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreate' => __DIR__ . '/../..' . '/sources/application/UI/Component/QuickCreate/QuickCreate.php', - 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreateFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreateHelper' => __DIR__ . '/../..' . '/sources/application/UI/Component/QuickCreate/QuickCreateHelper.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Title\\Title' => __DIR__ . '/../..' . '/sources/application/UI/Component/Title/Title.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Title\\TitleFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/Title/TitleFactory.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Title\\TitleForObjectDetails' => __DIR__ . '/../..' . '/sources/application/UI/Component/Title/TitleForObjectDetails.php', - 'Combodo\\iTop\\Application\\UI\\Component\\Toolbar\\Toolbar' => __DIR__ . '/../..' . '/sources/application/UI/Component/Toolbar/Toolbar.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Alert\\Alert' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Alert/Alert.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Alert\\AlertFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Alert/AlertFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Badge\\Badge' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Badge/Badge.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Badge\\BadgeFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Badge/BadgeFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Breadcrumbs\\Breadcrumbs' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\Button' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Button/Button.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Button/ButtonFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletBadge' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Dashlet/DashletBadge.php', + '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\\DataTable\\DataTableBlock' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/DataTable.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/DataTableFactory.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\\StaticTable\\FormTableRow\\FormTableRow' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\StaticTable\\FormTable\\FormTable' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\StaticTable\\StaticTable' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\FieldSet\\FieldSet' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/FieldSet/FieldSet.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Field\\Field' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Field/Field.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Form\\Form' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Form/Form.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\GlobalSearch\\GlobalSearch' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\GlobalSearch\\GlobalSearchFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\GlobalSearch\\GlobalSearchHelper' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Html\\Html' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Html/Html.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Input' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Input/Input.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\InputFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Input/InputFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\InputWithLabel' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Input/InputWithLabel.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\RichText\\RichText' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Input/RichText/RichText.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\Select' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Input/Select/Select.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\SelectOption' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Input/Select/SelectOption.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Panel\\Panel' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Panel/Panel.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Panel\\PanelEnhanced' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Panel/PanelEnhanced.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Panel\\PanelFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Panel/PanelFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenu' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\NewsroomMenu\\NewsroomMenuFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenu' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\JsPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItemFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\SeparatorPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\UrlPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreate' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreateFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/QuickCreate/QuickCreateFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\QuickCreate\\QuickCreateHelper' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\Title' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Title/Title.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\TitleFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Title/TitleFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Title\\TitleForObjectDetails' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Toolbar\\Toolbar' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/Toolbar/Toolbar.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\ActivityEntry' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\ActivityEntryFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpAttachmentAddedFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpAttachmentRemovedFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpCreateFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpDeleteFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpSetAttributeFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpSetAttributeScalarFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\CaseLogEntry' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\EditsEntry' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityEntry\\TransitionEntry' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanel' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryFormFactory\\CaseLogEntryFormFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryForm\\CaseLogEntryForm' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardColumn' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardLayout' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\Column' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumn' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenu' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenuFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Object\\ObjectDetails' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Object/ObjectDetails.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Object\\ObjectFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Object/ObjectFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\PageContent\\PageContent' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/PageContent/PageContent.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\PageContent\\PageContentFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/PageContent/PageContentFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\PageContent\\PageContentWithSideContent' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TabContainer\\TabContainer' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/TabContainer/TabContainer.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TabContainer\\Tab\\AjaxTab' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/TabContainer/Tab/AjaxTab.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TabContainer\\Tab\\Tab' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBar' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/TopBar/TopBar.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/TopBar/TopBarFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\UIContentBlock' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/UIContentBlock.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\iUIContentBlock' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/iUIContentBlock.php', + 'Combodo\\iTop\\Application\\UI\\Base\\UIBlock' => __DIR__ . '/../..' . '/sources/application/UI/Base/UIBlock.php', + 'Combodo\\iTop\\Application\\UI\\Base\\UIException' => __DIR__ . '/../..' . '/sources/application/UI/Base/UIException.php', + 'Combodo\\iTop\\Application\\UI\\Base\\iUIBlock' => __DIR__ . '/../..' . '/sources/application/UI/Base/iUIBlock.php', + 'Combodo\\iTop\\Application\\UI\\Base\\tUIContentAreas' => __DIR__ . '/../..' . '/sources/application/UI/Base/tUIContentAreas.php', + 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockChartAjaxBars\\BlockChartAjaxBars' => __DIR__ . '/../..' . '/sources/application/UI/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php', + 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockChartAjaxPie\\BlockChartAjaxPie' => __DIR__ . '/../..' . '/sources/application/UI/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php', + 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockChart\\BlockChart' => __DIR__ . '/../..' . '/sources/application/UI/DisplayBlock/BlockChart/BlockChart.php', + 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockList\\BlockList' => __DIR__ . '/../..' . '/sources/application/UI/DisplayBlock/BlockList/BlockList.php', 'Combodo\\iTop\\Application\\UI\\Helper\\UIHelper' => __DIR__ . '/../..' . '/sources/application/UI/Helper/UIHelper.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\ActivityEntry' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\ActivityEntryFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpAttachmentAddedFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpAttachmentRemovedFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpCreateFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpDeleteFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpSetAttributeFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CMDBChangeOp\\CMDBChangeOpSetAttributeScalarFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\CaseLogEntry' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\EditsEntry' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityEntry\\TransitionEntry' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityPanel' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\ActivityPanelFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\CaseLogEntryFormFactory\\CaseLogEntryFormFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\ActivityPanel\\CaseLogEntryForm\\CaseLogEntryForm' => __DIR__ . '/../..' . '/sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Dashboard\\DashboardColumn' => __DIR__ . '/../..' . '/sources/application/UI/Layout/Dashboard/DashboardColumn.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Dashboard\\DashboardLayout' => __DIR__ . '/../..' . '/sources/application/UI/Layout/Dashboard/DashboardLayout.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Dashboard\\DashboardRow' => __DIR__ . '/../..' . '/sources/application/UI/Layout/Dashboard/DashboardRow.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\MultiColumn\\Column\\Column' => __DIR__ . '/../..' . '/sources/application/UI/Layout/MultiColumn/Column/Column.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\MultiColumn\\MultiColumn' => __DIR__ . '/../..' . '/sources/application/UI/Layout/MultiColumn/MultiColumn.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\NavigationMenu\\NavigationMenu' => __DIR__ . '/../..' . '/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\NavigationMenu\\NavigationMenuFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Object\\ObjectDetails' => __DIR__ . '/../..' . '/sources/application/UI/Layout/Object/ObjectDetails.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\Object\\ObjectFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/Object/ObjectFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\PageContent\\PageContent' => __DIR__ . '/../..' . '/sources/application/UI/Layout/PageContent/PageContent.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\PageContent\\PageContentFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/PageContent/PageContentFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\PageContent\\PageContentWithSideContent' => __DIR__ . '/../..' . '/sources/application/UI/Layout/PageContent/PageContentWithSideContent.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TabContainer\\TabContainer' => __DIR__ . '/../..' . '/sources/application/UI/Layout/TabContainer/TabContainer.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TabContainer\\Tab\\AjaxTab' => __DIR__ . '/../..' . '/sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TabContainer\\Tab\\Tab' => __DIR__ . '/../..' . '/sources/application/UI/Layout/TabContainer/Tab/Tab.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TopBar\\TopBar' => __DIR__ . '/../..' . '/sources/application/UI/Layout/TopBar/TopBar.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\TopBar\\TopBarFactory' => __DIR__ . '/../..' . '/sources/application/UI/Layout/TopBar/TopBarFactory.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\UIContentBlock' => __DIR__ . '/../..' . '/sources/application/UI/Layout/UIContentBlock.php', - 'Combodo\\iTop\\Application\\UI\\Layout\\iUIContentBlock' => __DIR__ . '/../..' . '/sources/application/UI/Layout/iUIContentBlock.php', - 'Combodo\\iTop\\Application\\UI\\Specific\\DisplayBlock\\BlockChartAjaxBars\\BlockChartAjaxBars' => __DIR__ . '/../..' . '/sources/application/UI/Specific/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php', - 'Combodo\\iTop\\Application\\UI\\Specific\\DisplayBlock\\BlockChartAjaxPie\\BlockChartAjaxPie' => __DIR__ . '/../..' . '/sources/application/UI/Specific/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php', - 'Combodo\\iTop\\Application\\UI\\Specific\\DisplayBlock\\BlockChart\\BlockChart' => __DIR__ . '/../..' . '/sources/application/UI/Specific/DisplayBlock/BlockChart/BlockChart.php', - 'Combodo\\iTop\\Application\\UI\\Specific\\DisplayBlock\\BlockList\\BlockList' => __DIR__ . '/../..' . '/sources/application/UI/Specific/DisplayBlock/BlockList/BlockList.php', - 'Combodo\\iTop\\Application\\UI\\UIBlock' => __DIR__ . '/../..' . '/sources/application/UI/UIBlock.php', - 'Combodo\\iTop\\Application\\UI\\UIException' => __DIR__ . '/../..' . '/sources/application/UI/UIException.php', - 'Combodo\\iTop\\Application\\UI\\iUIBlock' => __DIR__ . '/../..' . '/sources/application/UI/iUIBlock.php', - 'Combodo\\iTop\\Application\\UI\\tBlockParams' => __DIR__ . '/../..' . '/sources/application/UI/tBlockParams.php', - 'Combodo\\iTop\\Application\\UI\\tUIContentAreas' => __DIR__ . '/../..' . '/sources/application/UI/tUIContentAreas.php', 'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php', 'Combodo\\iTop\\Controller\\AjaxRenderController' => __DIR__ . '/../..' . '/sources/Controller/AjaxRenderController.php', 'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php', @@ -575,7 +573,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'DashletProxy' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DashletUnknown' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DataTable' => __DIR__ . '/../..' . '/application/datatable.class.inc.php', - 'DataTableConfig' => __DIR__ . '/../..' . '/sources/application/UI/Component/DataTable/DataTableConfig/DataTableConfig.php', + 'DataTableConfig' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php', 'Datamatrix' => __DIR__ . '/..' . '/combodo/tcpdf/include/barcodes/datamatrix.php', 'DateTimeFormat' => __DIR__ . '/../..' . '/core/datetimeformat.class.inc.php', 'DeadLockLog' => __DIR__ . '/../..' . '/core/log.class.inc.php', diff --git a/pages/UI.php b/pages/UI.php index b8c6ea8aa..f9af9ffe1 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -17,12 +17,12 @@ * You should have received a copy of the GNU Affero General Public License */ -use Combodo\iTop\Application\UI\Component\Button\ButtonFactory; -use Combodo\iTop\Application\UI\Component\Form\Form; -use Combodo\iTop\Application\UI\Component\GlobalSearch\GlobalSearchHelper; -use Combodo\iTop\Application\UI\Component\Input\InputFactory; -use Combodo\iTop\Application\UI\Component\QuickCreate\QuickCreateHelper; -use Combodo\iTop\Application\UI\Layout\PageContent\PageContentFactory; +use Combodo\iTop\Application\UI\Base\Component\Button\ButtonFactory; +use Combodo\iTop\Application\UI\Base\Component\Form\Form; +use Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearchHelper; +use Combodo\iTop\Application\UI\Base\Component\Input\InputFactory; +use Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreateHelper; +use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory; /** * Displays a popup welcome message, once per session at maximum diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 98a7c9c80..48d176d56 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -17,9 +17,9 @@ * You should have received a copy of the GNU Affero General Public License */ -use Combodo\iTop\Application\UI\Component\DataTable\DataTableFactory; -use Combodo\iTop\Application\UI\Component\DataTable\DataTableSettings; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntryFactory; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableFactory; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\ActivityEntryFactory; use Combodo\iTop\Controller\AjaxRenderController; use Combodo\iTop\Renderer\BlockRenderer; use Combodo\iTop\Renderer\Console\ConsoleFormRenderer; diff --git a/pages/preferences.php b/pages/preferences.php index 817e180e1..97a52320a 100644 --- a/pages/preferences.php +++ b/pages/preferences.php @@ -17,14 +17,13 @@ * You should have received a copy of the GNU Affero General Public License */ -use Combodo\iTop\Application\UI\Component\Button\ButtonFactory; -use Combodo\iTop\Application\UI\Component\Form\Form; -use Combodo\iTop\Application\UI\Component\Html\Html; -use Combodo\iTop\Application\UI\Component\Input\InputFactory; -use Combodo\iTop\Application\UI\Component\Input\RichText\RichText; -use Combodo\iTop\Application\UI\Component\Panel\Panel; -use Combodo\iTop\Application\UI\Component\Title\TitleFactory; -use Combodo\iTop\Application\UI\Layout\PageContent\PageContentFactory; +use Combodo\iTop\Application\UI\Base\Component\Button\ButtonFactory; +use Combodo\iTop\Application\UI\Base\Component\Form\Form; +use Combodo\iTop\Application\UI\Base\Component\Html\Html; +use Combodo\iTop\Application\UI\Base\Component\Input\InputFactory; +use Combodo\iTop\Application\UI\Base\Component\Panel\Panel; +use Combodo\iTop\Application\UI\Base\Component\Title\TitleFactory; +use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory; require_once('../approot.inc.php'); require_once(APPROOT.'/application/application.inc.php'); @@ -444,7 +443,7 @@ HTML * @param \ApplicationContext $oAppContext * @param string $sURL * - * @return \Combodo\iTop\Application\UI\Component\Form\Form + * @return \Combodo\iTop\Application\UI\Base\Component\Form\Form */ function GetUserLanguageForm(ApplicationContext $oAppContext, string $sURL): Form { @@ -465,7 +464,7 @@ function GetUserLanguageForm(ApplicationContext $oAppContext, string $sURL): For } ksort($aSortedLang); $oUserLanguageBlockSelect = InputFactory::MakeForSelectWithLabel('language', Dict::S('UI:Favorites:SelectYourLanguage')); - /** @var \Combodo\iTop\Application\UI\Component\Input\Select $oUserLanguageBlockSelectInput */ + /** @var \Combodo\iTop\Application\UI\Base\Component\Input\Select $oUserLanguageBlockSelectInput */ $oUserLanguageBlockSelectInput = $oUserLanguageBlockSelect->GetInput(); foreach ($aSortedLang as $sCode) { $bSelected = ($sCode == Dict::GetUserLanguage()); diff --git a/sources/Renderer/BlockRenderer.php b/sources/Renderer/BlockRenderer.php index f19be3017..c6f56228c 100644 --- a/sources/Renderer/BlockRenderer.php +++ b/sources/Renderer/BlockRenderer.php @@ -20,7 +20,7 @@ namespace Combodo\iTop\Renderer; use Combodo\iTop\Application\TwigBase\Twig\TwigHelper; -use Combodo\iTop\Application\UI\iUIBlock; +use Combodo\iTop\Application\UI\Base\iUIBlock; use utils; /** @@ -45,7 +45,7 @@ class BlockRenderer /** * BlockRenderer constructor. * - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * @param array $aContextParams * * @throws \Twig\Error\LoaderError @@ -65,7 +65,7 @@ class BlockRenderer /** * Helper to use directly in TWIG to render a block and its sub blocks * - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * @param array $aContextParams * * @return string @@ -81,7 +81,7 @@ class BlockRenderer return $oSelf->RenderHtml(); } - /** @var \Combodo\iTop\Application\UI\iUIBlock $oBlock */ + /** @var \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock */ protected $oBlock; /** @var array $aContextParams Optional context parameters to pass to the template during rendering */ protected $aContextParams; diff --git a/sources/application/TwigBase/Twig/Extension.php b/sources/application/TwigBase/Twig/Extension.php index d98be035c..94cfe7057 100644 --- a/sources/application/TwigBase/Twig/Extension.php +++ b/sources/application/TwigBase/Twig/Extension.php @@ -8,7 +8,7 @@ namespace Combodo\iTop\Application\TwigBase\Twig; use AttributeDateTime; -use Combodo\iTop\Application\UI\iUIBlock; +use Combodo\iTop\Application\UI\Base\iUIBlock; use Combodo\iTop\Renderer\BlockRenderer; use Dict; use Exception; diff --git a/sources/application/UI/Component/Alert/Alert.php b/sources/application/UI/Base/Component/Alert/Alert.php similarity index 92% rename from sources/application/UI/Component/Alert/Alert.php rename to sources/application/UI/Base/Component/Alert/Alert.php index edeb869f7..98a0df6c8 100644 --- a/sources/application/UI/Component/Alert/Alert.php +++ b/sources/application/UI/Base/Component/Alert/Alert.php @@ -17,24 +17,24 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\Alert; +namespace Combodo\iTop\Application\UI\Base\Component\Alert; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class Alert * * @author Stephen Abello - * @package Combodo\iTop\Application\UI\Component\Alert + * @package Combodo\iTop\Application\UI\Base\Component\Alert * @since 3.0.0 */ class Alert extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-alert'; - public const HTML_TEMPLATE_REL_PATH = 'components/alert/layout'; - public const JS_TEMPLATE_REL_PATH = 'components/alert/layout'; + 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 = [ 'js/components/alert.js', ]; diff --git a/sources/application/UI/Component/Alert/AlertFactory.php b/sources/application/UI/Base/Component/Alert/AlertFactory.php similarity index 83% rename from sources/application/UI/Component/Alert/AlertFactory.php rename to sources/application/UI/Base/Component/Alert/AlertFactory.php index fdc5f0025..ca4c16053 100644 --- a/sources/application/UI/Component/Alert/AlertFactory.php +++ b/sources/application/UI/Base/Component/Alert/AlertFactory.php @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\Alert; +namespace Combodo\iTop\Application\UI\Base\Component\Alert; /** * Class AlertFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\Alert + * @package Combodo\iTop\Application\UI\Base\Component\Alert * @since 3.0.0 * * @link /test/VisualTest/Backoffice/RenderAllUiBlocks.php#title-alerts to see live examples @@ -36,7 +36,7 @@ class AlertFactory * @param string $sTitle * @param string $sContent The raw HTML content, must be already sanitized * - * @return \Combodo\iTop\Application\UI\Component\Alert\Alert + * @return \Combodo\iTop\Application\UI\Base\Component\Alert\Alert */ public static function MakeNeutral(string $sTitle, string $sContent) { @@ -49,7 +49,7 @@ class AlertFactory * @param string $sTitle * @param string $sContent The raw HTML content, must be already sanitized * - * @return \Combodo\iTop\Application\UI\Component\Alert\Alert + * @return \Combodo\iTop\Application\UI\Base\Component\Alert\Alert */ public static function MakeForInformation(string $sTitle, string $sContent) { @@ -62,7 +62,7 @@ class AlertFactory * @param string $sTitle * @param string $sContent The raw HTML content, must be already sanitized * - * @return \Combodo\iTop\Application\UI\Component\Alert\Alert + * @return \Combodo\iTop\Application\UI\Base\Component\Alert\Alert */ public static function MakeForSuccess(string $sTitle, string $sContent) { @@ -75,7 +75,7 @@ class AlertFactory * @param string $sTitle * @param string $sContent The raw HTML content, must be already sanitized * - * @return \Combodo\iTop\Application\UI\Component\Alert\Alert + * @return \Combodo\iTop\Application\UI\Base\Component\Alert\Alert */ public static function MakeForWarning(string $sTitle, string $sContent) { @@ -88,7 +88,7 @@ class AlertFactory * @param string $sTitle * @param string $sContent The raw HTML content, must be already sanitized * - * @return \Combodo\iTop\Application\UI\Component\Alert\Alert + * @return \Combodo\iTop\Application\UI\Base\Component\Alert\Alert */ public static function MakeForDanger(string $sTitle, string $sContent) { @@ -101,7 +101,7 @@ class AlertFactory * @param string $sTitle * @param string $sContent The raw HTML content, must be already sanitized * - * @return \Combodo\iTop\Application\UI\Component\Alert\Alert + * @return \Combodo\iTop\Application\UI\Base\Component\Alert\Alert */ public static function MakeForFailure(string $sTitle, string $sContent) { @@ -114,7 +114,7 @@ class AlertFactory * @param string $sTitle * @param string $sContent The raw HTML content, must be already sanitized * - * @return \Combodo\iTop\Application\UI\Component\Alert\Alert + * @return \Combodo\iTop\Application\UI\Base\Component\Alert\Alert */ public static function MakeWithBrandingPrimaryColor(string $sTitle, string $sContent) { @@ -127,7 +127,7 @@ class AlertFactory * @param string $sTitle * @param string $sContent The raw HTML content, must be already sanitized * - * @return \Combodo\iTop\Application\UI\Component\Alert\Alert + * @return \Combodo\iTop\Application\UI\Base\Component\Alert\Alert */ public static function MakeWithBrandingSecondaryColor(string $sTitle, string $sContent) { diff --git a/sources/application/UI/Component/Badge/Badge.php b/sources/application/UI/Base/Component/Badge/Badge.php similarity index 83% rename from sources/application/UI/Component/Badge/Badge.php rename to sources/application/UI/Base/Component/Badge/Badge.php index e5d7c04b1..a7ea63d12 100644 --- a/sources/application/UI/Component/Badge/Badge.php +++ b/sources/application/UI/Base/Component/Badge/Badge.php @@ -5,10 +5,10 @@ */ -namespace Combodo\iTop\Application\UI\Component\Badge; +namespace Combodo\iTop\Application\UI\Base\Component\Badge; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; class Badge extends UIContentBlock { diff --git a/sources/application/UI/Component/Badge/BadgeFactory.php b/sources/application/UI/Base/Component/Badge/BadgeFactory.php similarity index 86% rename from sources/application/UI/Component/Badge/BadgeFactory.php rename to sources/application/UI/Base/Component/Badge/BadgeFactory.php index f13767c5e..ac9f63124 100644 --- a/sources/application/UI/Component/Badge/BadgeFactory.php +++ b/sources/application/UI/Base/Component/Badge/BadgeFactory.php @@ -5,7 +5,7 @@ */ -namespace Combodo\iTop\Application\UI\Component\Badge; +namespace Combodo\iTop\Application\UI\Base\Component\Badge; use Combodo\iTop\Application\UI\Helper\UIHelper; diff --git a/sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php b/sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php similarity index 86% rename from sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php rename to sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php index 7d7ddc45f..c748e03d3 100644 --- a/sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php +++ b/sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php @@ -17,10 +17,10 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\Breadcrumbs; +namespace Combodo\iTop\Application\UI\Base\Component\Breadcrumbs; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; use MetaModel; use utils; @@ -28,7 +28,7 @@ use utils; * Class Breadcrumbs * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\Breadcrumbs + * @package Combodo\iTop\Application\UI\Base\Component\Breadcrumbs * @internal * @since 3.0.0 */ @@ -36,8 +36,8 @@ class Breadcrumbs extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-breadcrumbs'; - public const HTML_TEMPLATE_REL_PATH = 'components/breadcrumbs/layout'; - public const JS_TEMPLATE_REL_PATH = 'components/breadcrumbs/layout'; + 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 = [ 'js/components/breadcrumbs.js', ]; diff --git a/sources/application/UI/Component/Button/Button.php b/sources/application/UI/Base/Component/Button/Button.php similarity index 95% rename from sources/application/UI/Component/Button/Button.php rename to sources/application/UI/Base/Component/Button/Button.php index 8567885da..2620a12ea 100644 --- a/sources/application/UI/Component/Button/Button.php +++ b/sources/application/UI/Base/Component/Button/Button.php @@ -17,24 +17,24 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\Button; +namespace Combodo\iTop\Application\UI\Base\Component\Button; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class Button * * @author Stephen Abello - * @package Combodo\iTop\Application\UI\Component\Button + * @package Combodo\iTop\Application\UI\Base\Component\Button * @since 3.0.0 */ class Button extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-button'; - public const HTML_TEMPLATE_REL_PATH = 'components/button/layout'; - public const JS_TEMPLATE_REL_PATH = 'components/button/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/button/layout'; + public const JS_TEMPLATE_REL_PATH = 'base/components/button/layout'; // Specific constants /** @var string ENUM_TYPE_BUTTON */ diff --git a/sources/application/UI/Component/Button/ButtonFactory.php b/sources/application/UI/Base/Component/Button/ButtonFactory.php similarity index 91% rename from sources/application/UI/Component/Button/ButtonFactory.php rename to sources/application/UI/Base/Component/Button/ButtonFactory.php index fd5f52528..164b5ff74 100644 --- a/sources/application/UI/Component/Button/ButtonFactory.php +++ b/sources/application/UI/Base/Component/Button/ButtonFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\Button; +namespace Combodo\iTop\Application\UI\Base\Component\Button; /** * Class ButtonFactory * * @internal * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\Button + * @package Combodo\iTop\Application\UI\Base\Component\Button * @since 3.0.0 * * @link /test/VisualTest/Backoffice/RenderAllUiBlocks.php#title-buttons to see live examples @@ -42,7 +42,7 @@ class ButtonFactory * @param string $sName See Button::$sName * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeNeutral(string $sLabel, string $sName, ?string $sId = null): Button { $oButton = new Button($sLabel, $sId); @@ -62,7 +62,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeForPrimaryAction( string $sLabel, @@ -83,7 +83,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeForSecondaryAction( string $sLabel, @@ -104,7 +104,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeForPositiveAction( string $sLabel, @@ -126,7 +126,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeForDestructiveAction( string $sLabel, @@ -152,7 +152,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeAlternativeNeutral( string $sLabel, @@ -175,7 +175,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeForAlternativePrimaryAction( string $sLabel, @@ -197,7 +197,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeForAlternativeSecondaryAction( string $sLabel, @@ -219,7 +219,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeForAlternativeValidationAction( string $sLabel, @@ -241,7 +241,7 @@ class ButtonFactory * @param bool $bIsSubmit See Button::$sType * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeForAlternativeDestructiveAction( string $sLabel, @@ -268,7 +268,7 @@ class ButtonFactory * @param string|null $sTarget * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeLinkNeutral( string $sURL, ?string $sLabel = null, ?string $sIconClasses = null, ?string $sName = null, ?string $sTarget = null, @@ -300,7 +300,7 @@ class ButtonFactory * @param string|null $sTarget * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ public static function MakeIconLink( string $sIconClasses, string $sTooltipText, ?string $sURL = null, ?string $sName = null, ?string $sTarget = null, @@ -336,7 +336,7 @@ class ButtonFactory * @param bool $bIsSubmit * @param string|null $sId * - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button * @internal */ protected static function MakeForAction( diff --git a/sources/application/UI/Component/Dashlet/DashletBadge.php b/sources/application/UI/Base/Component/Dashlet/DashletBadge.php similarity index 95% rename from sources/application/UI/Component/Dashlet/DashletBadge.php rename to sources/application/UI/Base/Component/Dashlet/DashletBadge.php index 092b0a514..da36bd03d 100644 --- a/sources/application/UI/Component/Dashlet/DashletBadge.php +++ b/sources/application/UI/Base/Component/Dashlet/DashletBadge.php @@ -5,13 +5,13 @@ */ -namespace Combodo\iTop\Application\UI\Component\Dashlet; +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 = 'components/dashlet/dashletbadge'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/dashlet/dashletbadge'; /** @var string */ protected $sClassIconUrl; diff --git a/sources/application/UI/Component/Dashlet/DashletContainer.php b/sources/application/UI/Base/Component/Dashlet/DashletContainer.php similarity index 52% rename from sources/application/UI/Component/Dashlet/DashletContainer.php rename to sources/application/UI/Base/Component/Dashlet/DashletContainer.php index 3e44c797b..f5445d80e 100644 --- a/sources/application/UI/Component/Dashlet/DashletContainer.php +++ b/sources/application/UI/Base/Component/Dashlet/DashletContainer.php @@ -5,13 +5,13 @@ */ -namespace Combodo\iTop\Application\UI\Component\Dashlet; +namespace Combodo\iTop\Application\UI\Base\Component\Dashlet; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; class DashletContainer extends UIContentBlock { public const BLOCK_CODE = 'ibo-dashlet'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/content-block/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/content-block/layout'; } \ No newline at end of file diff --git a/sources/application/UI/Component/Dashlet/DashletFactory.php b/sources/application/UI/Base/Component/Dashlet/DashletFactory.php similarity index 92% rename from sources/application/UI/Component/Dashlet/DashletFactory.php rename to sources/application/UI/Base/Component/Dashlet/DashletFactory.php index f3c8af7a5..77b27fd20 100644 --- a/sources/application/UI/Component/Dashlet/DashletFactory.php +++ b/sources/application/UI/Base/Component/Dashlet/DashletFactory.php @@ -5,7 +5,7 @@ */ -namespace Combodo\iTop\Application\UI\Component\Dashlet; +namespace Combodo\iTop\Application\UI\Base\Component\Dashlet; class DashletFactory diff --git a/sources/application/UI/Component/Dashlet/DashletHeaderStatic.php b/sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php similarity index 91% rename from sources/application/UI/Component/Dashlet/DashletHeaderStatic.php rename to sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php index 36ab68b87..d2b64c627 100644 --- a/sources/application/UI/Component/Dashlet/DashletHeaderStatic.php +++ b/sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php @@ -5,13 +5,13 @@ */ -namespace Combodo\iTop\Application\UI\Component\Dashlet; +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 = 'components/dashlet/dashletheaderstatic'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/dashlet/dashletheaderstatic'; /** @var string */ protected $sTitle; diff --git a/sources/application/UI/Component/DataTable/DataTable.php b/sources/application/UI/Base/Component/DataTable/DataTable.php similarity index 86% rename from sources/application/UI/Component/DataTable/DataTable.php rename to sources/application/UI/Base/Component/DataTable/DataTable.php index 9bfaa03a8..bd86c057f 100644 --- a/sources/application/UI/Component/DataTable/DataTable.php +++ b/sources/application/UI/Base/Component/DataTable/DataTable.php @@ -4,24 +4,24 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Component\DataTable; +namespace Combodo\iTop\Application\UI\Base\Component\DataTable; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use DataTableConfig; /** * Class DataTable * - * @package Combodo\iTop\Application\UI\Component\DataTable + * @package Combodo\iTop\Application\UI\Base\Component\DataTable * @since 3.0.0 */ class DataTableBlock extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-datatable'; - public const HTML_TEMPLATE_REL_PATH = 'components/datatable/layout'; - public const JS_TEMPLATE_REL_PATH = 'components/datatable/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/layout'; + public const 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/Component/DataTable/DataTableConfig/DataTableConfig.php b/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php similarity index 71% rename from sources/application/UI/Component/DataTable/DataTableConfig/DataTableConfig.php rename to sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php index ca0e96bf3..37fe9b08a 100644 --- a/sources/application/UI/Component/DataTable/DataTableConfig/DataTableConfig.php +++ b/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php @@ -1,7 +1,7 @@ [ diff --git a/sources/application/UI/Component/Field/Field.php b/sources/application/UI/Base/Component/Field/Field.php similarity index 77% rename from sources/application/UI/Component/Field/Field.php rename to sources/application/UI/Base/Component/Field/Field.php index 902e47795..4b7d5f3c8 100644 --- a/sources/application/UI/Component/Field/Field.php +++ b/sources/application/UI/Base/Component/Field/Field.php @@ -4,15 +4,15 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Component\Field; +namespace Combodo\iTop\Application\UI\Base\Component\Field; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class Field * - * @package Combodo\iTop\Application\UI\Component\Field + * @package Combodo\iTop\Application\UI\Base\Component\Field * @author Eric Espie * @author Anne-Catherine Cognet * @since 3.0.0 @@ -23,7 +23,7 @@ class Field extends UIBlock /** @inheritdoc */ public const BLOCK_CODE = 'ibo-field'; /** @inheritdoc */ - public const HTML_TEMPLATE_REL_PATH = 'components/field/layout'; + public const 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/Component/FieldSet/FieldSet.php b/sources/application/UI/Base/Component/FieldSet/FieldSet.php similarity index 70% rename from sources/application/UI/Component/FieldSet/FieldSet.php rename to sources/application/UI/Base/Component/FieldSet/FieldSet.php index 58281fa06..033743681 100644 --- a/sources/application/UI/Component/FieldSet/FieldSet.php +++ b/sources/application/UI/Base/Component/FieldSet/FieldSet.php @@ -4,21 +4,21 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Component\FieldSet; +namespace Combodo\iTop\Application\UI\Base\Component\FieldSet; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; /** * Class FieldSet * - * @package Combodo\iTop\Application\UI\Component\FieldSet + * @package Combodo\iTop\Application\UI\Base\Component\FieldSet */ class FieldSet extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-fieldset'; - public const HTML_TEMPLATE_REL_PATH = 'components/fieldset/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/fieldset/layout'; /** @var string */ protected $sLegend; diff --git a/sources/application/UI/Component/Form/Form.php b/sources/application/UI/Base/Component/Form/Form.php similarity index 79% rename from sources/application/UI/Component/Form/Form.php rename to sources/application/UI/Base/Component/Form/Form.php index 26a1ff5c5..ed084db46 100644 --- a/sources/application/UI/Component/Form/Form.php +++ b/sources/application/UI/Base/Component/Form/Form.php @@ -4,21 +4,21 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Component\Form; +namespace Combodo\iTop\Application\UI\Base\Component\Form; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; /** * Class Form * - * @package Combodo\iTop\Application\UI\Component\Form + * @package Combodo\iTop\Application\UI\Base\Component\Form */ class Form extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-form'; - public const HTML_TEMPLATE_REL_PATH = 'components/form/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/form/layout'; /** @var string */ protected $sOnSubmitJsCode; diff --git a/sources/application/UI/Component/GlobalSearch/GlobalSearch.php b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php similarity index 89% rename from sources/application/UI/Component/GlobalSearch/GlobalSearch.php rename to sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php index ccbd51574..fda8a1835 100644 --- a/sources/application/UI/Component/GlobalSearch/GlobalSearch.php +++ b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php @@ -17,10 +17,10 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\GlobalSearch; +namespace Combodo\iTop\Application\UI\Base\Component\GlobalSearch; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; use MetaModel; use utils; @@ -28,7 +28,7 @@ use utils; * Class GlobalSearch * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\GlobalSearch + * @package Combodo\iTop\Application\UI\Base\Component\GlobalSearch * @internal * @since 3.0.0 */ @@ -36,8 +36,8 @@ class GlobalSearch extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-global-search'; - public const HTML_TEMPLATE_REL_PATH = 'components/global-search/layout'; - public const JS_TEMPLATE_REL_PATH = 'components/global-search/layout'; + 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 = [ 'js/components/global-search.js', ]; diff --git a/sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchFactory.php similarity index 84% rename from sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php rename to sources/application/UI/Base/Component/GlobalSearch/GlobalSearchFactory.php index c15934803..4c19e5a42 100644 --- a/sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php +++ b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\GlobalSearch; +namespace Combodo\iTop\Application\UI\Base\Component\GlobalSearch; /** * Class GlobalSearchFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\GlobalSearch + * @package Combodo\iTop\Application\UI\Base\Component\GlobalSearch * @internal * @since 3.0.0 */ @@ -33,7 +33,7 @@ class GlobalSearchFactory /** * Make a GlobalSearch component with the history entries from the current user * - * @return \Combodo\iTop\Application\UI\Component\GlobalSearch\GlobalSearch + * @return \Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearch * @throws \CoreException * @throws \CoreUnexpectedValue * @throws \MySQLException diff --git a/sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php similarity index 96% rename from sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php rename to sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php index 2987f8a98..964688069 100644 --- a/sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php +++ b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\GlobalSearch; +namespace Combodo\iTop\Application\UI\Base\Component\GlobalSearch; use appUserPreferences; @@ -28,7 +28,7 @@ use utils; * Class GlobalSearchHelper * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\GlobalSearch + * @package Combodo\iTop\Application\UI\Base\Component\GlobalSearch * @internal * @since 3.0.0 */ diff --git a/sources/application/UI/Component/Html/Html.php b/sources/application/UI/Base/Component/Html/Html.php similarity index 87% rename from sources/application/UI/Component/Html/Html.php rename to sources/application/UI/Base/Component/Html/Html.php index 857d09554..291eda223 100644 --- a/sources/application/UI/Component/Html/Html.php +++ b/sources/application/UI/Base/Component/Html/Html.php @@ -17,23 +17,23 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\Html; +namespace Combodo\iTop\Application\UI\Base\Component\Html; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class Html * * @author Stephen Abello - * @package Combodo\iTop\Application\UI\Component\Html + * @package Combodo\iTop\Application\UI\Base\Component\Html * @since 3.0.0 */ class Html extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-html'; - public const HTML_TEMPLATE_REL_PATH = 'components/html/layout'; + public const 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/Component/Input/Input.php b/sources/application/UI/Base/Component/Input/Input.php similarity index 82% rename from sources/application/UI/Component/Input/Input.php rename to sources/application/UI/Base/Component/Input/Input.php index dd4a383e9..05dc11245 100644 --- a/sources/application/UI/Component/Input/Input.php +++ b/sources/application/UI/Base/Component/Input/Input.php @@ -4,21 +4,21 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Component\Input; +namespace Combodo\iTop\Application\UI\Base\Component\Input; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class Input * - * @package Combodo\iTop\Application\UI\Component\Input + * @package Combodo\iTop\Application\UI\Base\Component\Input */ class Input extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-input'; - public const HTML_TEMPLATE_REL_PATH = 'components/input/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/input/layout'; public const INPUT_HIDDEN = 'hidden'; diff --git a/sources/application/UI/Component/Input/InputFactory.php b/sources/application/UI/Base/Component/Input/InputFactory.php similarity index 84% rename from sources/application/UI/Component/Input/InputFactory.php rename to sources/application/UI/Base/Component/Input/InputFactory.php index dd06e1d21..3e429dd8c 100644 --- a/sources/application/UI/Component/Input/InputFactory.php +++ b/sources/application/UI/Base/Component/Input/InputFactory.php @@ -5,11 +5,11 @@ */ -namespace Combodo\iTop\Application\UI\Component\Input; +namespace Combodo\iTop\Application\UI\Base\Component\Input; -use Combodo\iTop\Application\UI\Component\Input\Select\Select; -use Combodo\iTop\Application\UI\Component\Input\Select\SelectOption; +use Combodo\iTop\Application\UI\Base\Component\Input\Select\Select; +use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOption; class InputFactory { diff --git a/sources/application/UI/Component/Input/InputWithLabel.php b/sources/application/UI/Base/Component/Input/InputWithLabel.php similarity index 54% rename from sources/application/UI/Component/Input/InputWithLabel.php rename to sources/application/UI/Base/Component/Input/InputWithLabel.php index 47266b483..e067347e5 100644 --- a/sources/application/UI/Component/Input/InputWithLabel.php +++ b/sources/application/UI/Base/Component/Input/InputWithLabel.php @@ -5,27 +5,27 @@ */ -namespace Combodo\iTop\Application\UI\Component\Input; +namespace Combodo\iTop\Application\UI\Base\Component\Input; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; class InputWithLabel extends UIBlock { - public const HTML_TEMPLATE_REL_PATH = 'components/input/inputwithlabel'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/input/inputwithlabel'; /** @var string */ protected $sLabel; - /** @var \Combodo\iTop\Application\UI\Component\Input\Input */ + /** @var \Combodo\iTop\Application\UI\Base\Component\Input\Input */ protected $oInput; /** * InputWithLabel constructor. * * @param string $sLabel - * @param \Combodo\iTop\Application\UI\Component\Input\Input $oInput + * @param \Combodo\iTop\Application\UI\Base\Component\Input\Input $oInput */ - public function __construct(string $sLabel, \Combodo\iTop\Application\UI\Component\Input\Input $oInput, ?string $sId) + public function __construct(string $sLabel, \Combodo\iTop\Application\UI\Base\Component\Input\Input $oInput, ?string $sId) { parent::__construct($sId); $this->sLabel = $sLabel; @@ -33,19 +33,19 @@ class InputWithLabel extends UIBlock } /** - * @return \Combodo\iTop\Application\UI\Component\Input\Input + * @return \Combodo\iTop\Application\UI\Base\Component\Input\Input */ - public function GetInput(): \Combodo\iTop\Application\UI\Component\Input\Input + public function GetInput(): \Combodo\iTop\Application\UI\Base\Component\Input\Input { return $this->oInput; } /** - * @param \Combodo\iTop\Application\UI\Component\Input\Input $oInput + * @param \Combodo\iTop\Application\UI\Base\Component\Input\Input $oInput * * @return $this */ - public function SetInput(\Combodo\iTop\Application\UI\Component\Input\Input $oInput): InputWithLabel + public function SetInput(\Combodo\iTop\Application\UI\Base\Component\Input\Input $oInput): InputWithLabel { $this->oInput = $oInput; return $this; diff --git a/sources/application/UI/Base/Component/Input/RichText/RichText.php b/sources/application/UI/Base/Component/Input/RichText/RichText.php new file mode 100644 index 000000000..73b40c28b --- /dev/null +++ b/sources/application/UI/Base/Component/Input/RichText/RichText.php @@ -0,0 +1,20 @@ + - * @package Combodo\iTop\Application\UI\Component\Panel + * @package Combodo\iTop\Application\UI\Base\Component\Panel * @since 3.0.0 */ class Panel extends UIContentBlock @@ -39,7 +39,7 @@ class Panel extends UIContentBlock // Overloaded constants public const BLOCK_CODE = 'ibo-panel'; - public const HTML_TEMPLATE_REL_PATH = 'components/panel/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/panel/layout'; // Specific constants /** @var string ENUM_COLOR_PRIMARY */ @@ -94,7 +94,7 @@ class Panel extends UIContentBlock * Panel constructor. * * @param string $sTitle - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aSubBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aSubBlocks * @param string $sColor * @param string|null $sId */ @@ -155,7 +155,7 @@ class Panel extends UIContentBlock /** * Set all main blocks at once. * - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aBlocks * * @return $this */ @@ -168,7 +168,7 @@ class Panel extends UIContentBlock /** * Return all the main blocks * - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] * @throws \Exception */ public function GetMainBlocks(): array { @@ -179,7 +179,7 @@ class Panel extends UIContentBlock * Add the $oBlock to the main blocks. * Note that if a block with the same ID already exists, it will be replaced. * - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * * @return $this */ @@ -206,7 +206,7 @@ class Panel extends UIContentBlock /** * Set all toolbar blocks at once. * - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aBlocks * * @return $this */ @@ -219,7 +219,7 @@ class Panel extends UIContentBlock /** * Return all the toolbar blocks * - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] * @throws \Exception */ public function GetToolbarBlocks(): array { @@ -230,7 +230,7 @@ class Panel extends UIContentBlock * Add the $oBlock to the toolbar blocks. * Note that if a block with the same ID already exists, it will be replaced. * - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * * @return $this */ @@ -331,7 +331,7 @@ class Panel extends UIContentBlock * Set the MAIN AREA subBlocks * * @inheritDoc - * @return $this|\Combodo\iTop\Application\UI\Layout\iUIContentBlock + * @return $this|\Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock */ public function SetSubBlocks(array $aSubBlocks): iUIContentBlock { $this->SetMainBlocks($aSubBlocks); diff --git a/sources/application/UI/Component/Panel/PanelEnhanced.php b/sources/application/UI/Base/Component/Panel/PanelEnhanced.php similarity index 85% rename from sources/application/UI/Component/Panel/PanelEnhanced.php rename to sources/application/UI/Base/Component/Panel/PanelEnhanced.php index 676b54a8f..5f8caa7fa 100644 --- a/sources/application/UI/Component/Panel/PanelEnhanced.php +++ b/sources/application/UI/Base/Component/Panel/PanelEnhanced.php @@ -5,15 +5,15 @@ */ -namespace Combodo\iTop\Application\UI\Component\Panel; +namespace Combodo\iTop\Application\UI\Base\Component\Panel; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +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 = 'components/panel/panelenhanced'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/panel/panelenhanced'; /** @var UIContentBlock */ protected $sSubTitle; diff --git a/sources/application/UI/Component/Panel/PanelFactory.php b/sources/application/UI/Base/Component/Panel/PanelFactory.php similarity index 82% rename from sources/application/UI/Component/Panel/PanelFactory.php rename to sources/application/UI/Base/Component/Panel/PanelFactory.php index 1a9d58612..6b7de75ef 100644 --- a/sources/application/UI/Component/Panel/PanelFactory.php +++ b/sources/application/UI/Base/Component/Panel/PanelFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\Panel; +namespace Combodo\iTop\Application\UI\Base\Component\Panel; /** * Class PanelFactory * * @internal * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\Panel + * @package Combodo\iTop\Application\UI\Base\Component\Panel * @since 3.0.0 * * @link /test/VisualTest/Backoffice/RenderAllUiBlocks.php#title-panels to see live examples @@ -36,7 +36,7 @@ class PanelFactory * * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeNeutral(string $sTitle) { @@ -52,7 +52,7 @@ class PanelFactory * * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeForInformation(string $sTitle) { @@ -67,7 +67,7 @@ class PanelFactory * * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeForSuccess(string $sTitle) { @@ -82,7 +82,7 @@ class PanelFactory * * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeForWarning(string $sTitle) { @@ -97,7 +97,7 @@ class PanelFactory * * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeForDanger(string $sTitle) { @@ -112,7 +112,7 @@ class PanelFactory * * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeForFailure(string $sTitle) { @@ -127,7 +127,7 @@ class PanelFactory * * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeWithBrandingPrimaryColor(string $sTitle) { @@ -142,7 +142,7 @@ class PanelFactory * * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeWithBrandingSecondaryColor(string $sTitle) { @@ -158,7 +158,7 @@ class PanelFactory * @param string $sClass Class of the object the panel is for * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeForClass(string $sClass, string $sTitle) { @@ -175,7 +175,7 @@ class PanelFactory * @param string $sTitle * @param String $sIconUrl * - * @return \Combodo\iTop\Application\UI\Component\Panel\Panel + * @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel */ public static function MakeEnhancedNeutral(string $sTitle, string $sIconUrl) { diff --git a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php similarity index 76% rename from sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php rename to sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php index ad683ed0a..7fe1f9bac 100644 --- a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php +++ b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php @@ -17,24 +17,24 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu\NewsroomMenu; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; /** * Class NewsroomMenu * * @author Stephen Abello - * @package Combodo\iTop\Application\UI\Component\NewsroomMenu + * @package Combodo\iTop\Application\UI\Base\Component\NewsroomMenu * @internal * @since 3.0.0 */ class NewsroomMenu extends PopoverMenu { // Overloaded constants - public const HTML_TEMPLATE_REL_PATH = 'components/popover-menu/newsroom-menu/layout'; - public const JS_TEMPLATE_REL_PATH = 'components/popover-menu/newsroom-menu/layout'; + 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 = [ 'js/components/newsroom-menu.js', ]; diff --git a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php similarity index 92% rename from sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php rename to sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php index 84ec60faa..3ab653da1 100644 --- a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php +++ b/sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu\NewsroomMenu; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu; use appUserPreferences; use Dict; @@ -29,7 +29,7 @@ use utils; * Class NewsroomMenuFactory * * @author Stephen Abello -* @package Combodo\iTop\Application\UI\Component\NewsroomMenu +* @package Combodo\iTop\Application\UI\Base\Component\NewsroomMenu * @internal * @since 3.0.0 */ @@ -38,7 +38,7 @@ class NewsroomMenuFactory /** * Make a standard NewsroomMenu layout for backoffice pages * - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\NewsroomMenu\NewsroomMenu + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenu * @throws \CoreException * @throws \Exception */ diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenu.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php similarity index 91% rename from sources/application/UI/Component/PopoverMenu/PopoverMenu.php rename to sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php index 23fedb0c1..166c33ac5 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenu.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php @@ -17,18 +17,18 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem; +use Combodo\iTop\Application\UI\Base\UIBlock; use Exception; /** * Class PopoverMenu * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\PopoverMenu + * @package Combodo\iTop\Application\UI\Base\Component\PopoverMenu * @internal * @since 3.0.0 */ @@ -36,7 +36,7 @@ class PopoverMenu extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-popover-menu'; - public const HTML_TEMPLATE_REL_PATH = 'components/popover-menu/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/layout'; public const JS_FILES_REL_PATH = [ 'js/components/popover-menu.js', ]; @@ -140,7 +140,7 @@ class PopoverMenu extends UIBlock * Add the $oItem in the $sSectionId. If an item with the same ID already exists it will be overwritten. * * @param string $sSectionId - * @param \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem $oItem + * @param \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem $oItem * * @return $this * @throws \Exception diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php similarity index 90% rename from sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php rename to sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php index b7025c7fa..90084a6e1 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItemFactory; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItemFactory; use Dict; use JSPopupMenuItem; use MetaModel; @@ -33,7 +33,7 @@ use utils; * Class PopoverMenuFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\PopoverMenu + * @package Combodo\iTop\Application\UI\Base\Component\PopoverMenu * @internal * @since 3.0.0 */ @@ -42,7 +42,7 @@ class PopoverMenuFactory /** * Make a standard NavigationMenu layout for backoffice pages * - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu * @throws \CoreException * @throws \Exception */ @@ -72,7 +72,7 @@ class PopoverMenuFactory /** * Return the allowed portals items for the current user * - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem[] + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem[] */ protected static function PrepareAllowedPortalsItemsForUserMenu() { @@ -97,7 +97,7 @@ class PopoverMenuFactory /** * Return the user related items (preferences, change password, log off, ...) * - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem[] + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem[] * @throws \CoreException * @throws \Exception */ @@ -169,7 +169,7 @@ class PopoverMenuFactory /** * Return the misc. items for the user menu (online doc., about box) * - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem[] + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem[] */ protected static function PrepareMiscItemsForUserMenu() { diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php similarity index 85% rename from sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php rename to sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php index fe48f2ae8..2321fa1ed 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem; use JSPopupMenuItem; @@ -26,14 +26,14 @@ use JSPopupMenuItem; * Class JsPopoverMenuItem * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem + * @package Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem * @property \JSPopupMenuItem $oPopupMenuItem * @since 3.0.0 */ class JsPopoverMenuItem extends PopoverMenuItem { // Overloaded constants - public const HTML_TEMPLATE_REL_PATH = 'components/popover-menu/item/mode_js'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_js'; /** * @see \JSPopupMenuItem::GetJsCode() diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php similarity index 89% rename from sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php rename to sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php index bcfdb0900..82e422a19 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php @@ -17,17 +17,17 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem; use ApplicationPopupMenuItem; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class PopoverMenuItem * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem + * @package Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem * @internal * @since 3.0.0 */ @@ -35,7 +35,7 @@ class PopoverMenuItem extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-popover-menu--item'; - public const HTML_TEMPLATE_REL_PATH = 'components/popover-menu/item/layout'; + public const 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/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php similarity index 81% rename from sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php rename to sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php index 9cd51c7bd..5e1f4f3e7 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php @@ -17,20 +17,20 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem; use ApplicationPopupMenuItem; use JSPopupMenuItem; -use URLPopupMenuItem; use SeparatorPopupMenuItem; +use URLPopupMenuItem; /** * Class PopupMenuItemFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem + * @package Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem * @internal * @since 3.0.0 */ @@ -41,11 +41,11 @@ class PopoverMenuItemFactory * * @param \ApplicationPopupMenuItem $oItem * - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItem */ public static function MakeFromApplicationPopupMenuItem(ApplicationPopupMenuItem $oItem) { - $sNamespace = 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\'; + $sNamespace = 'Combodo\\iTop\\Application\\UI\\Base\\Component\\PopoverMenu\\PopoverMenuItem\\'; switch(true) { case $oItem instanceof URLPopupMenuItem: diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php similarity index 77% rename from sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php rename to sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php index 38a5688b6..b70c49787 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php @@ -17,19 +17,19 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem; /** * Class SeparatorPopoverMenuItem * * @author Stephen Abello - * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem + * @package Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem * @property \SeparatorPopupMenuItem $oPopupMenuItem * @since 3.0.0 */ class SeparatorPopoverMenuItem extends PopoverMenuItem { - public const HTML_TEMPLATE_REL_PATH = 'components/popover-menu/item/mode_separator'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_separator'; } \ No newline at end of file diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php similarity index 82% rename from sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php rename to sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php index f06c4fa61..a19d32919 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php +++ b/sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php @@ -17,21 +17,21 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem; +namespace Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem; /** * Class UrlPopoverMenuItem * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem + * @package Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem * @property \URLPopupMenuItem $oPopupMenuItem * @since 3.0.0 */ class UrlPopoverMenuItem extends PopoverMenuItem { // Overloaded constants - public const HTML_TEMPLATE_REL_PATH = 'components/popover-menu/item/mode_url'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/popover-menu/item/mode_url'; /** * @see \URLPopupMenuItem::GetUrl() diff --git a/sources/application/UI/Component/QuickCreate/QuickCreate.php b/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php similarity index 90% rename from sources/application/UI/Component/QuickCreate/QuickCreate.php rename to sources/application/UI/Base/Component/QuickCreate/QuickCreate.php index 7414fd22c..6df964139 100644 --- a/sources/application/UI/Component/QuickCreate/QuickCreate.php +++ b/sources/application/UI/Base/Component/QuickCreate/QuickCreate.php @@ -17,10 +17,10 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\QuickCreate; +namespace Combodo\iTop\Application\UI\Base\Component\QuickCreate; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; use MetaModel; use UserRights; @@ -28,7 +28,7 @@ use UserRights; * Class QuickCreate * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\QuickCreate + * @package Combodo\iTop\Application\UI\Base\Component\QuickCreate * @internal * @since 3.0.0 */ @@ -36,8 +36,8 @@ class QuickCreate extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-quick-create'; - public const HTML_TEMPLATE_REL_PATH = 'components/quick-create/layout'; - public const JS_TEMPLATE_REL_PATH = 'components/quick-create/layout'; + 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 = [ 'js/selectize.min.js', 'js/components/quick-create.js', diff --git a/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php b/sources/application/UI/Base/Component/QuickCreate/QuickCreateFactory.php similarity index 84% rename from sources/application/UI/Component/QuickCreate/QuickCreateFactory.php rename to sources/application/UI/Base/Component/QuickCreate/QuickCreateFactory.php index 55342ca5b..01f258da5 100644 --- a/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php +++ b/sources/application/UI/Base/Component/QuickCreate/QuickCreateFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\QuickCreate; +namespace Combodo\iTop\Application\UI\Base\Component\QuickCreate; /** * Class QuickCreateFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\QuickCreate + * @package Combodo\iTop\Application\UI\Base\Component\QuickCreate * @internal * @since 3.0.0 */ @@ -33,7 +33,7 @@ class QuickCreateFactory /** * Make a QuickCreate component with the last classes from the current user * - * @return \Combodo\iTop\Application\UI\Component\QuickCreate\QuickCreate + * @return \Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreate * @throws \CoreException * @throws \CoreUnexpectedValue * @throws \MySQLException diff --git a/sources/application/UI/Component/QuickCreate/QuickCreateHelper.php b/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php similarity index 96% rename from sources/application/UI/Component/QuickCreate/QuickCreateHelper.php rename to sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php index f3c73f0ee..656b30249 100644 --- a/sources/application/UI/Component/QuickCreate/QuickCreateHelper.php +++ b/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Component\QuickCreate; +namespace Combodo\iTop\Application\UI\Base\Component\QuickCreate; use appUserPreferences; @@ -29,7 +29,7 @@ use utils; * Class QuickCreateHelper * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Component\QuickCreate + * @package Combodo\iTop\Application\UI\Base\Component\QuickCreate * @internal * @since 3.0.0 */ diff --git a/sources/application/UI/Component/Title/Title.php b/sources/application/UI/Base/Component/Title/Title.php similarity index 89% rename from sources/application/UI/Component/Title/Title.php rename to sources/application/UI/Base/Component/Title/Title.php index d455b9792..63b207418 100644 --- a/sources/application/UI/Component/Title/Title.php +++ b/sources/application/UI/Base/Component/Title/Title.php @@ -4,15 +4,15 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Component\Title; +namespace Combodo\iTop\Application\UI\Base\Component\Title; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class Title * - * @package Combodo\iTop\Application\UI\Component\Title + * @package Combodo\iTop\Application\UI\Base\Component\Title */ class Title extends UIBlock { @@ -20,7 +20,7 @@ class Title extends UIBlock /** @inheritDoc */ public const BLOCK_CODE = 'ibo-title'; /** @inheritDoc */ - public const HTML_TEMPLATE_REL_PATH = 'components/title/layout'; + public const 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/Component/Title/TitleFactory.php b/sources/application/UI/Base/Component/Title/TitleFactory.php similarity index 97% rename from sources/application/UI/Component/Title/TitleFactory.php rename to sources/application/UI/Base/Component/Title/TitleFactory.php index 64b964673..dcbe7475e 100644 --- a/sources/application/UI/Component/Title/TitleFactory.php +++ b/sources/application/UI/Base/Component/Title/TitleFactory.php @@ -5,7 +5,7 @@ */ -namespace Combodo\iTop\Application\UI\Component\Title; +namespace Combodo\iTop\Application\UI\Base\Component\Title; use Combodo\iTop\Application\UI\Helper\UIHelper; diff --git a/sources/application/UI/Component/Title/TitleForObjectDetails.php b/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php similarity index 89% rename from sources/application/UI/Component/Title/TitleForObjectDetails.php rename to sources/application/UI/Base/Component/Title/TitleForObjectDetails.php index 8ee4c5763..7848a8d2d 100644 --- a/sources/application/UI/Component/Title/TitleForObjectDetails.php +++ b/sources/application/UI/Base/Component/Title/TitleForObjectDetails.php @@ -5,12 +5,12 @@ */ -namespace Combodo\iTop\Application\UI\Component\Title; +namespace Combodo\iTop\Application\UI\Base\Component\Title; class TitleForObjectDetails extends Title { - public const HTML_TEMPLATE_REL_PATH = 'components/title/titleforobjectdetails'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/title/titleforobjectdetails'; /** @var string */ protected $sClassName; diff --git a/sources/application/UI/Component/Toolbar/Toolbar.php b/sources/application/UI/Base/Component/Toolbar/Toolbar.php similarity index 50% rename from sources/application/UI/Component/Toolbar/Toolbar.php rename to sources/application/UI/Base/Component/Toolbar/Toolbar.php index 1b00abdc6..5c132197a 100644 --- a/sources/application/UI/Component/Toolbar/Toolbar.php +++ b/sources/application/UI/Base/Component/Toolbar/Toolbar.php @@ -4,19 +4,19 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Component\Toolbar; +namespace Combodo\iTop\Application\UI\Base\Component\Toolbar; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; /** * Class Toolbar * - * @package Combodo\iTop\Application\UI\Component\Toolbar + * @package Combodo\iTop\Application\UI\Base\Component\Toolbar */ class Toolbar extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-toolbar'; - public const HTML_TEMPLATE_REL_PATH = 'components/toolbar/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/components/toolbar/layout'; } \ No newline at end of file diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php similarity index 95% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php index ce83782c2..82e730dae 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry; use AttributeDateTime; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; use DateTime; use UserRights; @@ -29,7 +29,7 @@ use UserRights; * Class ActivityEntry * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry * @internal * @since 3.0.0 */ @@ -37,7 +37,7 @@ class ActivityEntry extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-activity-entry'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/activity-panel/activity-entry/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-entry/layout'; // Specific constants /** @var string DEFAULT_ORIGIN */ diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php similarity index 88% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php index 169f246a0..9ca148b38 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry; use AttributeDateTime; @@ -32,7 +32,7 @@ use ReflectionClass; * * @internal * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry * @since 3.0.0 */ class ActivityEntryFactory @@ -42,7 +42,7 @@ class ActivityEntryFactory * * @param \CMDBChangeOp $oChangeOp * - * @return \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntry + * @return \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\ActivityEntry * @throws \Exception */ public static function MakeFromCmdbChangeOp(CMDBChangeOp $oChangeOp) @@ -55,7 +55,7 @@ class ActivityEntryFactory throw new Exception('No factory found for '.get_class($oChangeOp).', did you forgot to create one?'); } - /** @var \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntry $oEntry */ + /** @var \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\ActivityEntry $oEntry */ /** @noinspection PhpUndefinedMethodInspection Call static method from the $sFactoryFqcn class */ $oEntry = $sFactoryFqcn::MakeFromCmdbChangeOp($oChangeOp); @@ -68,7 +68,7 @@ class ActivityEntryFactory * @param string $sAttCode Code of the case log attribute * @param array $aOrmEntry * - * @return \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CaseLogEntry + * @return \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CaseLogEntry * @throws \ArchivedObjectException * @throws \CoreException * @throws \OQLException diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php similarity index 83% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php index 4eccd717c..055f3a9c7 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; /** * Class CMDBChangeOpAttachmentAddedFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp */ class CMDBChangeOpAttachmentAddedFactory extends CMDBChangeOpFactory { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php similarity index 83% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php index 8fec02d16..95ff41ac4 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; /** * Class CMDBChangeOpAttachmentRemovedFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp */ class CMDBChangeOpAttachmentRemovedFactory extends CMDBChangeOpFactory { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php similarity index 83% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php index 75bbc66ae..4d3f93336 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; /** * Class CMDBChangeOpCreateFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp */ class CMDBChangeOpCreateFactory extends CMDBChangeOpFactory { public const DEFAULT_DECORATION_CLASSES = 'fas fa-fw fa-seedling'; diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php similarity index 83% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php index 35dca777b..6942d807c 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; /** * Class CMDBChangeOpDeleteFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp */ class CMDBChangeOpDeleteFactory extends CMDBChangeOpFactory { public const DEFAULT_DECORATION_CLASSES = 'fas fa-fw fa-trash'; diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php similarity index 85% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php index 67113f15f..ed2fd804e 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php @@ -17,12 +17,12 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; use AttributeDateTime; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntry; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\EditsEntry; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\ActivityEntry; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\EditsEntry; use DateTime; use iCMDBChangeOp; use MetaModel; @@ -33,7 +33,7 @@ use MetaModel; * Default factory for CMDBChangeOp change ops * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp */ class CMDBChangeOpFactory { @@ -47,7 +47,7 @@ class CMDBChangeOpFactory * * @param \iCMDBChangeOp $oChangeOp * - * @return \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntry + * @return \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\ActivityEntry * @throws \OQLException */ public static function MakeFromCmdbChangeOp(iCMDBChangeOp $oChangeOp) diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php similarity index 82% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php index 40dadf7f8..6347913d3 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; use AttributeDateTime; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\EditsEntry; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\EditsEntry; use DateTime; use iCMDBChangeOp; @@ -31,7 +31,7 @@ use iCMDBChangeOp; * Default factory for CMDBChangeOpSetAttribute change ops * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp */ class CMDBChangeOpSetAttributeFactory extends CMDBChangeOpFactory { @@ -40,7 +40,7 @@ class CMDBChangeOpSetAttributeFactory extends CMDBChangeOpFactory * * @param \iCMDBChangeOp $oChangeOp * - * @return \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\EditsEntry + * @return \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\EditsEntry * @throws \OQLException * @throws \Exception */ diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php similarity index 87% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php index e823a2986..227564f80 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php @@ -17,20 +17,20 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp; use AttributeDateTime; -use iCMDBChangeOp; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\TransitionEntry; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\TransitionEntry; use DateTime; +use iCMDBChangeOp; use MetaModel; /** * Class CMDBChangeOpSetAttributeScalarFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp\Factory + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp\Factory * @since 3.0.0 */ class CMDBChangeOpSetAttributeScalarFactory extends CMDBChangeOpSetAttributeFactory diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php similarity index 90% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php index d689fb934..928f0d905 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry; use DateTime; @@ -26,7 +26,7 @@ use DateTime; * Class CaseLogEntry * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry * @internal * @since 3.0.0 */ @@ -34,7 +34,7 @@ class CaseLogEntry extends ActivityEntry { // Overloaded constants public const BLOCK_CODE = 'ibo-caselog-entry'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/activity-panel/activity-entry/caselog-entry'; + public const 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/Layout/ActivityPanel/ActivityEntry/EditsEntry.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php similarity index 93% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php index ba9c88973..8d73f8739 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry; use DateTime; @@ -29,7 +29,7 @@ use MetaModel; * Class EditsEntry * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry * @internal * @since 3.0.0 */ @@ -37,7 +37,7 @@ class EditsEntry extends ActivityEntry { // Overloaded constants public const BLOCK_CODE = 'ibo-edits-entry'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/activity-panel/activity-entry/edits-entry'; + public const 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'; @@ -140,7 +140,7 @@ class EditsEntry extends ActivityEntry * Merge $oEntry into the current one ($this). * Note that edits on any existing attribute codes will be replaced. * - * @param \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\EditsEntry $oEntry + * @param \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\EditsEntry $oEntry * * @return $this * @throws \Exception diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php similarity index 93% rename from sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php index b0eb97974..8e1541873 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry; use DateTime; @@ -27,7 +27,7 @@ use MetaModel; * Class TransitionEntry * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry * @internal * @since 3.0.0 */ @@ -35,7 +35,7 @@ class TransitionEntry extends ActivityEntry { // Overloaded constants public const BLOCK_CODE = 'ibo-transition-entry'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/activity-panel/activity-entry/transition-entry'; + public const 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/Layout/ActivityPanel/ActivityPanel.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php similarity index 89% rename from sources/application/UI/Layout/ActivityPanel/ActivityPanel.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php index 670e7c015..7175a2dcc 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php @@ -17,17 +17,15 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel; use AttributeDateTime; use cmdbAbstractObject; -use Combodo\iTop\Application\UI\Component\Button\ButtonFactory; -use Combodo\iTop\Application\UI\Component\Input\RichText\RichText; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntry; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CaseLogEntry; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\ActivityEntry; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CaseLogEntry; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm; +use Combodo\iTop\Application\UI\Base\UIBlock; use DBObject; use Exception; use MetaModel; @@ -36,7 +34,7 @@ use MetaModel; * Class ActivityPanel * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel * @internal * @since 3.0.0 */ @@ -44,8 +42,8 @@ class ActivityPanel extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-activity-panel'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/activity-panel/layout'; - public const JS_TEMPLATE_REL_PATH = 'layouts/activity-panel/layout'; + 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 = [ 'js/layouts/activity-panel/activity-panel.js', ]; @@ -65,9 +63,9 @@ class ActivityPanel extends UIBlock protected $bAreEntriesSorted; /** @var bool $bHasLifecycle True if the host object has a lifecycle */ protected $bHasLifecycle; - /** @var \Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm $oActivityTabEntryForm New entry form for the activity tab which is different from the case log tabs */ + /** @var \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm $oActivityTabEntryForm New entry form for the activity tab which is different from the case log tabs */ protected $oActivityTabEntryForm; - /** @var \Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm[] $aCaseLogTabsEntryForms */ + /** @var \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm[] $aCaseLogTabsEntryForms */ protected $aCaseLogTabsEntryForms; /** @@ -293,7 +291,7 @@ class ActivityPanel extends UIBlock /** * Add an $oEntry after all others, excepted if there is already an entry with the same ID in which case it replaces it. * - * @param \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntry $oEntry + * @param \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\ActivityEntry $oEntry * * @return $this * @throws \Exception @@ -478,7 +476,7 @@ class ActivityPanel extends UIBlock /** * Return all entry forms for all case log tabs * - * @return \Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm[] + * @return \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm[] */ public function GetCaseLogTabsEntryForms(): array { @@ -490,7 +488,7 @@ class ActivityPanel extends UIBlock * Note: If there is no caselog for that ID, it will proceed silently. * * @param string $sCaseLogId - * @param \Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm $oCaseLogEntryForm + * @param \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm $oCaseLogEntryForm * * @return $this */ @@ -508,7 +506,7 @@ class ActivityPanel extends UIBlock * * @param string $sCaseLogId * - * @return \Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm + * @return \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm */ public function GetCaseLogTabEntryForm(string $sCaseLogId) { @@ -551,7 +549,7 @@ class ActivityPanel extends UIBlock * Return the entry form for the activity tab * * @see $oActivityTabEntryForm - * @return \Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm + * @return \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm */ public function GetActivityTabEntryForm(): CaseLogEntryForm { @@ -561,7 +559,7 @@ class ActivityPanel extends UIBlock /** * Set the entry form for the activity tab * - * @param \Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm $oCaseLogEntryForm + * @param \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm $oCaseLogEntryForm * @see $oActivityTabEntryForm * * @return $this diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php similarity index 90% rename from sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php index e82c32684..fc3dede79 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel; use cmdbAbstractObject; use CMDBChangeOpSetAttributeCaseLog; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntryFactory; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\EditsEntry; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryFormFactory\CaseLogEntryFormFactory; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\ActivityEntryFactory; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\EditsEntry; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryFormFactory\CaseLogEntryFormFactory; use DBObject; use DBObjectSearch; use DBObjectSet; @@ -36,7 +36,7 @@ use MetaModel; * * @internal * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel * @since 3.0.0 */ class ActivityPanelFactory @@ -49,7 +49,7 @@ class ActivityPanelFactory * * @see cmdbAbstractObject::ENUM_OBJECT_MODE_XXX * - * @return \Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityPanel + * @return \Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityPanel * @throws \ArchivedObjectException * @throws \CoreException * @throws \CoreUnexpectedValue diff --git a/sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php b/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php similarity index 81% rename from sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php rename to sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php index 4aab9c873..7a40b4a43 100644 --- a/sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php @@ -3,25 +3,25 @@ * @copyright Copyright (C) 2010-2020 Combodo SARL * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm; use cmdbAbstractObject; -use Combodo\iTop\Application\UI\Component\Input\RichText\RichText; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Component\Input\RichText\RichText; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class CaseLogEntryForm * - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm */ class CaseLogEntryForm extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-caselog-entry-form'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/activity-panel/caselog-entry-form/layout'; - public const JS_TEMPLATE_REL_PATH = 'layouts/activity-panel/caselog-entry-form/layout'; + 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 = [ 'js/layouts/activity-panel/caselog-entry-form.js', ]; @@ -50,9 +50,9 @@ class CaseLogEntryForm extends UIContentBlock * @see static::ENUM_CONTAINER_TAB_TYPE_XXX */ protected $sContainerTabType; - /** @var \Combodo\iTop\Application\UI\Component\Input\RichText\RichText $oTextInput The main input to write a case log entry */ + /** @var \Combodo\iTop\Application\UI\Base\Component\Input\RichText\RichText $oTextInput The main input to write a case log entry */ protected $oTextInput; - /** @var \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu Menu for possible options on the send button */ + /** @var \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu Menu for possible options on the send button */ protected $oSendButtonPopoverMenu; /** @var array $aMainActionButtons The form main actions (send, cancel, ...) */ protected $aMainActionButtons; @@ -160,7 +160,7 @@ class CaseLogEntryForm extends UIContentBlock } /** - * @return \Combodo\iTop\Application\UI\Component\Input\RichText\RichText + * @return \Combodo\iTop\Application\UI\Base\Component\Input\RichText\RichText */ public function GetTextInput(): RichText { @@ -168,7 +168,7 @@ class CaseLogEntryForm extends UIContentBlock } /** - * @param \Combodo\iTop\Application\UI\Component\Input\RichText\RichText $oTextInput + * @param \Combodo\iTop\Application\UI\Base\Component\Input\RichText\RichText $oTextInput * * @return $this */ @@ -179,7 +179,7 @@ class CaseLogEntryForm extends UIContentBlock } /** - * @return \Combodo\iTop\Application\UI\UIBlock[] + * @return \Combodo\iTop\Application\UI\Base\UIBlock[] */ public function GetMainActionButtons() { @@ -199,7 +199,7 @@ class CaseLogEntryForm extends UIContentBlock } /** - * @param \Combodo\iTop\Application\UI\UIBlock $oMainActionButton + * @param \Combodo\iTop\Application\UI\Base\UIBlock $oMainActionButton * @return $this; */ public function AddMainActionButtons(UIBlock $oMainActionButton) @@ -209,7 +209,7 @@ class CaseLogEntryForm extends UIContentBlock } /** - * @return \Combodo\iTop\Application\UI\UIBlock[] + * @return \Combodo\iTop\Application\UI\Base\UIBlock[] */ public function GetExtraActionButtons() { @@ -231,7 +231,7 @@ class CaseLogEntryForm extends UIContentBlock } /** - * @param \Combodo\iTop\Application\UI\UIBlock $oExtraActionButton + * @param \Combodo\iTop\Application\UI\Base\UIBlock $oExtraActionButton * * @return $this; * @see $aExtraActionButtons @@ -244,7 +244,7 @@ class CaseLogEntryForm extends UIContentBlock } /** - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu */ public function GetSendButtonPopoverMenu(): PopoverMenu { @@ -252,7 +252,7 @@ class CaseLogEntryForm extends UIContentBlock } /** - * @param \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu $oCaseLogSelectionPopOverMenu + * @param \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu $oCaseLogSelectionPopOverMenu * @return $this */ public function SetSendButtonPopoverMenu(PopoverMenu $oCaseLogSelectionPopOverMenu) diff --git a/sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php b/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php similarity index 86% rename from sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php rename to sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php index f7503d633..cf2c470a4 100644 --- a/sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php +++ b/sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php @@ -5,20 +5,20 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryFormFactory; +namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryFormFactory; use cmdbAbstractObject; -use Combodo\iTop\Application\UI\Component\Button\Button; -use Combodo\iTop\Application\UI\Component\Button\ButtonFactory; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItemFactory; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm; +use Combodo\iTop\Application\UI\Base\Component\Button\Button; +use Combodo\iTop\Application\UI\Base\Component\Button\ButtonFactory; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItemFactory; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryForm\CaseLogEntryForm; use DBObject; use DBObjectSet; use Dict; -use MetaModel; use JSPopupMenuItem; +use MetaModel; use UserRights; /** @@ -27,7 +27,7 @@ use UserRights; * @internal * @author Stephen Abello * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\CaseLogEntryFormFactory + * @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\CaseLogEntryFormFactory * @since 3.0.0 */ class CaseLogEntryFormFactory @@ -56,7 +56,7 @@ class CaseLogEntryFormFactory } /** - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ protected static function PrepareCancelButton(): Button { @@ -64,7 +64,7 @@ class CaseLogEntryFormFactory } /** - * @return \Combodo\iTop\Application\UI\Component\Button\Button + * @return \Combodo\iTop\Application\UI\Base\Component\Button\Button */ protected static function PrepareSendButton(): Button { @@ -131,7 +131,7 @@ JS * * @param \DBObject $oObject * - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu * @throws \CoreException * @throws \Exception */ diff --git a/sources/application/UI/Layout/Dashboard/DashboardColumn.php b/sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php similarity index 91% rename from sources/application/UI/Layout/Dashboard/DashboardColumn.php rename to sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php index 06e46e0ca..d32d274ff 100644 --- a/sources/application/UI/Layout/Dashboard/DashboardColumn.php +++ b/sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php @@ -5,15 +5,15 @@ */ -namespace Combodo\iTop\Application\UI\Layout\Dashboard; +namespace Combodo\iTop\Application\UI\Base\Layout\Dashboard; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; class DashboardColumn extends UIBlock { public const BLOCK_CODE = 'ibo-dashboard-column'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/dashboard/column/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/column/layout'; /** @var UIBlock[] */ protected $aUIBlocks; diff --git a/sources/application/UI/Layout/Dashboard/DashboardLayout.php b/sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php similarity index 74% rename from sources/application/UI/Layout/Dashboard/DashboardLayout.php rename to sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php index c9ffaccbb..1c5175aa7 100644 --- a/sources/application/UI/Layout/Dashboard/DashboardLayout.php +++ b/sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php @@ -5,14 +5,14 @@ */ -namespace Combodo\iTop\Application\UI\Layout\Dashboard; +namespace Combodo\iTop\Application\UI\Base\Layout\Dashboard; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; class DashboardLayout extends UIBlock { public const BLOCK_CODE = 'ibo-dashboard'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/dashboard/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/layout'; /** @var DashboardRow[] */ protected $aDashboardRows; @@ -28,7 +28,7 @@ class DashboardLayout extends UIBlock /** * - * @param \Combodo\iTop\Application\UI\Layout\Dashboard\DashboardRow $oDashboardRow + * @param \Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardRow $oDashboardRow * * @return DashboardLayout */ diff --git a/sources/application/UI/Layout/Dashboard/DashboardRow.php b/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php similarity index 80% rename from sources/application/UI/Layout/Dashboard/DashboardRow.php rename to sources/application/UI/Base/Layout/Dashboard/DashboardRow.php index 2dc86a3be..bce52378c 100644 --- a/sources/application/UI/Layout/Dashboard/DashboardRow.php +++ b/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php @@ -5,14 +5,14 @@ */ -namespace Combodo\iTop\Application\UI\Layout\Dashboard; +namespace Combodo\iTop\Application\UI\Base\Layout\Dashboard; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; class DashboardRow extends UIBlock { public const BLOCK_CODE = 'ibo-dashboard-row'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/dashboard/row/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/dashboard/row/layout'; /** @var DashboardColumn[] */ protected $aDashboardColumns; @@ -31,7 +31,7 @@ class DashboardRow extends UIBlock /** * - * @param \Combodo\iTop\Application\UI\Layout\Dashboard\DashboardColumn $oDashboardColumn + * @param \Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardColumn $oDashboardColumn * * @return DashboardRow */ diff --git a/sources/application/UI/Layout/MultiColumn/Column/Column.php b/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php similarity index 50% rename from sources/application/UI/Layout/MultiColumn/Column/Column.php rename to sources/application/UI/Base/Layout/MultiColumn/Column/Column.php index 8cb639c71..14d24cb14 100644 --- a/sources/application/UI/Layout/MultiColumn/Column/Column.php +++ b/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php @@ -4,20 +4,20 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Layout\MultiColumn\Column; +namespace Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; /** * Class Column * - * @package Combodo\iTop\Application\UI\Layout\MultiColumn\Column + * @package Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column * @internal * @since 3.0.0 */ class Column extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-column'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/multi-column/column/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/multi-column/column/layout'; } \ No newline at end of file diff --git a/sources/application/UI/Layout/MultiColumn/MultiColumn.php b/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php similarity index 67% rename from sources/application/UI/Layout/MultiColumn/MultiColumn.php rename to sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php index 7938befc9..7cabc2a71 100644 --- a/sources/application/UI/Layout/MultiColumn/MultiColumn.php +++ b/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php @@ -4,25 +4,25 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Layout\MultiColumn; +namespace Combodo\iTop\Application\UI\Base\Layout\MultiColumn; -use Combodo\iTop\Application\UI\Layout\MultiColumn\Column\Column; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\Column; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class MultiColumn * - * @package Combodo\iTop\Application\UI\Layout\MultiColumn + * @package Combodo\iTop\Application\UI\Base\Layout\MultiColumn * @internal * @since 3.0.0 */ class MultiColumn extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-multi-column'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/multi-column/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/multi-column/layout'; - /** @var \Combodo\iTop\Application\UI\Layout\MultiColumn\Column\Column[] */ + /** @var \Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\Column[] */ protected $aColumns; /** @@ -34,7 +34,7 @@ class MultiColumn extends UIBlock { } /** - * @param \Combodo\iTop\Application\UI\Layout\MultiColumn\Column\Column $oColumn + * @param \Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\Column $oColumn * * @return $this */ diff --git a/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php similarity index 89% rename from sources/application/UI/Layout/NavigationMenu/NavigationMenu.php rename to sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php index 35ab7f363..f64c4d3d7 100644 --- a/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php +++ b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\NavigationMenu; +namespace Combodo\iTop\Application\UI\Base\Layout\NavigationMenu; use ApplicationContext; @@ -25,9 +25,9 @@ use ApplicationMenu; use appUserPreferences; use CMDBObjectSet; use Combodo\iTop\Application\Branding; -use Combodo\iTop\Application\UI\Component\PopoverMenu\NewsroomMenu\NewsroomMenu; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenu; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; +use Combodo\iTop\Application\UI\Base\UIBlock; use DBObjectSearch; use Dict; use MetaModel; @@ -39,7 +39,7 @@ use utils; * Class NavigationMenu * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\NavigationMenu + * @package Combodo\iTop\Application\UI\Base\Layout\NavigationMenu * @internal * @since 3.0.0 */ @@ -47,8 +47,8 @@ class NavigationMenu extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-navigation-menu'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/navigation-menu/layout'; - public const JS_TEMPLATE_REL_PATH = 'layouts/navigation-menu/layout'; + 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 = [ 'js/layouts/navigation-menu.js', 'js/extkeywidget.js', @@ -69,9 +69,9 @@ class NavigationMenu extends UIBlock protected $aMenuGroups; /** @var array $aUserData */ protected $aUserData; - /** @var \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu $oUserMenu */ + /** @var \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu $oUserMenu */ private $oUserMenu; - /** @var \Combodo\iTop\Application\UI\Component\PopoverMenu\NewsroomMenu\NewsroomMenu $oNewsroomMenu */ + /** @var \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenu $oNewsroomMenu */ private $oNewsroomMenu; /** @var bool $bIsExpanded */ protected $bIsExpanded; @@ -80,8 +80,8 @@ class NavigationMenu extends UIBlock * NavigationMenu constructor. * * @param \ApplicationContext $oAppContext - * @param \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu $oUserMenu - * @param \Combodo\iTop\Application\UI\Component\PopoverMenu\NewsroomMenu\NewsroomMenu|null $oNewsroomMenu + * @param \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu $oUserMenu + * @param \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenu|null $oNewsroomMenu * @param string|null $sId * * @throws \CoreException @@ -166,14 +166,14 @@ class NavigationMenu extends UIBlock } /** - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu */ public function GetUserMenu() { return $this->oUserMenu; } /** - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\NewsroomMenu\NewsroomMenu + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenu */ public function GetNewsroomMenu() { diff --git a/sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php similarity index 78% rename from sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php rename to sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php index bab16d662..088ca3c6a 100644 --- a/sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php +++ b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php @@ -17,19 +17,19 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\NavigationMenu; +namespace Combodo\iTop\Application\UI\Base\Layout\NavigationMenu; use ApplicationContext; -use Combodo\iTop\Application\UI\Component\PopoverMenu\NewsroomMenu\NewsroomMenuFactory; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuFactory; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\NewsroomMenu\NewsroomMenuFactory; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuFactory; use MetaModel; /** * Class NavigationMenuFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\NavigationMenu + * @package Combodo\iTop\Application\UI\Base\Layout\NavigationMenu * @internal * @since 3.0.0 */ @@ -38,7 +38,7 @@ class NavigationMenuFactory /** * Make a standard NavigationMenu layout for backoffice pages * - * @return \Combodo\iTop\Application\UI\Layout\NavigationMenu\NavigationMenu + * @return \Combodo\iTop\Application\UI\Base\Layout\NavigationMenu\NavigationMenu * @throws \CoreException * @throws \CoreUnexpectedValue * @throws \DictExceptionMissingString diff --git a/sources/application/UI/Layout/Object/ObjectDetails.php b/sources/application/UI/Base/Layout/Object/ObjectDetails.php similarity index 91% rename from sources/application/UI/Layout/Object/ObjectDetails.php rename to sources/application/UI/Base/Layout/Object/ObjectDetails.php index ad4f91fba..17eb0b729 100644 --- a/sources/application/UI/Layout/Object/ObjectDetails.php +++ b/sources/application/UI/Base/Layout/Object/ObjectDetails.php @@ -4,10 +4,10 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Layout\Object; +namespace Combodo\iTop\Application\UI\Base\Layout\Object; -use Combodo\iTop\Application\UI\Component\Panel\Panel; +use Combodo\iTop\Application\UI\Base\Component\Panel\Panel; use Combodo\iTop\Application\UI\Helper\UIHelper; use DBObject; use MetaModel; @@ -16,7 +16,7 @@ class ObjectDetails extends Panel { // Overloaded constants public const BLOCK_CODE = 'ibo-object-details'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/object/object-details/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/object/object-details/layout'; /** @var string */ protected $sClassName; diff --git a/sources/application/UI/Layout/Object/ObjectFactory.php b/sources/application/UI/Base/Layout/Object/ObjectFactory.php similarity index 65% rename from sources/application/UI/Layout/Object/ObjectFactory.php rename to sources/application/UI/Base/Layout/Object/ObjectFactory.php index e753ba08a..17a8685ca 100644 --- a/sources/application/UI/Layout/Object/ObjectFactory.php +++ b/sources/application/UI/Base/Layout/Object/ObjectFactory.php @@ -4,10 +4,9 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Layout\Object; +namespace Combodo\iTop\Application\UI\Base\Layout\Object; -use Combodo\iTop\Application\UI\Layout\Object\ObjectDetails; use DBObject; /** @@ -15,14 +14,14 @@ use DBObject; * * @internal * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\Object + * @package Combodo\iTop\Application\UI\Base\Layout\Object * @since 3.0.0 */ class ObjectFactory { /** * Make a standard object details layout. * - * @return \Combodo\iTop\Application\UI\Layout\Object\ObjectDetails + * @return \Combodo\iTop\Application\UI\Base\Layout\Object\ObjectDetails */ public static function MakeDetails(DBObject $oObject) { return new ObjectDetails($oObject); diff --git a/sources/application/UI/Layout/PageContent/PageContent.php b/sources/application/UI/Base/Layout/PageContent/PageContent.php similarity index 89% rename from sources/application/UI/Layout/PageContent/PageContent.php rename to sources/application/UI/Base/Layout/PageContent/PageContent.php index 04d3cdf91..f9b2f22f8 100644 --- a/sources/application/UI/Layout/PageContent/PageContent.php +++ b/sources/application/UI/Base/Layout/PageContent/PageContent.php @@ -17,20 +17,20 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\PageContent; +namespace Combodo\iTop\Application\UI\Base\Layout\PageContent; -use Combodo\iTop\Application\UI\Component\Html\Html; -use Combodo\iTop\Application\UI\iUIBlock; -use Combodo\iTop\Application\UI\Layout\iUIContentBlock; -use Combodo\iTop\Application\UI\tUIContentAreas; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Component\Html\Html; +use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock; +use Combodo\iTop\Application\UI\Base\tUIContentAreas; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class PageContent * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\PageContent + * @package Combodo\iTop\Application\UI\Base\Layout\PageContent * @internal * @since 3.0.0 */ @@ -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 = 'layouts/page-content/layout'; + public const 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'; @@ -65,7 +65,7 @@ class PageContent extends UIBlock implements iUIContentBlock { /** * Set all main blocks at once. * - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aBlocks * * @return $this */ @@ -78,7 +78,7 @@ class PageContent extends UIBlock implements iUIContentBlock { /** * Return all the main blocks * - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] * @throws \Exception */ public function GetMainBlocks() { @@ -89,7 +89,7 @@ class PageContent extends UIBlock implements iUIContentBlock { * Add the $oBlock to the main blocks. * Note that if a block with the same ID already exists, it will be replaced. * - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * * @return $this */ @@ -212,7 +212,7 @@ class PageContent extends UIBlock implements iUIContentBlock { * Set the MAIN AREA subBlocks * * @inheritDoc - * @return $this|\Combodo\iTop\Application\UI\Layout\iUIContentBlock + * @return $this|\Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock */ public function SetSubBlocks(array $aSubBlocks): iUIContentBlock { $this->SetMainBlocks($aSubBlocks); @@ -312,7 +312,7 @@ class PageContent extends UIBlock implements iUIContentBlock { * Set the MAIN AREA subBlocks * * @inheritDoc - * @return $this|\Combodo\iTop\Application\UI\Layout\iUIContentBlock + * @return $this|\Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock */ public function SetDeferredBlocks(array $aDeferredBlocks): iUIContentBlock { diff --git a/sources/application/UI/Layout/PageContent/PageContentFactory.php b/sources/application/UI/Base/Layout/PageContent/PageContentFactory.php similarity index 82% rename from sources/application/UI/Layout/PageContent/PageContentFactory.php rename to sources/application/UI/Base/Layout/PageContent/PageContentFactory.php index 9fa44c6cd..b44800dce 100644 --- a/sources/application/UI/Layout/PageContent/PageContentFactory.php +++ b/sources/application/UI/Base/Layout/PageContent/PageContentFactory.php @@ -17,11 +17,11 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\PageContent; +namespace Combodo\iTop\Application\UI\Base\Layout\PageContent; use cmdbAbstractObject; -use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityPanelFactory; +use Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityPanelFactory; use DBObject; /** @@ -29,7 +29,7 @@ use DBObject; * * @internal * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\PageContent + * @package Combodo\iTop\Application\UI\Base\Layout\PageContent * @since 3.0.0 */ class PageContentFactory @@ -37,7 +37,7 @@ class PageContentFactory /** * Make a standard empty PageContent layout for backoffice pages. * - * @return \Combodo\iTop\Application\UI\Layout\PageContent\PageContent + * @return \Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContent */ public static function MakeStandardEmpty() { @@ -52,7 +52,7 @@ class PageContentFactory * * @see cmdbAbstractObject::ENUM_OBJECT_MODE_XXX * - * @return \Combodo\iTop\Application\UI\Layout\PageContent\PageContentWithSideContent + * @return \Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentWithSideContent * @throws \CoreException */ public static function MakeForObjectDetails(DBObject $oObject, string $sMode = cmdbAbstractObject::DEFAULT_OBJECT_MODE) diff --git a/sources/application/UI/Layout/PageContent/PageContentWithSideContent.php b/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php similarity index 83% rename from sources/application/UI/Layout/PageContent/PageContentWithSideContent.php rename to sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php index f343b6c13..274172e77 100644 --- a/sources/application/UI/Layout/PageContent/PageContentWithSideContent.php +++ b/sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php @@ -17,23 +17,23 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\PageContent; +namespace Combodo\iTop\Application\UI\Base\Layout\PageContent; -use Combodo\iTop\Application\UI\iUIBlock; +use Combodo\iTop\Application\UI\Base\iUIBlock; /** * Class PageContentWithSideContent * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\PageContent + * @package Combodo\iTop\Application\UI\Base\Layout\PageContent * @internal * @since 3.0.0 */ class PageContentWithSideContent extends PageContent { // Overloaded constants public const BLOCK_CODE = 'ibo-page-content-with-side-content'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/page-content/with-side-content'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/page-content/with-side-content'; // Specific constants public const ENUM_CONTENT_AREA_SIDE = 'side'; @@ -52,7 +52,7 @@ class PageContentWithSideContent extends PageContent { /** * Set all side blocks at once. * - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aBlocks * * @return $this */ @@ -65,7 +65,7 @@ class PageContentWithSideContent extends PageContent { /** * Return all the side blocks * - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] * @throws \Exception */ public function GetSideBlocks() { @@ -76,7 +76,7 @@ class PageContentWithSideContent extends PageContent { * Add the $oBlock to the side blocks. * Note that if a block with the same ID already exists, it will be replaced. * - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * * @return $this */ diff --git a/sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php b/sources/application/UI/Base/Layout/TabContainer/Tab/AjaxTab.php similarity index 88% rename from sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php rename to sources/application/UI/Base/Layout/TabContainer/Tab/AjaxTab.php index 82cca07ea..c366dd101 100644 --- a/sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php +++ b/sources/application/UI/Base/Layout/TabContainer/Tab/AjaxTab.php @@ -17,18 +17,18 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\TabContainer\Tab; +namespace Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab; -use Combodo\iTop\Application\UI\iUIBlock; -use Combodo\iTop\Application\UI\UIException; +use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\UI\Base\UIException; use Dict; use TabManager; /** * Class AjaxTab * - * @package Combodo\iTop\Application\UI\Layout\TabContainer\Tab + * @package Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab * @internal * @since 3.0.0 */ @@ -104,7 +104,7 @@ class AjaxTab extends Tab { /** * @inheritDoc - * @throws \Combodo\iTop\Application\UI\UIException + * @throws \Combodo\iTop\Application\UI\Base\UIException */ public function AddHtml(string $sHtml) { throw new UIException($this, Dict::Format('UIBlock:Error:AddBlockForbidden', $this->GetId())); @@ -112,7 +112,7 @@ class AjaxTab extends Tab { /** * @inheritDoc - * @throws \Combodo\iTop\Application\UI\UIException + * @throws \Combodo\iTop\Application\UI\Base\UIException */ public function AddSubBlock(iUIBlock $oSubBlock) { throw new UIException($this, Dict::Format('UIBlock:Error:AddBlockForbidden', $this->GetId())); diff --git a/sources/application/UI/Layout/TabContainer/Tab/Tab.php b/sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php similarity index 85% rename from sources/application/UI/Layout/TabContainer/Tab/Tab.php rename to sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php index a8ffa1f23..7e87928e8 100644 --- a/sources/application/UI/Layout/TabContainer/Tab/Tab.php +++ b/sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php @@ -17,16 +17,16 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\TabContainer\Tab; +namespace Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use TabManager; /** * Class Tab * - * @package Combodo\iTop\Application\UI\Layout\TabContainer\Tab + * @package Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab * @internal * @since 3.0.0 */ @@ -34,7 +34,7 @@ class Tab extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-tab'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/tab-container/tab/layout'; + public const 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/Layout/TabContainer/TabContainer.php b/sources/application/UI/Base/Layout/TabContainer/TabContainer.php similarity index 76% rename from sources/application/UI/Layout/TabContainer/TabContainer.php rename to sources/application/UI/Base/Layout/TabContainer/TabContainer.php index 6cc727bb4..3d09f721a 100644 --- a/sources/application/UI/Layout/TabContainer/TabContainer.php +++ b/sources/application/UI/Base/Layout/TabContainer/TabContainer.php @@ -17,29 +17,29 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\TabContainer; +namespace Combodo\iTop\Application\UI\Base\Layout\TabContainer; use appUserPreferences; -use Combodo\iTop\Application\UI\iUIBlock; -use Combodo\iTop\Application\UI\Layout\iUIContentBlock; -use Combodo\iTop\Application\UI\Layout\TabContainer\Tab\AjaxTab; -use Combodo\iTop\Application\UI\Layout\TabContainer\Tab\Tab; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; -use Combodo\iTop\Application\UI\UIException; +use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\AjaxTab; +use Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\Tab; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\UIException; use Dict; /** * Class TabContainer * - * @package Combodo\iTop\Application\UI\Layout\TabContainer + * @package Combodo\iTop\Application\UI\Base\Layout\TabContainer */ class TabContainer extends UIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-tab-container'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/tab-container/layout'; - public const JS_TEMPLATE_REL_PATH = 'layouts/tab-container/layout'; + 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 = [ 'js/layouts/tab-container.js' ]; @@ -94,7 +94,7 @@ class TabContainer extends UIContentBlock public function GetTab($sTabCode): ?Tab { - /** @var \Combodo\iTop\Application\UI\Layout\TabContainer\Tab\Tab $oTab */ + /** @var \Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\Tab $oTab */ $oTab = $this->GetSubBlock($sTabCode); return $oTab; } @@ -103,8 +103,8 @@ class TabContainer extends UIContentBlock * @param string $sTabCode * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Layout\TabContainer\Tab\Tab - * @throws \Combodo\iTop\Application\UI\UIException + * @return \Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\Tab + * @throws \Combodo\iTop\Application\UI\Base\UIException */ public function AddAjaxTab(string $sTabCode, string $sTitle): Tab { @@ -117,8 +117,8 @@ class TabContainer extends UIContentBlock * @param string $sTabCode * @param string $sTitle * - * @return \Combodo\iTop\Application\UI\Layout\TabContainer\Tab\Tab - * @throws \Combodo\iTop\Application\UI\UIException + * @return \Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\Tab + * @throws \Combodo\iTop\Application\UI\Base\UIException */ public function AddTab(string $sTabCode, string $sTitle): Tab { @@ -134,10 +134,10 @@ class TabContainer extends UIContentBlock } /** - * @param \Combodo\iTop\Application\UI\iUIBlock $oSubBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oSubBlock * * @return iUIContentBlock - * @throws \Combodo\iTop\Application\UI\UIException + * @throws \Combodo\iTop\Application\UI\Base\UIException */ public function AddSubBlock(iUIBlock $oSubBlock): iUIContentBlock { diff --git a/sources/application/UI/Layout/TopBar/TopBar.php b/sources/application/UI/Base/Layout/TopBar/TopBar.php similarity index 74% rename from sources/application/UI/Layout/TopBar/TopBar.php rename to sources/application/UI/Base/Layout/TopBar/TopBar.php index 5159a544e..e43259103 100644 --- a/sources/application/UI/Layout/TopBar/TopBar.php +++ b/sources/application/UI/Base/Layout/TopBar/TopBar.php @@ -17,20 +17,20 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\TopBar; +namespace Combodo\iTop\Application\UI\Base\Layout\TopBar; -use Combodo\iTop\Application\UI\Component\Breadcrumbs\Breadcrumbs; -use Combodo\iTop\Application\UI\Component\GlobalSearch\GlobalSearch; -use Combodo\iTop\Application\UI\Component\QuickCreate\QuickCreate; -use Combodo\iTop\Application\UI\Component\Toolbar\Toolbar; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Component\Breadcrumbs\Breadcrumbs; +use Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearch; +use Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreate; +use Combodo\iTop\Application\UI\Base\Component\Toolbar\Toolbar; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class TopBar * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\TopBar + * @package Combodo\iTop\Application\UI\Base\Layout\TopBar * @internal * @since 3.0.0 */ @@ -38,7 +38,7 @@ class TopBar extends UIBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-top-bar'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/top-bar/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/top-bar/layout'; /** @var QuickCreate|null $oQuickCreate */ protected $oQuickCreate; @@ -53,9 +53,9 @@ class TopBar extends UIBlock * TopBar constructor. * * @param string|null $sId - * @param \Combodo\iTop\Application\UI\Component\QuickCreate\QuickCreate|null $oQuickCreate - * @param \Combodo\iTop\Application\UI\Component\GlobalSearch\GlobalSearch|null $oGlobalSearch - * @param \Combodo\iTop\Application\UI\Component\Breadcrumbs\Breadcrumbs|null $oBreadcrumbs + * @param \Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreate|null $oQuickCreate + * @param \Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearch|null $oGlobalSearch + * @param \Combodo\iTop\Application\UI\Base\Component\Breadcrumbs\Breadcrumbs|null $oBreadcrumbs */ public function __construct( $sId = null, QuickCreate $oQuickCreate = null, GlobalSearch $oGlobalSearch = null, Breadcrumbs $oBreadcrumbs = null @@ -70,7 +70,7 @@ class TopBar extends UIBlock /** * Set the quick create component * - * @param \Combodo\iTop\Application\UI\Component\QuickCreate\QuickCreate $oQuickCreate + * @param \Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreate $oQuickCreate * * @return $this */ @@ -83,7 +83,7 @@ class TopBar extends UIBlock /** * Return the global search component * - * @return \Combodo\iTop\Application\UI\Component\QuickCreate\QuickCreate|null + * @return \Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreate|null */ public function GetQuickCreate() { @@ -103,7 +103,7 @@ class TopBar extends UIBlock /** * Set the global search component * - * @param \Combodo\iTop\Application\UI\Component\GlobalSearch\GlobalSearch $oGlobalSearch + * @param \Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearch $oGlobalSearch * * @return $this */ @@ -116,7 +116,7 @@ class TopBar extends UIBlock /** * Return the global search component * - * @return \Combodo\iTop\Application\UI\Component\GlobalSearch\GlobalSearch|null + * @return \Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearch|null */ public function GetGlobalSearch() { @@ -136,7 +136,7 @@ class TopBar extends UIBlock /** * Set the breadcrumbs component * - * @param \Combodo\iTop\Application\UI\Component\Breadcrumbs\Breadcrumbs $oBreadcrumbs + * @param \Combodo\iTop\Application\UI\Base\Component\Breadcrumbs\Breadcrumbs $oBreadcrumbs * * @return $this */ @@ -149,7 +149,7 @@ class TopBar extends UIBlock /** * Return the breadcrumbs component * - * @return \Combodo\iTop\Application\UI\Component\Breadcrumbs\Breadcrumbs|null + * @return \Combodo\iTop\Application\UI\Base\Component\Breadcrumbs\Breadcrumbs|null */ public function GetBreadcrumbs() { diff --git a/sources/application/UI/Layout/TopBar/TopBarFactory.php b/sources/application/UI/Base/Layout/TopBar/TopBarFactory.php similarity index 80% rename from sources/application/UI/Layout/TopBar/TopBarFactory.php rename to sources/application/UI/Base/Layout/TopBar/TopBarFactory.php index 56d9de491..ddf4435b7 100644 --- a/sources/application/UI/Layout/TopBar/TopBarFactory.php +++ b/sources/application/UI/Base/Layout/TopBar/TopBarFactory.php @@ -17,19 +17,19 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI\Layout\TopBar; +namespace Combodo\iTop\Application\UI\Base\Layout\TopBar; -use Combodo\iTop\Application\UI\Component\Breadcrumbs\Breadcrumbs; -use Combodo\iTop\Application\UI\Component\GlobalSearch\GlobalSearchFactory; -use Combodo\iTop\Application\UI\Component\QuickCreate\QuickCreateFactory; +use Combodo\iTop\Application\UI\Base\Component\Breadcrumbs\Breadcrumbs; +use Combodo\iTop\Application\UI\Base\Component\GlobalSearch\GlobalSearchFactory; +use Combodo\iTop\Application\UI\Base\Component\QuickCreate\QuickCreateFactory; use utils; /** * Class TopBarFactory * * @author Guillaume Lajarige - * @package Combodo\iTop\Application\UI\Layout\TopBar + * @package Combodo\iTop\Application\UI\Base\Layout\TopBar * @internal * @since 3.0.0 */ @@ -40,7 +40,7 @@ class TopBarFactory * * @param array|null $aBreadcrumbsEntry Current breadcrumbs entry to add * - * @return \Combodo\iTop\Application\UI\Layout\TopBar\TopBar + * @return \Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBar * @throws \CoreException * @throws \CoreUnexpectedValue * @throws \MySQLException diff --git a/sources/application/UI/Layout/UIContentBlock.php b/sources/application/UI/Base/Layout/UIContentBlock.php similarity index 92% rename from sources/application/UI/Layout/UIContentBlock.php rename to sources/application/UI/Base/Layout/UIContentBlock.php index 07d6bb0a4..fa8045c59 100644 --- a/sources/application/UI/Layout/UIContentBlock.php +++ b/sources/application/UI/Base/Layout/UIContentBlock.php @@ -5,17 +5,18 @@ */ -namespace Combodo\iTop\Application\UI\Layout; +namespace Combodo\iTop\Application\UI\Base\Layout; -use Combodo\iTop\Application\UI\Component\Html\Html; -use Combodo\iTop\Application\UI\iUIBlock; -use Combodo\iTop\Application\UI\UIBlock; +use Combodo\iTop\Application\UI\Base\Component\Html\Html; +use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\UI\Base\UIBlock; /** * Class UIContentBlock + * Base block containing sub-blocks * - * @package Combodo\iTop\Application\UI\Layout + * @package Combodo\iTop\Application\UI\Base\Layout * @author Eric Espie * @author Anne-Catherine Cognet * @internal @@ -25,7 +26,7 @@ class UIContentBlock extends UIBlock implements iUIContentBlock { // Overloaded constants public const BLOCK_CODE = 'ibo-content-block'; - public const HTML_TEMPLATE_REL_PATH = 'layouts/content-block/layout'; + public const HTML_TEMPLATE_REL_PATH = 'base/layouts/content-block/layout'; /** @var array */ protected $aCSSClasses; diff --git a/sources/application/UI/Layout/iUIContentBlock.php b/sources/application/UI/Base/Layout/iUIContentBlock.php similarity index 78% rename from sources/application/UI/Layout/iUIContentBlock.php rename to sources/application/UI/Base/Layout/iUIContentBlock.php index fec141e34..af25123ba 100644 --- a/sources/application/UI/Layout/iUIContentBlock.php +++ b/sources/application/UI/Base/Layout/iUIContentBlock.php @@ -4,14 +4,14 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI\Layout; +namespace Combodo\iTop\Application\UI\Base\Layout; -use Combodo\iTop\Application\UI\iUIBlock; +use Combodo\iTop\Application\UI\Base\iUIBlock; /** * Interface iUIContentBlock * - * @package Combodo\iTop\Application\UI\Layout + * @package Combodo\iTop\Application\UI\Base\Layout * @author Eric Espie * @author Anne-Catherine Cognet * @internal @@ -30,7 +30,7 @@ interface iUIContentBlock { /** * Add $oSubBlock, replacing any block with the same ID * - * @param \Combodo\iTop\Application\UI\iUIBlock $oSubBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oSubBlock * * @return $this */ @@ -60,21 +60,21 @@ interface iUIContentBlock { * * @param string $sId * - * @return \Combodo\iTop\Application\UI\iUIBlock|null + * @return \Combodo\iTop\Application\UI\Base\iUIBlock|null */ public function GetSubBlock(string $sId): ?iUIBlock; /** * Return an array of all the sub blocks * - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] */ public function GetSubBlocks(): array; /** * Set all sub blocks at once, replacing all existing ones * - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aSubBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aSubBlocks * * @return $this */ @@ -84,7 +84,7 @@ interface iUIContentBlock { /** * Add $oDeferredBlock, replacing any block with the same ID * - * @param \Combodo\iTop\Application\UI\iUIBlock $oDeferredBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oDeferredBlock * * @return $this */ @@ -114,21 +114,21 @@ interface iUIContentBlock { * * @param string $sId * - * @return \Combodo\iTop\Application\UI\iUIBlock|null + * @return \Combodo\iTop\Application\UI\Base\iUIBlock|null */ public function GetDeferredBlock(string $sId): ?iUIBlock; /** * Return an array of all the sub blocks * - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] */ public function GetDeferredBlocks(): array; /** * Set all sub blocks at once, replacing all existing ones * - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aDeferredBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aDeferredBlocks * * @return $this */ diff --git a/sources/application/UI/UIBlock.php b/sources/application/UI/Base/UIBlock.php similarity index 98% rename from sources/application/UI/UIBlock.php rename to sources/application/UI/Base/UIBlock.php index cd719abe5..dc7b639aa 100644 --- a/sources/application/UI/UIBlock.php +++ b/sources/application/UI/Base/UIBlock.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI; +namespace Combodo\iTop\Application\UI\Base; use utils; @@ -159,7 +159,7 @@ abstract class UIBlock implements iUIBlock /** * @inheritDoc - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] */ public function GetSubBlocks() { @@ -168,7 +168,7 @@ abstract class UIBlock implements iUIBlock /** * @inheritDoc - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] */ public function GetDeferredBlocks(): array { diff --git a/sources/application/UI/UIException.php b/sources/application/UI/Base/UIException.php similarity index 89% rename from sources/application/UI/UIException.php rename to sources/application/UI/Base/UIException.php index fa032c51a..857912202 100644 --- a/sources/application/UI/UIException.php +++ b/sources/application/UI/Base/UIException.php @@ -5,7 +5,7 @@ */ -namespace Combodo\iTop\Application\UI; +namespace Combodo\iTop\Application\UI\Base; use Exception; diff --git a/sources/application/UI/iUIBlock.php b/sources/application/UI/Base/iUIBlock.php similarity index 95% rename from sources/application/UI/iUIBlock.php rename to sources/application/UI/Base/iUIBlock.php index 0da82f9a9..5902a15c7 100644 --- a/sources/application/UI/iUIBlock.php +++ b/sources/application/UI/Base/iUIBlock.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Application\UI; +namespace Combodo\iTop\Application\UI\Base; /** @@ -82,7 +82,7 @@ interface iUIBlock { * Return an array iUIBlock embedded in this iUIBlock * Must be an associative array ( => ) * - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] */ public function GetSubBlocks(); @@ -90,7 +90,7 @@ interface iUIBlock { * Return an array of iUIBlock to add at the end of the page * Must be an associative array ( => ) * - * @return \Combodo\iTop\Application\UI\iUIBlock[] + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] */ public function GetDeferredBlocks(): array; diff --git a/sources/application/UI/tUIContentAreas.php b/sources/application/UI/Base/tUIContentAreas.php similarity index 87% rename from sources/application/UI/tUIContentAreas.php rename to sources/application/UI/Base/tUIContentAreas.php index 770d91036..8a1edfdc6 100644 --- a/sources/application/UI/tUIContentAreas.php +++ b/sources/application/UI/Base/tUIContentAreas.php @@ -4,10 +4,10 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -namespace Combodo\iTop\Application\UI; +namespace Combodo\iTop\Application\UI\Base; -use Combodo\iTop\Application\UI\Layout\iUIContentBlock; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use Dict; /** @@ -38,7 +38,7 @@ trait tUIContentAreas { /** * Return an array of all the content areas * - * @return \Combodo\iTop\Application\UI\Layout\iUIContentBlock[] + * @return \Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock[] */ protected function GetContentAreas(): array { return $this->aContentAreasBlocks; @@ -59,7 +59,7 @@ trait tUIContentAreas { * Set all block for a content area at once, replacing all existing ones. * * @param string $sAreaId - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aBlocks * * @return $this */ @@ -78,7 +78,7 @@ trait tUIContentAreas { * Set all block for a content area at once, replacing all existing ones. * * @param string $sAreaId - * @param \Combodo\iTop\Application\UI\iUIBlock[] $aBlocks + * @param \Combodo\iTop\Application\UI\Base\iUIBlock[] $aBlocks * * @return $this */ @@ -98,8 +98,8 @@ trait tUIContentAreas { * * @param string $sAreaId * - * @return \Combodo\iTop\Application\UI\iUIBlock[] - * @throws \Combodo\iTop\Application\UI\UIException + * @return \Combodo\iTop\Application\UI\Base\iUIBlock[] + * @throws \Combodo\iTop\Application\UI\Base\UIException */ protected function GetContentAreaBlocks(string $sAreaId): array { @@ -115,7 +115,7 @@ trait tUIContentAreas { * Note that if the area doesn't exist yet, it is created. Also if a block with the same ID already exists, it will be replaced. * * @param string $sAreaId - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * * @return $this */ @@ -135,7 +135,7 @@ trait tUIContentAreas { * Note that if the area doesn't exist yet, it is created. Also if a block with the same ID already exists, it will be replaced. * * @param string $sAreaId - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * * @return $this */ diff --git a/sources/application/UI/Component/Input/RichText/RichText.php b/sources/application/UI/Component/Input/RichText/RichText.php deleted file mode 100644 index 3f4e5c635..000000000 --- a/sources/application/UI/Component/Input/RichText/RichText.php +++ /dev/null @@ -1,19 +0,0 @@ - -use \Combodo\iTop\Application\UI\iUIBlock; +use \Combodo\iTop\Application\UI\Base\iUIBlock; /** * CLI page diff --git a/sources/application/WebPage/CSVPage.php b/sources/application/WebPage/CSVPage.php index 56ade4ffe..3d8d3b633 100644 --- a/sources/application/WebPage/CSVPage.php +++ b/sources/application/WebPage/CSVPage.php @@ -16,7 +16,7 @@ // You should have received a copy of the GNU Affero General Public License // along with iTop. If not, see -use \Combodo\iTop\Application\UI\iUIBlock; +use Combodo\iTop\Application\UI\Base\iUIBlock; /** * Simple web page with no includes or fancy formatting, useful to generateXML documents diff --git a/sources/application/WebPage/Page.php b/sources/application/WebPage/Page.php index 567e485b7..923376939 100644 --- a/sources/application/WebPage/Page.php +++ b/sources/application/WebPage/Page.php @@ -4,7 +4,7 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -use Combodo\iTop\Application\UI\iUIBlock; +use Combodo\iTop\Application\UI\Base\iUIBlock; /** diff --git a/sources/application/WebPage/TabManager.php b/sources/application/WebPage/TabManager.php index 7d7f18f27..f8917ec8b 100644 --- a/sources/application/WebPage/TabManager.php +++ b/sources/application/WebPage/TabManager.php @@ -4,9 +4,9 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ -use Combodo\iTop\Application\UI\iUIBlock; -use Combodo\iTop\Application\UI\Layout\TabContainer\Tab\Tab; -use Combodo\iTop\Application\UI\Layout\TabContainer\TabContainer; +use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\Tab; +use Combodo\iTop\Application\UI\Base\Layout\TabContainer\TabContainer; /** @@ -37,7 +37,7 @@ class TabManager * @param string $sTabContainer * @param string $sPrefix * - * @return \Combodo\iTop\Application\UI\iUIBlock + * @return \Combodo\iTop\Application\UI\Base\iUIBlock */ public function AddTabContainer(string $sTabContainer, $sPrefix = ''): TabContainer { @@ -168,7 +168,7 @@ class TabManager * @param string|null $sTabTitle * * @return string - * @throws \Combodo\iTop\Application\UI\UIException + * @throws \Combodo\iTop\Application\UI\Base\UIException */ public function SetCurrentTab(string $sTabCode = '', string $sTabTitle = null): ?string { @@ -201,13 +201,13 @@ class TabManager * * @return string * - * @throws \Combodo\iTop\Application\UI\UIException + * @throws \Combodo\iTop\Application\UI\Base\UIException * @since 2.0.3 */ public function AddAjaxTab(string $sTabCode, string $sUrl, bool $bCache = true, string $sTabTitle = null): string { // Set the content of the tab - /** @var \Combodo\iTop\Application\UI\Layout\TabContainer\Tab\AjaxTab $oTab */ + /** @var \Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\AjaxTab $oTab */ $oTab = $this->InitTab($this->m_sCurrentTabContainer, $sTabCode, static::ENUM_TAB_TYPE_AJAX, $sTabTitle); $oTab->SetUrl($sUrl) ->SetCache($bCache); @@ -312,8 +312,8 @@ class TabManager * @param string $sTabType * @param string|null $sTabTitle * - * @return \Combodo\iTop\Application\UI\Layout\TabContainer\Tab\Tab - * @throws \Combodo\iTop\Application\UI\UIException + * @return \Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\Tab + * @throws \Combodo\iTop\Application\UI\Base\UIException * @since 2.7.0 */ protected function InitTab(string $sTabContainer, string $sTabCode, string $sTabType = self::DEFAULT_TAB_TYPE, string $sTabTitle = null): Tab diff --git a/sources/application/WebPage/WebPage.php b/sources/application/WebPage/WebPage.php index 5c4e8b761..df928a65b 100644 --- a/sources/application/WebPage/WebPage.php +++ b/sources/application/WebPage/WebPage.php @@ -18,12 +18,12 @@ */ use Combodo\iTop\Application\TwigBase\Twig\TwigHelper; -use Combodo\iTop\Application\UI\Component\Html\Html; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu; -use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuFactory; -use Combodo\iTop\Application\UI\iUIBlock; -use Combodo\iTop\Application\UI\Layout\iUIContentBlock; -use Combodo\iTop\Application\UI\Layout\UIContentBlock; +use Combodo\iTop\Application\UI\Base\Component\Html\Html; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; +use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuFactory; +use Combodo\iTop\Application\UI\Base\iUIBlock; +use Combodo\iTop\Application\UI\Base\Layout\iUIContentBlock; +use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use Combodo\iTop\Renderer\BlockRenderer; @@ -312,9 +312,9 @@ class WebPage implements Page /** * Add a UIBlock in the page by dispatching its parts in the right places (CSS, JS, HTML) * - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * - * @return \Combodo\iTop\Application\UI\iUIBlock block added + * @return \Combodo\iTop\Application\UI\Base\iUIBlock block added * @since 3.0.0 */ public function AddUiBlock(?iUIBlock $oBlock): ?iUIBlock @@ -706,7 +706,7 @@ class WebPage implements Page } /** - * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock + * @param \Combodo\iTop\Application\UI\Base\iUIBlock $oBlock * * @throws \ReflectionException * @throws \Twig\Error\LoaderError @@ -1035,7 +1035,7 @@ class WebPage implements Page * @param string $sId * @param array $aActions * - * @return \Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu|null + * @return \Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu|null */ public function GetPopoverMenu(string $sId, array $aActions): ?PopoverMenu { diff --git a/sources/application/WebPage/XMLPage.php b/sources/application/WebPage/XMLPage.php index f1f4478ba..a1ccda2fe 100644 --- a/sources/application/WebPage/XMLPage.php +++ b/sources/application/WebPage/XMLPage.php @@ -16,7 +16,7 @@ // You should have received a copy of the GNU Affero General Public License // along with iTop. If not, see -use \Combodo\iTop\Application\UI\iUIBlock; +use \Combodo\iTop\Application\UI\Base\iUIBlock; /** * Class XMLPage diff --git a/sources/application/WebPage/iTabbedPage.php b/sources/application/WebPage/iTabbedPage.php index ecd7ce9b0..411948b18 100644 --- a/sources/application/WebPage/iTabbedPage.php +++ b/sources/application/WebPage/iTabbedPage.php @@ -1,6 +1,6 @@ {% endblock %} \ No newline at end of file diff --git a/templates/components/input/richtext/layout.js.twig b/templates/base/components/input/richtext/layout.js.twig similarity index 100% rename from templates/components/input/richtext/layout.js.twig rename to templates/base/components/input/richtext/layout.js.twig diff --git a/templates/components/input/select/select.html.twig b/templates/base/components/input/select/select.html.twig similarity index 87% rename from templates/components/input/select/select.html.twig rename to templates/base/components/input/select/select.html.twig index d2afdce60..6f5df97f4 100644 --- a/templates/components/input/select/select.html.twig +++ b/templates/base/components/input/select/select.html.twig @@ -1,6 +1,6 @@ {# @copyright Copyright (C) 2010-2020 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} -{% extends "components/input/layout.html.twig" %} +{% extends "base/components/input/layout.html.twig" %} {% block iboInput %}