Add proper titles to the joystick navigation

refs #8458
This commit is contained in:
Johannes Meyer 2015-02-23 17:21:12 +01:00
parent 261abbd65e
commit a966f543f6

View File

@ -6,7 +6,7 @@ if ($xAxisPaginator->count() <= 1 && $yAxisPaginator->count() <= 1) {
return; // Display this pagination only if there are multiple pages return; // Display this pagination only if there are multiple pages
} }
$fromTo = t('%s: %d to %d of %d (on the %s-axis)'); $showText = $this->translate('%s: Show %s %u to %u out of %u', 'pagination.joystick');
$xAxisPages = $xAxisPaginator->getPages('all'); $xAxisPages = $xAxisPaginator->getPages('all');
$yAxisPages = $yAxisPaginator->getPages('all'); $yAxisPages = $yAxisPaginator->getPages('all');
@ -28,16 +28,25 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
<?php if ($prevYAxisPage): ?> <?php if ($prevYAxisPage): ?>
<a target="_self" href="<?= Url::fromRequest()->overwriteParams(array( <?= $this->qlink(
'page' => $currentXAxisPage . ',' . $prevYAxisPage $this->icon('up-open'),
))->getAbsoluteUrl(); ?>" title="<?= sprintf( Url::fromRequest(),
$fromTo, array(
t('Hosts'), 'page' => $currentXAxisPage . ',' . $prevYAxisPage
($prevYAxisPage - 1) * $yAxisPages->itemCountPerPage + 1, ),
$prevYAxisPage * $yAxisPages->itemCountPerPage, array(
$yAxisPages->totalItemCount, 'data-base-target' => '_self',
'y' 'title' => sprintf(
); ?>"><?= $this->icon('up-open'); ?></a> $showText,
$this->translate('Y-Axis', 'pagination.joystick'),
$this->translate('hosts', 'pagination.joystick'),
($prevYAxisPage - 1) * $yAxisPages->itemCountPerPage + 1,
$prevYAxisPage * $yAxisPages->itemCountPerPage,
$yAxisPages->totalItemCount
)
),
false
); ?>
<?php else: ?> <?php else: ?>
<?= $this->icon('up-open'); ?> <?= $this->icon('up-open'); ?>
<?php endif ?> <?php endif ?>
@ -47,16 +56,25 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
<tr> <tr>
<td> <td>
<?php if ($prevXAxisPage): ?> <?php if ($prevXAxisPage): ?>
<a target="_self" href="<?= Url::fromRequest()->overwriteParams(array( <?= $this->qlink(
'page' => $prevXAxisPage . ',' . $currentYAxisPage $this->icon('left-open'),
))->getAbsoluteUrl(); ?>" title="<?= sprintf( Url::fromRequest(),
$fromTo, array(
t('Services'), 'page' => $prevXAxisPage . ',' . $currentYAxisPage
($prevXAxisPage - 1) * $xAxisPages->itemCountPerPage + 1, ),
$prevXAxisPage * $xAxisPages->itemCountPerPage, array(
$xAxisPages->totalItemCount, 'data-base-target' => '_self',
'x' 'title' => sprintf(
); ?>"><?= $this->icon('left-open'); ?></a> $showText,
$this->translate('X-Axis', 'pagination.joystick'),
$this->translate('services', 'pagination.joystick'),
($prevXAxisPage - 1) * $xAxisPages->itemCountPerPage + 1,
$prevXAxisPage * $xAxisPages->itemCountPerPage,
$xAxisPages->totalItemCount
)
),
false
); ?>
<?php else: ?> <?php else: ?>
<?= $this->icon('left-open'); ?> <?= $this->icon('left-open'); ?>
<?php endif ?> <?php endif ?>
@ -64,16 +82,25 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
<?php if ($nextXAxisPage): ?> <?php if ($nextXAxisPage): ?>
<a target="_self" href="<?= Url::fromRequest()->overwriteParams(array( <?= $this->qlink(
'page' => $nextXAxisPage . ',' . $currentYAxisPage $this->icon('right-open'),
))->getAbsoluteUrl(); ?>" title="<?= sprintf( Url::fromRequest(),
$fromTo, array(
t('Services'), 'page' => $nextXAxisPage . ',' . $currentYAxisPage
$currentXAxisPage * $xAxisPages->itemCountPerPage + 1, ),
$nextXAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $nextXAxisPage * $xAxisPages->itemCountPerPage, array(
$xAxisPages->totalItemCount, 'data-base-target' => '_self',
'x' 'title' => sprintf(
); ?>"><?= $this->icon('right-open'); ?></a> $showText,
$this->translate('X-Axis', 'pagination.joystick'),
$this->translate('services', 'pagination.joystick'),
$currentXAxisPage * $xAxisPages->itemCountPerPage + 1,
$nextXAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $nextXAxisPage * $xAxisPages->itemCountPerPage,
$xAxisPages->totalItemCount
)
),
false
); ?>
<?php else: ?> <?php else: ?>
<?= $this->icon('right-open'); ?> <?= $this->icon('right-open'); ?>
<?php endif ?> <?php endif ?>
@ -83,16 +110,25 @@ $nextXAxisPage = $currentXAxisPage < $totalXAxisPages ? $currentXAxisPage + 1 :
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
<?php if ($nextYAxisPage): ?> <?php if ($nextYAxisPage): ?>
<a target="_self" href="<?= Url::fromRequest()->overwriteParams(array( <?= $this->qlink(
'page' => $currentXAxisPage . ',' . $nextYAxisPage $this->icon('down-open'),
))->getAbsoluteUrl(); ?>" title="<?= sprintf( Url::fromRequest(),
$fromTo, array(
t('Hosts'), 'page' => $currentXAxisPage . ',' . $nextYAxisPage
$currentYAxisPage * $yAxisPages->itemCountPerPage + 1, ),
$nextYAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $nextYAxisPage * $yAxisPages->itemCountPerPage, array(
$yAxisPages->totalItemCount, 'data-base-target' => '_self',
'y' 'title' => sprintf(
); ?>"><?= $this->icon('down-open'); ?></a> $showText,
$this->translate('Y-Axis', 'pagination.joystick'),
$this->translate('hosts', 'pagination.joystick'),
$currentYAxisPage * $yAxisPages->itemCountPerPage + 1,
$nextYAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $nextYAxisPage * $yAxisPages->itemCountPerPage,
$yAxisPages->totalItemCount
)
),
false
); ?>
<?php else: ?> <?php else: ?>
<?= $this->icon('down-open'); ?> <?= $this->icon('down-open'); ?>
<?php endif ?> <?php endif ?>