Merge branch 'feature/issue55' into develop

release v1.22.2
fix regression: apps does not open in the tab
2021-02-09 16:51:29 +01:00 · 2021-02-09 16:51:27 +01:00 · 2021-02-09 16:50:16 +01:00 · 2021-02-05 17:57:46 +01:00 · 2021-02-05 17:54:50 +01:00 · 2021-02-03 15:23:07 +01:00
21 changed files with 1667 additions and 372 deletions
@@ -9,7 +9,7 @@ labels:

 ### Environment

-* Side menu version: 
+* Custom menu version: 
 * Nextcloud version: 
 * PHP version: 
 * Web server (Nginx, Apache2): 
@@ -12,7 +12,7 @@ Comptatible with AppOrder.
 * [How to contribute?](#how-to-contribute)
 * [Screenshots](https://gitnet.fr/deblan/side_menu/src/branch/master/screenshots/)

-You like this app and you want to support me? [Buy me a coffee](https://www.buymeacoffee.com/deblan) ☕
+You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)

 Requirements
 ------------
@@ -22,10 +22,11 @@ Requirements:

 If you like this application and if you want to support the development:

-* ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan)
-* 😃 [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
+* [Buy me a coffee](https://www.buymeacoffee.com/deblan)
+* [Donate with liberapay](https://liberapay.com/deblan)
+* [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.20.0</version>
+    <version>1.22.2</version>
    <licence>agpl</licence>
    <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
    <namespace>SideMenu</namespace>
@@ -35,7 +36,7 @@ If you like this application and if you want to support the development:
    </documentation>
    <category>customization</category>
    <website>https://gitnet.fr/deblan/side_menu</website>
-    <discussion>https://matrix.to/#/!GhfQePnOSPYpYEunWM:neutralnetwork.org</discussion>
+    <discussion>https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org</discussion>
    <bugs>https://gitnet.fr/deblan/side_menu/issues</bugs>
    <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png</screenshot>
@@ -68,3 +68,46 @@
 .side-menu-toggler {
    cursor: pointer;
 }
+
+.side-menu-setting-list {
+    margin: 10px 4px 4px 0px;
+}
+
+.side-menu-setting-list-item {
+    padding: 5px 10px;
+    border: 1px solid var(--color-border-dark);
+    max-width: 300px;
+    margin: -1px 0 0 0;
+    cursor: pointer;
+}
+
+.side-menu-setting.arrow {
+    color: #ccc;
+    padding-right: 5px;
+}
+
+.side-menu-setting-list-item input {
+    min-height: auto;
+    margin-top: -1px;
+}
+
+
+.side-menu-setting-table {
+    display: table;
+    width: 100%;
+}
+
+.side-menu-setting-row {
+    display: table;
+}
+
+.side-menu-setting-label {
+    display: table-cell;
+    width: 400px;
+    padding-right: 20px;
+}
+
+.side-menu-setting-form {
+    display: table-cell;
+    width: 300px;
+}
@@ -6,6 +6,7 @@ use OC;
 use OC\Security\CSP\ContentSecurityPolicyNonceManager;
 use OC\User\User;
 use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\App;
 use OCP\IUserSession;
@@ -84,8 +85,12 @@ class Application extends App
            return new AppRepository();
        });

+        $container->registerService('CategoryRepository', function (ContainerInterface $c) {
+            return new CategoryRepository();
+        });
+
        $container->registerService('ConfigProxy', function (ContainerInterface $c) {
-            return new ConfigProxy($this->config);
+            return new ConfigProxy();
        });
    }

@@ -97,6 +97,7 @@ class JsController extends Controller
        $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
        $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
        $isForced = $this->config->getAppValueBool('force', '0');
+        $addLogoLink = $this->config->getAppValueBool('add-logo-link', '1');
        $avatar = null;
        $settings = null;

@@ -141,6 +142,8 @@ class JsController extends Controller
            }
        }

+        $indexUrl = OC::$server->getURLGenerator()->linkTo('', 'index.php');
+
        return [
            'opener-position' => $this->config->getAppValue('opener-position', 'before'),
            'opener-hover' => $this->config->getAppValueBool('opener-hover', '0'),
@@ -156,6 +159,7 @@ class JsController extends Controller
            'target-blank-apps' => $targetBlankApps,
            'settings' => $settings,
            'logo' => $this->themingDefaults->getLogo(),
+            'logo-link' => $addLogoLink ? $indexUrl : null,
        ];
    }
 }
