diff --git a/css/admin.css b/css/admin.css index 086d0d7..5332c4e 100644 --- a/css/admin.css +++ b/css/admin.css @@ -73,7 +73,7 @@ .side-menu-setting-list { margin: 10px 4px 4px 0px; - border: 1px solid var(--color-border-dark); + border: 2px solid var(--color-border-dark); border-radius: 15px; } @@ -175,3 +175,42 @@ .btn-reset--progress { transform: rotate(-359deg); } + +.badges { + margin-bottom: 14px; + margin-top: 4px; +} + +.badge { + border-size: 1px; + padding: 2px 8px; + margin-right: 2px; + margin-bottom: 5px; + display: inline-block; + border-radius: 4px; + font-size: 13px; +} + +.badge-1 { + background: #d4ce14; + border-color: #cad413; + color: #373a05; +} + +.badge-2 { + background: #96d47f; + border-color: #7ed49b; + color: #333; +} + +.badge-3 { + background: #d4540a; + border-color: #d4700c; + color: #fff; +} + +.badge-4 { + background: #9d81d4; + border-color: #c681d4; + color: #fff; +} diff --git a/src/l10n/fixtures/cs.yaml b/src/l10n/fixtures/cs.yaml index 920f630..0e3f028 100644 --- a/src/l10n/fixtures/cs.yaml +++ b/src/l10n/fixtures/cs.yaml @@ -53,14 +53,10 @@ \ obrazovky)" "Display the big menu": "Zobrazit velkou nabídku" "Display the logo": "Zobrazit logo" -"This feature is not compatible with the big menu display.": "Tato funkce\ - \ není kompatibilní se zobrazením velké nabídky." "Icons and texts": "Ikony a texty" "Loader enabled": "Načítání zapnuto" "Tips": "Tipy" "Always displayed": "Vždy zobrazeno" -"The logo will be hidden when the menu is always displayed.": "Pokud je nabídka zobrazena\ - \ trvale, logo bude skryto." "This is the automatic behavior when the menu is always displayed.": "Toto je automatické\ \ chování, kdy je nabídka vždy zobrazena." "Not compatible with touch screens.": "Nekompatibilní s dotykovými obrazovkami." @@ -97,8 +93,6 @@ "With categories": "S kategoriemi" "Custom categories": "Vlastní kategorie" "Customize application categories": "Přizpůsobte kategorie aplikací" -"Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce" -"Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce" "Reset to default": "Vrátit zpět na výchozí hodnoty" "Hidden icon": "Skrytá ikona" "Small icon": "Malá ikona" @@ -109,3 +103,6 @@ "Normal text": "Normální text" "Big text": "Velký text" "Applications": "Applications" +"Applications kept in the top menu": "Applications kept in the top menu" +"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu" +"These applications must be selected in the previous option.": "These applications must be selected in the previous option." diff --git a/src/l10n/fixtures/de.yaml b/src/l10n/fixtures/de.yaml index 134b29f..d8d9bc1 100644 --- a/src/l10n/fixtures/de.yaml +++ b/src/l10n/fixtures/de.yaml @@ -53,14 +53,10 @@ \ deaktiviert)" "Display the big menu": "Großes Menü anzeigen" "Display the logo": "Logo anzeigen" -"This feature is not compatible with the big menu display.": "Diese Funktion\ - \ ist nicht mit dem großen Menü kompatibel." "Icons and texts": "Symbole und Texte" "Loader enabled": "Ladestandanzeige aktiviert" "Tips": "Tipps" "Always displayed": "Immer anzeigen" -"The logo will be hidden when the menu is always displayed.": "Das Logo wird ausgeblendet,\ - \ wenn das Menü immer angezeigt wird." "This is the automatic behavior when the menu is always displayed.": "Dies ist das\ \ automatische Verhalten, wenn das Menü immer angezeigt wird." "Not compatible with touch screens.": "Nicht kompatibel mit Touchscreens." @@ -100,8 +96,6 @@ "With categories": "Mit Kategorien" "Custom categories": "Benutzerdefinierte Kategorien" "Customize application categories": "Anwendungskategorien anpassen" -"Apps only visible in the top menu": "Apps nur im oberen Menü sichtbar" -"Apps visible in the top and side menus": "Apps im oberen und seitlichen Menü sichtbar" "Reset to default": "Auf Standard zurücksetzen" "Hidden icon": "Verstecktes Symbol" "Small icon": "Kleines Symbol" @@ -112,3 +106,6 @@ "Normal text": "Normaler Text" "Big text": "Großer Text" "Applications": "Applications" +"Applications kept in the top menu": "Applications kept in the top menu" +"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu" +"These applications must be selected in the previous option.": "These applications must be selected in the previous option." diff --git a/src/l10n/fixtures/fr.yaml b/src/l10n/fixtures/fr.yaml index fa3eccd..e1a535b 100644 --- a/src/l10n/fixtures/fr.yaml +++ b/src/l10n/fixtures/fr.yaml @@ -61,14 +61,10 @@ \ le menu au passage de la souris (automatiquement désactivé sur les écrans tactiles)" "Display the big menu": "Afficher le menu large" "Display the logo": "Afficher le logo" -"This feature is not compatible with the big menu display.": "Cette fonctionnalité\ - \ n'est pas compatible avec l'affichage Menu large." "Icons and texts": "Icônes et textes" "Loader enabled": "Activation de l'indicateur de chargement" "Tips": "Astuces" "Always displayed": "Toujours affiché" -"The logo will be hidden when the menu is always displayed.": "Le logo sera masque\ - \ si le menu est toujours affiché." "This is the automatic behavior when the menu is always displayed.": "C'est le comportement\ \ automatique lorsque le menu est toujours affiché." "Not compatible with touch screens.": "Incompatible avec les écrans tactiles." @@ -108,9 +104,8 @@ "With categories": "Avec les catégories" "Custom categories": "Catégories personnalisées" "Customize application categories": "Personnaliser les catégories des applications" -"Apps only visible in the top menu": "Applications visibles uniquement dans le menu\ - \ supérieur" -"Apps visible in the top and side menus": "Applications visibles dans le menus supérieur\ - \ et latéral" "Reset to default": "Restaurer les valeurs par défaut" "Applications": "Applications" +"Applications kept in the top menu": "Applications conservées dans le menu supérieur" +"Applications kept in the top menu but also shown in side menu": "Applications conservées dans le menu supérieur mais également affichées dans le menu latéral" +"These applications must be selected in the previous option.": "Ces applications doivent également être sélectionnées dans l'option précédente" diff --git a/src/l10n/fixtures/tpl/base.yaml b/src/l10n/fixtures/tpl/base.yaml index e7c1980..eb9bdab 100644 --- a/src/l10n/fixtures/tpl/base.yaml +++ b/src/l10n/fixtures/tpl/base.yaml @@ -52,12 +52,10 @@ "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" "Display the big menu": "" "Display the logo": "" -"This feature is not compatible with the big menu display.": "" "Icons and texts": "" "Loader enabled": "" "Tips": "" "Always displayed": "" -"The logo will be hidden when the menu is always displayed.": "" "This is the automatic behavior when the menu is always displayed.": "" "Not compatible with touch screens.": "" "Big menu": "" @@ -89,7 +87,8 @@ "With categories": "" "Custom categories": "" "Customize application categories": "" -"Apps only visible in the top menu": "" -"Apps visible in the top and side menus": "" "Reset to default": "" "Applications": "" +"Applications kept in the top menu": "" +"Applications kept in the top menu but also shown in side menu": "" +"These applications must be selected in the previous option.": "" diff --git a/src/l10n/fixtures/zh_CN.yaml b/src/l10n/fixtures/zh_CN.yaml index 8fdec79..df3b412 100644 --- a/src/l10n/fixtures/zh_CN.yaml +++ b/src/l10n/fixtures/zh_CN.yaml @@ -41,12 +41,10 @@ "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)" "Display the big menu": "显示大型菜单" "Display the logo": "显示logo" -"This feature is not compatible with the big menu<\/code> display.": "此功能与显示大型菜单<\/code>不兼容。" "Icons and texts": "图标与文字" "Loader enabled": "菜单指示器已激活" "Tips": "技巧" "Always displayed": "一直显示" -"The logo will be hidden when the menu is always displayed.": "一直显示菜单时logo将被隐藏。" "This is the automatic behavior when the menu is always displayed.": "一直显示菜单时的自动动作。" "Not compatible with touch screens.": "与触屏不兼容。" "Big menu": "大型菜单" @@ -78,8 +76,6 @@ "With categories": "有类别" "Custom categories": "自定义类别" "Customize application categories": "自定义应用程序类别" -"Apps only visible in the top menu": "应用程序仅在顶部菜单中可见" -"Apps visible in the top and side menus": "顶部和侧边菜单中可见的应用程序" "Reset to default": "重置为默认设置" "Hidden icon": "隐藏图标" "Small icon": "小图标" @@ -90,3 +86,6 @@ "Normal text": "普通文本" "Big text": "大文本" "Applications": "Applications" +"Applications kept in the top menu": "Applications kept in the top menu" +"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu" +"These applications must be selected in the previous option.": "These applications must be selected in the previous option." diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php index 5a55946..5d1d088 100644 --- a/templates/settings/admin-form.php +++ b/templates/settings/admin-form.php @@ -41,8 +41,104 @@ $choicesSizes = [ $labelShowHideApps = 'Show and hide the list of applications'; $labelReset = 'Reset to default'; + ?>
+ +
+

+ t('Panel')); ?> +

