diff --git a/css/admin.css b/css/admin.css index 0fce026..8c54856 100644 --- a/css/admin.css +++ b/css/admin.css @@ -90,3 +90,24 @@ 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; +} diff --git a/lib/Service/CategoryRepository.php b/lib/Service/CategoryRepository.php index e523cd7..3e67e63 100644 --- a/lib/Service/CategoryRepository.php +++ b/lib/Service/CategoryRepository.php @@ -54,7 +54,7 @@ class CategoryRepository public function getOrderedCategories() { $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2); - $type = $this->config->getAppValueArray('categories-order-type', 'default'); + $type = $this->config->getAppValue('categories-order-type', 'default'); $order = $this->config->getAppValueArray('categories-order', '[]'); $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]'); @@ -76,7 +76,7 @@ class CategoryRepository asort($categoriesLabels); - if ('custom' === $type || true) { + if ('custom' === $type) { $ordered = []; foreach ($order as $id) { diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php index 9524ebf..4ef405e 100644 --- a/templates/settings/admin-form.php +++ b/templates/settings/admin-form.php @@ -160,88 +160,83 @@ $choicesSizes = [ t('Opener')); ?> - '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', - ]; - ?> +
@@ -310,191 +305,193 @@ $choicesSizes = [t('This is the automatic behavior when the menu is always displayed.')); ?>
+ @@ -502,36 +499,38 @@ $choicesSizes = [- - 🖱️ t('Show and hide the list of applications')); ?> - -
+ @@ -540,54 +539,56 @@ $choicesSizes = [