composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 06:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2847 - Comment (temp) migrated parts of the iTopWebPage

Browse Source
This commit is contained in:
Molkobain
2020-10-02 09:29:50 +02:00
parent 15a9856f89
commit 29f58103b0
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/ajax.render.php
View File

@@ -1642,6 +1642,7 @@ JS
$oPage->add("</div>");
break;
// TODO 2.8.0: Handle the history pagination
case 'history':
$oPage->SetContentType('text/html');
$id = (int)utils::ReadParam('id', 0);
@@ -1654,6 +1655,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?
case 'history_from_filter':
$oPage->SetContentType('text/html');
$oHistoryFilter = DBSearch::unserialize($sFilter);

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

@@ -982,7 +982,7 @@ EOF;
$sForm = $this->GetSiloSelectionForm();
// Render the tabs in the page (if any)
$this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
// $this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
// Put here the 'ready scripts' that must be executed after all others
$aMultiselectOptions = array(
@@ -1019,7 +1019,7 @@ EOF
if ($this->GetOutputFormat() == 'html')
{
$sHtml .= $this->output_dict_entries(true); // before any script so that they can benefit from the translations
// $sHtml .= $this->output_dict_entries(true); // before any script so that they can benefit from the translations
// if (!$this->IsPrintableVersion())
// {
@@ -1066,7 +1066,7 @@ EOF
{
$sBodyClass = 'printable-version';
}
$sHtml .= "<body class=\"$sBodyClass\" data-gui-type=\"backoffice\">\n";
// $sHtml .= "<body class=\"$sBodyClass\" data-gui-type=\"backoffice\">\n";
if ($this->IsPrintableVersion())
{
$sHtml .= "<div class=\"explain-printable not-printable\">";
@@ -1118,10 +1118,10 @@ EOF;
if (trim($s_captured_output) != "") {
$sHtml .= "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">".utils::FilterXSS($s_captured_output)."</div></div>\n";
}
$sHtml .= "<div id=\"at_the_end\">".utils::FilterXSS($this->s_deferred_content)."</div>";
$sHtml .= "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
$sHtml .= "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
$sHtml .= "<div style=\"display:none\" id=\"ajax_content\"></div>";
// $sHtml .= "<div id=\"at_the_end\">".utils::FilterXSS($this->s_deferred_content)."</div>";
// $sHtml .= "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
// $sHtml .= "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
// $sHtml .= "<div style=\"display:none\" id=\"ajax_content\"></div>";
} else {
$sHtml .= utils::FilterXSS($this->s_content);
}