+ + !$_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'], + 'always-displayed' => $_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'], + 'side-with-categories' => $_['side-with-categories'] && !$_['always-displayed'] && !$_['big-menu'], + 'big-menu' => $_['big-menu'] && !$_['always-displayed'] && !$_['side-with-categories'], + ]; + ?> + +
+ +
+

+ <?php p($l->t('Default')); ?> +

+ +
+ +
+

+ <?php p($l->t('With categories')); ?> +

+ +
+ +
+

+ <?php p($l->t('Big menu')); ?> +

+ +
+ +
+

t('Not compatible with touch screens.')); ?>

+

+ <?php p($l->t('Always displayed')); ?> +

+ + + + +
+

t('Colors')); ?> @@ -50,6 +146,13 @@ $labelReset = 'Reset to default'; t('Live preview')); ?>

+
+ t('Default')); ?> + t('With categories')); ?> + t('Big menu')); ?> + t('Always displayed')); ?> +
+
@@ -234,6 +337,13 @@ $labelReset = 'Reset to default'; t('Dark mode colors')); ?> +
+ t('Default')); ?> + t('With categories')); ?> + t('Big menu')); ?> + t('Always displayed')); ?> +
+

t('This parameters are used when Dark theme or Breeze Dark Theme are enabled.'); ?>

