Skip to content

Improve accessibility of list Views. sope=cols, no table footer, pagi… #21

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 1 commit into from
Aug 8, 2018
Merged

Improve accessibility of list Views. sope=cols, no table footer, pagi… #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 10 additions & 14 deletions administrator/components/com_workflow/tmpl/states/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,36 +47,29 @@
<table class="table table-striped">
<thead>
<tr>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', '', 's.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 's.condition', $listDirn, $listOrder); ?>
</th>
<th style="width:1%" class="text-center nowrap hidden-sm-down">
<th scope="col" style="width:1%" class="text-center nowrap hidden-sm-down">
<?php echo JText::_('COM_WORKFLOW_DEFAULT'); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_NAME', 's.title', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_CONDITION', 's.condition', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-right hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap text-right hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_ID', 's.id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="7">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>">
<?php foreach ($this->states as $i => $item):
$edit = JRoute::_('index.php?option=com_workflow&task=state.edit&id=' . $item->id . '&workflow_id=' . (int) $this->workflowID . '&extension=' . $this->extension);
Expand Down Expand Up @@ -136,6 +129,9 @@
<?php endforeach ?>
</tbody>
</table>
<?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
23 changes: 9 additions & 14 deletions administrator/components/com_workflow/tmpl/transitions/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,25 @@
<table class="table table-striped">
<thead>
<tr>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', '', 't.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 't.published', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_NAME', 't.title', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_FROM_STATE', 't.from_state', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_TO_STATE', 't.to_state', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-right hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap text-right hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_ID', 't.id', $listDirn, $listOrder); ?>
</th>
</tr>
Expand Down Expand Up @@ -132,14 +132,9 @@
</tr>
<?php endforeach ?>
</tbody>
<tfoot>
<tr>
<td colspan="7">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
</table>
<?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
39 changes: 16 additions & 23 deletions administrator/components/com_workflow/tmpl/workflows/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,41 +59,39 @@
<table class="table table-striped" id="emailList">
<thead>
<tr>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:1%" class="nowrap text-center d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', '', 'w.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th style="width:1%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'w.condition', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_NAME', 'w.title', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
<?php echo JText::_('COM_WORKFLOW_STATES'); ?>
</th>
<th style="width:10%" class="text-center nowrap hidden-sm-down">
<th scope="col" style="width:10%" class="text-center nowrap hidden-sm-down">
<?php echo JText::_('COM_WORKFLOW_DEFAULT'); ?>
</th>
<th style="width:3%" class="nowrap text-center hidden-sm-down">
<span class="fa fa-circle-o text-warning hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_WORKFLOW_COUNT_STATES'); ?>">
<span class="sr-only"><?php echo JText::_('COM_WORKFLOW_COUNT_STATES'); ?></span>
</span>
<th scope="col" style="width:3%" class="nowrap text-center hidden-sm-down">
<span class="fa fa-circle-o text-warning hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_WORKFLOW_COUNT_STATES'); ?>"></span>
<span class="sr-only"><?php echo JText::_('COM_WORKFLOW_COUNT_STATES'); ?></span>
</th>
<th style="width:3%" class="nowrap text-center hidden-sm-down">
<span class="fa fa-arrows-h text-info hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?>">
<span class="sr-only"><?php echo JText::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?></span>
</span>
<th scope="col" style="width:3%" class="nowrap text-center hidden-sm-down">
<span class="fa fa-arrows-h text-info hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?>"></span>
<span class="sr-only"><?php echo JText::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?></span>
</th>
<th style="width:10%" class="nowrap hidden-sm-down text-center">
<th scope="col" style="width:10%" class="nowrap hidden-sm-down text-center">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_DATE_' . strtoupper($orderingColumn), 'w.' . $orderingColumn, $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-center hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_AUTHOR', 'w.created_by', $listDirn, $listOrder); ?>
</th>
<th style="width:10%" class="nowrap text-right hidden-sm-down">
<th scope="col" style="width:10%" class="nowrap text-right hidden-sm-down">
<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_ID', 'w.id', $listDirn, $listOrder); ?>
</th>
</tr>
Expand Down Expand Up @@ -176,15 +174,10 @@
</td>
</tr>
<?php endforeach ?>
</tbody>
<tfoot>
<tr>
<td colspan="<?php echo $columns; ?>">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
</table>
<?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