From 460dac5faf64f8dca7dd1a78e72ba61d6703761a Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 11 Aug 2020 15:26:17 +0200
Subject: [PATCH] update admin and personal pages

---
 templates/settings/admin-form.php    | 50 +++++++++++++++++-----------
 templates/settings/personal-form.php | 10 +++---
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 84702be..e56932f 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -40,7 +40,7 @@ $choicesSizes = [
         </h2>
 
         <div>
-            <label for="side-menu-background-color" class="settings-hint">
+            <label for="side-menu-background-color">
                 <?php p($l->t('Background color')); ?>
             </label>
         </div>
@@ -60,7 +60,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-current-app-background-color" class="settings-hint">
+            <label for="side-menu-current-app-background-color">
                 <?php p($l->t('Background color of current app')); ?>
             </label>
         </div>
@@ -74,7 +74,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-text-color" class="settings-hint">
+            <label for="side-menu-text-color">
                 <?php p($l->t('Text color')); ?>
             </label>
         </div>
@@ -88,11 +88,13 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-opener-only" class="settings-hint">
+            <label for="side-menu-opener-only">
                 <?php p($l->t('Force light icons')); ?>
             </label>
         </div>
 
+        <p><em>This feature is not compatible with the <code>big menu</code> display.</em></p>
+
         <div>
             <select id="side-menu-force-light-icon" name="force-light-icon" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
@@ -104,7 +106,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-text-color" class="settings-hint">
+            <label for="side-menu-text-color">
                 <?php p($l->t('Loader')); ?>
             </label>
         </div>
@@ -135,7 +137,7 @@ $choicesSizes = [
         ?>
 
         <div>
-            <label for="side-menu-opener" class="settings-hint">
+            <label for="side-menu-opener">
                 <?php p($l->t('Icon')); ?>
             </label>
         </div>
@@ -158,7 +160,7 @@ $choicesSizes = [
         ?>
 
         <div>
-            <label for="side-menu-opener-position" class="settings-hint">
+            <label for="side-menu-opener-position">
                 <?php p($l->t('Position')); ?>
             </label>
         </div>
@@ -174,7 +176,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-opener-only" class="settings-hint">
+            <label for="side-menu-opener-only">
                 <?php p($l->t('Show only the opener (hidden logo)')); ?>
             </label>
         </div>
@@ -190,11 +192,13 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-hide-when-no-apps" class="settings-hint">
+            <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>
 
+        <p><em>If the <code>big menu</code> is enabled then the menu will be hidden in public pages.</em></p>
+
         <div>
             <select id="side-menu-hide-when-no-apps" name="hide-when-no-apps" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
@@ -212,13 +216,13 @@ $choicesSizes = [
         </h2>
 
         <div>
-            <label for="side-menu-opener" class="settings-hint">
+            <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>Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>
-         to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.</p>
+        <p><em>Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>
+         to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.</em></p>
 
         <div>
             <select id="side-menu-opener-hover" name="opener-hover" class="side-menu-setting">
@@ -231,12 +235,14 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-big-menu" class="settings-hint">
+            <label for="side-menu-big-menu">
                 <?php p($l->t('Display the big menu')); ?>
+
+                <small><span class="warning">Experimental</span></small>
             </label>
         </div>
 
-        <p>The big menu is not compatible with AppOrder.</p>
+        <p><em>The big menu is not compatible with AppOrder.</em></p>
 
         <div>
             <select id="side-menu-big-menu" name="big-menu" class="side-menu-setting">
@@ -249,11 +255,13 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-opener" class="settings-hint">
+            <label for="side-menu-opener">
                 <?php p($l->t('Display the logo')); ?>
             </label>
         </div>
 
+        <p><em>This feature is not compatible with the <code>big menu</code> display.</em></p>
+
         <div>
             <select id="side-menu-display-logo" name="display-logo" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
@@ -265,7 +273,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label class="settings-hint">
+            <label>
                 <?php p($l->t('Icons and texts')); ?>
             </label>
         </div>
@@ -289,7 +297,7 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-loader-enabled" class="settings-hint">
+            <label for="side-menu-loader-enabled">
                 <?php p($l->t('Loader enabled')); ?>
             </label>
         </div>
@@ -305,12 +313,14 @@ $choicesSizes = [
         </div>
 
         <div>
-            <label for="side-menu-external-sites-in-top-menu" class="settings-hint">
+            <label for="side-menu-external-sites-in-top-menu">
                 <?php p($l->t('Do not move external sites in the side menu')); ?>
                 <small><span class="warning">Experimental</span></small>
             </label>
         </div>
 
+        <p><em>This feature is not compatible with the <code>big menu</code> display.</em></p>
+
         <div>
             <select id="side-menu-external-sites-in-top-menu" name="external-sites-in-top-menu" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>
@@ -327,7 +337,7 @@ $choicesSizes = [
             <?php p($l->t('Tips')); ?>
         </h2>
 
-        <p class="settings-hint">Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>
+        <p>Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>
          to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.</p>
     </div>
 
@@ -341,7 +351,7 @@ $choicesSizes = [
         <div style="height: 30px"></div>
 
         <div>
-            <span for="side-menu-opener" class="settings-hint">
+            <span for="side-menu-opener">
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
diff --git a/templates/settings/personal-form.php b/templates/settings/personal-form.php
index 9f7cffe..2eac0f6 100644
--- a/templates/settings/personal-form.php
+++ b/templates/settings/personal-form.php
@@ -34,11 +34,14 @@ $choicesYesNo = [
         </h2>
 
         <div>
-            <label for="side-menu-enabled" class="settings-hint">
+            <label for="side-menu-enabled">
                 <?php p($l->t('Enable the side menu')); ?>
             </label>
         </div>
 
+        <p><em>Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>
+         to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.</em></p>
+
         <div>
             <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
                 <?php foreach ($choicesYesNo as $label => $value): ?>
@@ -48,9 +51,6 @@ $choicesYesNo = [
                 <?php endforeach; ?>
             </select>
         </div>
-
-        <p>Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> 
-         to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.</p>
     </div>
 
     <div class="section">
@@ -61,7 +61,7 @@ $choicesYesNo = [
         <div style="height: 30px"></div>
 
         <div>
-            <span for="side-menu-opener" class="settings-hint">
+            <span for="side-menu-opener">
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">