@@ -422,6 +532,13 @@ $labelReset = 'Reset to default'; t('Opener')); ?> +
+ t('Default')); ?> + t('With categories')); ?> + t('Big menu')); ?> + t('Always displayed')); ?> +
+
-
-
-
-

- t('Panel')); ?> -

- - !$_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'], - 'always-displayed' => $_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'], - 'side-with-categories' => $_['side-with-categories'] && !$_['always-displayed'] && !$_['big-menu'], - 'big-menu' => $_['big-menu'] && !$_['always-displayed'] && !$_['side-with-categories'], - ]; - ?> - -
- -
-

- <?php p($l->t('Default')); ?> -

- -
- -
-

- <?php p($l->t('With categories')); ?> -

- -
- -
-

- <?php p($l->t('Big menu')); ?> -

- -
- -
-

t('Not compatible with touch screens.')); ?>

-

- <?php p($l->t('Always displayed')); ?> -

- - - - -
- - -
t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?> @@ -589,16 +608,18 @@ $labelReset = 'Reset to default';
+
+
+
+
t('Display the logo')); ?> -
- - t('This feature is not compatible with the big menu display.'); ?> -
- t('The logo will be hidden when the menu is always displayed.')); ?> -
+ +
+ t('Default')); ?> +
@@ -629,6 +654,10 @@ $labelReset = 'Reset to default';
t('The logo is a link to the default app')); ?> + +
+ t('Default')); ?> +