release v1.15.0

ISSUE_TEMPLATE.md

@@ -15,8 +15,10 @@
 ### Environment
 
 * Side menu version: ...
+* Nextcloud version: ...
 * PHP version: ...
 * Web server (Nginx, Apache2): ...
+* Web browser and version (Firefox 80, Google Chrome 74, etc): ...
 
 ### Steps to reproduce
 

README.md

@@ -1,7 +1,7 @@
-🤙 Nextcloud app / Side menu 🎨
+🤙 Nextcloud app / Custom menu 🎨
 ===============================
 
-Side menu allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
+Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
 You can also define apps that must be displayed in the top menu. Fully customisable.
 
 This application is rather suitable for instances that activate a lot of applications.
@@ -17,7 +17,7 @@ You like this app and you want to support me? [Buy me a coffee](https://www.buym
 Installation and upgrade
 ------------------------
 
-Side menu is availabe 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 content into `apps`.
+Custom menu is available 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 content into `apps`.
 
 ```
 $ cd /path/to/nextcloud/apps

appinfo/info.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <info>
     <id>side_menu</id>
-    <name>Side menu</name>
+    <name>Custom menu</name>
     <summary>Modify the display of the menu.</summary>
     <description><![CDATA[Side menu allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
 You can also define apps that must be displayed in the top menu. Fully customisable.
@@ -21,7 +21,7 @@ You like this app and you want to support me?
 ]]></description>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.14.0</version>
+    <version>1.15.0</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>

img/icon.svg

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="37.099998mm"
+   height="37.099998mm"
+   viewBox="0 0 37.099998 37.099998"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="242.1839"
+     inkscape:cy="32.026866"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1918"
+     inkscape:window-height="1027"
+     inkscape:window-x="1920"
+     inkscape:window-y="21"
+     inkscape:window-maximized="0"
+     inkscape:snap-nodes="false" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-59.922223,-92.669069)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.46500015;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:accumulate"
+       id="rect815-6-2-7"
+       width="34.535"
+       height="34.535"
+       x="61.204723"
+       y="93.951569"
+       rx="5.4806547"
+       ry="5.4806547" />
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.46500015;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:accumulate"
+       id="rect815-6-7"
+       width="20.357224"
+       height="33.40107"
+       x="61.677193"
+       y="94.518532"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:3.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 66.59458,111.16177 h 9.997359"
+       id="path873-5"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g1018"
+       transform="translate(2.6458333)"
+       style="stroke:#333333;stroke-opacity:1">
+      <g
+         id="g1013"
+         style="stroke:#333333;stroke-opacity:1">
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:3.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 63.948747,103.80467 H 75.349244"
+           id="path873"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:3.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 63.948747,118.51887 H 75.349244"
+           id="path873-5-3"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:2.56500006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:accumulate"
+       id="rect815-6-2"
+       width="34.535"
+       height="34.535"
+       x="61.204723"
+       y="93.951569"
+       rx="5.4806547"
+       ry="5.4806547" />
+  </g>
+</svg>

lib/AppInfo/Application.php

@@ -21,7 +21,7 @@ class Application extends App
 {
     public const APP_ID = 'side_menu';
 
-    public const APP_NAME = 'Side menu';
+    public const APP_NAME = 'Custom menu';
     /**
      * @var OC\AllConfig
      */

lib/Controller/CssController.php

@@ -89,9 +89,9 @@ class CssController extends Controller
                 'icon-invert-filter' => abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%',
                 'icon-opacity' => abs($this->config->getAppValueInt('icon-opacity', '100') / 100),
             ],
-            'display-logo' => $this->config->getAppValueBool('display-logo', 1),
-            'opener-only' => $this->config->getAppValueBool('opener-only', 0),
-            'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', 0),
+            'display-logo' => $this->config->getAppValueBool('display-logo', '1'),
+            'opener-only' => $this->config->getAppValueBool('opener-only', '0'),
+            'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', '0'),
             'size-icon' => $this->config->getAppValue('size-icon', 'normal'),
             'size-text' => $this->config->getAppValue('size-text', 'normal'),
             'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),

lib/Controller/JsController.php

@@ -116,7 +116,7 @@ class JsController extends Controller
         return [
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),
             'opener-hover' => $this->config->getAppValueBool('opener-hover', '0'),
-            'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', 0),
+            'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', '0'),
             'force-light-icon' => $this->config->getAppValueBool('force-light-icon', '0'),
             'hide-when-no-apps' => $this->config->getAppValueBool('hide-when-no-apps', '0'),
             'loader-enabled' => $this->config->getAppValueBool('loader-enabled', '1'),

lib/Controller/NavController.php

@@ -88,7 +88,7 @@ class NavController extends Controller
         $apps = $this->appRepository->getVisibleApps();
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $categoriesLabels = $this->categoryFetcher->get();
-        $externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', 0);
+        $externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', '0');
         $user = OC::$server[IUserSession::class]->getUser();
         $appsCategories = [];
         $categoriesAppsCount = [];

lib/Settings/AdminSection.php

@@ -84,6 +84,6 @@ class AdminSection implements IIconSection
      */
     public function getIcon()
     {
-        return $this->url->imagePath('theming', 'app-dark.svg');
+        return $this->url->imagePath(Application::APP_ID, 'icon.svg');
     }
 }

lib/Settings/PersonalSection.php

@@ -84,6 +84,6 @@ class PersonalSection implements IIconSection
      */
     public function getIcon()
     {
-        return $this->url->imagePath('theming', 'app-dark.svg');
+        return $this->url->imagePath(Application::APP_ID, 'icon.svg');
     }
 }

src/l10n/fixtures/de.yaml

@@ -1,5 +1,5 @@
-"Side menu": "Seitenmenü"
-"Enable the side menu": "Aktiviere das Seitenmenü"
+"Custom menu": "Benutzerdefiniertes Menü"
+"Enable the custom menu": "Aktiviere das Benutzerdefiniertes Menü"
 "No": "Nein"
 "Yes": "Ja"
 "Menu": "Menü"

src/l10n/fixtures/fr.yaml

@@ -1,5 +1,5 @@
-"Side menu": "Menu latéral"
-"Enable the side menu": "Activer le menu latéral"
+"Custom menu": "Menu personnalisé"
+"Enable the custom menu": "Activer le menu personnalisé"
 "No": "Non"
 "Yes": "Oui"
 "Menu": "Menu"

templates/js/script.php

@@ -85,10 +85,10 @@
                     headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
 
                     sideMenu.addClass('hide-opener')
-                <?php else: ?>
-                    sideMenu.on('mouseleave', sideMenuMouseLeave)
-                    sideMenu.on('mouseenter', sideMenuOpenerMouseEnter)
                 <?php endif ?>
+
+                sideMenu.on('mouseleave', sideMenuMouseLeave)
+                sideMenu.on('mouseenter', sideMenuOpenerMouseEnter)
             }
         <?php endif; ?>
 

templates/settings/personal-form.php

@@ -35,7 +35,7 @@ $choicesYesNo = [
 
         <div>
             <label for="side-menu-enabled">
-                <?php p($l->t('Enable the side menu')); ?>
+                <?php p($l->t('Enable the custom menu')); ?>
             </label>
         </div>