From 457bfc282ba301858540271c2f45d4393a1e9e9f Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 20 Apr 2020 14:04:06 +0200
Subject: [PATCH] add opener-position option (issue #3)

---
 lib/Controller/JsController.php   |   1 +
 lib/Settings/Admin.php            |   1 +
 src/admin.js                      |   1 +
 templates/js/script.php           |   7 +-
 templates/settings/admin-form.php | 242 +++++++++++++++++-------------
 5 files changed, 149 insertions(+), 103 deletions(-)

diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php
index f6ed7b2..0bbeebf 100644
--- a/lib/Controller/JsController.php
+++ b/lib/Controller/JsController.php
@@ -52,6 +52,7 @@ class JsController extends Controller
     public function script()
     {
         $parameters = [
+            'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
             'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
         ];
 
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index c3b3207..98e47b6 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -54,6 +54,7 @@ class Admin implements ISettings
             'cache' => $this->config->getAppValue('side_menu', 'cache', '0'),
             'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
             'display-logo' => $this->config->getAppValue('side_menu', 'display-logo', '1'),
+            'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
             'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'),
         ];
 
diff --git a/src/admin.js b/src/admin.js
index aa923f6..fbed5bc 100644
--- a/src/admin.js
+++ b/src/admin.js
@@ -20,6 +20,7 @@ const elements = [
     'side-menu-current-app-background-color',
     'side-menu-text-color',
     'side-menu-opener',
+    'side-menu-opener-position',
     'side-menu-opener-hover',
     'side-menu-display-logo',
     'side-menu-cache',
diff --git a/templates/js/script.php b/templates/js/script.php
index 6ceaff9..b93058e 100644
--- a/templates/js/script.php
+++ b/templates/js/script.php
@@ -7,7 +7,12 @@
     body.append(sideMenuContainer)
 
     sideMenuContainer.append(sideMenu)
-    sideMenuOpener.insertBefore('#nextcloud')
+
+    <?php if ($_['opener-position'] === 'before'): ?>
+        sideMenuOpener.insertBefore('#nextcloud')
+    <?php else: ?>
+        sideMenuOpener.insertAfter('#nextcloud')
+    <?php endif; ?>
 
     var isTouchDevice = window.matchMedia("(pointer: coarse)").matches
 
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index bd8a012..0db40de 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -19,115 +19,153 @@
 script('side_menu', 'admin');
 style('side_menu', 'admin');
 
+$choicesYesNo = [
+    'No' => '0',
+    'Yes' => '1',
+];
 ?>
 
-<div id="side-menu-section" class="section">
-	<h2 class="inlineblock"><?php p($l->t('Side menu settings')); ?></h2>
+<div id="side-menu-section">
+    <div class="section">
+        <h2>
+            <?php p($l->t('Colors')); ?>
+        </h2>
 
-    <div>
-        <label for="side-menu-background-color" class="settings-hint">
-            <?php p($l->t('Background color')); ?>
-        </label>
+        <div>
+            <label for="side-menu-background-color" class="settings-hint">
+                <?php p($l->t('Background color')); ?>
+            </label>
+        </div>
+        <div>
+            <input
+                id="side-menu-background-color"
+                name="background-color"
+                type="color"
+                value="<?php print_unescaped($_['background-color']); ?>">
+        </div>
+
+        <div>
+            <label for="side-menu-current-app-background-color" class="settings-hint">
+                <?php p($l->t('Background color of current app')); ?>
+            </label>
+        </div>
+        <div>
+            <input
+                id="side-menu-current-app-background-color"
+                name="current-app-background-color"
+                type="color"
+                value="<?php print_unescaped($_['current-app-background-color']); ?>">
+        </div>
+
+        <div>
+            <label for="side-menu-text-color" class="settings-hint">
+                <?php p($l->t('Text color')); ?>
+            </label>
+        </div>
+        <div>
+            <input
+                id="side-menu-text-color"
+                name="text-color"
+                type="color"
+                value="<?php print_unescaped($_['text-color']); ?>">
+        </div>
     </div>
-    <div>
-        <input
-            id="side-menu-background-color"
-            name="background-color"
-            type="color"
-            value="<?php print_unescaped($_['background-color']); ?>">
+    
+    <div class="section">
+        <h2>
+            <?php p($l->t('Opener')); ?>
+        </h2>
+
+        <?php
+            $choices = [
+                'Default' => 'side-menu-opener',
+                'Hamburger' => 'side-menu-opener-hamburger',
+            ];
+        ?>
+
+        <div>
+            <label for="side-menu-opener" class="settings-hint">
+                <?php p($l->t('Icon')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-opener" name="opener">
+                <?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" class="settings-hint">
+                <?php p($l->t('Position')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-opener-position" name="opener-position">
+                <?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>
 
-    <div>
-        <label for="side-menu-current-app-background-color" class="settings-hint">
-            <?php p($l->t('Background color of current app')); ?>
-        </label>
-    </div>
-    <div>
-        <input
-            id="side-menu-current-app-background-color"
-            name="current-app-background-color"
-            type="color"
-            value="<?php print_unescaped($_['current-app-background-color']); ?>">
+    <div class="section">
+        <h2>
+            <?php p($l->t('Panel')); ?>
+        </h2>
+
+        <div>
+            <label for="side-menu-opener" class="settings-hint">
+                <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-opener-hover" name="opener-hover">
+                <?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" class="settings-hint">
+                <?php p($l->t('Display the logo')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-display-logo" name="display-logo">
+                <?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-text-color" class="settings-hint">
-            <?php p($l->t('Text color')); ?>
-        </label>
+    <div class="section">
+        <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>">
+
+        <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
+
+        <span id="side-menu-message" class="msg"></span>
     </div>
-    <div>
-        <input
-            id="side-menu-text-color"
-            name="text-color"
-            type="color"
-            value="<?php print_unescaped($_['text-color']); ?>">
-    </div>
-
-    <?php
-        $choices = [
-            'Default' => 'side-menu-opener',
-            'Hamburger' => 'side-menu-opener-hamburger',
-        ];
-    ?>
-
-    <div>
-        <label for="side-menu-opener" class="settings-hint">
-            <?php p($l->t('Opener icon')); ?>
-        </label>
-    </div>
-
-    <div>
-        <select id="side-menu-opener" name="opener">
-            <?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 = [
-            'No' => '0',
-            'Yes' => '1',
-        ];
-    ?>
-
-    <div>
-        <label for="side-menu-opener" class="settings-hint">
-            <?php p($l->t('Display the logo')); ?>
-        </label>
-    </div>
-
-    <div>
-        <select id="side-menu-display-logo" name="display-logo">
-            <?php foreach ($choices 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>
-        <label for="side-menu-opener" class="settings-hint">
-            <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>
-        </label>
-    </div>
-
-    <div>
-        <select id="side-menu-opener-hover" name="opener-hover">
-            <?php foreach ($choices 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>
-
-    <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>">
-
-    <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
-
-    <span id="side-menu-message" class="msg"></span>
 </div>