@@ -21,13 +21,11 @@ namespace OCA\SideMenu\Controller;
 use OC;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\URLGenerator;
-use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
-use OCP\IConfig;
-use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
@@ -39,11 +37,6 @@ class NavController extends Controller
     */
    protected $config;

-    /**
-     * @var IConfig
-     */
-    protected $iConfig;
-
    /**
     * @var AppRepository
     */
@@ -67,20 +60,17 @@ class NavController extends Controller
    public function __construct(
        string $appName,
        IRequest $request,
-        IConfig $iConfig,
        ConfigProxy $config,
        AppRepository $appRepository,
-        CategoryFetcher $categoryFetcher,
+        CategoryRepository $categoryRepository,
        URLGenerator $router,
-        IL10N $trans,
        IFactory $l10nFactory
    ) {
        parent::__construct($appName, $request);

        $this->config = $config;
-        $this->iConfig = $iConfig;
        $this->appRepository = $appRepository;
-        $this->categoryFetcher = $categoryFetcher;
+        $this->categoryRepository = $categoryRepository;
        $this->l10nFactory = $l10nFactory;
        $this->router = $router;
    }
@@ -94,14 +84,7 @@ class NavController extends Controller
     */
    public function items()
    {
-        $apps = $this->appRepository->getVisibleApps();
-        $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
-        $externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', '0');
-        $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
        $user = OC::$server[IUserSession::class]->getUser();
-        $isForced = $this->config->getAppValueBool('force', '0');
-        $appsCategories = [];
-        $categoriesAppsCount = [];
        $items = [];

        if (!$user) {
@@ -110,34 +93,19 @@ class NavController extends Controller
            ]);
        }

-        $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
-
-        if (empty($categoriesLabels)) {
-            $categoriesLabels = $this->categoryFetcher->get();
-
-            $this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
-        }
-
+        $apps = $this->appRepository->getVisibleApps();
+        $categoriesLabels = $this->categoryRepository->getOrderedCategories();
+        $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
+        $isForced = $this->config->getAppValueBool('force', '0');
        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
        $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
+        $appsCategories = [];
+        $categoriesAppsCount = [];

        if (!$isForced && !empty($userTopMenuApps)) {
            $topMenuApps = $userTopMenuApps;
        }

-        foreach ($categoriesLabels as $k => $category) {
-            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
-
-            unset($categoriesLabels[$k]);
-        }
-
-        $categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
-
-        $items['other'] = [
-            'name' => '',
-            'apps' => [],
-        ];
-
        foreach ($apps as $app) {
            if (in_array($app['id'], $topMenuApps)) {
                continue;
@@ -158,6 +126,7 @@ class NavController extends Controller
                if (!isset($items[$category])) {
                    $items[$category] = [
                        'name' => $categoriesLabels[$category] ?? $category,
+                        'categoryId' => $category,
                        'apps' => [],
                    ];
                }
@@ -216,8 +185,17 @@ class NavController extends Controller
            }
        }

