release v1.3.3

ISSUE_TEMPLATE.md

@@ -0,0 +1,33 @@
+## Feature
+
+### Description
+
+...
+
+### Benefits
+
+...
+
+---
+
+## Issue
+
+### Environment
+
+* Side menu version: ...
+* PHP version: ...
+* Web server (Nginx, Apache2): ...
+
+### Steps to reproduce
+
+* ...
+* ...
+* ...
+
+### Observed Results
+
+...
+
+### Expected Results
+
+...

README.md

@@ -1,8 +1,8 @@
 🤙 Nextcloud app / Side menu 🎨
 ===============================
 
-
+Side menu allows you to modify the position of the main menu by creating a panel on the left of the interface.
-This application moves the top menu of Nextcloud to the left side.
+This application is rather suitable for instances that activate a lot of applications.
 
 Comptatible with AppOrder.
 
@@ -39,13 +39,20 @@ $ 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/5ea42d1a.png)
 
 
 How to contribute?
 ------------------
 
-Fork the repository, go to `apps/`, clone your repository and run `npm install` inside.
+You can report a bug or request a feature by opening an issue: https://gitnet.fr/deblan/side_menu/issues
+
+If you are a developer:
+
+* fork the repository
+* install an instance of Nextcloud
+* go to `apps/` and clone your repository
+* go to `apps/side_menu` and run `npm install`
 
 Build javascripts using `webpack --config ./webpack.js` (add `-w` to build them in real time).
 

appinfo/info.xml

@@ -3,10 +3,17 @@
     <id>side_menu</id>
     <name>Side menu</name>
     <summary>Move the top menu to the left side.</summary>
-    <description>Move the top menu to the left side.</description>
+    <description><![CDATA[Side menu allows you to modify the position of the main menu by creating a panel on the left of the interface.
+This application is rather suitable for instances that activate a lot of applications.
+
+Comptatible with AppOrder.
+
+You can report a bug or request a feature by opening an issue
+
+]]></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.3</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
@@ -14,7 +21,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/5ea42d1a.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' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
-		['name' => 'Js#script', 'url' => '/js/script.js', 'verb' => 'GET'],
+		['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
     ],
 ];

css/sideMenu.css

@@ -26,7 +26,7 @@
     height: 100vh;
     width: 100%;
     max-width: 250px;
