composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always display the number of elements (and the number of elements selected) when displaying a list.

Browse Source 
SVN:trunk[1354]
This commit is contained in:
Denis Flaven
2011-07-25 12:22:49 +00:00
parent a3611f7f63
commit 0c539aada9
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -725,17 +725,17 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
$sHtml .= $oPage->GetTable($aAttribs, $aValues);
$sHtml .= '</td></tr>';
$sHtml .= '</table>';
$iCount = $oSet->Count();
if ($bSelectMode)
{
$sHeader = Dict::Format('UI:Pagination:HeaderSelection', '<span id="total">'.$iCount.'</span>', '<span class="selectedCount">0</span>');
}
else
{
$sHeader = Dict::Format('UI:Pagination:HeaderNoSelection', '<span id="total">'.$iCount.'</span>');
}
if ($oSet->Count() > MetaModel::GetConfig()->GetMaxDisplayLimit())
{
$iCount = $oSet->Count();
if ($bSelectMode)
{
$sHeader = Dict::Format('UI:Pagination:HeaderSelection', '<span id="total">0</span>', '<span class="selectedCount"></span>');
}
else
{
$sHeader = Dict::Format('UI:Pagination:HeaderNoSelection', '<span id="total">0</span>');
}
$sCombo = '<select class="pagesize">';
for($iPage = 1; $iPage < 5; $iPage++)
{
@@ -753,7 +753,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
$sHtml =
<<<EOF
<div id="pager{$iListId}" class="pager">
</p>$sHeader</p>
<p>$sHeader</p>
<p><table class="pagination"><tr><td>$sPages</td><td><img src="../images/first.png" class="first"/></td>
<td><img src="../images/prev.png" class="prev"/></td>
<td><span id="index"></span></td>
@@ -784,6 +784,13 @@ EOF
}
else
{
$sHtml =
<<<EOF
<div id="pager{$iListId}" class="pager">
<p>$sHeader</p>
</div>
EOF
.$sHtml;
$sHeaders = '';
if ($bSelectMode)
{
@@ -808,6 +815,7 @@ EOF
var c = $('{$sCssCount}');
var v = $('#{$iListId} table.listResults $sSelectSelector:checked').length;
c.val(v);
$('#{$iListId} .selectedCount').text(v);
c.trigger('change');
});
EOF