Skip to content

[4.0] Pagination [a11y] admin #21293

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 16 commits into from
Jul 31, 2018
Merged

[4.0] Pagination [a11y] admin #21293

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
678f36b
[4.0] Pagination [a11y]
brianteeman Jul 29, 2018
7fbc85f
Update default.php
brianteeman Jul 29, 2018
b0c4a38
Update modal.php
brianteeman Jul 29, 2018
04863f2
Update modal.php
brianteeman Jul 30, 2018
5025239
Update default.php
brianteeman Jul 30, 2018
3954951
Update default.php
brianteeman Jul 30, 2018
fd55bb1
Update default.php
brianteeman Jul 30, 2018
5ccdbf2
Update default.php
brianteeman Jul 30, 2018
38b5e82
Update default.php
brianteeman Jul 30, 2018
0c4d007
Update default.php
brianteeman Jul 30, 2018
ff4cd49
Update default.php
brianteeman Jul 30, 2018
432fb5d
Update default.php
brianteeman Jul 30, 2018
ec394a4
Update default.php
brianteeman Jul 30, 2018
e18bf21
Update default.php
brianteeman Jul 30, 2018
31393ae
Update default.php
brianteeman Jul 30, 2018
7864cae
tabs
brianteeman Jul 30, 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
18 changes: 7 additions & 11 deletions administrator/components/com_associations/tmpl/associations/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));
$canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');
$colSpan = 5;

$iconStates = array(
-2 => 'icon-trash',
Expand All @@ -47,7 +46,7 @@
<tr>
<?php if (!empty($this->typeSupports['state'])) : ?>
<th scope="col" style="width:1%" class="text-center nowrap">
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th scope="col" class="nowrap">
Expand All @@ -64,26 +63,19 @@
</th>
<?php if (!empty($this->typeFields['menutype'])) : ?>
<th scope="col" style="width:10%" class="nowrap">
<?php echo HTMLHelper::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
<?php echo HTMLHelper::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<?php if (!empty($this->typeFields['access'])) : ?>
<th scope="col" style="width:5%" class="nowrap d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th scope="col" style="width:1%" class="nowrap d-none d-md-table-cell text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="<?php echo $colSpan; ?>">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php foreach ($this->items as $i => $item) :
$canCheckin = true;
Expand Down Expand Up @@ -148,6 +140,10 @@
<?php endforeach; ?>
</tbody>
</table>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove tabs.

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>
<input type="hidden" name="task" value="">
<?php echo HTMLHelper::_('form.token'); ?>
Expand Down
17 changes: 6 additions & 11 deletions administrator/components/com_associations/tmpl/associations/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));
$canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');
$colSpan = 4;

