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

Bug fix: allow printing lists fully expanded without the "pager" navigation.

Browse Source 
Also try to completely hide the main menu on the left when printing.

SVN:trunk[2675]
This commit is contained in:
Denis Flaven
2013-04-08 11:57:07 +00:00
parent 2e18c96328
commit b83d42efee
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -800,7 +800,10 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
$iDefaultPageSize = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit()); $iDefaultPageSize = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
$oSettings->iDefaultPageSize = $iDefaultPageSize; $oSettings->iDefaultPageSize = $iDefaultPageSize;
} }
else
{
$oSettings->iDefaultPageSize = 0;
}
$oSettings->aSortOrder = MetaModel::GetOrderByDefault($sClassName); $oSettings->aSortOrder = MetaModel::GetOrderByDefault($sClassName);
return $oDataTable->Display($oPage, $oSettings, $bDisplayMenu, $sSelectMode, $bViewLink, $aExtraParams); return $oDataTable->Display($oPage, $oSettings, $bDisplayMenu, $sSelectMode, $bViewLink, $aExtraParams);

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

@@ -60,6 +60,10 @@ class DataTable
{ {
// Custom settings overload the default ones // Custom settings overload the default ones
$this->bUseCustomSettings = true; $this->bUseCustomSettings = true;
if ($this->oDefaultSettings->iDefaultPageSize == 0)
{
$oCustomSettings->iDefaultPageSize = 0;
}
} }
else else
{ {
@@ -176,6 +180,8 @@ class DataTable
if ($iPageSize < 1) // Display all if ($iPageSize < 1) // Display all
{ {
$sPagerStyle = 'style="display:none"'; // no limit: display the full table, so hide the "pager" UI $sPagerStyle = 'style="display:none"'; // no limit: display the full table, so hide the "pager" UI
// WARNING: mPDF does not take the "display" style into account
// when applied to a <td> or a <table> tag, so make sure you apply this to a div
} }
else else
{ {
@@ -226,7 +232,8 @@ class DataTable
$sSelectionMode = ($iNbPages == 1) ? '' : 'positive'; $sSelectionMode = ($iNbPages == 1) ? '' : 'positive';
$sHtml = $sHtml =
<<<EOF <<<EOF
<td $sPagerStyle colspan="2"> <td colspan="2">
<div $sPagerStyle>
<table id="pager{$this->iListId}" class="pager"><tr> <table id="pager{$this->iListId}" class="pager"><tr>
<td>$sPages</td> <td>$sPages</td>
<td><img src="../images/first.png" class="first"/></td> <td><img src="../images/first.png" class="first"/></td>
@@ -239,6 +246,7 @@ class DataTable
</td> </td>
</tr> </tr>
</table> </table>
</div>
</td> </td>
EOF; EOF;
return $sHtml; return $sHtml;

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

@@ -768,7 +768,7 @@ EOF
$sHtml .= ' </div>'; $sHtml .= ' </div>';
$sHtml .= ' </div> <!-- /inner menu -->'; $sHtml .= ' </div> <!-- /inner menu -->';
$sHtml .= ' </div> <!-- /menu -->'; $sHtml .= ' </div> <!-- /menu -->';
$sHtml .= ' <div class="footer ui-layout-south"><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logo-combodo.png"/></a></div>'; $sHtml .= ' <div class="footer ui-layout-south"><div id="combodo_logo"><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logo-combodo.png"/></a></div></div>';
$sHtml .= '<!-- End of the left pane -->'; $sHtml .= '<!-- End of the left pane -->';
$sHtml .= '</div>'; $sHtml .= '</div>';

3
css/light-grey.css
View File

@@ -1102,9 +1102,6 @@ table.pagination tr td {
.pagination_container { .pagination_container {
padding-left: 3px; padding-left: 3px;
} }
.pager {
display:inline-block;
}
.pager p { .pager p {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;

6
css/print.css
View File

@@ -1,15 +1,15 @@
@CHARSET "UTF-8"; @CHARSET "UTF-8";
#left-pane { display: none; }
span.ui-layout-resizer { display: none; } span.ui-layout-resizer { display: none; }
#header-logo { display: none; } #header-logo { display: none; }
#logo { display: none; } #logo { display: none; }
div.header-menu { display:none; } div.header-menu { display:none; }
div.footer { display:none; } div.footer { display:none; }
#top-bar { display: none; } #top-bar { display: none; }
#menu { display: none; } #inner_menu { display: none; }
div.actions_button { display:none; } div.actions_button { display:none; }
div.itop_popup { display:none; } div.itop_popup { display:none; }
div.HRDrawer { display:none; } div.HRDrawer { display:none; }
div.DrawerHandle { display:none; } div.DrawerHandle { display:none; }
a.tab { display:none; } a.tab { display:none; }
div.itop-tab { border: #ccc 1px solid; margin-top: 1em; padding-bottom:1em; } div.itop-tab { border: #ccc 1px solid; margin-top: 1em; padding-bottom:1em; }
#combodo_logo { display:none; };