-    background: var(--side-menu-background-color, #333);
+    background: linear-gradient(90deg, var(--side-menu-background-color, #333) 0%, var(--side-menu-background-color-to, #333) 100%);
     z-index: 3000;
     color: var(--side-menu-text-color, #fff);
     box-shadow: rgba(0, 0, 0, 0.22) 0px 25.6px 57.6px 0px, rgba(0, 0, 0, 0.18) 0px 4.8px 14.4px 0px;
@@ -63,13 +63,14 @@
     width: 20px;
     vertical-align: middle;
     margin-right: 10px;
+    padding-top: 3px;
 }
 
 .side-menu-app a {
     line-height: 30px;
     color: var(--side-menu-text-color, #fff);
     display: block;
-    padding: 7px 0 7px 15px;
+    padding: 7px 0 5px 15px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -93,7 +94,6 @@
     width: 100%;
     z-index: 2300;
     max-width: 250px;
-    background: var(--side-menu-background-color, #333);
     position: fixed;
     padding-top: 2px;
     top: 0;

lib/Controller/CssController.php

@@ -51,19 +51,20 @@ class CssController extends Controller
      */
     public function stylesheet()
     {
-        $requestUri = $this->request->server['REQUEST_URI'];
+        $backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
-        $assetsRoot = str_replace('/index.php', '', $requestUri);
+        $backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
-        $assetsRoot = preg_replace('#apps/side_menu/.*#s', 'apps/side_menu', $assetsRoot);
 
         $parameters = [
             'vars' => [
-                'background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
+                'background-color' => $backgroundColor,
+                'background-color-to' => $backgroundColorTo,
                 'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
                 'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
                 'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
             ],
             'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1),
-            'assetsRoot' => $assetsRoot,
+            'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
+            'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
         ];
 
         $response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');

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

@@ -47,14 +47,21 @@ class Admin implements ISettings
      */
     public function getForm()
     {
+        $backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
+        $backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
+
         $parameters = [
-            'background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
+            'background-color' => $backgroundColor,
+            'background-color-to' => $backgroundColorTo,
             'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
             'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
             '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'),
+            'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
+            'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
         ];
 
         return new TemplateResponse('side_menu', 'settings/admin-form', $parameters, '');

src/SideMenu.vue

@@ -28,8 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
             <li v-for="app in apps" v-bind:class="{'side-menu-app': true, 'active': app.active}">
                 <a v-bind:href="app.href">
                      <span class="side-menu-app-icon" v-html="app.icon"></span>
-
+                     <span class="side-menu-app-text" v-html="app.name"></span>
-                    {{ app.name }}
                 </a>
             </li>
         </ul>
@@ -54,10 +53,14 @@ export default {
                 let href = element.getAttribute('href')
 
                 if (href !== '#') {
+					let svg = element.querySelector('svg').outerHTML
+
+					svg = svg.replace(/(height|width)="20"/, '')
+
                     this.apps.push({
                         href: href,
                         name: element.querySelector('span').innerHTML,
-                        icon: element.querySelector('svg').outerHTML,
+                        icon: svg,
                         active: element.classList.contains('active')
                     });
                 }

src/admin.js

@@ -17,11 +17,15 @@
 
 const elements = [
     'side-menu-background-color',
+    'side-menu-background-color-to',
     '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-size-icon',
+    'side-menu-size-text',
     'side-menu-cache',
 ];
 

templates/css/stylesheet.php

@@ -1,7 +1,7 @@
 :root {
     <?php foreach ($_['vars'] as $key => $value): ?>
         <?php if ($key === 'opener'): ?>
-            --side-menu-<?php echo $key ?>: url('<?php echo $_['assetsRoot'] ?>/img/<?php echo $value ?>.svg');
+            --side-menu-<?php echo $key ?>: url('<?php print_unescaped(image_path('side_menu', $value.'.svg')); ?>');
         <?php else: ?>
             --side-menu-<?php echo $key ?>: <?php echo $value ?>;
         <?php endif; ?>
@@ -9,25 +9,78 @@
 }
 
 <?php if ($_['display-logo'] === false): ?>
-.side-menu-logo {
+    .side-menu-logo {
-    display: none;
+        display: none;
-}
+    }
 
-.side-menu-header {
+    .side-menu-header {
-    height: 50px;
+        height: 50px;
-}
+    }
 
-.side-menu-apps-list {
+    .side-menu-apps-list {
-    height: calc(100vh - 60px);
+        height: calc(100vh - 60px);
-    top: 60px;
+        top: 60px;
-}
+    }
 
-#side-menu.hide-opener .side-menu-header {
+    #side-menu.hide-opener .side-menu-header {
-    display: none;
+        display: none;
-}
+    }
 
-#side-menu.hide-opener .side-menu-apps-list {
+    #side-menu.hide-opener .side-menu-apps-list {
-    height: calc(100vh);
+        height: calc(100vh);
-    top: 0;
+        top: 0;
-}
+    }
+
+    <?php if ($_['size-text'] === 'hidden'): ?>
+        #side-menu, .side-menu-apps-list {
+            <?php if ($_['size-icon'] === 'big'): ?>
+                width: 55px;
+            <?php else: ?>
+                width: 52px;
+            <?php endif; ?>
+        }
+
+        #side-menu .side-menu-opener {
+            <?php if ($_['size-icon'] === 'big'): ?>
+                margin-left: 6px;
+            <?php else: ?>
+                margin-left: 4px;
+            <?php endif; ?>
+        }
+    <?php endif; ?>
+<?php endif; ?>
+
+<?php if ($_['size-icon'] === 'hidden'): ?>
+    .side-menu-app-icon {
+        display: none;
+    }
+<?php elseif ($_['size-icon'] === 'small'): ?>
+    .side-menu-app-icon svg {
+        width: 15px;
+        height: 15px;
+    }
+<?php elseif ($_['size-icon'] === 'normal'): ?>
+    .side-menu-app-icon svg {
+        width: 20px;
+        height: 20px;
+    }
+<?php elseif ($_['size-icon'] === 'big'): ?>
+    .side-menu-app-icon svg {
+        width: 23px;
+        height: 23px;
+    }
+<?php endif; ?>
+
+<?php if ($_['size-text'] === 'hidden'): ?>
+    .side-menu-app-text {
+        display: none;
+    }
+<?php elseif ($_['size-text'] === 'small'): ?>
+    .side-menu-app-text {
+        font-size: 12px;
+    }
+<?php elseif ($_['size-text'] === 'big'): ?>
+    .side-menu-app-text {
+        font-size: 16px;
+    }
 <?php endif; ?>

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

@@ -18,116 +18,205 @@
 
 script('side_menu', 'admin');
 style('side_menu', 'admin');
+style('side_menu', 'support');
 
+$choicesYesNo = [
+    'No' => '0',
+    'Yes' => '1',
+];
+
+$choicesSizes = [
+    'Hidden' => 'hidden',
+    'Small' => 'small',
+    'Normal' => 'normal',
+    'Big' => 'big',
+];
 ?>
 
-<div id="side-menu-section" class="section">
+<div id="side-menu-section">
-	<h2 class="inlineblock"><?php p($l->t('Side menu settings')); ?></h2>
+    <div class="section">
+        <h2>
+            <?php p($l->t('Colors')); ?>
+        </h2>
 
-    <div>
+        <div>
-        <label for="side-menu-background-color" class="settings-hint">
+            <label for="side-menu-background-color" class="settings-hint">
-            <?php p($l->t('Background color')); ?>
+                <?php p($l->t('Background color')); ?>
-        </label>
+            </label>
-    </div>
+        </div>
-    <div>
+        <div>
-        <input
+            <input
-            id="side-menu-background-color"
+                id="side-menu-background-color"
-            name="background-color"
+                name="background-color"
-            type="color"
+                type="color"
-            value="<?php print_unescaped($_['background-color']); ?>">
+                value="<?php print_unescaped($_['background-color']); ?>">
+            <input
+                id="side-menu-background-color-to"
+                name="background-color-to"
+                type="color"
+                value="<?php print_unescaped($_['background-color-to']); ?>">
+        </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>
+    <div class="section">
-        <label for="side-menu-current-app-background-color" class="settings-hint">
+        <h2>
-            <?php p($l->t('Background color of current app')); ?>
+            <?php p($l->t('Opener')); ?>
-        </label>
+        </h2>
-    </div>
+
-    <div>
+        <?php
-        <input
+            $choices = [
-            id="side-menu-current-app-background-color"
+                'Default' => 'side-menu-opener',
-            name="current-app-background-color"
+                'Hamburger' => 'side-menu-opener-hamburger',
-            type="color"
+            ];
-            value="<?php print_unescaped($_['current-app-background-color']); ?>">
+        ?>
+
+        <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>
+    <div class="section">
-        <label for="side-menu-text-color" class="settings-hint">
+        <h2>
-            <?php p($l->t('Text color')); ?>
+            <?php p($l->t('Panel')); ?>
-        </label>
+        </h2>
-    </div>
+
-    <div>
+        <div>
-        <input
+            <label for="side-menu-opener" class="settings-hint">
-            id="side-menu-text-color"
+                <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>
-            name="text-color"
+            </label>
-            type="color"
+        </div>
-            value="<?php print_unescaped($_['text-color']); ?>">
+
+        <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>
+            <label class="settings-hint">
+                <?php p($l->t('Icons and texts')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-size-icon" name="size-icon">
+                <?php foreach ($choicesSizes as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?> icon
+                    </option>
+                <?php endforeach; ?>
+            </select>
+
+            <select id="side-menu-size-text" name="size-text">
+                <?php foreach ($choicesSizes as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['size-text']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?> text
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
     </div>
 
-    <?php
+    <div class="section">
-        $choices = [
+        <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>">
-            'Default' => 'side-menu-opener',
-            'Hamburger' => 'side-menu-opener-hamburger',
-        ];
-    ?>
 
-    <div>
+        <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
-        <label for="side-menu-opener" class="settings-hint">
+
-            <?php p($l->t('Opener icon')); ?>
+        <span id="side-menu-message" class="msg"></span>
-        </label>
+
+        <div style="height: 30px"></div>
+
+        <div>
+            <span for="side-menu-opener" class="settings-hint">
+                <?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">
+                    <button>
+                        <?php p($l->t('Buy me a coffe ☕')); ?>
+                    </button>
+                </a>
+            </span>
+        </div>
     </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>