From b15ed8073205c658a738a8c582bc375a6fc6e189 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Wed, 14 Oct 2020 10:16:49 +0200 Subject: [PATCH] Internal: Replace references to iTop 2.8.0 with iTop 3.0.0 --- application/cmdbabstract.class.inc.php | 4 +- application/menunode.class.inc.php | 10 +-- application/template.class.inc.php | 2 +- application/utils.inc.php | 24 +++---- core/cmdbchange.class.inc.php | 2 +- core/cmdbchangeop.class.inc.php | 2 +- core/cmdbobject.class.inc.php | 4 +- core/userrights.class.inc.php | 12 ++-- .../activity-panel/activity-new-entry-form.js | 2 +- js/layouts/activity-panel/activity-panel.js | 2 +- js/layouts/tab-container.js | 2 +- js/pages/backoffice.js | 4 +- pages/ajax.render.php | 8 +-- setup/itopdesignformat.class.inc.php | 2 +- sources/Renderer/BlockRenderer.php | 2 +- sources/Renderer/RenderingOutput.php | 4 +- sources/application/Branding.php | 2 +- .../application/TwigBase/Twig/Extension.php | 6 +- .../application/TwigBase/Twig/TwigHelper.php | 10 +-- .../application/UI/Component/Alert/Alert.php | 2 +- .../UI/Component/Alert/AlertFactory.php | 2 +- .../UI/Component/Breadcrumbs/Breadcrumbs.php | 2 +- .../UI/Component/Button/Button.php | 2 +- .../UI/Component/Button/ButtonFactory.php | 2 +- .../Component/GlobalSearch/GlobalSearch.php | 2 +- .../GlobalSearch/GlobalSearchFactory.php | 2 +- .../GlobalSearch/GlobalSearchHelper.php | 2 +- .../application/UI/Component/Html/Html.php | 2 +- .../application/UI/Component/Panel/Panel.php | 2 +- .../UI/Component/Panel/PanelFactory.php | 6 +- .../PopoverMenu/NewsroomMenu/NewsroomMenu.php | 2 +- .../NewsroomMenu/NewsroomMenuFactory.php | 2 +- .../UI/Component/PopoverMenu/PopoverMenu.php | 2 +- .../PopoverMenu/PopoverMenuFactory.php | 2 +- .../PopoverMenuItem/JsPopoverMenuItem.php | 2 +- .../PopoverMenuItem/PopoverMenuItem.php | 2 +- .../PopoverMenuItemFactory.php | 2 +- .../SeparatorPopoverMenuItem.php | 2 +- .../PopoverMenuItem/UrlPopoverMenuItem.php | 2 +- .../UI/Component/QuickCreate/QuickCreate.php | 2 +- .../QuickCreate/QuickCreateFactory.php | 2 +- .../QuickCreate/QuickCreateHelper.php | 2 +- .../UI/Component/Title/TitleFactory.php | 4 +- .../ActivityEntry/ActivityEntry.php | 4 +- .../ActivityEntry/ActivityEntryFactory.php | 2 +- .../CMDBChangeOp/CMDBChangeOpFactory.php | 2 +- .../CMDBChangeOpSetAttributeScalarFactory.php | 2 +- .../ActivityEntry/CaseLogEntry.php | 2 +- .../ActivityEntry/EditsEntry.php | 2 +- .../ActivityEntry/TransitionEntry.php | 2 +- .../ActivityNewEntryFormFactory.php | 2 +- .../UI/Layout/ActivityPanel/ActivityPanel.php | 2 +- .../ActivityPanel/ActivityPanelFactory.php | 4 +- .../UI/Layout/MultiColumn/Column/Column.php | 2 +- .../UI/Layout/MultiColumn/MultiColumn.php | 2 +- .../Layout/NavigationMenu/NavigationMenu.php | 2 +- .../NavigationMenu/NavigationMenuFactory.php | 2 +- .../UI/Layout/Object/ObjectFactory.php | 2 +- .../UI/Layout/PageContent/PageContent.php | 2 +- .../Layout/PageContent/PageContentFactory.php | 4 +- .../PageContentWithSideContent.php | 2 +- .../UI/Layout/TabContainer/Tab/AjaxTab.php | 2 +- .../UI/Layout/TabContainer/Tab/Tab.php | 2 +- .../application/UI/Layout/TopBar/TopBar.php | 2 +- .../UI/Layout/TopBar/TopBarFactory.php | 2 +- .../application/UI/Layout/UIContentBlock.php | 2 +- .../application/UI/Layout/iUIContentBlock.php | 2 +- sources/application/UI/UIBlock.php | 2 +- sources/application/UI/iUIBlock.php | 2 +- sources/application/UI/tUIContentAreas.php | 2 +- sources/application/WebPage/AjaxPage.php | 8 +-- sources/application/WebPage/NiceWebPage.php | 4 +- sources/application/WebPage/TabManager.php | 8 +-- sources/application/WebPage/WebPage.php | 18 +++--- sources/application/WebPage/iTopWebPage.php | 62 +++++++++---------- .../pages/backoffice/webpage/layout.html.twig | 2 +- 76 files changed, 160 insertions(+), 160 deletions(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 377c7f073..eb28a7e66 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -979,7 +979,7 @@ EOF $sMode = static::ENUM_OBJECT_MODE_VIEW; // Object's details - // TODO 2.8.0: Complete the factory + // TODO 3.0.0: Complete the factory $oObjectDetails = ObjectFactory::MakeDetails($this); // $oPage->AddUiBlock($oObjectDetails); @@ -1056,7 +1056,7 @@ HTML $this->DisplayBareRelations($oPage, $bEditMode); //$oPage->SetCurrentTab('UI:HistoryTab'); //$this->DisplayBareHistory($oPage, $bEditMode); - // TODO 2.8.0: What to do with this? + // TODO 3.0.0: What to do with this? //$oPage->AddAjaxTab('UI:HistoryTab', utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=history&class='.$sClass.'&id='.$iKey); $oPage->add(<< diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php index 655715c46..3eb86da85 100644 --- a/application/menunode.class.inc.php +++ b/application/menunode.class.inc.php @@ -207,7 +207,7 @@ class ApplicationMenu * * @return array * @throws \DictExceptionMissingString - * @since 2.8.0 + * @since 3.0.0 */ public static function GetMenuGroups($aExtraParams = array()) { @@ -248,7 +248,7 @@ class ApplicationMenu * @return array * @throws \DictExceptionMissingString * @throws \Exception - * @since 2.8.0 + * @since 3.0.0 */ public static function GetSubMenuNodes($sMenuGroupIdx, $aExtraParams = array()) { @@ -291,7 +291,7 @@ class ApplicationMenu * @param array $aExtraParams * @throws DictExceptionMissingString * - * @deprecated Will be removed in 2.8.0, use static::GetMenuGroups() instead + * @deprecated Will be removed in 3.0.0, use static::GetMenuGroups() instead */ public static function DisplayMenu($oPage, $aExtraParams) { @@ -367,7 +367,7 @@ EOF * @return bool True if the currently selected menu is one of the submenus * @throws DictExceptionMissingString * @throws \Exception - * @deprecated Will be removed in 2.8.0, use static::GetSubMenuNodes() instead + * @deprecated Will be removed in 3.0.0, use static::GetSubMenuNodes() instead */ protected static function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1) { @@ -853,7 +853,7 @@ class MenuGroup extends MenuNode * Return the CSS classes used for decorating the menu group (typically the icon in the navigation menu) * * @return string - * @since 2.8.0 + * @since 3.0.0 */ public function GetDecorationClasses() { diff --git a/application/template.class.inc.php b/application/template.class.inc.php index db880a9d0..d0e5bdd7d 100644 --- a/application/template.class.inc.php +++ b/application/template.class.inc.php @@ -21,7 +21,7 @@ require_once(APPROOT.'/application/displayblock.class.inc.php'); /** * This class manages the special template format used internally to build the iTop web pages * - * @deprecated Since 2.8.0 + * @deprecated Since 3.0.0 */ class DisplayTemplate { diff --git a/application/utils.inc.php b/application/utils.inc.php index 412c4d769..6bcbdc8c4 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -46,52 +46,52 @@ class utils { /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_INTEGER = 'integer'; /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_CLASS = 'class'; /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_STRING = 'string'; /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_CONTEXT_PARAM = 'context_param'; /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_PARAMETER = 'parameter'; /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_FIELD_NAME = 'field_name'; /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_TRANSACTION_ID = 'transaction_id'; /** * @var string For XML / HTML node identifiers - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER = 'element_identifier'; /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_SANITIZATION_FILTER_RAW_DATA = 'raw_data'; /** * @var string - * @since 2.8.0 + * @since 3.0.0 */ public const DEFAULT_SANITIZATION_FILTER = self::ENUM_SANITIZATION_FILTER_RAW_DATA; @@ -966,7 +966,7 @@ class utils * Return the complete revision number of the application * * @return string - * @since 2.8.0 + * @since 3.0.0 */ public static function GetAppRevisionNumber() { @@ -2229,7 +2229,7 @@ class utils * Currently just checking if the "debug=true" parameter is in the URL, but could be more complex. * * @return bool - * @since 2.8.0 + * @since 3.0.0 */ public static function IsDebugEnabled() { diff --git a/core/cmdbchange.class.inc.php b/core/cmdbchange.class.inc.php index fdbaba9eb..d172add5a 100644 --- a/core/cmdbchange.class.inc.php +++ b/core/cmdbchange.class.inc.php @@ -81,7 +81,7 @@ class CMDBChange extends DBObject * * @return string|null * @throws \OQLException - * @since 2.8.0 + * @since 3.0.0 */ public static function GetCurrentUserId() { diff --git a/core/cmdbchangeop.class.inc.php b/core/cmdbchangeop.class.inc.php index aee542a7f..6aba76197 100644 --- a/core/cmdbchangeop.class.inc.php +++ b/core/cmdbchangeop.class.inc.php @@ -34,7 +34,7 @@ /** * Interface iCMDBChangeOp * - * @since 2.8.0 + * @since 3.0.0 */ interface iCMDBChangeOp { diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php index 11d81d06c..b1d87e301 100644 --- a/core/cmdbobject.class.inc.php +++ b/core/cmdbobject.class.inc.php @@ -155,7 +155,7 @@ abstract class CMDBObject extends DBObject * * @param string $sId ID of the user doing the change, null if not done by a user (eg. background task) * - * @since 2.8.0 + * @since 3.0.0 */ public static function SetTrackUserId($sId) { @@ -196,7 +196,7 @@ abstract class CMDBObject extends DBObject * * @return string|null * @throws \OQLException - * @since 2.8.0 + * @since 3.0.0 */ protected static function GetTrackUserId() { diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php index 6acf29d96..96c6023bf 100644 --- a/core/userrights.class.inc.php +++ b/core/userrights.class.inc.php @@ -313,7 +313,7 @@ abstract class User extends cmdbAbstractObject * @return string * @throws \ArchivedObjectException * @throws \CoreException - * @since 2.8.0 + * @since 3.0.0 */ public function GetInitials() { @@ -1118,7 +1118,7 @@ class UserRights * @return null|string * @throws \ArchivedObjectException * @throws \CoreException - * @since 2.8.0 + * @since 3.0.0 */ public static function GetContactPictureAbsUrl($sLogin = '', $bAllowDefaultPicture = true) { @@ -1173,7 +1173,7 @@ class UserRights * * @return string|null * @throws \Exception - * @since 2.8.0 + * @since 3.0.0 */ public static function GetContactOrganizationFriendlyname() { @@ -1194,7 +1194,7 @@ class UserRights * * @return string|null * @throws \Exception - * @since 2.8.0 + * @since 3.0.0 */ public static function GetContactFirstname() { @@ -1215,7 +1215,7 @@ class UserRights * * @return string|null * @throws \Exception - * @since 2.8.0 + * @since 3.0.0 */ public static function GetContactFriendlyname() { @@ -1277,7 +1277,7 @@ class UserRights * * @return string * @throws \OQLException - * @since 2.8.0 + * @since 3.0.0 */ public static function GetUserInitials($sLogin = '') { diff --git a/js/layouts/activity-panel/activity-new-entry-form.js b/js/layouts/activity-panel/activity-new-entry-form.js index 1702e9a32..3eb2f87af 100644 --- a/js/layouts/activity-panel/activity-new-entry-form.js +++ b/js/layouts/activity-panel/activity-new-entry-form.js @@ -93,7 +93,7 @@ $(function() { 'caselog_attcode' : sCaselog, 'caselog_rank' : $(me.js_selectors.panel).activity_panel('GetCaseLogRank', sCaselog), } - //TODO 2.8.0 Handle errors + //TODO 3.0.0 Handle errors $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(sNewEntry){ $(me.js_selectors.panel).activity_panel('AddEntry', sNewEntry, 'caselog:' + sCaselog) me._HideNewEntryForm(); diff --git a/js/layouts/activity-panel/activity-panel.js b/js/layouts/activity-panel/activity-panel.js index f79a28509..1685730a9 100644 --- a/js/layouts/activity-panel/activity-panel.js +++ b/js/layouts/activity-panel/activity-panel.js @@ -300,7 +300,7 @@ $(function() } else { - // TODO 2.8.0 Create a new entry group + // TODO 3.0.0 Create a new entry group window.location.reload(); } }, diff --git a/js/layouts/tab-container.js b/js/layouts/tab-container.js index 88c3cdb14..ab60857c3 100644 --- a/js/layouts/tab-container.js +++ b/js/layouts/tab-container.js @@ -209,7 +209,7 @@ $(function() // Prevent anchor default behaviour oEvent.preventDefault(); - // TODO 2.8.0: Should/could we use a popover menu instead here? + // TODO 3.0.0: Should/could we use a popover menu instead here? this.element.find(this.js_selectors.extra_tabs_list).toggleClass(this.css_classes.is_hidden); }, _onBodyClick: function(oEvent) diff --git a/js/pages/backoffice.js b/js/pages/backoffice.js index 183ee9d02..e4c58dc34 100644 --- a/js/pages/backoffice.js +++ b/js/pages/backoffice.js @@ -41,7 +41,7 @@ function StripArchiveArgument(sUrl) var res = sUrl.replace(/&with-archive=[01]/g, ''); return res; } -//TODO 2.8.0 Is this the right place to put this method ? +//TODO 3.0.0 Is this the right place to put this method ? function SwitchTabMode() { let aTabContainer = $('[data-role="ibo-tab-container"]'); @@ -62,7 +62,7 @@ function SwitchTabMode() * A toolbox for common JS operations in the backoffice. Meant to be used by Combodo developers and the community. * @type {{InitTooltipFromMarkup: CombodoBackofficeToolbox.InitTooltipFromMarkup}} * @api - * @since 2.8.0 + * @since 3.0.0 */ const CombodoBackofficeToolbox = { // Instanciate tooltips (abstraction layer between iTop markup and tooltip plugin to ease its replacement in the future) diff --git a/pages/ajax.render.php b/pages/ajax.render.php index fb5f09827..f09122be2 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -1643,7 +1643,7 @@ JS $oPage->add(""); break; - // TODO 2.8.0: Handle the history pagination + // TODO 3.0.0: Handle the history pagination case 'history': $oPage->SetContentType('text/html'); $id = (int)utils::ReadParam('id', 0); @@ -1656,7 +1656,7 @@ JS $oPage->add_ready_script("$('#history table.listResults').tableHover(); $('#history table.listResults').tablesorter( { widgets: ['myZebra', 'truncatedList']} );"); break; - // TODO 2.8.0: What to do with this? + // TODO 3.0.0: What to do with this? case 'history_from_filter': $oPage->SetContentType('text/html'); $oHistoryFilter = DBSearch::unserialize($sFilter); @@ -2784,11 +2784,11 @@ EOF $oPage->add(json_encode($aResult)); break; case 'add_caselog_entry': - // TODO 2.8.0: Handle errors & rights + // TODO 3.0.0: Handle errors & rights $sClass = utils::ReadPostedParam('class', '', 'class'); $sClassLabel = MetaModel::GetName($sClass); $id = utils::ReadPostedParam('id', ''); - // TODO 2.8.0 Handle transactions token + // TODO 3.0.0 Handle transactions token $sTransactionId = utils::ReadPostedParam('transaction_id', '', 'transaction_id'); $sCaseLogAttCode = utils::ReadPostedParam('caselog_attcode', ''); $sCaseLogNewEntry = utils::ReadPostedParam('caselog_new_entry', '', 'raw'); diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php index fc753065e..18896e458 100644 --- a/setup/itopdesignformat.class.inc.php +++ b/setup/itopdesignformat.class.inc.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -define('ITOP_DESIGN_LATEST_VERSION', '1.8'); // iTop >= 2.8.0 +define('ITOP_DESIGN_LATEST_VERSION', '1.8'); // iTop >= 3.0.0 /** * Utility to upgrade the format of a given XML datamodel to the latest version diff --git a/sources/Renderer/BlockRenderer.php b/sources/Renderer/BlockRenderer.php index f7f56cdd1..572ce9b4f 100644 --- a/sources/Renderer/BlockRenderer.php +++ b/sources/Renderer/BlockRenderer.php @@ -29,7 +29,7 @@ use Combodo\iTop\Application\UI\iUIBlock; * * @author Guillaume Lajarige * @package Combodo\iTop\Renderer\Component - * @since 2.8.0 + * @since 3.0.0 */ class BlockRenderer { diff --git a/sources/Renderer/RenderingOutput.php b/sources/Renderer/RenderingOutput.php index 2e3cd73d6..d3fc85f19 100644 --- a/sources/Renderer/RenderingOutput.php +++ b/sources/Renderer/RenderingOutput.php @@ -178,7 +178,7 @@ class RenderingOutput * @param array $aFiles Array of absolute URLs * * @return $this - * @since 2.8.0 + * @since 3.0.0 */ public function SetJsFiles(array $aFiles) { @@ -238,7 +238,7 @@ class RenderingOutput * @param array $aFiles Array of absolute URLs * * @return $this - * @since 2.8.0 + * @since 3.0.0 */ public function SetCssFiles(array $aFiles) { diff --git a/sources/application/Branding.php b/sources/application/Branding.php index 3a7356ef4..630ded1a9 100644 --- a/sources/application/Branding.php +++ b/sources/application/Branding.php @@ -26,7 +26,7 @@ use utils; * * @author Guillaume Lajarige * @package Combodo\iTop\Application - * @since 2.8.0 + * @since 3.0.0 */ class Branding { diff --git a/sources/application/TwigBase/Twig/Extension.php b/sources/application/TwigBase/Twig/Extension.php index 9790db7a4..2db2f9515 100644 --- a/sources/application/TwigBase/Twig/Extension.php +++ b/sources/application/TwigBase/Twig/Extension.php @@ -142,21 +142,21 @@ class Extension // Function to get iTop's app root absolute URL (eg. https://aaa.bbb.ccc/xxx/yyy/) // Usage in twig: {{ get_absolute_url_app_root() }} - /** @since 2.8.0 */ + /** @since 3.0.0 */ $oTwigEnv->addFunction(new Twig_SimpleFunction('get_absolute_url_app_root', function () { return utils::GetAbsoluteUrlAppRoot(); })); // Function to get iTop's modules root absolute URL (eg. https://aaa.bbb.ccc/xxx/yyy/env-zzz/) // Usage in twig: {{ get_absolute_url_modules_root() }} - /** @since 2.8.0 */ + /** @since 3.0.0 */ $oTwigEnv->addFunction(new Twig_SimpleFunction('get_absolute_url_modules_root', function () { return utils::GetAbsoluteUrlModulesRoot(); })); // Function to render a UI block (HTML, inline CSS, inline JS) and its sub blocks directly in the TWIG // Usage in twig: {{ render_block(oBlock) }} - /** @since 2.8.0 */ + /** @since 3.0.0 */ $oTwigEnv->addFunction(new Twig_SimpleFunction('render_block', function(iUIBlock $oBlock, $aContextParams = []){ return BlockRenderer::RenderBlockTemplates($oBlock, $aContextParams); }, ['is_safe' => ['html']])); diff --git a/sources/application/TwigBase/Twig/TwigHelper.php b/sources/application/TwigBase/Twig/TwigHelper.php index a6643c702..123db01a5 100644 --- a/sources/application/TwigBase/Twig/TwigHelper.php +++ b/sources/application/TwigBase/Twig/TwigHelper.php @@ -26,28 +26,28 @@ class TwigHelper { /** * @var string ENUM_FILE_TYPE_HTML - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_FILE_TYPE_HTML = 'html'; /** * @var string ENUM_FILE_TYPE_JS - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_FILE_TYPE_JS = 'js'; /** * @var string ENUM_FILE_TYPE_CSS - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_FILE_TYPE_CSS = 'css'; /** * @var string ENUM_FILE_TYPE_SVG - * @since 2.8.0 + * @since 3.0.0 */ public const ENUM_FILE_TYPE_SVG = 'svg'; /** * @var string DEFAULT_FILE_TYPE - * @since 2.8.0 + * @since 3.0.0 */ public const DEFAULT_FILE_TYPE = self::ENUM_FILE_TYPE_HTML; diff --git a/sources/application/UI/Component/Alert/Alert.php b/sources/application/UI/Component/Alert/Alert.php index 48210107b..0a993c4fe 100644 --- a/sources/application/UI/Component/Alert/Alert.php +++ b/sources/application/UI/Component/Alert/Alert.php @@ -27,7 +27,7 @@ use Combodo\iTop\Application\UI\UIBlock; * * @author Stephen Abello * @package Combodo\iTop\Application\UI\Component\Alert - * @since 2.8.0 + * @since 3.0.0 */ class Alert extends UIBlock { diff --git a/sources/application/UI/Component/Alert/AlertFactory.php b/sources/application/UI/Component/Alert/AlertFactory.php index 126983559..706f5a4ff 100644 --- a/sources/application/UI/Component/Alert/AlertFactory.php +++ b/sources/application/UI/Component/Alert/AlertFactory.php @@ -25,7 +25,7 @@ namespace Combodo\iTop\Application\UI\Component\Alert; * @internal * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\Alert - * @since 2.8.0 + * @since 3.0.0 */ class AlertFactory { diff --git a/sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php b/sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php index a64771903..7d7ddc45f 100644 --- a/sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php +++ b/sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php @@ -30,7 +30,7 @@ use utils; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\Breadcrumbs * @internal - * @since 2.8.0 + * @since 3.0.0 */ class Breadcrumbs extends UIBlock { diff --git a/sources/application/UI/Component/Button/Button.php b/sources/application/UI/Component/Button/Button.php index b05994037..eab79744d 100644 --- a/sources/application/UI/Component/Button/Button.php +++ b/sources/application/UI/Component/Button/Button.php @@ -27,7 +27,7 @@ use Combodo\iTop\Application\UI\UIBlock; * * @author Stephen Abello * @package Combodo\iTop\Application\UI\Component\Button - * @since 2.8.0 + * @since 3.0.0 */ class Button extends UIBlock { diff --git a/sources/application/UI/Component/Button/ButtonFactory.php b/sources/application/UI/Component/Button/ButtonFactory.php index 8232e27bb..df2442d24 100644 --- a/sources/application/UI/Component/Button/ButtonFactory.php +++ b/sources/application/UI/Component/Button/ButtonFactory.php @@ -25,7 +25,7 @@ namespace Combodo\iTop\Application\UI\Component\Button; * @internal * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\Button - * @since 2.8.0 + * @since 3.0.0 */ class ButtonFactory { diff --git a/sources/application/UI/Component/GlobalSearch/GlobalSearch.php b/sources/application/UI/Component/GlobalSearch/GlobalSearch.php index e482e3c35..ccbd51574 100644 --- a/sources/application/UI/Component/GlobalSearch/GlobalSearch.php +++ b/sources/application/UI/Component/GlobalSearch/GlobalSearch.php @@ -30,7 +30,7 @@ use utils; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\GlobalSearch * @internal - * @since 2.8.0 + * @since 3.0.0 */ class GlobalSearch extends UIBlock { diff --git a/sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php b/sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php index facc8cddf..c15934803 100644 --- a/sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php +++ b/sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php @@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI\Component\GlobalSearch; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\GlobalSearch * @internal - * @since 2.8.0 + * @since 3.0.0 */ class GlobalSearchFactory { diff --git a/sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php b/sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php index be5eb2583..2987f8a98 100644 --- a/sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php +++ b/sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php @@ -30,7 +30,7 @@ use utils; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\GlobalSearch * @internal - * @since 2.8.0 + * @since 3.0.0 */ class GlobalSearchHelper { diff --git a/sources/application/UI/Component/Html/Html.php b/sources/application/UI/Component/Html/Html.php index de4fd9789..a1543bf67 100644 --- a/sources/application/UI/Component/Html/Html.php +++ b/sources/application/UI/Component/Html/Html.php @@ -27,7 +27,7 @@ use Combodo\iTop\Application\UI\UIBlock; * * @author Stephen Abello * @package Combodo\iTop\Application\UI\Component\Html - * @since 2.8.0 + * @since 3.0.0 */ class Html extends UIBlock { diff --git a/sources/application/UI/Component/Panel/Panel.php b/sources/application/UI/Component/Panel/Panel.php index 5e0ff3898..49a3f6c86 100644 --- a/sources/application/UI/Component/Panel/Panel.php +++ b/sources/application/UI/Component/Panel/Panel.php @@ -31,7 +31,7 @@ use Combodo\iTop\Application\UI\tUIContentAreas; * * @author Stephen Abello * @package Combodo\iTop\Application\UI\Component\Panel - * @since 2.8.0 + * @since 3.0.0 */ class Panel extends UIContentBlock { diff --git a/sources/application/UI/Component/Panel/PanelFactory.php b/sources/application/UI/Component/Panel/PanelFactory.php index 37691abdd..1f086950a 100644 --- a/sources/application/UI/Component/Panel/PanelFactory.php +++ b/sources/application/UI/Component/Panel/PanelFactory.php @@ -25,7 +25,7 @@ namespace Combodo\iTop\Application\UI\Component\Panel; * @internal * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\Panel - * @since 2.8.0 + * @since 3.0.0 */ class PanelFactory { @@ -39,7 +39,7 @@ class PanelFactory public static function MakeNeutral(string $sTitle) { $oPanel = new Panel($sTitle); - // TODO 2.8.0: Set this back to neutral when object details are done + // TODO 3.0.0: Set this back to neutral when object details are done $oPanel->SetColor(Panel::ENUM_COLOR_BLUE); return $oPanel; @@ -161,7 +161,7 @@ class PanelFactory public static function MakeForClass(string $sClass, string $sTitle) { $oPanel = new Panel($sTitle); - // TODO 2.8.0: Change this to clas color when done + // TODO 3.0.0: Change this to clas color when done $oPanel->SetColor(Panel::ENUM_COLOR_BLUE); return $oPanel; diff --git a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php b/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php index d71d7e7e2..ad683ed0a 100644 --- a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php +++ b/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php @@ -28,7 +28,7 @@ use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu; * @author Stephen Abello * @package Combodo\iTop\Application\UI\Component\NewsroomMenu * @internal - * @since 2.8.0 + * @since 3.0.0 */ class NewsroomMenu extends PopoverMenu { diff --git a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php b/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php index 046679ff5..84ec60faa 100644 --- a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php +++ b/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php @@ -31,7 +31,7 @@ use utils; * @author Stephen Abello * @package Combodo\iTop\Application\UI\Component\NewsroomMenu * @internal -* @since 2.8.0 +* @since 3.0.0 */ class NewsroomMenuFactory { diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenu.php b/sources/application/UI/Component/PopoverMenu/PopoverMenu.php index d02bc0407..23fedb0c1 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenu.php +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenu.php @@ -30,7 +30,7 @@ use Exception; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\PopoverMenu * @internal - * @since 2.8.0 + * @since 3.0.0 */ class PopoverMenu extends UIBlock { diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php b/sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php index 53a726111..db5f18b94 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php @@ -35,7 +35,7 @@ use utils; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\PopoverMenu * @internal - * @since 2.8.0 + * @since 3.0.0 */ class PopoverMenuFactory { diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php index 1960fb8d2..fe48f2ae8 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php @@ -28,7 +28,7 @@ use JSPopupMenuItem; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem * @property \JSPopupMenuItem $oPopupMenuItem - * @since 2.8.0 + * @since 3.0.0 */ class JsPopoverMenuItem extends PopoverMenuItem { diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php index 07c1a6474..bcfdb0900 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php @@ -29,7 +29,7 @@ use Combodo\iTop\Application\UI\UIBlock; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem * @internal - * @since 2.8.0 + * @since 3.0.0 */ class PopoverMenuItem extends UIBlock { diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php index 6c3d1ea8c..9cd51c7bd 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php @@ -32,7 +32,7 @@ use SeparatorPopupMenuItem; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem * @internal - * @since 2.8.0 + * @since 3.0.0 */ class PopoverMenuItemFactory { diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php index 175decbe1..38a5688b6 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php @@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem; * @author Stephen Abello * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem * @property \SeparatorPopupMenuItem $oPopupMenuItem - * @since 2.8.0 + * @since 3.0.0 */ class SeparatorPopoverMenuItem extends PopoverMenuItem { diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php index e46bfd37f..f06c4fa61 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php @@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem * @property \URLPopupMenuItem $oPopupMenuItem - * @since 2.8.0 + * @since 3.0.0 */ class UrlPopoverMenuItem extends PopoverMenuItem { diff --git a/sources/application/UI/Component/QuickCreate/QuickCreate.php b/sources/application/UI/Component/QuickCreate/QuickCreate.php index 20c8d3c5d..7414fd22c 100644 --- a/sources/application/UI/Component/QuickCreate/QuickCreate.php +++ b/sources/application/UI/Component/QuickCreate/QuickCreate.php @@ -30,7 +30,7 @@ use UserRights; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\QuickCreate * @internal - * @since 2.8.0 + * @since 3.0.0 */ class QuickCreate extends UIBlock { diff --git a/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php b/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php index 4fa2d4879..55342ca5b 100644 --- a/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php +++ b/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php @@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI\Component\QuickCreate; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\QuickCreate * @internal - * @since 2.8.0 + * @since 3.0.0 */ class QuickCreateFactory { diff --git a/sources/application/UI/Component/QuickCreate/QuickCreateHelper.php b/sources/application/UI/Component/QuickCreate/QuickCreateHelper.php index bc6c35cec..f3c73f0ee 100644 --- a/sources/application/UI/Component/QuickCreate/QuickCreateHelper.php +++ b/sources/application/UI/Component/QuickCreate/QuickCreateHelper.php @@ -31,7 +31,7 @@ use utils; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Component\QuickCreate * @internal - * @since 2.8.0 + * @since 3.0.0 */ class QuickCreateHelper { diff --git a/sources/application/UI/Component/Title/TitleFactory.php b/sources/application/UI/Component/Title/TitleFactory.php index 30f29d4fc..d747b1763 100644 --- a/sources/application/UI/Component/Title/TitleFactory.php +++ b/sources/application/UI/Component/Title/TitleFactory.php @@ -21,7 +21,7 @@ class TitleFactory public static function MakeForObjectDetails(DBObject $oObject, ?string $sId = null) { - // TODO 2.8.0: Refactor all of this + // TODO 3.0.0: Refactor all of this $sObjIconUrl = $oObject->GetIcon(false); $sObjClass = get_class($oObject); $sObjClassName = MetaModel::GetName($sObjClass); @@ -35,7 +35,7 @@ class TitleFactory { $sStateCode = $oObject->GetState(); $sStatusLabel = $oObject->GetStateLabel(); - // TODO 2.8.0 : Dehardcode this + // TODO 3.0.0 : Dehardcode this switch ($sStateCode) { case 'new': diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php index d12ca2eca..ce83782c2 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php @@ -31,7 +31,7 @@ use UserRights; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry * @internal - * @since 2.8.0 + * @since 3.0.0 */ class ActivityEntry extends UIBlock { @@ -215,7 +215,7 @@ class ActivityEntry extends UIBlock } else { - // TODO 2.8.0: Check that this does not return '' when author is the CRON or an extension. + // TODO 3.0.0: Check that this does not return '' when author is the CRON or an extension. $this->sAuthorFriendlyname = UserRights::GetUserFriendlyName($this->sAuthorLogin); } $this->sAuthorInitials = UserRights::GetUserInitials($this->sAuthorLogin); diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php index 1b7c7825a..169f246a0 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php @@ -33,7 +33,7 @@ use ReflectionClass; * @internal * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry - * @since 2.8.0 + * @since 3.0.0 */ class ActivityEntryFactory { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php index 53c0d0e20..67113f15f 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php @@ -79,7 +79,7 @@ class CMDBChangeOpFactory $iAuthorId = $oChangeOp->Get('user_id'); // - Set login in the friendlyname as a fallback $sAuthorLogin = $oChangeOp->Get('userinfo'); - // - Try to find user login from its ID if present (since iTop 2.8.0) + // - Try to find user login from its ID if present (since iTop 3.0.0) if(empty($iAuthorId) === false) { $oAuthor = MetaModel::GetObject('User', $iAuthorId, false, true); diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php index 1ec8e875d..ba3f4bf6f 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php @@ -31,7 +31,7 @@ use MetaModel; * * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp\Factory - * @since 2.8.0 + * @since 3.0.0 */ class CMDBChangeOpSetAttributeScalarFactory extends CMDBChangeOpSetAttributeFactory { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php index 2352e1a90..d689fb934 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php @@ -28,7 +28,7 @@ use DateTime; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry * @internal - * @since 2.8.0 + * @since 3.0.0 */ class CaseLogEntry extends ActivityEntry { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php index 3398468fc..ba9c88973 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php @@ -31,7 +31,7 @@ use MetaModel; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry * @internal - * @since 2.8.0 + * @since 3.0.0 */ class EditsEntry extends ActivityEntry { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php index 9ba19932d..b0eb97974 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php @@ -29,7 +29,7 @@ use MetaModel; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry * @internal - * @since 2.8.0 + * @since 3.0.0 */ class TransitionEntry extends ActivityEntry { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php b/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php index bbe6481aa..ba0e73c8e 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php @@ -19,7 +19,7 @@ use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryForm\Activi * @internal * @author Stephen Abello * @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryFormFactory - * @since 2.8.0 + * @since 3.0.0 */ class ActivityNewEntryFormFactory { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php b/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php index 82545b7d9..ce84d9a26 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityPanel.php @@ -36,7 +36,7 @@ use MetaModel; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\ActivityPanel * @internal - * @since 2.8.0 + * @since 3.0.0 */ class ActivityPanel extends UIBlock { diff --git a/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php b/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php index 903cb2bfd..0f8dfab0e 100644 --- a/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php +++ b/sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php @@ -38,7 +38,7 @@ use MetaModel; * @internal * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\ActivityPanel - * @since 2.8.0 + * @since 3.0.0 */ class ActivityPanelFactory { @@ -73,7 +73,7 @@ class ActivityPanelFactory if($oActivityPanel->HasCaseLogTabs()) { - //TODO 2.8.0 check write rights + //TODO 3.0.0 check write rights $aCaseLogsForNewEntryForm = []; foreach ($aCaseLogAttCodes as $sCaseLogAttCode){ $aCaseLogsForNewEntryForm[$sCaseLogAttCode] = MetaModel::GetLabel($sObjClass, $sCaseLogAttCode); diff --git a/sources/application/UI/Layout/MultiColumn/Column/Column.php b/sources/application/UI/Layout/MultiColumn/Column/Column.php index d10fa3d0c..8cb639c71 100644 --- a/sources/application/UI/Layout/MultiColumn/Column/Column.php +++ b/sources/application/UI/Layout/MultiColumn/Column/Column.php @@ -14,7 +14,7 @@ use Combodo\iTop\Application\UI\Layout\UIContentBlock; * * @package Combodo\iTop\Application\UI\Layout\MultiColumn\Column * @internal - * @since 2.8.0 + * @since 3.0.0 */ class Column extends UIContentBlock { // Overloaded constants diff --git a/sources/application/UI/Layout/MultiColumn/MultiColumn.php b/sources/application/UI/Layout/MultiColumn/MultiColumn.php index ec73a4346..7938befc9 100644 --- a/sources/application/UI/Layout/MultiColumn/MultiColumn.php +++ b/sources/application/UI/Layout/MultiColumn/MultiColumn.php @@ -15,7 +15,7 @@ use Combodo\iTop\Application\UI\UIBlock; * * @package Combodo\iTop\Application\UI\Layout\MultiColumn * @internal - * @since 2.8.0 + * @since 3.0.0 */ class MultiColumn extends UIBlock { // Overloaded constants diff --git a/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php b/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php index 397f6b9b2..4a6815e68 100644 --- a/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php +++ b/sources/application/UI/Layout/NavigationMenu/NavigationMenu.php @@ -38,7 +38,7 @@ use utils; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\NavigationMenu * @internal - * @since 2.8.0 + * @since 3.0.0 */ class NavigationMenu extends UIBlock { diff --git a/sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php b/sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php index acb725c33..bab16d662 100644 --- a/sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php +++ b/sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php @@ -31,7 +31,7 @@ use MetaModel; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\NavigationMenu * @internal - * @since 2.8.0 + * @since 3.0.0 */ class NavigationMenuFactory { diff --git a/sources/application/UI/Layout/Object/ObjectFactory.php b/sources/application/UI/Layout/Object/ObjectFactory.php index 6d4ab3377..5d28818ad 100644 --- a/sources/application/UI/Layout/Object/ObjectFactory.php +++ b/sources/application/UI/Layout/Object/ObjectFactory.php @@ -16,7 +16,7 @@ use DBObject; * @internal * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\Object - * @since 2.8.0 + * @since 3.0.0 */ class ObjectFactory { /** diff --git a/sources/application/UI/Layout/PageContent/PageContent.php b/sources/application/UI/Layout/PageContent/PageContent.php index 336b9e5a6..5cc7e578f 100644 --- a/sources/application/UI/Layout/PageContent/PageContent.php +++ b/sources/application/UI/Layout/PageContent/PageContent.php @@ -32,7 +32,7 @@ use Combodo\iTop\Application\UI\UIBlock; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\PageContent * @internal - * @since 2.8.0 + * @since 3.0.0 */ class PageContent extends UIBlock implements iUIContentBlock { use tUIContentAreas; diff --git a/sources/application/UI/Layout/PageContent/PageContentFactory.php b/sources/application/UI/Layout/PageContent/PageContentFactory.php index 04c7cb6f6..72fa43794 100644 --- a/sources/application/UI/Layout/PageContent/PageContentFactory.php +++ b/sources/application/UI/Layout/PageContent/PageContentFactory.php @@ -29,7 +29,7 @@ use DBObject; * @internal * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\PageContent - * @since 2.8.0 + * @since 3.0.0 */ class PageContentFactory { @@ -56,7 +56,7 @@ class PageContentFactory $oLayout = new PageContentWithSideContent(); // Add object details layout - // TODO 2.8.0 + // TODO 3.0.0 // Add object activity layout $oActivityPanel = ActivityPanelFactory::MakeForObjectDetails($oObject); diff --git a/sources/application/UI/Layout/PageContent/PageContentWithSideContent.php b/sources/application/UI/Layout/PageContent/PageContentWithSideContent.php index ed4fdf430..f343b6c13 100644 --- a/sources/application/UI/Layout/PageContent/PageContentWithSideContent.php +++ b/sources/application/UI/Layout/PageContent/PageContentWithSideContent.php @@ -28,7 +28,7 @@ use Combodo\iTop\Application\UI\iUIBlock; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\PageContent * @internal - * @since 2.8.0 + * @since 3.0.0 */ class PageContentWithSideContent extends PageContent { // Overloaded constants diff --git a/sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php b/sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php index 06c3fb4db..82cca07ea 100644 --- a/sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php +++ b/sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php @@ -30,7 +30,7 @@ use TabManager; * * @package Combodo\iTop\Application\UI\Layout\TabContainer\Tab * @internal - * @since 2.8.0 + * @since 3.0.0 */ class AjaxTab extends Tab { // Overloaded constants diff --git a/sources/application/UI/Layout/TabContainer/Tab/Tab.php b/sources/application/UI/Layout/TabContainer/Tab/Tab.php index 6b32bcbf9..a8ffa1f23 100644 --- a/sources/application/UI/Layout/TabContainer/Tab/Tab.php +++ b/sources/application/UI/Layout/TabContainer/Tab/Tab.php @@ -28,7 +28,7 @@ use TabManager; * * @package Combodo\iTop\Application\UI\Layout\TabContainer\Tab * @internal - * @since 2.8.0 + * @since 3.0.0 */ class Tab extends UIContentBlock { diff --git a/sources/application/UI/Layout/TopBar/TopBar.php b/sources/application/UI/Layout/TopBar/TopBar.php index 37ca42053..89edb641b 100644 --- a/sources/application/UI/Layout/TopBar/TopBar.php +++ b/sources/application/UI/Layout/TopBar/TopBar.php @@ -31,7 +31,7 @@ use Combodo\iTop\Application\UI\UIBlock; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\TopBar * @internal - * @since 2.8.0 + * @since 3.0.0 */ class TopBar extends UIBlock { diff --git a/sources/application/UI/Layout/TopBar/TopBarFactory.php b/sources/application/UI/Layout/TopBar/TopBarFactory.php index e5b594c51..56d9de491 100644 --- a/sources/application/UI/Layout/TopBar/TopBarFactory.php +++ b/sources/application/UI/Layout/TopBar/TopBarFactory.php @@ -31,7 +31,7 @@ use utils; * @author Guillaume Lajarige * @package Combodo\iTop\Application\UI\Layout\TopBar * @internal - * @since 2.8.0 + * @since 3.0.0 */ class TopBarFactory { diff --git a/sources/application/UI/Layout/UIContentBlock.php b/sources/application/UI/Layout/UIContentBlock.php index 95931bbe9..16a13bea1 100644 --- a/sources/application/UI/Layout/UIContentBlock.php +++ b/sources/application/UI/Layout/UIContentBlock.php @@ -19,7 +19,7 @@ use Combodo\iTop\Application\UI\UIBlock; * @author Eric Espie * @author Anne-Catherine Cognet * @internal - * @since 2.8.0 + * @since 3.0.0 */ class UIContentBlock extends UIBlock implements iUIContentBlock { // Overloaded constants diff --git a/sources/application/UI/Layout/iUIContentBlock.php b/sources/application/UI/Layout/iUIContentBlock.php index 6553d3630..8012f05eb 100644 --- a/sources/application/UI/Layout/iUIContentBlock.php +++ b/sources/application/UI/Layout/iUIContentBlock.php @@ -15,7 +15,7 @@ use Combodo\iTop\Application\UI\iUIBlock; * @author Eric Espie * @author Anne-Catherine Cognet * @internal - * @since 2.8.0 + * @since 3.0.0 */ interface iUIContentBlock { /** diff --git a/sources/application/UI/UIBlock.php b/sources/application/UI/UIBlock.php index be16b2581..bb3b8651c 100644 --- a/sources/application/UI/UIBlock.php +++ b/sources/application/UI/UIBlock.php @@ -28,7 +28,7 @@ use utils; * @package Combodo\iTop\Application\UI * @author Guillaume Lajarige * @internal - * @since 2.8.0 + * @since 3.0.0 */ abstract class UIBlock implements iUIBlock { /** @var string BLOCK_CODE The block code to use to generate the identifier, the CSS/JS prefixes, ... diff --git a/sources/application/UI/iUIBlock.php b/sources/application/UI/iUIBlock.php index e68879286..ec0c6fa94 100644 --- a/sources/application/UI/iUIBlock.php +++ b/sources/application/UI/iUIBlock.php @@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI; * @package Combodo\iTop\Application\UI * @author Guillaume Lajarige * @internal - * @since 2.8.0 + * @since 3.0.0 */ interface iUIBlock { /** diff --git a/sources/application/UI/tUIContentAreas.php b/sources/application/UI/tUIContentAreas.php index 20f137154..a16671b9d 100644 --- a/sources/application/UI/tUIContentAreas.php +++ b/sources/application/UI/tUIContentAreas.php @@ -19,7 +19,7 @@ use Dict; * @package Combodo\iTop\Application\UI * @author Guillaume Lajarige * @internal - * @since 2.8.0 + * @since 3.0.0 */ trait tUIContentAreas { /** @var iUIContentBlock[] Blocks for the different content parts of the block */ diff --git a/sources/application/WebPage/AjaxPage.php b/sources/application/WebPage/AjaxPage.php index 566a373cd..5ec1737f2 100644 --- a/sources/application/WebPage/AjaxPage.php +++ b/sources/application/WebPage/AjaxPage.php @@ -127,7 +127,7 @@ class AjaxPage extends WebPage implements iTabbedPage /** * @param string $sHtml * - * @deprecated Will be removed in 2.8.0 + * @deprecated Will be removed in 3.0.0 */ public function AddToMenu($sHtml) { @@ -155,7 +155,7 @@ class AjaxPage extends WebPage implements iTabbedPage // Additional UI widgets to be activated inside the ajax fragment // Important: Testing the content type is not enough because some ajax handlers have not correctly positionned the flag (e.g json response corrupted by the script) - // TODO 2.8.0 à revoir + // TODO 3.0.0 à revoir if (($this->sContentType == 'text/html') && (preg_match('/class="date-pick"/', $this->s_content) || preg_match('/class="datetime-pick"/', $this->s_content))) { $this->add_ready_script( << $this->a_scripts, 'aJsInlineOnDomReady' => $this->m_aReadyScripts, 'bEscapeContent' => ($this->sContentType == 'text/html') && ($this->sContentDisposition == 'inline'), - // TODO 2.8.0: TEMP, used while developping, remove it. + // TODO 3.0.0: TEMP, used while developping, remove it. 'sSanitizedContent' => utils::FilterXSS($this->s_content), 'sDeferredContent' => utils::FilterXSS(addslashes(str_replace("\n", '', $this->s_deferred_content))), 'sCapturedOutput' => utils::FilterXSS($s_captured_output), @@ -216,7 +216,7 @@ EOF echo $this->s_content; } - // TODO 2.8.0 Only for designer ? + // TODO 3.0.0 Only for designer ? if (!empty($this->m_sMenu)) { $uid = time(); echo "
\n"; diff --git a/sources/application/WebPage/NiceWebPage.php b/sources/application/WebPage/NiceWebPage.php index c45058fb1..da9896b11 100644 --- a/sources/application/WebPage/NiceWebPage.php +++ b/sources/application/WebPage/NiceWebPage.php @@ -257,8 +257,8 @@ EOF */ protected function LoadTheme() { - // TODO 2.8.0: Remove light-grey when development of Full Moon is done. - // TODO 2.8.0: Reuse theming mechanism for Full Moon + // TODO 3.0.0: Remove light-grey when development of Full Moon is done. + // TODO 3.0.0: Reuse theming mechanism for Full Moon $sCssThemeUrl = ThemeHandler::GetCurrentThemeUrl(); $this->add_linked_stylesheet($sCssThemeUrl); diff --git a/sources/application/WebPage/TabManager.php b/sources/application/WebPage/TabManager.php index 7db09b8b1..7d7f18f27 100644 --- a/sources/application/WebPage/TabManager.php +++ b/sources/application/WebPage/TabManager.php @@ -77,7 +77,7 @@ class TabManager /** * @return int - * @deprecated 2.8.0 + * @deprecated 3.0.0 */ public function GetCurrentTabLength() { @@ -92,7 +92,7 @@ class TabManager * @param integer $iLength The length/offset at which to truncate the tab * * @return string The truncated part - * @deprecated 2.8.0 + * @deprecated 3.0.0 */ public function TruncateTab(string $sTabContainer, string $sTab, int $iLength) { @@ -287,7 +287,7 @@ class TabManager * @param string $sTabCode * * @return string - * @deprecated 2.8.0 + * @deprecated 3.0.0 */ public function SelectTab(string $sTabContainer, string $sTabCode) { @@ -299,7 +299,7 @@ class TabManager * @param \WebPage $oPage * * @return mixed - * @deprecated 2.8.0 + * @deprecated 3.0.0 */ public function RenderIntoContent(string $sContent, WebPage $oPage) { diff --git a/sources/application/WebPage/WebPage.php b/sources/application/WebPage/WebPage.php index b90051e5e..5770724ef 100644 --- a/sources/application/WebPage/WebPage.php +++ b/sources/application/WebPage/WebPage.php @@ -313,7 +313,7 @@ class WebPage implements Page * @param \Combodo\iTop\Application\UI\iUIBlock $oBlock * * @return \Combodo\iTop\Application\UI\iUIBlock block added - * @since 2.8.0 + * @since 3.0.0 */ public function AddUiBlock(?iUIBlock $oBlock): ?iUIBlock { @@ -429,7 +429,7 @@ class WebPage implements Page /** * Add a CSS stylesheet (as an include, i.e. link) to the header of the page - * Handles duplicates since 2.8.0 : calling twig with the same stylesheet will add the stylesheet only once + * Handles duplicates since 3.0.0 : calling twig with the same stylesheet will add the stylesheet only once * * @param string $s_linked_stylesheet * @param string $s_condition @@ -769,7 +769,7 @@ class WebPage implements Page 'aCssInline' => $this->a_styles, 'aJsFiles' => $this->a_linked_scripts, 'aJsInlineLive' => $this->a_scripts, - // TODO 2.8.0: TEMP, used while developing, remove it. + // TODO 3.0.0: TEMP, used while developing, remove it. 'sCapturedOutput' => utils::FilterXSS($s_captured_output), 'sDeferredContent' => utils::FilterXSS($this->s_deferred_content), ]; @@ -1157,7 +1157,7 @@ EOD * Return the language for the page metadata based on the current user * * @return string - * @since 2.8.0 + * @since 3.0.0 */ protected function GetLanguageForMetadata() { @@ -1171,12 +1171,12 @@ EOD * * @return string * @throws \Exception - * @since 2.8.0 + * @since 3.0.0 */ protected function GetFaviconAbsoluteUrl() { - // TODO 2.8.0: Make it a property so it can be changed programmatically - // TODO 2.8.0: How to set both dark/light mode favicons + // TODO 3.0.0: Make it a property so it can be changed programmatically + // TODO 3.0.0: How to set both dark/light mode favicons return utils::GetAbsoluteUrlAppRoot().'images/favicon.ico'; } @@ -1186,7 +1186,7 @@ EOD * @param string $sTemplateRelPath Relative path (from /templates/) to the template path * * @return $this - * @since 2.8.0 + * @since 3.0.0 */ public function SetTemplateRelPath($sTemplateRelPath) { @@ -1198,7 +1198,7 @@ EOD * Return the relative path (from /templates/) to the page template * * @return string - * @since 2.8.0 + * @since 3.0.0 */ public function GetTemplateRelPath() { diff --git a/sources/application/WebPage/iTopWebPage.php b/sources/application/WebPage/iTopWebPage.php index d32d5d14d..8e89d71a6 100644 --- a/sources/application/WebPage/iTopWebPage.php +++ b/sources/application/WebPage/iTopWebPage.php @@ -97,7 +97,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage $this->add_header('Pragma: no-cache'); $this->add_header('Expires: 0'); $this->add_header('X-Frame-Options: deny'); - // TODO 2.8.0: Add only what's necessary + // TODO 3.0.0: Add only what's necessary $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery.treeview.css'); $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery-ui-timepicker-addon.css'); $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery.multiselect.css'); @@ -110,7 +110,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css'); $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/selectize.default.css'); - // TODO 2.8.0: Add only what's necessary + // TODO 3.0.0: Add only what's necessary $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.layout.min.js'); $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.ba-bbq.min.js'); $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.treeview.js'); @@ -272,8 +272,8 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage JS ); - // TODO 2.8.0: This is for tag sets, refactor the attribute markup so it contains the necessary - // TODO 2.8.0: data-tooltip-* attributes to activate the tooltips automatically (see /js/pages/backoffice.js) + // TODO 3.0.0: This is for tag sets, refactor the attribute markup so it contains the necessary + // TODO 3.0.0: data-tooltip-* attributes to activate the tooltips automatically (see /js/pages/backoffice.js) // Attribute set tooltip on items $this->add_ready_script( <<add_ready_script( <<add_ready_script( <<add_ready_script( <<< JS @@ -425,7 +425,7 @@ JS JS ); - // TODO 2.8.0: To preserve + // TODO 3.0.0: To preserve $this->add_ready_script(InlineImage::FixImagesWidth()); /* @@ -434,7 +434,7 @@ JS AttributeDate::InitTableSorter($this, 'custom_date'); */ - // TODO 2.8.0: What is this for? + // TODO 3.0.0: What is this for? $sUserPrefs = appUserPreferences::GetAsJSON(); $this->add_script( <<
'; } - // TODO 2.8.0: Don't forget this! + // TODO 3.0.0: Don't forget this! if (utils::IsArchiveMode()) { $sIcon = ''; $this->AddApplicationMessage(Dict::S('UI:ArchiveMode:Banner'), $sIcon, Dict::S('UI:ArchiveMode:Banner+')); } - // TODO 2.8.0: Move this in the Header method + // TODO 3.0.0: Move this in the Header method $sRestrictions = ''; if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE)) { @@ -795,7 +795,7 @@ EOF; $this->AddApplicationMessage($sRestrictions, $sIcon); } - // TODO 2.8.0: Move this in the header method + // TODO 3.0.0: Move this in the header method $sApplicationMessages = ''; foreach ($this->m_aMessages as $aMessage) { @@ -821,7 +821,7 @@ EOF; * @internal * * @return string - * @since 2.8.0 + * @since 3.0.0 */ protected function RenderFooterHtml() { @@ -873,10 +873,10 @@ EOF; // Prepare internal parts (js files, css files, js snippets, css snippets, ...) // - Generate necessary dict. files $this->output_dict_entries(); - // TODO 2.8.0 not displayed ? + // TODO 3.0.0 not displayed ? $this->GetContentLayout()->SetExtraHtmlContent(utils::FilterXSS($this->s_content)); - // TODO 2.8.0 : to be removed + // TODO 3.0.0 : to be removed $this->outputCollapsibleSectionInit(); // Base structure of data to pass to the TWIG template @@ -945,7 +945,7 @@ EOF; 'aJsInlineOnInit' => $this->m_aInitScript, 'aJsInlineOnDomReady' => $this->m_aReadyScripts, 'aJsInlineLive' => $this->a_scripts, - // TODO 2.8.0: TEMP, used while developping, remove it. + // TODO 3.0.0: TEMP, used while developping, remove it. 'sSanitizedContent' => utils::FilterXSS($this->s_content), 'sDeferredContent' => utils::FilterXSS($this->s_deferred_content), 'sCapturedOutput' => utils::FilterXSS($s_captured_output), @@ -1010,11 +1010,11 @@ EOF $this->outputCollapsibleSectionInit(); - // TODO 2.8.0: Is this for the "Debug" popup? We should do a helper to display a popup in various cases (welcome message for example) + // TODO 3.0.0: Is this for the "Debug" popup? We should do a helper to display a popup in various cases (welcome message for example) $s_captured_output = $this->ob_get_clean_safe(); - // TODO 2.8.0: Stylesheet for printing instead of having all those "IsPrintableVersion()" ifs - // TODO 2.8.0: Careful! In the print view, we can actually choose which part to print or not, so it's not just a print stylesheet... + // TODO 3.0.0: Stylesheet for printing instead of having all those "IsPrintableVersion()" ifs + // TODO 3.0.0: Careful! In the print view, we can actually choose which part to print or not, so it's not just a print stylesheet... // special stylesheet for printing, hides the navigation gadgets $sHtml .= "\n"; @@ -1028,7 +1028,7 @@ EOF // } - // TODO 2.8.0: Should we still do this init vs ready separation? + // TODO 3.0.0: Should we still do this init vs ready separation? // $this->add_script("\$(document).ready(function() {\n{$sInitScripts};\nwindow.setTimeout('onDelayedReady()',10)\n});"); if ($this->IsPrintableVersion()) { @@ -1103,7 +1103,7 @@ EOF; $sHtml .= "
"; } - // TODO 2.8.0 + // TODO 3.0.0 // // Render the text of the global search form // $sText = htmlentities(utils::ReadParam('text', '', false, 'raw_data'), ENT_QUOTES, self::PAGES_CHARSET); // $sOnClick = " onclick=\"if ($('#global-search-input').val() != '') { $('#global-search form').submit(); } \""; @@ -1141,7 +1141,7 @@ EOF; } else { - // TODO 2.8.0: Check with ITOMIG if we can remove this + // TODO 3.0.0: Check with ITOMIG if we can remove this if ($this->GetOutputFormat() == 'pdf' && $this->IsOutputFormatAvailable('pdf')) { // Note: Apparently this was a demand from ITOMIG a while back, so it's not "dead code" per say. @@ -1256,7 +1256,7 @@ EOF; * @param string $sTabContainer * @param string $sTabCode * - * @deprecated 2.8.0 + * @deprecated 3.0.0 */ public function SelectTab($sTabContainer, $sTabCode) { diff --git a/templates/pages/backoffice/webpage/layout.html.twig b/templates/pages/backoffice/webpage/layout.html.twig index f277d828a..88d217f55 100644 --- a/templates/pages/backoffice/webpage/layout.html.twig +++ b/templates/pages/backoffice/webpage/layout.html.twig @@ -56,7 +56,7 @@ {% block iboPageJsInlineScripts %}