| @@ -9,15 +9,15 @@ | ||
| 9 | 9 | * |
| 10 | 10 | * @return string |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | -use UserAccessManager\Controller\Backend\Administration\UserGroupController; | |
| 13 | +use UserAccessManager\Controller\Backend\UserGroupController; | |
| 14 | 14 | use UserAccessManager\Object\ObjectHandler; |
| 15 | 15 | |
| 16 | 16 | $createHeaderColumn = function ($name, $sortingParameter) use ($controller) { |
| 17 | 17 | $isSorted = $controller->getRequestParameter('orderby') === $sortingParameter; |
| 18 | 18 | $class = $isSorted === true ? 'sorted' : 'sortable'; |
| 19 | - $sortOrder = ($isSorted === true && $controller->getRequestParameter('order') === 'desc') ? 'desc' : 'asc'; | |
| 19 | + $sortOrder = $isSorted === true ? $controller->getRequestParameter('order') : 'asc'; | |
| 20 | 20 | |
| 21 | 21 | $inner = "<span>$name</span><span class=\"sorting-indicator\"></span>"; |
| 22 | 22 | $link = "<a href=\"{$controller->getSortUrl($sortingParameter)}\" >$inner</a>"; |
| 23 | 23 | return "<th scope=\"col\" class=\"$class $sortOrder\">$link</th>"; |
| @@ -33,9 +33,9 @@ | ||
| 33 | 33 | value="<?php echo TXT_UAM_DELETE; ?>"/> |
| 34 | 34 | </div> |
| 35 | 35 | <br class="clear"/> |
| 36 | 36 | </div> |
| 37 | - <table class="wp-list-table widefat fixed striped"> | |
| 37 | + <table class="widefat"> | |
| 38 | 38 | <thead> |
| 39 | 39 | <tr class="thead"> |
| 40 | 40 | <th scope="col"></th> |
| 41 | 41 | <?php echo $createHeaderColumn(TXT_UAM_NAME, 'name'); ?> |
| @@ -47,20 +47,16 @@ | ||
| 47 | 47 | </tr> |
| 48 | 48 | </thead> |
| 49 | 49 | <tbody> |
| 50 | 50 | <?php |
| 51 | - $currentAdminPage = urlencode((string) $controller->getRequestParameter('page')); | |
| 51 | + $currentAdminPage = $controller->getRequestParameter('page'); | |
| 52 | 52 | $userGroups = $controller->getUserGroups(); |
| 53 | 53 | foreach ($userGroups as $userGroup) { |
| 54 | 54 | ?> |
| 55 | - <tr id="group-<?php echo $userGroup->getId(); ?>"> | |
| 55 | + <tr class="alternate" id="group-<?php echo $userGroup->getId(); ?>"> | |
| 56 | 56 | <th class="check-column"> |
| 57 | - <input id="uam-bulk-select" | |
| 58 | - type="checkbox" | |
| 59 | - value="<?php echo $userGroup->getId(); ?>" | |
| 60 | - name="delete[]"/> | |
| 61 | - <label for="uam-bulk-select"> | |
| 62 | - <span class="screen-reader-text"><?php echo TXT_UAM_DELETE; ?></span> | |
| 57 | + <label> | |
| 58 | + <input type="checkbox" value="<?php echo $userGroup->getId(); ?>" name="delete[]"/> | |
| 63 | 59 | </label> |
| 64 | 60 | </th> |
| 65 | 61 | <td> |
| 66 | 62 | <strong> |
