composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-04 07:58:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3123 - Refactor Directories

Browse Source
This commit is contained in:
Eric
2020-12-02 13:18:01 +01:00
parent d1b12ee04b
commit 15aa9e508c
259 changed files with 862 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/application/UI/Component/Alert/Alert.php → sources/application/UI/Base/Component/Alert/Alert.php
View File

@@ -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 <stephen.abello@combodo.com>
* @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',
];

20
sources/application/UI/Component/Alert/AlertFactory.php → sources/application/UI/Base/Component/Alert/AlertFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Alert
* @package Combodo\iTop\Application\UI\Base\Component\Alert
* @since 3.0.0
*
* @link <itop_url>/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)
{

4
sources/application/UI/Component/Badge/Badge.php → sources/application/UI/Base/Component/Badge/Badge.php
View File

@@ -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
{

2
sources/application/UI/Component/Badge/BadgeFactory.php → sources/application/UI/Base/Component/Badge/BadgeFactory.php
View File

@@ -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;

10
sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php → sources/application/UI/Base/Component/Breadcrumbs/Breadcrumbs.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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',
];

10
sources/application/UI/Component/Button/Button.php → sources/application/UI/Base/Component/Button/Button.php
View File

@@ -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 <stephen.abello@combodo.com>
* @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 */

30
sources/application/UI/Component/Button/ButtonFactory.php → sources/application/UI/Base/Component/Button/ButtonFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Button
* @package Combodo\iTop\Application\UI\Base\Component\Button
* @since 3.0.0
*
* @link <itop_url>/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(

4
sources/application/UI/Component/Dashlet/DashletBadge.php → sources/application/UI/Base/Component/Dashlet/DashletBadge.php
View File

@@ -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;

6
sources/application/UI/Component/Dashlet/DashletContainer.php → sources/application/UI/Base/Component/Dashlet/DashletContainer.php
View File

@@ -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';
}

2
sources/application/UI/Component/Dashlet/DashletFactory.php → sources/application/UI/Base/Component/Dashlet/DashletFactory.php
View File

@@ -5,7 +5,7 @@
*/
namespace Combodo\iTop\Application\UI\Component\Dashlet;
namespace Combodo\iTop\Application\UI\Base\Component\Dashlet;
class DashletFactory

4
sources/application/UI/Component/Dashlet/DashletHeaderStatic.php → sources/application/UI/Base/Component/Dashlet/DashletHeaderStatic.php
View File

@@ -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;

10
sources/application/UI/Component/DataTable/DataTable.php → sources/application/UI/Base/Component/DataTable/DataTable.php
View File

@@ -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;

8
sources/application/UI/Component/DataTable/DataTableConfig/DataTableConfig.php → sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php
View File

@@ -1,7 +1,7 @@
<?php
use Combodo\iTop\Application\UI\Component\DataTable\DataTableBlock;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableBlock;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
/**
* @copyright Copyright (C) 2010-2020 Combodo SARL
@@ -11,7 +11,7 @@ class DataTableConfig extends UIContentBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-datatableconfig';
public const HTML_TEMPLATE_REL_PATH = 'components/datatable/config/layout';
public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/config/layout';
/** @var DataTableBlock */
private $oDataTable;
@@ -23,7 +23,7 @@ class DataTableConfig extends UIContentBlock
}
/**
* @return \Combodo\iTop\Application\UI\Component\DataTable\DataTableBlock
* @return \Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableBlock
*/
private function GetDataTable(): DataTableBlock
{

20
sources/application/UI/Component/DataTable/DataTableFactory.php → sources/application/UI/Base/Component/DataTable/DataTableFactory.php
View File

@@ -4,17 +4,17 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Component\DataTable;
namespace Combodo\iTop\Application\UI\Base\Component\DataTable;
use ApplicationException;
use appUserPreferences;
use AttributeLinkedSet;
use cmdbAbstractObject;
use Combodo\iTop\Application\UI\Component\DataTable\StaticTable\FormTable\FormTable;
use Combodo\iTop\Application\UI\Component\DataTable\StaticTable\StaticTable;
use Combodo\iTop\Application\UI\Component\Panel\PanelFactory;
use Combodo\iTop\Application\UI\Component\Title\TitleFactory;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTable\FormTable;
use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\StaticTable;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelFactory;
use Combodo\iTop\Application\UI\Base\Component\Title\TitleFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
use DBObjectSet;
use Dict;
use MenuBlock;
@@ -27,7 +27,7 @@ use WebPage;
* Class DataTableFactory
*
* @internal
* @package Combodo\iTop\Application\UI\Component\DataTable
* @package Combodo\iTop\Application\UI\Base\Component\DataTable
* @since 3.0.0
*/
class DataTableFactory
@@ -38,7 +38,7 @@ class DataTableFactory
* @param \DBObjectSet $oSet
* @param array $aExtraParams
*
* @return \Combodo\iTop\Application\UI\Component\Panel\Panel
* @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel
* @throws \ApplicationException
* @throws \ArchivedObjectException
* @throws \CoreException
@@ -71,7 +71,7 @@ class DataTableFactory
* @param DBObjectSet $oSet
* @param array $aExtraParams
*
* @return \Combodo\iTop\Application\UI\Component\Panel\Panel
* @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel
* @throws \ArchivedObjectException
* @throws \CoreException
* @throws \CoreUnexpectedValue
@@ -351,7 +351,7 @@ class DataTableFactory
* @param DBObjectSet $oSet
* @param array $aExtraParams
*
* @return \Combodo\iTop\Application\UI\Component\DataTable\DataTableBlock
* @return \Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableBlock
* @throws \ArchivedObjectException
* @throws \CoreException
* @throws \CoreUnexpectedValue

2
sources/application/UI/Component/DataTable/DataTableSettings.php → sources/application/UI/Base/Component/DataTable/DataTableSettings.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Combodo\iTop\Application\UI\Component\DataTable;
namespace Combodo\iTop\Application\UI\Base\Component\DataTable;
use appUserPreferences;
use AttributeDashboard;

14
sources/application/UI/Component/DataTable/StaticTable/FormTable/FormTable.php → sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php
View File

@@ -4,24 +4,24 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Component\DataTable\StaticTable\FormTable;
namespace Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTable;
use Combodo\iTop\Application\UI\Component\DataTable\StaticTable\FormTableRow\FormTableRow;
use Combodo\iTop\Application\UI\Component\DataTable\StaticTable\StaticTable;
use Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTableRow\FormTableRow;
use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\StaticTable;
use Combodo\iTop\Application\UI\Base\iUIBlock;
/**
* Class FormTable
*
* @package Combodo\iTop\Application\UI\Component\FormTable
* @package Combodo\iTop\Application\UI\Base\Component\FormTable
*/
class FormTable extends StaticTable
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-formtable';
public const HTML_TEMPLATE_REL_PATH = 'components/datatable/static/formtable/layout';
public const JS_TEMPLATE_REL_PATH = 'components/datatable/static/formtable/layout';
public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtable/layout';
public const JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtable/layout';
/** @var string */
private $sRef;

10
sources/application/UI/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php → sources/application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php
View File

@@ -4,22 +4,22 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Component\DataTable\StaticTable\FormTableRow;
namespace Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTableRow;
use Combodo\iTop\Application\UI\UIBlock;
use Combodo\iTop\Application\UI\Base\UIBlock;
/**
* Class FormTableRow
*
* @package Combodo\iTop\Application\UI\Component\FormTableRow
* @package Combodo\iTop\Application\UI\Base\Component\FormTableRow
*/
class FormTableRow extends UIBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-formtablerow';
public const HTML_TEMPLATE_REL_PATH = 'components/datatable/static/formtablerow/layout';
public const JS_TEMPLATE_REL_PATH = 'components/datatable/static/formtablerow/layout';
public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtablerow/layout';
public const JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/formtablerow/layout';
/** @var string */
private $sRef;

8
sources/application/UI/Component/DataTable/StaticTable/StaticTable.php → sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php
View File

@@ -1,8 +1,8 @@
<?php
namespace Combodo\iTop\Application\UI\Component\DataTable\StaticTable;
namespace Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
/**
* @copyright Copyright (C) 2010-2020 Combodo SARL
@@ -17,8 +17,8 @@ class StaticTable extends UIContentBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-datatable';
public const HTML_TEMPLATE_REL_PATH = 'components/datatable/static/layout';
public const JS_TEMPLATE_REL_PATH = 'components/datatable/static/layout';
public const HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/layout';
public const JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/layout';
/**
* @var array of 'entry name' => [

8
sources/application/UI/Component/Field/Field.php → sources/application/UI/Base/Component/Field/Field.php
View File

@@ -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 <eric.espie@combodo.com>
* @author Anne-Catherine Cognet <annecatherine.cognet@combodo.com>
* @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;

8
sources/application/UI/Component/FieldSet/FieldSet.php → sources/application/UI/Base/Component/FieldSet/FieldSet.php
View File

@@ -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;

8
sources/application/UI/Component/Form/Form.php → sources/application/UI/Base/Component/Form/Form.php
View File

@@ -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;

10
sources/application/UI/Component/GlobalSearch/GlobalSearch.php → sources/application/UI/Base/Component/GlobalSearch/GlobalSearch.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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',
];

6
sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php → sources/application/UI/Base/Component/GlobalSearch/GlobalSearchFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

4
sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php → sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\GlobalSearch
* @package Combodo\iTop\Application\UI\Base\Component\GlobalSearch
* @internal
* @since 3.0.0
*/

8
sources/application/UI/Component/Html/Html.php → sources/application/UI/Base/Component/Html/Html.php
View File

@@ -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 <stephen.abello@combodo.com>
* @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;

8
sources/application/UI/Component/Input/Input.php → sources/application/UI/Base/Component/Input/Input.php
View File

@@ -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';

6
sources/application/UI/Component/Input/InputFactory.php → sources/application/UI/Base/Component/Input/InputFactory.php
View File

@@ -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
{

20
sources/application/UI/Component/Input/InputWithLabel.php → sources/application/UI/Base/Component/Input/InputWithLabel.php
View File

@@ -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;

20
sources/application/UI/Base/Component/Input/RichText/RichText.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
/**
* @copyright Copyright (C) 2010-2020 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Base\Component\Input\RichText;
use Combodo\iTop\Application\UI\Base\UIBlock;
/**
* Class RichText
*
* @package Combodo\iTop\Application\UI\Base\Component\RichText
*/
class RichText extends UIBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-richtext';
public const HTML_TEMPLATE_REL_PATH = 'base/components/input/richtext/layout';
public const JS_TEMPLATE_REL_PATH = 'base/components/input/richtext/layout';
}

6
sources/application/UI/Component/Input/Select/Select.php → sources/application/UI/Base/Component/Input/Select/Select.php
View File

@@ -5,14 +5,14 @@
*/
namespace Combodo\iTop\Application\UI\Component\Input\Select;
namespace Combodo\iTop\Application\UI\Base\Component\Input\Select;
use Combodo\iTop\Application\UI\Component\Input\Input;
use Combodo\iTop\Application\UI\Base\Component\Input\Input;
class Select extends Input
{
public const HTML_TEMPLATE_REL_PATH = 'components/input/select/select';
public const HTML_TEMPLATE_REL_PATH = 'base/components/input/select/select';
/** @var array */
protected $aOptions;

6
sources/application/UI/Component/Input/Select/SelectOption.php → sources/application/UI/Base/Component/Input/Select/SelectOption.php
View File

@@ -5,14 +5,14 @@
*/
namespace Combodo\iTop\Application\UI\Component\Input\Select;
namespace Combodo\iTop\Application\UI\Base\Component\Input\Select;
use Combodo\iTop\Application\UI\UIBlock;
use Combodo\iTop\Application\UI\Base\UIBlock;
class SelectOption extends UIBlock
{
public const HTML_TEMPLATE_REL_PATH = 'components/input/select/selectoption';
public const HTML_TEMPLATE_REL_PATH = 'base/components/input/select/selectoption';
/** @var string */
protected $sValue;

32
sources/application/UI/Component/Panel/Panel.php → sources/application/UI/Base/Component/Panel/Panel.php
View File

@@ -17,20 +17,20 @@
* 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;
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\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\tUIContentAreas;
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\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\Base\tUIContentAreas;
/**
* Class Panel
*
* @author Stephen Abello <stephen.abello@combodo.com>
* @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);

6
sources/application/UI/Component/Panel/PanelEnhanced.php → sources/application/UI/Base/Component/Panel/PanelEnhanced.php
View File

@@ -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;

24
sources/application/UI/Component/Panel/PanelFactory.php → sources/application/UI/Base/Component/Panel/PanelFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Panel
* @package Combodo\iTop\Application\UI\Base\Component\Panel
* @since 3.0.0
*
* @link <itop_url>/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)
{

10
sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php → sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php
View File

@@ -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 <stephen.abello@combodo.com>
* @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',
];

6
sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php → sources/application/UI/Base/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php
View File

@@ -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 <stephen.abello@combodo.com>
* @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
*/

12
sources/application/UI/Component/PopoverMenu/PopoverMenu.php → sources/application/UI/Base/Component/PopoverMenu/PopoverMenu.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

14
sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php → sources/application/UI/Base/Component/PopoverMenu/PopoverMenuFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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()
{

6
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php → sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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()

8
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php → sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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;

10
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php → sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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:

6
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php → sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php
View File

@@ -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 <stephen.abello@combodo.com>
* @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';
}

6
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php → sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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()

10
sources/application/UI/Component/QuickCreate/QuickCreate.php → sources/application/UI/Base/Component/QuickCreate/QuickCreate.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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',

6
sources/application/UI/Component/QuickCreate/QuickCreateFactory.php → sources/application/UI/Base/Component/QuickCreate/QuickCreateFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

4
sources/application/UI/Component/QuickCreate/QuickCreateHelper.php → sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\QuickCreate
* @package Combodo\iTop\Application\UI\Base\Component\QuickCreate
* @internal
* @since 3.0.0
*/

8
sources/application/UI/Component/Title/Title.php → sources/application/UI/Base/Component/Title/Title.php
View File

@@ -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';

2
sources/application/UI/Component/Title/TitleFactory.php → sources/application/UI/Base/Component/Title/TitleFactory.php
View File

@@ -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;

4
sources/application/UI/Component/Title/TitleForObjectDetails.php → sources/application/UI/Base/Component/Title/TitleForObjectDetails.php
View File

@@ -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;

8
sources/application/UI/Component/Toolbar/Toolbar.php → sources/application/UI/Base/Component/Toolbar/Toolbar.php
View File

@@ -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';
}

8
sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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 */

10
sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

4
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentAddedFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp
* @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp
*/
class CMDBChangeOpAttachmentAddedFactory extends CMDBChangeOpFactory
{

4
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpAttachmentRemovedFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp
* @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp
*/
class CMDBChangeOpAttachmentRemovedFactory extends CMDBChangeOpFactory
{

4
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpCreateFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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';

4
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpDeleteFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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';

10
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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)

8
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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
*/

8
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

6
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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';

8
sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/EditsEntry.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

6
sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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';

34
sources/application/UI/Layout/ActivityPanel/ActivityPanel.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityPanel.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

12
sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php → sources/application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

36
sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php → sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php
View File

@@ -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)

22
sources/application/UI/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php → sources/application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php
View File

@@ -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 <stephen.abello@combodo.com>
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @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
*/

6
sources/application/UI/Layout/Dashboard/DashboardColumn.php → sources/application/UI/Base/Layout/Dashboard/DashboardColumn.php
View File

@@ -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;

8
sources/application/UI/Layout/Dashboard/DashboardLayout.php → sources/application/UI/Base/Layout/Dashboard/DashboardLayout.php
View File

@@ -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
*/

8
sources/application/UI/Layout/Dashboard/DashboardRow.php → sources/application/UI/Base/Layout/Dashboard/DashboardRow.php
View File

@@ -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
*/

8
sources/application/UI/Layout/MultiColumn/Column/Column.php → sources/application/UI/Base/Layout/MultiColumn/Column/Column.php
View File

@@ -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';
}

14
sources/application/UI/Layout/MultiColumn/MultiColumn.php → sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php
View File

@@ -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
*/

26
sources/application/UI/Layout/NavigationMenu/NavigationMenu.php → sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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()
{

10
sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php → sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

6
sources/application/UI/Layout/Object/ObjectDetails.php → sources/application/UI/Base/Layout/Object/ObjectDetails.php
View File

@@ -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;

7
sources/application/UI/Layout/Object/ObjectFactory.php → sources/application/UI/Base/Layout/Object/ObjectFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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);

26
sources/application/UI/Layout/PageContent/PageContent.php → sources/application/UI/Base/Layout/PageContent/PageContent.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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
{

10
sources/application/UI/Layout/PageContent/PageContentFactory.php → sources/application/UI/Base/Layout/PageContent/PageContentFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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)

14
sources/application/UI/Layout/PageContent/PageContentWithSideContent.php → sources/application/UI/Base/Layout/PageContent/PageContentWithSideContent.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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
*/

12
sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php → sources/application/UI/Base/Layout/TabContainer/Tab/AjaxTab.php
View File

@@ -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()));