-        usort($items, function ($a, $b) {
-            return ($a['name'] < $b['name']) ? -1 : 1;
+        usort($items, function ($a, $b) use ($categoriesLabels) {
+            foreach ($categoriesLabels as $key => $value) {
+                if ($a['categoryId'] === $key) {
+                    return -1;
+                }
+                if ($b['categoryId'] === $key) {
+                    return 1;
+                }
+            }
+
+            return 0;
        });

        return new JSONResponse([
@@ -18,13 +18,13 @@

 namespace OCA\SideMenu\Controller;

+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
-use OCA\SideMenu\AppInfo\Application;
-use OCA\SideMenu\Service\ConfigProxy;

 class PersonalSettingController extends Controller
 {
@@ -0,0 +1,99 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OC\App\AppStore\Fetcher\CategoryFetcher;
+use OCA\SideMenu\AppInfo\Application;
+use OCP\IConfig;
+use OCP\L10N\IFactory;
+
+/**
+ * class CategoryRepository.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class CategoryRepository
+{
+    /**
+     * @var CategoryFetcher
+     */
+    protected $categoryFetcher;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var IConfig
+     */
+    protected $iConfig;
+
+    public function __construct(
+        CategoryFetcher $categoryFetcher,
+        ConfigProxy $config,
+        IConfig $iConfig,
+        IFactory $l10nFactory
+    ) {
+        $this->categoryFetcher = $categoryFetcher;
+        $this->l10nFactory = $l10nFactory;
+        $this->config = $config;
+        $this->iConfig = $iConfig;
+    }
+
+    /**
+     * Retrieves categories.
+     *
+     * @return array
+     */
+    public function getOrderedCategories()
+    {
+        $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
+        $type = $this->config->getAppValue('categories-order-type', 'default');
+        $order = $this->config->getAppValueArray('categories-order', '[]');
+
+        $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
+
+        if (empty($categoriesLabels)) {
+            $categoriesLabels = $this->categoryFetcher->get();
+
+            $this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
+        }
+
+        foreach ($categoriesLabels as $k => $category) {
+            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
+
+            unset($categoriesLabels[$k]);
+        }
+
+        $categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
+        $categoriesLabels['other'] = '';
+
+        asort($categoriesLabels);
+
+        if ('custom' === $type) {
+            $ordered = [];
+
+            foreach ($order as $id) {
+                if (isset($categoriesLabels[$id])) {
+                    $ordered[$id] = $categoriesLabels[$id];
+                }
+            }
+
+            foreach ($categoriesLabels as $id => $value) {
+                if (!isset($ordered[$id])) {
+                    $ordered[$id] = $value;
+                }
+            }
+
+            $categoriesLabels = $ordered;
+        }
+
+        return $categoriesLabels;
+    }
+}
@@ -20,6 +20,7 @@ namespace OCA\SideMenu\Settings;

 use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
@@ -48,12 +49,23 @@ class Admin implements ISettings
     */
    private $appRepository;

-    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, AppRepository $appRepository)
-    {
+    /**
+     * @var CategoryRepository
+     */
+    private $categoryRepository;
+
+    public function __construct(
+        IL10N $l,
+        ILogger $logger,
+        ConfigProxy $config,
+        AppRepository $appRepository,
+        CategoryRepository $categoryRepository
+    ) {
        $this->l = $l;
        $this->logger = $logger;
        $this->config = $config;
        $this->appRepository = $appRepository;
+        $this->categoryRepository = $categoryRepository;
    }

    /**
@@ -79,6 +91,7 @@ class Admin implements ISettings
            'big-menu' => $this->config->getAppValue('big-menu', '0'),
            'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
            'display-logo' => $this->config->getAppValue('display-logo', '1'),
+            'add-logo-link' => $this->config->getAppValue('add-logo-link', '1'),
            'use-avatar' => $this->config->getAppValue('use-avatar', '0'),
            'opener-position' => $this->config->getAppValue('opener-position', 'before'),
            'opener-hover' => $this->config->getAppValue('opener-hover', '0'),
@@ -91,7 +104,10 @@ class Admin implements ISettings
            'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
            'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
            'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
+            'categories-order-type' => $this->config->getAppValue('categories-order-type', 'default'),
+            'categories-order' => $this->config->getAppValueArray('categories-order', '[]'),
            'apps' => $this->appRepository->getVisibleApps(),
+            'categories' => $this->categoryRepository->getOrderedCategories(),
        ];

        return new TemplateResponse(Application::APP_ID, 'settings/admin-form', $parameters, '');
@@ -18,10 +18,10 @@

 namespace OCA\SideMenu\Settings;

+use OCA\SideMenu\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
-use OCA\SideMenu\AppInfo\Application;

 class AdminSection implements IIconSection
 {
@@ -35,10 +35,6 @@ class AdminSection implements IIconSection
     */
    private $url;

-    /**
-     * @param IURLGenerator $url
-     * @param IL10N $l
-     */
    public function __construct(IURLGenerator $url, IL10N $l)
    {
        $this->url = $url;
@@ -47,7 +43,7 @@ class AdminSection implements IIconSection

    /**
     * returns the ID of the section. It is supposed to be a lower case string,
-     * e.g. 'ldap'
+     * e.g. 'ldap'.
     *
     * @returns string
     */
@@ -69,8 +65,8 @@ class AdminSection implements IIconSection

    /**
     * @return int whether the form should be rather on the top or bottom of
-     * the settings navigation. The sections are arranged in ascending order of
-     * the priority values. It is required to return a value between 0 and 99.
+     *             the settings navigation. The sections are arranged in ascending order of
+     *             the priority values. It is required to return a value between 0 and 99.
     *
     * E.g.: 70
     */
@@ -18,10 +18,10 @@

 namespace OCA\SideMenu\Settings;

+use OCA\SideMenu\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
-use OCA\SideMenu\AppInfo\Application;

 class PersonalSection implements IIconSection
 {
@@ -35,10 +35,6 @@ class PersonalSection implements IIconSection
     */
    private $url;

-    /**
-     * @param IURLGenerator $url
-     * @param IL10N $l
-     */
    public function __construct(IURLGenerator $url, IL10N $l)
    {
        $this->url = $url;
@@ -47,7 +43,7 @@ class PersonalSection implements IIconSection

    /**
     * returns the ID of the section. It is supposed to be a lower case string,
-     * e.g. 'ldap'
+     * e.g. 'ldap'.
     *
     * @returns string
     */
@@ -69,8 +65,8 @@ class PersonalSection implements IIconSection

    /**
     * @return int whether the form should be rather on the top or bottom of
-     * the settings navigation. The sections are arranged in ascending order of
-     * the priority values. It is required to return a value between 0 and 99.
+     *             the settings navigation. The sections are arranged in ascending order of
+     *             the priority values. It is required to return a value between 0 and 99.
     *
     * E.g.: 70
     */
@@ -16,7 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
    <div v-bind:class="classes">
-        <img v-bind:src="image">
+        <a v-if="link !== null" v-bind:href="link">
+            <img v-bind:src="image">
+        </a>
+        <img v-else v-bind:src="image">
    </div>
 </template>

@@ -28,6 +31,10 @@ export default {
            type: String,
            required: true
        },
+        link: {
+            type: String,
+            required: false
+        },
        classes: {
            type: Object,
            required: true
@@ -25,8 +25,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

            <OpenerButton />

-            <Logo v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}" v-bind:image="logo" />
-            <Logo v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}" v-bind:image="avatar" />
+            <Logo
+                v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
+                v-bind:image="logo"
+                v-bind:link="logoLink"
+            />
+
+            <Logo
+                v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}"
+                v-bind:image="avatar"
+                v-bind:link="logoLink"
+            />
        </div>

        <ul class="side-menu-apps-list">
@@ -62,6 +71,7 @@ export default {
        return {
            apps: [],
            logo: null,
+            logoLink: null,
            avatar: null,
            forceLightIcon: false,
            targetBlankApps: [],
@@ -135,6 +145,7 @@ export default {
                    that.forceLightIcon = config['force-light-icon']
                    that.avatar = config['avatar']
                    that.logo = config['logo']
+                    that.logoLink = config['logo-link']
                    that.settings = config['settings']
                });
        },
@@ -43,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                            v-bind:icon="app.icon"
                            v-bind:label="app.name"
                            v-bind:href="app.href"
-                            v-bind:target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
+                            v-bind:target="targetBlankApps.indexOf(appId) !== -1 ? '_blank' : undefined"
                        />
                    </ul>
                </div>
@@ -129,4 +129,20 @@ jQuery(document).ready(() => {

        elementToggler(element)
    })
+
+    jQuery("#categories-list .side-menu-setting-list").sortable({
+		forcePlaceholderSize: true,
+		placeholder: 'placeholder',
+		stop: function (event, ui) {
+            let value = []
+
+            jQuery('#categories-list .side-menu-setting-list-item').each(function() {
+                value.push(jQuery(this).attr('data-id'))
+            });
+
+            value = JSON.stringify(value)
+
+            jQuery('input[name="categories-order"]').val(value)
+		}
+	});
 });
@@ -64,3 +64,13 @@
 "Show the link to settings": "Zeigen Sie den Link zu den Einstellungen an"
 "The menu is enabled by default for users": "Das Menü ist standardmäßig für Benutzer aktiviert"
 "Except when the configuration is forced.": "Außer wenn die Konfiguration erzwungen wird."
+"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
+"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit der Anzeige <code> Großes Menü </ code>."
+"The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"
+"Others": "Andere"
+"Categories": "Kategorien"
+"Customize sorting": "Sortierung anpassen"
+"Order by": "Sortieren nach"
+"Name": "Name"
+"Customed": "Kundenspezifisch"
+"Show and hide the list of categories": "Liste der Kategorien ein- und ausblenden"
@@ -64,3 +64,13 @@
 "Show the link to settings": "Afficher le lien vers les paramètres"
 "The menu is enabled by default for users": "Le menu est activé par défaut pour les utilisateurs"
 "Except when the configuration is forced.": "Sauf lorsque la configuration est forcée."
+"Apps that should not be displayed in the menu": "Applications qui ne doivent pas être affichées dans le menu"
+"This feature is only compatible with the <code>big menu</code> display.": "Compatible avec l'affichage <code>Menu large</code>."
+"The logo is a link to the default app": "Le logo est un lien vers l'application par défaut"
+"Others": "Autres"
+"Categories": "Catégories"
+"Customize sorting": "Personnaliser le tri"
+"Order by": "Trier par"
+"Name": "Nom"
+"Customed": "Personnalisé"
+"Show and hide the list of categories": "Afficher et masquer la liste des catégories"
@@ -160,88 +160,83 @@ $choicesSizes = [
            <?php p($l->t('Opener')); ?>
        </h2>

-        <?php
-            $choices = [
-                'Default' => 'side-menu-opener',
-                'Default (dark)' => 'side-menu-opener-dark',
-                'Hamburger' => 'side-menu-opener-hamburger',
-                'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
-                'Hamburger 2' => 'side-menu-opener-hamburger-2',
-                'Hamburger 2 (dark)' => 'side-menu-opener-hamburger-2-dark',
-            ];
-        ?>
+        <div class="side-menu-setting-table">
+            <?php
+                $choices = [
+                    'Default' => 'side-menu-opener',
+                    'Default (dark)' => 'side-menu-opener-dark',
+                    'Hamburger' => 'side-menu-opener-hamburger',
+                    'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
+                    'Hamburger 2' => 'side-menu-opener-hamburger-2',
+                    'Hamburger 2 (dark)' => 'side-menu-opener-hamburger-2-dark',
+                ];
+            ?>
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Icon')); ?>
+                    <small><span class="info"><?php p($l->t('Live preview')); ?></span></small>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-opener" name="opener" class="side-menu-setting side-menu-setting-live">
+                        <?php foreach ($choices as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['opener']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>

-        <div>
-            <label for="side-menu-opener">
-                <?php p($l->t('Icon')); ?>
+            <div class="side-menu-setting-row">
+                <?php
+                    $choices = [
+                        'Before the logo' => 'before',
+                        'After the logo' => 'after',
+                    ];
+                ?>
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Position')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-opener-position" name="opener-position" class="side-menu-setting">
+                        <?php foreach ($choices as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['opener-position']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>

-                <small><span class="info"><?php p($l->t('Live preview')); ?></span></small>
-            </label>
-        </div>
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Show only the opener (hidden logo)')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-opener-only" name="opener-only" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['opener-only']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>

-        <div>
-            <select id="side-menu-opener" name="opener" class="side-menu-setting side-menu-setting-live">
-                <?php foreach ($choices as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['opener']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <?php
-            $choices = [
-                'Before the logo' => 'before',
-                'After the logo' => 'after',
-            ];
-        ?>
-
-        <div>
-            <label for="side-menu-opener-position">
-                <?php p($l->t('Position')); ?>
-            </label>
-        </div>
-
-        <div>
-            <select id="side-menu-opener-position" name="opener-position" class="side-menu-setting">
-                <?php foreach ($choices as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['opener-position']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <div>
-            <label for="side-menu-opener-only">
-                <?php p($l->t('Show only the opener (hidden logo)')); ?>
-            </label>
-        </div>
-
-        <div>
-            <select id="side-menu-opener-only" name="opener-only" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['opener-only']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <div>
-            <label for="side-menu-hide-when-no-apps">
-                <?php p($l->t('Do not display the side menu and the opener if there is no application (eg: public pages).')); ?>
-            </label>
-        </div>
-
-        <div>
-            <select id="side-menu-hide-when-no-apps" name="hide-when-no-apps" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['hide-when-no-apps']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Do not display the side menu and the opener if there is no application (eg: public pages).')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-hide-when-no-apps" name="hide-when-no-apps" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['hide-when-no-apps']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
        </div>
    </div>

@@ -310,175 +305,193 @@ $choicesSizes = [

        <br>

-        <div>
-            <label for="side-menu-opener">
-                <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>
-            </label>
-        </div>

-        <p><em><?php p($l->t('This is the automatic behavior when the menu is always displayed.')); ?></em></p>
+        <div class="side-menu-setting-table">
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>

-        <div>
-            <select id="side-menu-opener-hover" name="opener-hover" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['opener-hover']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <div>
-            <label for="side-menu-opener">
-                <?php p($l->t('Display the logo')); ?>
-            </label>
-        </div>
-
-        <p><em><?php echo $l->t('This feature is not compatible with the <code>big menu</code> display.'); ?></em></p>
-        <p><em><?php p($l->t('The logo will be hidden when the menu is always displayed.')); ?></em></p>
-
-        <div>
-            <select id="side-menu-display-logo" name="display-logo" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['display-logo']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <p><em><?php p($l->t('Use the avatar instead of the logo')); ?></em></p>
-
-        <div>
-            <select id="side-menu-use-avatar" name="use-avatar" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['use-avatar']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <div>
-            <label for="side-menu-top-menu-apps">
-                <?php p($l->t('Apps that not must show in the menu')); ?>
-            </label>
-        </div>
-
-        <p><em><?php echo $l->t('This feature is only compatible with the <code>big menu</code> display.'); ?></em></p>
-
-        <p>
-            <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
-                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-            </a>
-        </p>
-
-        <div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none">
-            <?php foreach ($_['apps'] as $app): ?>
-                <div>
-                    <input
-                        type="checkbox"
-                        name="big-menu-hidden-apps[]"
-                        value="<?php echo $app['id'] ?>"
-                        id="big-menu-hidden-app-<?php echo $app['id'] ?>"
-                        <?php if (in_array($app['id'], $_['big-menu-hidden-apps'])): ?>checked<?php endif; ?>
-                    />
-
-                    <label for="big-menu-hidden-app-<?php echo $app['id'] ?>">
-                        <?php echo p($l->t($app['name'])); ?>
-                    </label>
+                    <br>
+                    <em><?php p($l->t('This is the automatic behavior when the menu is always displayed.')); ?></em>
                </div>
-            <?php endforeach; ?>
-        </div>
-
-        <br>
-
-        <div>
-            <label for="side-menu-show-settings">
-                <?php p($l->t('Show the link to settings')); ?>
-            </label>
-        </div>
-
-        <div>
-            <select id="side-menu-show-settings" name="show-settings" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['show-settings']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <div>
-            <label>
-                <?php p($l->t('Icons and texts')); ?>
-            </label>
-        </div>
-
-        <div>
-            <select id="side-menu-size-icon" name="size-icon" class="side-menu-setting">
-                <?php foreach ($choicesSizes as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?> icon
-                    </option>
-                <?php endforeach; ?>
-            </select>
-
-            <select id="side-menu-size-text" name="size-text" class="side-menu-setting">
-                <?php foreach ($choicesSizes as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['size-text']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?> text
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <div>
-            <label for="side-menu-target-blank">
-                <?php p($l->t('Open apps in new tab')); ?>
-            </label>
-        </div>
-
-        <p>
-            <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-            </a>
-        </p>
-
-        <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none">
-            <?php foreach ($_['apps'] as $app): ?>
-                <div>
-                    <input
-                        type="checkbox"
-                        name="target-blank-apps[]"
-                        value="<?php echo $app['id'] ?>"
-                        id="target-blank-app-<?php echo $app['id'] ?>"
-                        <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
-                    />
-
-                    <label for="target-blank-app-<?php echo $app['id'] ?>">
-                        <?php echo p($l->t($app['name'])); ?>
-                    </label>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-opener-hover" name="opener-hover" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['opener-hover']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
                </div>
-            <?php endforeach; ?>
-        </div>
+            </div>

-        <br>
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Display the logo')); ?>
+                    <br>
+                    <em>
+                        <?php echo $l->t('This feature is not compatible with the <code>big menu</code> display.'); ?>
+                        <br>
+                        <?php p($l->t('The logo will be hidden when the menu is always displayed.')); ?>
+                    </em>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-display-logo" name="display-logo" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['display-logo']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>

-        <div>
-            <label for="side-menu-loader-enabled">
-                <?php p($l->t('Loader enabled')); ?>
-            </label>
-        </div>
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Use the avatar instead of the logo')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-use-avatar" name="use-avatar" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['use-avatar']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>

-        <div>
-            <select id="side-menu-loader-enabled" name="loader-enabled" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['loader-enabled']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('The logo is a link to the default app')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-add-logo-link" name="add-logo-link" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['add-logo-link']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Apps that should not be displayed in the menu')); ?>
+                    <br>
+                    <em><?php echo $l->t('This feature is only compatible with the <code>big menu</code> display.'); ?></em>
+                </div>
+                <div class="side-menu-setting-form">
+                    <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
+                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                    </a>
+
+                    <div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none">
+                        <ul class="side-menu-setting-list">
+                            <?php foreach ($_['apps'] as $app): ?>
+                                <li class="side-menu-setting-list-item">
+                                    <input
+                                        type="checkbox"
+                                        name="big-menu-hidden-apps[]"
+                                        value="<?php echo $app['id'] ?>"
+                                        id="big-menu-hidden-app-<?php echo $app['id'] ?>"
+                                        <?php if (in_array($app['id'], $_['big-menu-hidden-apps'])): ?>checked<?php endif; ?>
+                                    />
+
+                                    <label for="big-menu-hidden-app-<?php echo $app['id'] ?>">
+                                        <?php echo p($l->t($app['name'])); ?>
+                                    </label>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Show the link to settings')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-show-settings" name="show-settings" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['show-settings']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Icons and texts')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-size-icon" name="size-icon" class="side-menu-setting">
+                        <?php foreach ($choicesSizes as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?> icon
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+
+                    <select id="side-menu-size-text" name="size-text" class="side-menu-setting">
+                        <?php foreach ($choicesSizes as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['size-text']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?> text
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Open apps in new tab')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
+                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                    </a>
+
+                    <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none">
+                        <ul class="side-menu-setting-list">
+                            <?php foreach ($_['apps'] as $app): ?>
+                                <li class="side-menu-setting-list-item">
+                                    <input
+                                        type="checkbox"
+                                        name="target-blank-apps[]"
+                                        value="<?php echo $app['id'] ?>"
+                                        id="target-blank-app-<?php echo $app['id'] ?>"
+                                        <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
+                                    />
+
+                                    <label for="target-blank-app-<?php echo $app['id'] ?>">
+                                        <?php echo p($l->t($app['name'])); ?>
+                                    </label>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Loader enabled')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-loader-enabled" name="loader-enabled" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['loader-enabled']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
        </div>
    </div>

@@ -486,34 +499,95 @@ $choicesSizes = [
        <h2>
            <?php p($l->t('Top menu')); ?>
        </h2>
-        <div>
-            <label for="side-menu-top-menu-apps">
-                <?php p($l->t('Apps that not must be moved in the side menu')); ?>
-            </label>
-        </div>

-        <p>
-            <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-            </a>
-        </p>
-
-        <div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none">
-            <?php foreach ($_['apps'] as $app): ?>
-                <div>
-                    <input
-                        type="checkbox"
-                        name="top-menu-apps[]"
-                        value="<?php echo $app['id'] ?>"
-                        id="top-menu-app-<?php echo $app['id'] ?>"
-                        <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
-                    />
-
-                    <label for="top-menu-app-<?php echo $app['id'] ?>">
-                        <?php echo p($l->t($app['name'])); ?>
-                    </label>
+        <div class="side-menu-setting-table">
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Apps that not must be moved in the side menu')); ?>
                </div>
-            <?php endforeach; ?>
+                <div class="side-menu-setting-form">
+                    <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
+                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                    </a>
+
+                    <div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none">
+                        <ul class="side-menu-setting-list">
+                            <?php foreach ($_['apps'] as $app): ?>
+                                <li class="side-menu-setting-list-item">
+                                    <input
+                                        type="checkbox"
+                                        name="top-menu-apps[]"
+                                        value="<?php echo $app['id'] ?>"
+                                        id="top-menu-app-<?php echo $app['id'] ?>"
+                                        <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
+                                    />
+
+                                    <label for="top-menu-app-<?php echo $app['id'] ?>">
+                                        <?php echo p($l->t($app['name'])); ?>
+                                    </label>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="section">
+        <h2>
+            <?php p($l->t('Categories')); ?>
+        </h2>
+
+        <div class="side-menu-setting-table">
+            <div class="side-menu-setting-row">
+                <?php
+                    $choices = [
+                        'Name' => 'default',
+                        'Customed' => 'custom',
+                    ];
+                ?>
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Order by')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-categories-order-type" name="categories-order-type" class="side-menu-setting">
+                        <?php foreach ($choices as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['categories-order-type']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Customize sorting')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <a class="side-menu-toggler" data-target="#categories-list" href="#_">
+                        🖱️ <?php p($l->t('Show and hide the list of categories')); ?>
+                    </a>
+
+                    <div class="side-menu-setting" data-name="categories" id="categories-list" style="display: none">
+                        <ul class="side-menu-setting-list">
+                            <?php foreach ($_['categories'] as $key => $label): ?>
+                                <li data-id="<?php echo $key; ?>" class="side-menu-setting-list-item">
+                                    <span class="arrow">
+                                        ⇅
+                                    </span>
+
+                                    <?php echo $label ? $l->t($label) : $l->t('Others'); ?>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+
+                    <input type="hidden" value='<?php echo json_encode(array_keys($_['categories'])) ?>' name="categories-order" class="side-menu-setting">
+                </div>
+            </div>
        </div>
    </div>

@@ -528,48 +602,50 @@ $choicesSizes = [
    </div>

    <div class="section">
-        <div>
-            <label for="side-menu-default-enabled">
-                <?php p($l->t('The menu is enabled by default for users')); ?>
-            </label>
+        <div class="side-menu-setting-table">
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('The menu is enabled by default for users')); ?>
+                    <br>
+                    <em><?php p($l->t('Except when the configuration is forced.')); ?></em>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-default-enabled" name="default-enabled" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['default-enabled']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>

-            <p><em><?php p($l->t('Except when the configuration is forced.')); ?></em></p>
-
-            <select id="side-menu-default-enabled" name="default-enabled" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['default-enabled']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </div>
-
-        <div>
-            <label for="side-menu-opener-only">
-                <?php p($l->t('Force this configuration to users')); ?>
-            </label>
-        </div>
-
-        <div>
-            <select id="side-menu-force" name="force" class="side-menu-setting">
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['force']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Force this configuration to users')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <select id="side-menu-force" name="force" class="side-menu-setting">
+                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                            <option value="<?php echo $value ?>" <?php if ($value === $_['force']): ?>selected<?php endif; ?>>
+                                <?php echo $l->t($label);  ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
        </div>

        <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>" class="side-menu-setting">
+    </div>

+    <div class="section" id="more">
        <button id="side-menu-save" class="btn btn-info">
            <?php p($l->t('Save')); ?>
        </button>

        <span id="side-menu-message" class="msg"></span>
-    </div>

-    <div class="section" id="more">
        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank">
            <button class="btn btn-primary" >
                <?php p($l->t('Export the configuration')); ?>
Author	SHA1	Message	Date
Simon Vieille	a27e723657	Merge branch 'feature/issue55' into develop	2021-02-09 16:51:29 +01:00
Simon Vieille	c7db75cea3	release v1.22.2	2021-02-09 16:51:27 +01:00
Simon Vieille	4cd5421e53	fix regression: apps does not open in the tab	2021-02-09 16:50:16 +01:00
Simon Vieille	f2d1de1cbe	release v1.22.1	2021-02-05 17:57:46 +01:00
Simon Vieille	6be679c569	fix regression: apps does not open in the tab	2021-02-05 17:54:50 +01:00
Simon Vieille	0893ddd5fe	release v1.22.0	2021-02-03 15:23:07 +01:00
Simon Vieille	c893391065	update ui of admin and fix #53	2021-02-03 15:21:08 +01:00
Simon Vieille	b06df8ad9f	update ui of admin lists	2021-02-03 10:27:08 +01:00
Simon Vieille	13f7e63514	PSR 2 compliance	2021-02-03 10:15:59 +01:00
Simon Vieille	64da45e676	add feature: order categories	2021-02-03 10:14:03 +01:00
Simon Vieille	77e27bcc1a	add code of conduct and update chat room link	2020-12-23 13:39:43 +01:00
Simon Vieille	99858d86c1	release v1.21.0	2020-12-03 13:34:57 +01:00
Simon Vieille	6984efdafd	fix issue #51 : add link on the logo	2020-12-03 13:33:28 +01:00
Simon Vieille	48d80edb0a	update issue template	2020-11-08 12:32:19 +01:00
Simon Vieille	b57743c61a	add donation link	2020-11-06 18:17:17 +01:00
Simon Vieille	a58ca57e46	release v1.20.1	2020-11-03 13:00:26 +01:00
Simon Vieille	dc6ec4eb89	fix typo and translations	2020-11-03 13:00:09 +01:00