refactor of menus

begin work on settings

lib/AppInfo/Application.php

@@ -123,14 +123,14 @@ class Application extends App implements IBootstrap
         //Util::addStyle(self::APP_ID, 'sideMenu');
 
         $assets = [
-            // 'stylesheet' => [
-            //     'route' => 'side_menu.Css.stylesheet',
-            //     'type' => 'link',
-            //     'route_attr' => 'href',
-            //     'attr' => [
-            //         'rel' => 'stylesheet',
-            //     ],
-            // ],
+            'stylesheet' => [
+                'route' => 'side_menu.Css.stylesheet',
+                'type' => 'link',
+                'route_attr' => 'href',
+                'attr' => [
+                    'rel' => 'stylesheet',
+                ],
+            ],
             // 'script' => [
             //     'route' => 'side_menu.Js.script',
             //     'type' => 'script',

lib/Controller/JsController.php

@@ -145,6 +145,8 @@ class JsController extends Controller
             'opener-hover' => $this->config->getAppValueBool('opener-hover', '0'),
             'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', '0'),
             'force-light-icon' => $this->config->getAppValueBool('force-light-icon', '0'),
+            'display-logo' => $this->config->getAppValueBool('display-logo', '1'),
+            'use-avatar' => $this->config->getAppValueBool('use-avatar', '0'),
             'hide-when-no-apps' => $this->config->getAppValueBool('hide-when-no-apps', '0'),
             'loader-enabled' => $this->config->getAppValueBool('loader-enabled', '1'),
             'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),

lib/Controller/NavController.php

@@ -115,6 +115,7 @@ class NavController extends Controller
                 $appsCategories[$app['id']][] = $category;
 
                 $items[$category]['apps'][$app['id']] = [
+                    'id' => $app['id'],
                     'name' => $app['name'],
                     'href' => $app['href'],
                     'icon' => $app['icon'],