Skip to content

[4.0] Admin Pagination [a11y] #21424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2018
Merged

[4.0] Admin Pagination [a11y] #21424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a23286
[4.0] Admin Pagination [a11y]
brianteeman Aug 6, 2018
5f48b38
cs
brianteeman Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions administrator/templates/atum/css/template-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,21 @@ iframe {
.modal iframe {
width: 100%; }

.page-link.active {
padding: 0; }
.page-link.active.current {
padding: .5rem .75rem;
color: #999;
background-color: #dee2e6; }
.page-link.active a {
padding: .5rem .75rem;
line-height: 2.25; }

.page-link.disabled {
color: #999; }
.page-link.disabled:hover {
background: transparent; }

.view-login {
background: #3073bb;
/**
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/css/template-rtl.min.css
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions administrator/templates/atum/css/template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,21 @@ iframe {
.modal iframe {
width: 100%; }

.page-link.active {
padding: 0; }
.page-link.active.current {
padding: .5rem .75rem;
color: #999;
background-color: #dee2e6; }
.page-link.active a {
padding: .5rem .75rem;
line-height: 2.25; }

.page-link.disabled {
color: #999; }
.page-link.disabled:hover {
background: transparent; }

.view-login {
background: #3073bb;
/**
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/atum/css/template.min.css
View file
Open in desktop

Large diffs are not rendered by default.

248 changes: 0 additions & 248 deletions administrator/templates/atum/html/pagination.php
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions administrator/templates/atum/scss/template.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
@import "blocks/header";
@import "blocks/icons";
@import "blocks/iframe";
@import "blocks/layout";
@import "blocks/login";
@import "blocks/modals";
@import "blocks/quickicons";
Expand Down
59 changes: 29 additions & 30 deletions layouts/joomla/pagination/links.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

$options = new Registry($displayData['options']);

$showLimitBox = $options->get('showLimitBox', true);
$showLimitBox = $options->get('showLimitBox', false);
$showPagesLinks = $options->get('showPagesLinks', true);
$showLimitStart = $options->get('showLimitStart', true);

Expand Down Expand Up @@ -50,39 +50,38 @@
}
}
?>
<nav role="navigation" aria-label="<?php echo Text::_('JLIB_HTML_PAGINATION'); ?>">
<div class="pagination pagination-toolbar text-center">

<div class="pagination pagination-toolbar text-center">
<?php if ($showLimitBox) : ?>
<div class="limit float-right">
<?php echo Text::_('JGLOBAL_DISPLAY_NUM') . $list['limitfield']; ?>
</div>
<?php endif; ?>

<?php if ($showLimitBox) : ?>
<div class="limit float-right">
<?php echo Text::_('JGLOBAL_DISPLAY_NUM') . $list['limitfield']; ?>
</div>
<?php endif; ?>
<?php if ($showPagesLinks && (!empty($pages))) : ?>
<ul class="pagination ml-0 mb-4">
<?php echo LayoutHelper::render('joomla.pagination.link', $pages['start']); ?>
<?php echo LayoutHelper::render('joomla.pagination.link', $pages['previous']); ?>
<?php foreach ($pages['pages'] as $k => $page) : ?>

<?php if ($showPagesLinks && (!empty($pages))) : ?>
<ul class="pagination-list">
<?php
echo LayoutHelper::render('joomla.pagination.link', $pages['start']);
echo LayoutHelper::render('joomla.pagination.link', $pages['previous']); ?>
<?php foreach ($pages['pages'] as $k => $page) : ?>

<?php $output = LayoutHelper::render('joomla.pagination.link', $page); ?>
<?php if (in_array($k, range($range * $step - ($step + 1), $range * $step), true)) : ?>
<?php if (($k % $step === 0 || $k === $range * $step - ($step + 1)) && $k !== $currentPage && $k !== $range * $step - $step) : ?>
<?php $output = preg_replace('#(<a.*?>).*?(</a>)#', '$1...$2', $output); ?>
<?php $output = LayoutHelper::render('joomla.pagination.link', $page); ?>
<?php if (in_array($k, range($range * $step - ($step + 1), $range * $step), true)) : ?>
<?php if (($k % $step === 0 || $k === $range * $step - ($step + 1)) && $k !== $currentPage && $k !== $range * $step - $step) : ?>
<?php $output = preg_replace('#(<a.*?>).*?(</a>)#', '$1...$2', $output); ?>
<?php endif; ?>
<?php endif; ?>
<?php endif; ?>

<?php echo $output; ?>
<?php endforeach; ?>
<?php
echo LayoutHelper::render('joomla.pagination.link', $pages['next']);
echo LayoutHelper::render('joomla.pagination.link', $pages['end']); ?>
</ul>
<?php endif; ?>
<?php echo $output; ?>
<?php endforeach; ?>
<?php echo LayoutHelper::render('joomla.pagination.link', $pages['next']); ?>
<?php echo LayoutHelper::render('joomla.pagination.link', $pages['end']); ?>
</ul>
<?php endif; ?>

<?php if ($showLimitStart) : ?>
<input type="hidden" name="<?php echo $list['prefix']; ?>limitstart" value="<?php echo $list['limitstart']; ?>">
<?php endif; ?>
<?php if ($showLimitStart) : ?>
<input type="hidden" name="<?php echo $list['prefix']; ?>limitstart" value="<?php echo $list['limitstart']; ?>">
<?php endif; ?>

</div>
</div>
</nav>