composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-03 07:28:57 +02: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

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