From 469b8fac4688c1d255a0f0f638bfc99a3fc53ba6 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 31 Jul 2021 17:20:48 +0200
Subject: [PATCH] bug fixes and template adjustments

---
 Theme/Backend/accounts-list.tpl.php | 12 ++----------
 composer.json                       |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index f7d508b..5c9f974 100755
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -31,13 +31,11 @@ echo $this->getData('nav')->render(); ?>
         <div class="portlet">
             <div class="portlet-head">
                 <?= $this->getHtml('Accounts'); ?>
+                <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-additional-function.tpl.php'; ?>
                 <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
             </div>
             <table id="accountList" class="default sticky">
                 <thead>
-                <template>
-
-                </template>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="accountList-r1-asc">
@@ -48,7 +46,6 @@ echo $this->getData('nav')->render(); ?>
                             <input id="accountList-r1-desc" name="accountList-sort" type="radio">
                             <i class="sort-desc fa fa-chevron-down"></i>
                         </label>
-                        <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-filter-table.tpl.php'; ?>
                     <td><?= $this->getHtml('Status'); ?>
                         <label for="accountList-r2-asc">
                             <input id="accountList-r2-asc" name="accountList-sort" type="radio">
@@ -58,9 +55,6 @@ echo $this->getData('nav')->render(); ?>
                             <input id="accountList-r2-desc" name="accountList-sort" type="radio">
                             <i class="sort-desc fa fa-chevron-down"></i>
                         </label>
-                        <label>
-                            <i class="filter fa fa-filter"></i>
-                        </label>
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="accountList-r3-asc">
                             <input id="accountList-r3-asc" name="accountList-sort" type="radio">
@@ -70,9 +64,7 @@ echo $this->getData('nav')->render(); ?>
                             <input id="accountList-r3-desc" name="accountList-sort" type="radio">
                             <i class="sort-desc fa fa-chevron-down"></i>
                         </label>
-                        <label>
-                            <i class="filter fa fa-filter"></i>
-                        </label>
+                        <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-filter-table.tpl.php'; ?>
                     <td><?= $this->getHtml('Activity'); ?>
                         <label for="accountList-r4-asc">
                             <input id="accountList-r4-asc" name="accountList-sort" type="radio">
diff --git a/composer.json b/composer.json
index 7ad134b..7cf5769 100755
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "require-dev": {
         "phpunit/phpunit": ">=9.4",
         "friendsofphp/php-cs-fixer": ">=3.0",
-        "squizlabs/php_codesniffer": ">=3.5",
+        "squizlabs/php_codesniffer": ">=3.6",
         "phpmd/phpmd": ">=2.9",
         "phpstan/phpstan": ">=0.12.58",
         "phan/phan": ">=3.2.6"