release v1.3.1

README.md

@@ -39,7 +39,7 @@ $ unzip -d side_menu /path/to/side_menu_vX.Y.Z.zip
 
 ![](https://upload.deblan.org/u/2020-03/5e81b219.jpg)
 
-![](https://upload.deblan.org/u/2020-04/5e9998b5.png)
+![](https://upload.deblan.org/u/2020-04/5e9d9058.png)
 
 
 How to contribute?

appinfo/info.xml

@@ -6,7 +6,7 @@
     <description>Move the top menu to the left side.</description>
     <licence>agpl</licence>
     <author mail="dev+sidemenu@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
@@ -14,7 +14,7 @@
     <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
     <screenshot>https://upload.deblan.org/u/2020-03/5e7fab2b.jpg</screenshot>
     <screenshot>https://upload.deblan.org/u/2020-03/5e81b219.jpg</screenshot>
-    <screenshot>https://upload.deblan.org/u/2020-04/5e9998b5.png</screenshot>
+    <screenshot>https://upload.deblan.org/u/2020-04/5e9d9058.png</screenshot>
     <dependencies>
         <nextcloud min-version="18" max-version="18"/>
     </dependencies>

appinfo/routes.php

@@ -19,7 +19,7 @@
 
 return [
     'routes' => [
-		['name' => 'Css#stylesheet', 'url' => '/css/stylesheet.css', 'verb' => 'GET'],
-		['name' => 'Js#script', 'url' => '/js/script.js', 'verb' => 'GET'],
+		['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
+		['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
     ],
 ];

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'),
         ];
 

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'),
         ];
 

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',

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
 

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 with 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>