composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Internal: Replace references to iTop 2.8.0 with iTop 3.0.0

Browse Source
This commit is contained in:
Molkobain
2020-10-14 10:16:49 +02:00
parent 986c08aa81
commit b15ed80732
76 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/cmdbabstract.class.inc.php
View File

@@ -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(<<<HTML
</div><!-- End of object-details -->

10
application/menunode.class.inc.php
View File

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

2
application/template.class.inc.php
View File

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

24
application/utils.inc.php
View File

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

2
core/cmdbchange.class.inc.php
View File

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

2
core/cmdbchangeop.class.inc.php
View File

@@ -34,7 +34,7 @@
/**
* Interface iCMDBChangeOp
*
* @since 2.8.0
* @since 3.0.0
*/
interface iCMDBChangeOp
{

4
core/cmdbobject.class.inc.php
View File

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

12
core/userrights.class.inc.php
View File

@@ -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 = '')
{

2
js/layouts/activity-panel/activity-new-entry-form.js
View File

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

2
js/layouts/activity-panel/activity-panel.js
View File

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

2
js/layouts/tab-container.js
View File

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

4
js/pages/backoffice.js
View File

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

8
pages/ajax.render.php
View File

@@ -1643,7 +1643,7 @@ JS
$oPage->add("</div>");
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');

2
setup/itopdesignformat.class.inc.php
View File

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

2
sources/Renderer/BlockRenderer.php
View File

@@ -29,7 +29,7 @@ use Combodo\iTop\Application\UI\iUIBlock;
*
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Renderer\Component
* @since 2.8.0
* @since 3.0.0
*/
class BlockRenderer
{

4
sources/Renderer/RenderingOutput.php
View File

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

2
sources/application/Branding.php
View File

@@ -26,7 +26,7 @@ use utils;
*
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application
* @since 2.8.0
* @since 3.0.0
*/
class Branding
{

6
sources/application/TwigBase/Twig/Extension.php
View File

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

10
sources/application/TwigBase/Twig/TwigHelper.php
View File

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

2
sources/application/UI/Component/Alert/Alert.php
View File

@@ -27,7 +27,7 @@ use Combodo\iTop\Application\UI\UIBlock;
*
* @author Stephen Abello <stephen.abello@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Alert
* @since 2.8.0
* @since 3.0.0
*/
class Alert extends UIBlock
{

2
sources/application/UI/Component/Alert/AlertFactory.php
View File

@@ -25,7 +25,7 @@ namespace Combodo\iTop\Application\UI\Component\Alert;
* @internal
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Alert
* @since 2.8.0
* @since 3.0.0
*/
class AlertFactory
{

2
sources/application/UI/Component/Breadcrumbs/Breadcrumbs.php
View File

@@ -30,7 +30,7 @@ use utils;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Breadcrumbs
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class Breadcrumbs extends UIBlock
{

2
sources/application/UI/Component/Button/Button.php
View File

@@ -27,7 +27,7 @@ use Combodo\iTop\Application\UI\UIBlock;
*
* @author Stephen Abello <stephen.abello@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Button
* @since 2.8.0
* @since 3.0.0
*/
class Button extends UIBlock
{

2
sources/application/UI/Component/Button/ButtonFactory.php
View File

@@ -25,7 +25,7 @@ namespace Combodo\iTop\Application\UI\Component\Button;
* @internal
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Button
* @since 2.8.0
* @since 3.0.0
*/
class ButtonFactory
{

2
sources/application/UI/Component/GlobalSearch/GlobalSearch.php
View File

@@ -30,7 +30,7 @@ use utils;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\GlobalSearch
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class GlobalSearch extends UIBlock
{

2
sources/application/UI/Component/GlobalSearch/GlobalSearchFactory.php
View File

@@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI\Component\GlobalSearch;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\GlobalSearch
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class GlobalSearchFactory
{

2
sources/application/UI/Component/GlobalSearch/GlobalSearchHelper.php
View File

@@ -30,7 +30,7 @@ use utils;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\GlobalSearch
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class GlobalSearchHelper
{

2
sources/application/UI/Component/Html/Html.php
View File

@@ -27,7 +27,7 @@ use Combodo\iTop\Application\UI\UIBlock;
*
* @author Stephen Abello <stephen.abello@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Html
* @since 2.8.0
* @since 3.0.0
*/
class Html extends UIBlock
{

2
sources/application/UI/Component/Panel/Panel.php
View File

@@ -31,7 +31,7 @@ use Combodo\iTop\Application\UI\tUIContentAreas;
*
* @author Stephen Abello <stephen.abello@combodo.com>
* @package Combodo\iTop\Application\UI\Component\Panel
* @since 2.8.0
* @since 3.0.0
*/
class Panel extends UIContentBlock
{

6
sources/application/UI/Component/Panel/PanelFactory.php
View File

@@ -25,7 +25,7 @@ namespace Combodo\iTop\Application\UI\Component\Panel;
* @internal
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @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;

2
sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenu.php
View File

@@ -28,7 +28,7 @@ use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu;
* @author Stephen Abello <stephen.abello@combodo.com>
* @package Combodo\iTop\Application\UI\Component\NewsroomMenu
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class NewsroomMenu extends PopoverMenu
{

2
sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php
View File

@@ -31,7 +31,7 @@ use utils;
* @author Stephen Abello <stephen.abello@combodo.com>
* @package Combodo\iTop\Application\UI\Component\NewsroomMenu
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class NewsroomMenuFactory
{

2
sources/application/UI/Component/PopoverMenu/PopoverMenu.php
View File

@@ -30,7 +30,7 @@ use Exception;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\PopoverMenu
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class PopoverMenu extends UIBlock
{

2
sources/application/UI/Component/PopoverMenu/PopoverMenuFactory.php
View File

@@ -35,7 +35,7 @@ use utils;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\PopoverMenu
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class PopoverMenuFactory
{

2
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php
View File

@@ -28,7 +28,7 @@ use JSPopupMenuItem;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem
* @property \JSPopupMenuItem $oPopupMenuItem
* @since 2.8.0
* @since 3.0.0
*/
class JsPopoverMenuItem extends PopoverMenuItem
{

2
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php
View File

@@ -29,7 +29,7 @@ use Combodo\iTop\Application\UI\UIBlock;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class PopoverMenuItem extends UIBlock
{

2
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php
View File

@@ -32,7 +32,7 @@ use SeparatorPopupMenuItem;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class PopoverMenuItemFactory
{

2
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php
View File

@@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem;
* @author Stephen Abello <stephen.abello@combodo.com>
* @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem
* @property \SeparatorPopupMenuItem $oPopupMenuItem
* @since 2.8.0
* @since 3.0.0
*/
class SeparatorPopoverMenuItem extends PopoverMenuItem
{

2
sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php
View File

@@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem
* @property \URLPopupMenuItem $oPopupMenuItem
* @since 2.8.0
* @since 3.0.0
*/
class UrlPopoverMenuItem extends PopoverMenuItem
{

2
sources/application/UI/Component/QuickCreate/QuickCreate.php
View File

@@ -30,7 +30,7 @@ use UserRights;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\QuickCreate
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class QuickCreate extends UIBlock
{

2
sources/application/UI/Component/QuickCreate/QuickCreateFactory.php
View File

@@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI\Component\QuickCreate;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\QuickCreate
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class QuickCreateFactory
{

2
sources/application/UI/Component/QuickCreate/QuickCreateHelper.php
View File

@@ -31,7 +31,7 @@ use utils;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Component\QuickCreate
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class QuickCreateHelper
{

4
sources/application/UI/Component/Title/TitleFactory.php
View File

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

4
sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntry.php
View File

@@ -31,7 +31,7 @@ use UserRights;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @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);

2
sources/application/UI/Layout/ActivityPanel/ActivityEntry/ActivityEntryFactory.php
View File

@@ -33,7 +33,7 @@ use ReflectionClass;
* @internal
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry
* @since 2.8.0
* @since 3.0.0
*/
class ActivityEntryFactory
{

2
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpFactory.php
View File

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

2
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CMDBChangeOp/CMDBChangeOpSetAttributeScalarFactory.php
View File

@@ -31,7 +31,7 @@ use MetaModel;
*
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\CMDBChangeOp\Factory
* @since 2.8.0
* @since 3.0.0
*/
class CMDBChangeOpSetAttributeScalarFactory extends CMDBChangeOpSetAttributeFactory
{

2
sources/application/UI/Layout/ActivityPanel/ActivityEntry/CaseLogEntry.php
View File

@@ -28,7 +28,7 @@ use DateTime;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class CaseLogEntry extends ActivityEntry
{

2
sources/application/UI/Layout/ActivityPanel/ActivityEntry/EditsEntry.php
View File

@@ -31,7 +31,7 @@ use MetaModel;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class EditsEntry extends ActivityEntry
{

2
sources/application/UI/Layout/ActivityPanel/ActivityEntry/TransitionEntry.php
View File

@@ -29,7 +29,7 @@ use MetaModel;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class TransitionEntry extends ActivityEntry
{

2
sources/application/UI/Layout/ActivityPanel/ActivityNewEntryForm/ActivityNewEntryFormFactory.php
View File

@@ -19,7 +19,7 @@ use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryForm\Activi
* @internal
* @author Stephen Abello <stephen.abello@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityNewEntryFormFactory
* @since 2.8.0
* @since 3.0.0
*/
class ActivityNewEntryFormFactory
{

2
sources/application/UI/Layout/ActivityPanel/ActivityPanel.php
View File

@@ -36,7 +36,7 @@ use MetaModel;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\ActivityPanel
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class ActivityPanel extends UIBlock
{

4
sources/application/UI/Layout/ActivityPanel/ActivityPanelFactory.php
View File

@@ -38,7 +38,7 @@ use MetaModel;
* @internal
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @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);

2
sources/application/UI/Layout/MultiColumn/Column/Column.php
View File

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

2
sources/application/UI/Layout/MultiColumn/MultiColumn.php
View File

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

2
sources/application/UI/Layout/NavigationMenu/NavigationMenu.php
View File

@@ -38,7 +38,7 @@ use utils;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\NavigationMenu
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class NavigationMenu extends UIBlock
{

2
sources/application/UI/Layout/NavigationMenu/NavigationMenuFactory.php
View File

@@ -31,7 +31,7 @@ use MetaModel;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\NavigationMenu
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class NavigationMenuFactory
{

2
sources/application/UI/Layout/Object/ObjectFactory.php
View File

@@ -16,7 +16,7 @@ use DBObject;
* @internal
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\Object
* @since 2.8.0
* @since 3.0.0
*/
class ObjectFactory {
/**

2
sources/application/UI/Layout/PageContent/PageContent.php
View File

@@ -32,7 +32,7 @@ use Combodo\iTop\Application\UI\UIBlock;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\PageContent
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class PageContent extends UIBlock implements iUIContentBlock {
use tUIContentAreas;

4
sources/application/UI/Layout/PageContent/PageContentFactory.php
View File

@@ -29,7 +29,7 @@ use DBObject;
* @internal
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @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);

2
sources/application/UI/Layout/PageContent/PageContentWithSideContent.php
View File

@@ -28,7 +28,7 @@ use Combodo\iTop\Application\UI\iUIBlock;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\PageContent
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class PageContentWithSideContent extends PageContent {
// Overloaded constants

2
sources/application/UI/Layout/TabContainer/Tab/AjaxTab.php
View File

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

2
sources/application/UI/Layout/TabContainer/Tab/Tab.php
View File

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

2
sources/application/UI/Layout/TopBar/TopBar.php
View File

@@ -31,7 +31,7 @@ use Combodo\iTop\Application\UI\UIBlock;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\TopBar
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class TopBar extends UIBlock
{

2
sources/application/UI/Layout/TopBar/TopBarFactory.php
View File

@@ -31,7 +31,7 @@ use utils;
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @package Combodo\iTop\Application\UI\Layout\TopBar
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class TopBarFactory
{

2
sources/application/UI/Layout/UIContentBlock.php
View File

@@ -19,7 +19,7 @@ use Combodo\iTop\Application\UI\UIBlock;
* @author Eric Espie <eric.espie@combodo.com>
* @author Anne-Catherine Cognet <anne-catherine.cognet@combodo.com>
* @internal
* @since 2.8.0
* @since 3.0.0
*/
class UIContentBlock extends UIBlock implements iUIContentBlock {
// Overloaded constants

2
sources/application/UI/Layout/iUIContentBlock.php
View File

@@ -15,7 +15,7 @@ use Combodo\iTop\Application\UI\iUIBlock;
* @author Eric Espie <eric.espie@combodo.com>
* @author Anne-Catherine Cognet <anne-catherine.cognet@combodo.com>
* @internal
* @since 2.8.0
* @since 3.0.0
*/
interface iUIContentBlock {
/**

2
sources/application/UI/UIBlock.php
View File

@@ -28,7 +28,7 @@ use utils;
* @package Combodo\iTop\Application\UI
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @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, ...

2
sources/application/UI/iUIBlock.php
View File

@@ -26,7 +26,7 @@ namespace Combodo\iTop\Application\UI;
* @package Combodo\iTop\Application\UI
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @internal
* @since 2.8.0
* @since 3.0.0
*/
interface iUIBlock {
/**

2
sources/application/UI/tUIContentAreas.php
View File

@@ -19,7 +19,7 @@ use Dict;
* @package Combodo\iTop\Application\UI
* @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
* @internal
* @since 2.8.0
* @since 3.0.0
*/
trait tUIContentAreas {
/** @var iUIContentBlock[] Blocks for the different content parts of the block */

8
sources/application/WebPage/AjaxPage.php
View File

@@ -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(
<<<EOF
@@ -184,7 +184,7 @@ EOF
'aJsInlineLive' => $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 "<div id=\"accordion_temp_$uid\">\n";

4
sources/application/WebPage/NiceWebPage.php
View File

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

8
sources/application/WebPage/TabManager.php
View File

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

18
sources/application/WebPage/WebPage.php
View File

@@ -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 <ITOP>/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 <ITOP>/templates/) to the page template
*
* @return string
* @since 2.8.0
* @since 3.0.0
*/
public function GetTemplateRelPath()
{

62
sources/application/WebPage/iTopWebPage.php
View File

@@ -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(
<<<JS
@@ -306,7 +306,7 @@ JS
JS
);
// TODO 2.8.0: Change CSS class and extract this in backoffice.js
// TODO 3.0.0: Change CSS class and extract this in backoffice.js
// Make image attributes zoomable
$this->add_ready_script(
<<<JS
@@ -317,7 +317,7 @@ JS
JS
);
// TODO 2.8.0: Change CSS class and extract this in backoffice.js
// TODO 3.0.0: Change CSS class and extract this in backoffice.js
// Highlight code content created with CKEditor
$this->add_ready_script(
<<<JS
@@ -332,7 +332,7 @@ JS
JS
);
// TODO 2.8.0: What is this for?
// TODO 3.0.0: What is this for?
$this->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(
<<<JS
@@ -624,7 +624,7 @@ JS
* @throws \CoreUnexpectedValue
* @throws \DictExceptionMissingString
* @throws \MySQLException
* @since 2.8.0
* @since 3.0.0
*/
protected function GetNavigationMenuLayout()
{
@@ -638,7 +638,7 @@ JS
* @return \Combodo\iTop\Application\UI\Layout\TopBar\TopBar
* @throws \CoreException
* @throws \CoreUnexpectedValue
* @since 2.8.0
* @since 3.0.0
*/
protected function GetTopBarLayout()
{
@@ -654,7 +654,7 @@ JS
* @param \Combodo\iTop\Application\UI\Layout\PageContent\PageContent $oLayout
*
* @return $this
* @since 2.8.0
* @since 3.0.0
*/
public function SetContentLayout(PageContent $oLayout)
{
@@ -668,7 +668,7 @@ JS
*
* @internal
* @return \Combodo\iTop\Application\UI\Layout\PageContent\PageContent
* @since 2.8.0
* @since 3.0.0
*/
protected function GetContentLayout()
{
@@ -682,7 +682,7 @@ JS
*
* @internal
* @return array|null
* @since 2.8.0
* @since 3.0.0
*/
protected function GetBreadCrumbsNewEntry()
{
@@ -721,7 +721,7 @@ JS
* @internal
*
* @return string
* @since 2.8.0
* @since 3.0.0
*/
protected function RenderBannerHtml()
{
@@ -743,7 +743,7 @@ JS
* @internal
*
* @return string
* @since 2.8.0
* @since 3.0.0
*/
protected function RenderHeaderHtml()
{
@@ -753,18 +753,18 @@ JS
if (UserRights::IsAdministrator() && ExecutionKPI::IsEnabled())
{
// TODO 2.8.0: Don't forget this dude!
// TODO 3.0.0: Don't forget this dude!
$sHeaderHtml .= '<div class="app-message"><span style="padding:5px;">'.ExecutionKPI::GetDescription().'<span></div>';
}
// TODO 2.8.0: Don't forget this!
// TODO 3.0.0: Don't forget this!
if (utils::IsArchiveMode())
{
$sIcon = '<span class="fas fa-lock fa-1x"></span>';
$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 .= "<link rel=\"stylesheet\" media=\"print\" type=\"text/css\" href=\"../css/print.css?t=".utils::GetCacheBusterTimestamp()."\" />\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 .= "<div class=\"printable-content\" style=\"width: $sDefaultResolution;\">";
}
// 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)
{

2
templates/pages/backoffice/webpage/layout.html.twig
View File

@@ -56,7 +56,7 @@
{% block iboPageJsInlineScripts %}
<script type="text/javascript">
{# TODO 2.8.0: How to do this in native JS? #}
{# TODO 3.0.0: How to do this in native JS? #}
$(document).ready(function () {
{% block iboPageJsInlineOnInit %}
{% endblock %}