release

README.md

@@ -23,7 +23,9 @@ $ unzip -d side_menu /path/to/side_menu_vX.Y.Z.zip
 Upgrade
 -------
 
-Go to https://gitnet.fr/deblan/side_menu/releases and download the last release (side_menu_vX.Y.Z.zip).
+Side menu can be upgraded from the app store.
+
+If you want to install it from source: go to https://gitnet.fr/deblan/side_menu/releases and download the last release (side_menu_vX.Y.Z.zip).
 
 Copy the archive to your Nextcloud server.
 

appinfo/app.php

@@ -36,7 +36,8 @@ Util::addHeader(
     [
         'href' => $stylesheet,
         'rel' => 'stylesheet'
-    ], ''
+    ],
+    ''
 );
 
 Util::addScript('side_menu', 'main');

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.2.1</version>
+    <version>1.2.4</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>

appinfo/routes.php

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

lib/Controller/CssController.php

@@ -19,7 +19,7 @@
 namespace OCA\SideMenu\Controller;
 
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\DataDownloadResponse;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\IConfig;
 use OCP\IRequest;
@@ -38,6 +38,7 @@ class CssController extends Controller
     public function __construct($appName, IRequest $request, IConfig $config)
     {
         parent::__construct($appName, $request);
+
         $this->config = $config;
     }
 
@@ -50,25 +51,24 @@ class CssController extends Controller
      */
     public function stylesheet()
     {
+        $requestUri = $this->request->server['REQUEST_URI'];
+        $assetsRoot = str_replace('/index.php', '', $requestUri);
+        $assetsRoot = preg_replace('#apps/side_menu/.*#s', 'apps/side_menu', $assetsRoot);
+
         $parameters = [
-            '--side-menu-background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
+            'vars' => [
-            '--side-menu-current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
+                'background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
-            '--side-menu-text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
+                'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
-            '--side-menu-opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
+                '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,
         ];
 
-        $css = '';
+        $response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');
+        $response->addHeader('Content-Type', 'text/css');
 
-        foreach ($parameters as $key => $value) {
+        return $response;
-            if ($key === '--side-menu-opener') {
-                $value = sprintf("url('../img/%s.svg')", $value);
-            }
-
-            $css.= sprintf('%s: %s;', $key, $value);
-        }
-
-        $css = sprintf(':root { %s }', $css);
-
-        return new DataDownloadResponse($css, 'stylesheet', 'text/css');
     }
 }

lib/Settings/Admin.php

@@ -53,6 +53,7 @@ class Admin implements ISettings
             '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'),
         ];
 
         return new TemplateResponse('side_menu', 'settings/admin-form', $parameters, '');

src/SideMenu.vue

@@ -67,10 +67,14 @@ export default {
 			const ncLogo = document.querySelector('#nextcloud .logo')
 
 			if (ncLogo) {
-				this.logo = window.getComputedStyle(ncLogo, null)
+				const url = window.getComputedStyle(ncLogo, null)
 					.getPropertyValue('background-image')
 					.replace('url("', '')
 					.replace('")', '')
+
+				if (url && url !== 'none') {
+					this.logo = url
+				}
 			}
         },
     },

src/admin.js

@@ -20,6 +20,7 @@ const elements = [
     'side-menu-current-app-background-color',
     'side-menu-text-color',
     'side-menu-opener',
+    'side-menu-display-logo',
     'side-menu-cache',
 ];
 

templates/css/stylesheet.php

@@ -0,0 +1,24 @@
+: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');
+        <?php else: ?>
+            --side-menu-<?php echo $key ?>: <?php echo $value ?>;
+        <?php endif; ?>
+    <?php endforeach; ?>
+}
+
+<?php if ($_['display-logo'] === false): ?>
+.side-menu-logo {
+    display: none;
+}
+
+.side-menu-header {
+    height: 50px;
+}
+
+.side-menu-apps-list {
+    height: calc(100vh - 60px);
+    top: 60px;
+}
+<?php endif; ?>

templates/settings/admin-form.php

@@ -86,6 +86,29 @@ style('side_menu', 'admin');
         </select>
     </div>
 
+    <div>
+        <label for="side-menu-opener" class="settings-hint">
+            <?php p($l->t('Display the logo')); ?>
+        </label>
+    </div>
+
+    <?php
+        $choices = [
+            'Yes' => '1',
+            'No' => '0',
+        ];
+    ?>
+
+    <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>
+
     <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>