From 005357b5e17f108b0369ce5c727c7fe3c9e6749b Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 25 Dec 2022 00:06:17 +0100
Subject: [PATCH] test fixes and changes for release

---
 .../Theme/Backend/modules-nav-list.tpl.php    | 21 +++++++++++++++----
 tests/Bootstrap.php                           | 19 +++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php b/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php
index 5c74d0d..29ee526 100755
--- a/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php
+++ b/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php
@@ -54,7 +54,19 @@ echo $this->getData('nav')->render();
                         <label>
                             <i class="filter fa fa-filter"></i>
                         </label>
-                    <td><?= $this->getHtml('Name'); ?>
+                    <td><?= $this->getHtml('Order'); ?>
+                        <label for="navElements-sort-1">
+                            <input type="radio" name="navElements-sort" id="navElements-sort-1">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="navElements-sort-2">
+                            <input type="radio" name="navElements-sort" id="navElements-sort-2">
+                            <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="navElements-sort-1">
                             <input type="radio" name="navElements-sort" id="navElements-sort-1">
                             <i class="sort-asc fa fa-chevron-up"></i>
@@ -87,10 +99,11 @@ echo $this->getData('nav')->render();
                                 <input id="iActive-<?= $c; ?>" type="checkbox" name="active_route" value="<?= $this->printHtml($nav->uri); ?>"<?= true ? ' checked' : ''; ?>>
                                 <span class="checkmark"></span>
                             </label>
-                        <td><?= $apps[$nav->app]?->name; ?>
+                        <td><?= $this->printHtml($apps[$nav->app]?->name); ?>
                         <td><?= $nav->id; ?>
-                        <td><?= $nav->name; ?>
-                        <td><?= $nav->uri; ?>
+                        <td><?= $nav->order; ?>
+                        <td><?= $this->printHtml($nav->name); ?>
+                        <td><?= $this->printHtml($nav->uri); ?>
                     <?php endforeach; ?>
             </table>
         </div>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index d46fd31..b5d36a8 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -257,6 +257,25 @@ $CONFIG = [
         'root'  => '/',
         'https' => false,
     ],
+    'app'      => [
+        'path'    => __DIR__,
+        'default' => [
+            'app'   => 'Backend',
+            'id'    => 'backend',
+            'lang'  => 'en',
+            'theme' => 'Backend',
+            'org'   => 1,
+        ],
+        'domains' => [
+            '127.0.0.1' => [
+                'app'   => 'Backend',
+                'id'    => 'backend',
+                'lang'  => 'en',
+                'theme' => 'Backend',
+                'org'   => 1,
+            ],
+        ],
+    ],
     'socket'   => [
         'master' => [
             'host'  => '127.0.0.1',