Merge branch 'instance/fid' into instance/fid_bbi

themes/fid/templates/fid/admin/list-entry.phtml

@@ -3,7 +3,9 @@
 $permissions  = [];
 foreach ($config['Admin']['permission_options'] ?? [] as $perm) {
     $state = $user->getPermissions()[$perm];
-    $permissions[$perm] = $this->escapeHtml($perm).' ('.$this->escapeHtml($state).')';
+    /* #16383: set requested as bold text - GG */
+    $state = $state === 'requested' ? '<strong>'.$this->escapeHtml($state).'</strong>' : $state;
+    $permissions[$perm] = $this->escapeHtml($perm)." ($state)";
 }
 
 foreach ($this->fields as $field):

themes/fid/templates/fid/admin/list.phtml

 <!-- fid - user - admin - list -->
+<?php
+/* #16383: added tablesorter - GG*/
+$this->headScript()->appendFile('jquery.tablesorter.min.js');
+$script = <<<JS
+$(document).ready(function() {
+            // Tablesorter
+           $('table').tablesorter({
+               sortList: [[0,1]],
+               // widgets: ['zebra', 'filter']
+           });
+        });
+JS;
+echo $this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $script, 'SET');
+?>
 <?=$this->translate('Users')?>
 <?= $this->flashmessages() ?>
 <?php if (!empty($this->list)): ?>
     <table class="fid fid-admin table user-table table-striped">
-    <tr>
-    <td><!-- empty cell --></td>
-    <th>#</th>
-    <?php foreach ($fields as $fieldname): ?>
-        <th><?=$this->translate('fid::'.$fieldname)?></th>
-    <?php endforeach; ?>
-    </tr>
-    <?php foreach ($list as $id => $user):?>
-        <?php $tooltip = $this->translate('fid::user_edit',['%%userid%%' => $id]); ?>
+      <?php /* #16383 */ ?>
+      <thead>
+      <tr>
+        <td><!-- empty cell --></td>
+        <th>#</th>
+          <?php foreach ($fields as $fieldname): ?>
+            <th><?=$this->translate('fid::'.$fieldname)?></th>
+          <?php endforeach; ?>
+      </tr>
+      <?php /* #16383 */ ?>
+      </thead>
+      <tbody>
+      <?php foreach ($list as $id => $user):?>
+          <?php $tooltip = $this->translate('fid::user_edit',['%%userid%%' => $id]); ?>
         <tr><td><a href="<?=$this->url('fid/admin/edit',['userid' => $id])?>" title="<?=$tooltip?>"><i class="fa fa-pencil-square-o"></i><span class="sr-only"><?=$tooltip?></span></a></td><th><?=$id?></th><?= $this->render('fid/admin/list-entry',['user' => $user,'fields'=>$fields, 'config' => $config]) ?></tr>
-    <?php endforeach; ?>
+      <?php endforeach; ?>
+      <?php /* #16383 */ ?>
+      </tbody>
     </table>
     <a href="<?=$this->url('fid/admin/exportList')?>" class="btn btn-primary" target="_blank"><i class="fa fa-download"></i> <?=$this->translate('fid::user_list_export')?></a>
 <?php else: ?>