fix #6: menu items x4

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.
 
@@ -38,3 +40,13 @@ $ 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/5e8ee1f7.jpg)
+
+
+How to contribute?
+------------------
+
+Fork the repository, go to `apps/`, clone your repository and run `npm install` inside.
+
+Build javascripts using `webpack --config ./webpack.js` (add `-w` to build them in real time).
+
+Then commit and create a pull request.

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.1.3</version>
+    <version>1.2.3</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'],
     ],
 ];

css/sideMenu.css

@@ -33,7 +33,7 @@
     display: none;
 }
 
-#side-menu.is-active {
+#side-menu.open {
     display: block;
 }
 
@@ -71,7 +71,7 @@
     white-space: nowrap;
 }
 
-.side-menu-app a:hover, .side-menu-app.is-active a {
+.side-menu-app a:hover, .side-menu-app.active a {
     background: var(--side-menu-current-app-background-color, #444);
 }
 

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;
@@ -51,24 +51,18 @@ class CssController extends Controller
     public function stylesheet()
     {
         $parameters = [
-            '--side-menu-background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
-            '--side-menu-current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
-            '--side-menu-text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
-            '--side-menu-opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
+            'vars' => [
+                'background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
+                '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),
         ];
 
-        $css = '';
+        $response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');
+        $response->addHeader('Content-Type', 'text/css');
 
-        foreach ($parameters as $key => $value) {
-            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');
+        return $response;
     }
 }

lib/Settings/Admin.php

@@ -35,7 +35,8 @@ class Admin implements ISettings
     /** @var IConfig */
     private $config;
 
-    public function __construct(IL10N $l, ILogger $logger, IConfig $config) {
+    public function __construct(IL10N $l, ILogger $logger, IConfig $config)
+    {
         $this->l = $l;
         $this->logger = $logger;
         $this->config = $config;
@@ -52,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, '');

lib/Settings/Section.php

@@ -79,6 +79,6 @@ class Section implements IIconSection
      */
     public function getIcon()
     {
-		return $this->url->imagePath('theming', 'app-dark.svg');
+        return $this->url->imagePath('theming', 'app-dark.svg');
     }
 }

src/SideMenu.js

@@ -18,13 +18,12 @@
 import Vue from 'vue'
 import SideMenu from './SideMenu.vue'
 
-Vue.prototype.t = t
-Vue.prototype.OC = OC
-Vue.prototype.OC = OCP
+// Vue.prototype.t = t
+// Vue.prototype.OC = OC
+// Vue.prototype.OC = OCP
 
 const View = Vue.extend(SideMenu)
-const sideMenu = new View({
-})
+const sideMenu = new View({})
 
 const mountSideMenuComponent = () => {
     const sideMenuContainer = document.querySelector('#side-menu')

src/SideMenu.vue

@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         </div>
 
         <ul class="side-menu-apps-list">
-            <li v-for="app in apps" v-bind:class="{'side-menu-app': true, 'is-active': app.active}">
+            <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>
 
@@ -37,9 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
-
 export default {
     name: 'SideMenu',
     data() {
@@ -67,10 +64,14 @@ export default {
             }
         },
         retrieveLogo() {
-            this.logo = window.getComputedStyle(document.querySelector('#nextcloud .logo'), null)
-                .getPropertyValue('background-image')
-                .replace('url("', '')
-                .replace('")', '')
+			const ncLogo = document.querySelector('#nextcloud .logo')
+
+			if (ncLogo) {
+				this.logo = window.getComputedStyle(ncLogo, null)
+					.getPropertyValue('background-image')
+					.replace('url("', '')
+					.replace('")', '')
+			}
         },
     },
     created() {

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',
 ];
 
@@ -42,7 +43,7 @@ const saveSettings = (key) => {
                 t('side_menu', (key + 1) + '/' + size)
             )
 
-            if (key < size -1) {
+            if (key < size - 1) {
                 saveSettings(++key)
             } else {
                 OC.msg.finishedSuccess(selector, t('side_menu', 'Saved'))
@@ -55,10 +56,10 @@ const saveSettings = (key) => {
 }
 
 $(document).ready(() => {
-	$('#side-menu-save').on('click', (event) => {
-		event.preventDefault()
-		OC.msg.startSaving(selector)
+    $('#side-menu-save').on('click', (event) => {
+        event.preventDefault()
+        OC.msg.startSaving(selector)
 
         saveSettings(0)
-	});
+    });
 });

src/main.js

@@ -15,13 +15,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-const sideMenuContainer = $('<div id="side-menu">')
+const sideMenuContainer = $('<div id="side-menu-container">')
 const sideMenuOpener = $('<button class="side-menu-opener"></button>')
+const sideMenu = $('<div id="side-menu">')
+
+sideMenuContainer.append(sideMenu);
 
 $('body').append(sideMenuContainer);
 
 sideMenuOpener.insertBefore('#nextcloud');
 
 $('body').on('click', '.side-menu-opener', () => {
-    $('#side-menu').toggleClass('is-active');
+    $('#side-menu').toggleClass('open');
 })

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('../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>