8
sources/application/UI/Layout/TabContainer/Tab/Tab.php → sources/application/UI/Base/Layout/TabContainer/Tab/Tab.php
View File

@@ -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;

34
sources/application/UI/Layout/TabContainer/TabContainer.php → sources/application/UI/Base/Layout/TabContainer/TabContainer.php
View File

@@ -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
{

34
sources/application/UI/Layout/TopBar/TopBar.php → sources/application/UI/Base/Layout/TopBar/TopBar.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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()
{

12
sources/application/UI/Layout/TopBar/TopBarFactory.php → sources/application/UI/Base/Layout/TopBar/TopBarFactory.php
View File

@@ -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 <guillaume.lajarige@combodo.com>
* @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

13
sources/application/UI/Layout/UIContentBlock.php → sources/application/UI/Base/Layout/UIContentBlock.php
View File

@@ -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 <eric.espie@combodo.com>
* @author Anne-Catherine Cognet <anne-catherine.cognet@combodo.com>
* @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;

22
sources/application/UI/Layout/iUIContentBlock.php → sources/application/UI/Base/Layout/iUIContentBlock.php
View File

@@ -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 <eric.espie@combodo.com>
* @author Anne-Catherine Cognet <anne-catherine.cognet@combodo.com>
* @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
*/

6
sources/application/UI/UIBlock.php → sources/application/UI/Base/UIBlock.php
View File

@@ -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
{

2
sources/application/UI/UIException.php → sources/application/UI/Base/UIException.php
View File

@@ -5,7 +5,7 @@
*/
namespace Combodo\iTop\Application\UI;
namespace Combodo\iTop\Application\UI\Base;
use Exception;

6
sources/application/UI/iUIBlock.php → sources/application/UI/Base/iUIBlock.php
View File

@@ -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 (<BLOCK_ID> => <BLOCK_INSTANCE>)
*
* @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 (<BLOCK_ID> => <BLOCK_INSTANCE>)
*
* @return \Combodo\iTop\Application\UI\iUIBlock[]
* @return \Combodo\iTop\Application\UI\Base\iUIBlock[]
*/
public function GetDeferredBlocks(): array;

20
sources/application/UI/tUIContentAreas.php → sources/application/UI/Base/tUIContentAreas.php
View File

@@ -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
*/

19
sources/application/UI/Component/Input/RichText/RichText.php
View File

@@ -1,19 +0,0 @@
<?php
/**
* @copyright Copyright (C) 2010-2020 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Component\Input\RichText;
use Combodo\iTop\Application\UI\UIBlock;
/**
* Class RichText
*
* @package Combodo\iTop\Application\UI\Component\RichText
*/
class RichText extends UIBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-richtext';
public const HTML_TEMPLATE_REL_PATH = 'components/input/richtext/layout';
public const JS_TEMPLATE_REL_PATH = 'components/input/richtext/layout';
}

10
sources/application/UI/Specific/DisplayBlock/BlockChart/BlockChart.php → sources/application/UI/DisplayBlock/BlockChart/BlockChart.php
View File

@@ -4,22 +4,22 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChart;
namespace Combodo\iTop\Application\UI\DisplayBlock\BlockChart;
use Combodo\iTop\Application\UI\UIBlock;
use Combodo\iTop\Application\UI\Base\UIBlock;
/**
* Class BlockChart
*
* @package Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChart
* @package Combodo\iTop\Application\UI\DisplayBlock\BlockChart
*/
class BlockChart extends UIBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-blockchart';
public const HTML_TEMPLATE_REL_PATH = 'specific/displayblock/blockchart/layout';
public const JS_TEMPLATE_REL_PATH = 'specific/displayblock/blockchart/layout';
public const HTML_TEMPLATE_REL_PATH = 'application/display-block/block-chart/layout';
public const JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart/layout';
/** @var int */
public $iChartCounter;

8
sources/application/UI/Specific/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php → sources/application/UI/DisplayBlock/BlockChartAjaxBars/BlockChartAjaxBars.php
View File

@@ -4,21 +4,21 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChartAjaxBars;
namespace Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxBars;
use Combodo\iTop\Application\UI\UIBlock;
use Combodo\iTop\Application\UI\Base\UIBlock;
/**
* Class BlockChartAjaxBars
*
* @package Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChartAjaxBars
* @package Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxBars
*/
class BlockChartAjaxBars extends UIBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-blockchartajaxbars';
public const JS_TEMPLATE_REL_PATH = 'specific/displayblock/blockchartajaxbars/layout';
public const JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart-ajax-bars/layout';
/** @var string */
public $sJSNames;

8
sources/application/UI/Specific/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php → sources/application/UI/DisplayBlock/BlockChartAjaxPie/BlockChartAjaxPie.php
View File

@@ -4,21 +4,21 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChartAjaxPie;
namespace Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxPie;
use Combodo\iTop\Application\UI\UIBlock;
use Combodo\iTop\Application\UI\Base\UIBlock;
/**
* Class BlockChartAjaxPie
*
* @package Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChartAjaxPie
* @package Combodo\iTop\Application\UI\DisplayBlock\BlockChartAjaxPie
*/
class BlockChartAjaxPie extends UIBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-blockchartajaxpie';
public const JS_TEMPLATE_REL_PATH = 'specific/displayblock/blockchartajaxpie/layout';
public const JS_TEMPLATE_REL_PATH = 'application/display-block/block-chart-ajax-pie/layout';
/** @var string */
public $sId;

10
sources/application/UI/Specific/DisplayBlock/BlockList/BlockList.php → sources/application/UI/DisplayBlock/BlockList/BlockList.php
View File

@@ -4,22 +4,22 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockList;
namespace Combodo\iTop\Application\UI\DisplayBlock\BlockList;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
/**
* Class BlockList
*
* @package Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockList
* @package Combodo\iTop\Application\UI\DisplayBlock\BlockList
*/
class BlockList extends UIContentBlock
{
// Overloaded constants
public const BLOCK_CODE = 'ibo-blocklist';
public const HTML_TEMPLATE_REL_PATH = 'specific/displayblock/blocklist/layout';
public const JS_TEMPLATE_REL_PATH = 'specific/displayblock/blocklist/layout';
public const HTML_TEMPLATE_REL_PATH = 'application/display-block/block-list/layout';
public const JS_TEMPLATE_REL_PATH = 'application/display-block/block-list/layout';
/** @var bool */
public $bEmptySet = false;