$iconStates = array(
-2 => 'icon-trash',
Expand Down Expand Up @@ -62,7 +61,7 @@
<tr>
<?php if (!empty($this->typeSupports['state'])) : ?>
<th scope="col" style="width:1%" class="center nowrap">
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th scope="col" class="nowrap">
Expand All @@ -76,26 +75,19 @@
</th>
<?php if (!empty($this->typeFields['menutype'])) : ?>
<th scope="col" style="width:10%" class="nowrap">
<?php echo HTMLHelper::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
<?php echo HTMLHelper::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<?php if (!empty($this->typeSupports['acl'])) : ?>
<th scope="col" style="width:5%" class="nowrap d-none d-sm-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th scope="col" style="width:1%" class="nowrap d-none d-sm-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="<?php echo $colSpan; ?>">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove $colSpan on line 33 and its instances.

Copy link
Contributor

@Quy Quy Jul 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just in case you missed this one and its instances: https://github.com/joomla/joomla-cms/pull/21293/files#diff-d64a62878ec1eefbdd29c4dd3869061dR33

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update lines 64, 78, and 83.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php foreach ($this->items as $i => $item) :
$canEdit = AssociationsHelper::allowEdit($this->extensionName, $this->typeName, $item->id);
Expand Down Expand Up @@ -160,6 +152,9 @@
</tbody>
</table>

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>

<input type="hidden" name="task" value="">
Expand Down
11 changes: 4 additions & 7 deletions administrator/components/com_banners/tmpl/banners/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="13">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody <?php if ($saveOrder) :?> class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>" data-nested="true"<?php endif; ?>>
<?php foreach ($this->items as $i => $item) :
$ordering = ($listOrder == 'ordering');
Expand Down Expand Up @@ -176,6 +169,10 @@
<?php endforeach; ?>
</tbody>
</table>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove tabs

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php // Load the batch processing form. ?>
<?php if ($user->authorise('core.create', 'com_banners')
&& $user->authorise('core.edit', 'com_banners')
Expand Down
11 changes: 4 additions & 7 deletions administrator/components/com_banners/tmpl/clients/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="11">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php foreach ($this->items as $i => $item) :
$canCreate = $user->authorise('core.create', 'com_banners');
Expand Down Expand Up @@ -160,6 +153,10 @@
<?php endforeach; ?>
</tbody>
</table>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove tabs

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>

<input type="hidden" name="task" value="">
Expand Down
11 changes: 4 additions & 7 deletions administrator/components/com_banners/tmpl/tracks/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="5">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php foreach ($this->items as $i => $item) : ?>
<tr class="row<?php echo $i % 2; ?>">
Expand All @@ -80,6 +73,10 @@
<?php endforeach; ?>
</tbody>
</table>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove tabs

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>
<?php // Load the export form ?>
<?php echo HTMLHelper::_(
Expand Down
11 changes: 4 additions & 7 deletions administrator/components/com_cache/tmpl/cache/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="4">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php $i = 0; ?>
<?php foreach ($this->data as $folder => $item) : ?>
Expand All @@ -73,6 +66,10 @@
<?php $i++; endforeach; ?>
</tbody>
</table>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove tabs

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>
<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
Expand Down
27 changes: 9 additions & 18 deletions administrator/components/com_categories/tmpl/categories/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
$parts = explode('.', $extension, 2);
$component = $parts[0];
$section = null;
$columns = 7;

if (count($parts) > 1)
{
Expand Down Expand Up @@ -85,32 +84,28 @@
<th scope="col" class="nowrap">
<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
</th>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) :
$columns++; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
<th scope="col" style="width:3%" class="nowrap text-center d-none d-md-table-cell">
<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?></span>
</span>
</th>
<?php endif; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) :
$columns++; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
<th scope="col" style="width:3%" class="nowrap text-center d-none d-md-table-cell">
<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?></span>
</span>
</th>
<?php endif; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) :
$columns++; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
<th scope="col" style="width:3%" class="nowrap text-center d-none d-md-table-cell">
<span class="icon-archive hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?></span>
</span>
</th>
<?php endif; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) :
$columns++; ?>
<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
<th scope="col" style="width:3%" class="nowrap text-center d-none d-md-table-cell">
<span class="icon-trash hasTooltip" aria-hidden="true" title="<?php echo Text::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>">
<span class="sr-only"><?php echo Text::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?></span>
Expand All @@ -120,8 +115,7 @@
<th scope="col" style="width:10%" class="nowrap d-none d-md-table-cell text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
</th>
<?php if ($this->assoc) :
$columns++; ?>
<?php if ($this->assoc) : ?>
<th scope="col" style="width:10%" class="nowrap d-none d-md-table-cell text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'COM_CATEGORY_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
</th>
Expand All @@ -136,13 +130,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="<?php echo $columns; ?>">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove $columns instances above.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody <?php if ($saveOrder) :?> class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>" data-nested="false"<?php endif; ?>>
<?php foreach ($this->items as $i => $item) : ?>
<?php
Expand Down Expand Up @@ -273,6 +260,10 @@
<?php endforeach; ?>
</tbody>
</table>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove tabs

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php // Load the batch processing form. ?>
<?php if ($user->authorise('core.create', $extension)
&& $user->authorise('core.edit', $extension)
Expand Down
11 changes: 4 additions & 7 deletions administrator/components/com_categories/tmpl/categories/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="5">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php
$iconStates = array(
Expand Down Expand Up @@ -127,6 +120,10 @@
<?php endforeach; ?>
</tbody>
</table>

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>

<input type="hidden" name="extension" value="<?php echo $extension; ?>">
Expand Down
11 changes: 4 additions & 7 deletions administrator/components/com_checkin/tmpl/checkin/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="3">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php $i = 0; ?>
<?php foreach ($this->items as $table => $count) : ?>
Expand All @@ -69,6 +62,10 @@
<?php endforeach; ?>
</tbody>
</table>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove tabs

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>
<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
Expand Down
11 changes: 4 additions & 7 deletions administrator/components/com_contact/tmpl/contacts/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="10">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody <?php if ($saveOrder) :?> class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>" data-nested="true"<?php endif; ?>>
<?php
$n = count($this->items);
Expand Down Expand Up @@ -180,6 +173,10 @@
<?php endforeach; ?>
</tbody>
</table>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove tabs

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php // Load the batch processing form. ?>
<?php if ($user->authorise('core.create', 'com_contact')
&& $user->authorise('core.edit', 'com_contact')
Expand Down
11 changes: 4 additions & 7 deletions administrator/components/com_contact/tmpl/contacts/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,6 @@
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="6">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php
$iconStates = array(
Expand Down Expand Up @@ -144,6 +137,10 @@
<?php endforeach; ?>
</tbody>
</table>

<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>

<input type="hidden" name="task" value="">
Expand Down
Loading