fix links that must be opened in new window

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,9 +1,9 @@
 <?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.
+    <description><![CDATA[Custom 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.
 
 This application is rather suitable for instances that activate a lot of applications.
@@ -14,18 +14,18 @@ Comptatible with AppOrder.
 
 You can report a bug or request a feature by opening an issue.
 
-You like this app and you want to support me?
+If you like this application and want to support the development:
 
 * ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan)
 * 😃 [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.14.0</version>
+    <version>1.16.2</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
-    <discussion>https://deblan.cloud/index.php/call/fffxkc7h</discussion>
+    <discussion>https://matrix.to/#/!GhfQePnOSPYpYEunWM:neutralnetwork.org</discussion>
     <bugs>https://gitnet.fr/deblan/side_menu/issues</bugs>
     <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png</screenshot>

css/sideMenu.css

@@ -175,6 +175,16 @@
     color: var(--side-menu-text-color, #fff);
 }
 
+.side-menu-loader {
+    text-align: center;
+}
+
+.side-menu-loader svg {
+    width: 38px;
+    margin: auto;
+    stroke: var(--side-menu-text-color, #fff);
+}
+
 .side-menu-big .side-menu-app-icon {
     vertical-align: middle;
     margin-top: -2px;

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>

img/loader.svg

@@ -0,0 +1,17 @@
+<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
+<svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
+    <g fill="none" fill-rule="evenodd">
+        <g transform="translate(1 1)" stroke-width="2">
+            <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+            <path d="M36 18c0-9.94-8.06-18-18-18">
+                <animateTransform
+                    attributeName="transform"
+                    type="rotate"
+                    from="0 18 18"
+                    to="360 18 18"
+                    dur="1s"
+                    repeatCount="indefinite"/>
+            </path>
+        </g>
+    </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
      */
@@ -55,8 +55,9 @@ class Application extends App
     public function isEnabled(): bool
     {
         $enabled = true;
+        $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
 
-        if (null !== $this->user) {
+        if (null !== $this->user && !$isForced) {
             $enabled = (bool) $this->config->getUserValue($this->user->getUid(), self::APP_ID, 'enabled', '1');
         }
 

lib/Controller/CssController.php

@@ -67,13 +67,13 @@ class CssController extends Controller
     {
         $backgroundColor = $this->config->getAppValue('background-color', '#333333');
         $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
-
+        $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
 
         if ($this->user) {
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
 
-            if (!empty($userTopMenuApps)) {
+            if (!empty($userTopMenuApps) && !$isForced) {
                 $topMenuApps = $userTopMenuApps;
             }
         }
@@ -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

@@ -84,19 +84,20 @@ class JsController extends Controller
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
         $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
+        $isForced = $this->config->getAppValueBool('force', '0');
         $avatar = null;
 
         if ($this->user) {
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
 
-            if (!empty($userTopMenuApps)) {
+            if (!empty($userTopMenuApps) && !$isForced) {
                 $topMenuApps = $userTopMenuApps;
             }
 
             $userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
             $userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');
 
-            if (2 === $userTargetBlankMode) {
+            if (2 === $userTargetBlankMode && !$isForced) {
                 $targetBlankApps = $userTargetBlankApps;
             }
 
@@ -116,7 +117,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

@@ -21,10 +21,12 @@ namespace OCA\SideMenu\Controller;
 use OC;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\URLGenerator;
+use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUserSession;
@@ -37,6 +39,11 @@ class NavController extends Controller
      */
     protected $config;
 
+    /**
+     * @var IConfig
+     */
+    protected $iConfig;
+
     /**
      * @var AppRepository
      */
@@ -60,6 +67,7 @@ class NavController extends Controller
     public function __construct(
         string $appName,
         IRequest $request,
+        IConfig $iConfig,
         ConfigProxy $config,
         AppRepository $appRepository,
         CategoryFetcher $categoryFetcher,
@@ -70,6 +78,7 @@ class NavController extends Controller
         parent::__construct($appName, $request);
 
         $this->config = $config;
+        $this->iConfig = $iConfig;
         $this->appRepository = $appRepository;
         $this->categoryFetcher = $categoryFetcher;
         $this->l10nFactory = $l10nFactory;
@@ -87,9 +96,9 @@ 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();
+        $isForced = $this->config->getAppValueBool('force', '0');
         $appsCategories = [];
         $categoriesAppsCount = [];
         $items = [];
@@ -100,10 +109,18 @@ class NavController extends Controller
             ]);
         }
 
+        $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
+
+        if (empty($categoriesLabels)) {
+            $categoriesLabels = $this->categoryFetcher->get();
+
+            $this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
+        }
+
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
         $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
 
-        if (!empty($userTopMenuApps)) {
+        if (!$isForced && !empty($userTopMenuApps)) {
             $topMenuApps = $userTopMenuApps;
         }
 
@@ -135,7 +152,7 @@ class NavController extends Controller
             foreach ($categories as $category) {
                 if (!isset($items[$category])) {
                     $items[$category] = [
-                        'name' => $categoriesLabels[$category],
+                        'name' => $categoriesLabels[$category] ?? $category,
                         'apps' => [],
                     ];
                 }

lib/Controller/PersonalSettingController.php

@@ -24,24 +24,31 @@ use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
 use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
 
 class PersonalSettingController extends Controller
 {
     /**
-     * @var \OCP\IConfig
+     * @var IConfig
      */
     protected $config;
 
+    /**
+     * @var ConfigProxy
+     */
+    protected $configProxy;
+
     /**
      * @var IUserSession
      */
-    private $userSession;
+    protected $userSession;
 
-    public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession)
+    public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession)
     {
         parent::__construct($appName, $request);
 
         $this->config = $config;
+        $this->configProxy = $configProxy;
         $this->userSession = $userSession;
     }
 
@@ -104,6 +111,10 @@ class PersonalSettingController extends Controller
             }
         }
 
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            $doSave = false;
+        }
+
         if ($doSave) {
             $this->config->setUserValue($user->getUid(), Application::APP_ID, $name, $value);
 

lib/Settings/Admin.php

@@ -18,13 +18,13 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Settings\ISettings;
-use OCA\SideMenu\AppInfo\Application;
 
 class Admin implements ISettings
 {
@@ -39,7 +39,7 @@ class Admin implements ISettings
     private $logger;
 
     /**
-     * @var IConfig
+     * @var ConfigProxy
      */
     private $config;
 
@@ -48,7 +48,7 @@ class Admin implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, IConfig $config, AppRepository $appRepository)
+    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, AppRepository $appRepository)
     {
         $this->l = $l;
         $this->logger = $logger;
@@ -61,32 +61,33 @@ class Admin implements ISettings
      */
     public function getForm()
     {
-        $backgroundColor = $this->config->getAppValue(Application::APP_ID, 'background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue(Application::APP_ID, 'background-color-to', $backgroundColor);
+        $backgroundColor = $this->config->getAppValue('background-color', '#333333');
+        $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
 
         $parameters = [
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
-            'current-app-background-color' => $this->config->getAppValue(Application::APP_ID, 'current-app-background-color', '#444444'),
-            'loader-color' => $this->config->getAppValue(Application::APP_ID, 'loader-color', '#0e75ac'),
-            'icon-invert-filter' => (int) $this->config->getAppValue(Application::APP_ID, 'icon-invert-filter', '0'),
-            'icon-opacity' => (int) $this->config->getAppValue(Application::APP_ID, 'icon-opacity', '100'),
-            'loader-enabled' => $this->config->getAppValue(Application::APP_ID, 'loader-enabled', '1'),
-            'text-color' => $this->config->getAppValue(Application::APP_ID, 'text-color', '#FFFFFF'),
-            'cache' => $this->config->getAppValue(Application::APP_ID, 'cache', '0'),
-            'opener' => $this->config->getAppValue(Application::APP_ID, 'opener', 'side-menu-opener'),
-            'always-displayed' => $this->config->getAppValue(Application::APP_ID, 'always-displayed', '0'),
-            'big-menu' => $this->config->getAppValue(Application::APP_ID, 'big-menu', '0'),
-            'display-logo' => $this->config->getAppValue(Application::APP_ID, 'display-logo', '1'),
-            'use-avatar' => $this->config->getAppValue(Application::APP_ID, 'use-avatar', '0'),
-            'opener-position' => $this->config->getAppValue(Application::APP_ID, 'opener-position', 'before'),
-            'opener-hover' => $this->config->getAppValue(Application::APP_ID, 'opener-hover', '0'),
-            'opener-only' => $this->config->getAppValue(Application::APP_ID, 'opener-only', '0'),
-            'hide-when-no-apps' => $this->config->getAppValue(Application::APP_ID, 'hide-when-no-apps', '0'),
-            'size-icon' => $this->config->getAppValue(Application::APP_ID, 'size-icon', 'normal'),
-            'size-text' => $this->config->getAppValue(Application::APP_ID, 'size-text', 'normal'),
-            'target-blank-apps' => (array) json_decode($this->config->getAppValue(Application::APP_ID, 'target-blank-apps', '[]'), true),
-            'top-menu-apps' => (array) json_decode($this->config->getAppValue(Application::APP_ID, 'top-menu-apps', '[]'), true),
+            'current-app-background-color' => $this->config->getAppValue('current-app-background-color', '#444444'),
+            'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
+            'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
+            'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
+            'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
+            'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
+            'cache' => $this->config->getAppValue('cache', '0'),
+            'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
+            'always-displayed' => $this->config->getAppValue('always-displayed', '0'),
+            'big-menu' => $this->config->getAppValue('big-menu', '0'),
+            'display-logo' => $this->config->getAppValue('display-logo', '1'),
+            'use-avatar' => $this->config->getAppValue('use-avatar', '0'),
+            'opener-position' => $this->config->getAppValue('opener-position', 'before'),
+            'opener-hover' => $this->config->getAppValue('opener-hover', '0'),
+            'opener-only' => $this->config->getAppValue('opener-only', '0'),
+            'hide-when-no-apps' => $this->config->getAppValue('hide-when-no-apps', '0'),
+            'size-icon' => $this->config->getAppValue('size-icon', 'normal'),
+            'size-text' => $this->config->getAppValue('size-text', 'normal'),
+            'force' => $this->config->getAppValue('force', '0'),
+            'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
+            'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
             'apps' => $this->appRepository->getVisibleApps(),
         ];
 

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/Personal.php

@@ -18,14 +18,14 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
 use OCP\ILogger;
-use OCP\Settings\ISettings;
-use OCP\IConfig;
 use OCP\IUserSession;
-use OCA\SideMenu\Service\AppRepository;
-use OCA\SideMenu\AppInfo\Application;
+use OCP\Settings\ISettings;
 
 class Personal implements ISettings
 {
@@ -40,7 +40,7 @@ class Personal implements ISettings
     private $logger;
 
     /**
-     * @var IConfig
+     * @var ConfigProxy
      */
     private $config;
 
@@ -54,7 +54,7 @@ class Personal implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, IConfig $config, IUserSession $userSession, AppRepository $appRepository)
+    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository)
     {
         $this->l = $l;
         $this->logger = $logger;
@@ -71,10 +71,11 @@ class Personal implements ISettings
         $user = $this->userSession->getUser();
 
         $parameters = [
-            'enabled' => $this->config->getUserValue($user->getUid(), Application::APP_ID, 'enabled', '1'),
-            'top-menu-apps' => (array) json_decode($this->config->getUserValue($user->getUid(), Application::APP_ID, 'top-menu-apps', '[]'), true),
-            'target-blank-mode' => $this->config->getUserValue($user->getUid(), Application::APP_ID, 'target-blank-mode', '1'),
-            'target-blank-apps' => (array) json_decode($this->config->getUserValue($user->getUid(), Application::APP_ID, 'target-blank-apps', '[]'), true),
+            'force' => $this->config->getAppValueBool('force', '0'),
+            'enabled' => $this->config->getUserValue($user, 'enabled', '1'),
+            'top-menu-apps' => $this->config->getUserValueArray($user, 'top-menu-apps', '[]'),
+            'target-blank-mode' => $this->config->getUserValue($user, 'target-blank-mode', '1'),
+            'target-blank-apps' => $this->config->getUserValueArray($user, 'target-blank-apps', '[]'),
             'apps' => $this->appRepository->getVisibleApps(),
         ];
 
@@ -91,8 +92,8 @@ class Personal implements ISettings
 
     /**
      * @return int whether the form should be rather on the top or bottom of
-     * the admin section. The forms are arranged in ascending order of the
-     * priority values. It is required to return a value between 0 and 100.
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
      *
      * E.g.: 70
      */

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/SideMenuBig.vue

@@ -23,6 +23,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
         <div class="side-menu-categories-wrapper">
             <div class="side-menu-categories">
+                <div v-if="!items.length" class="side-menu-loader">
+                    <svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="none" fill-rule="evenodd">
+                            <g transform="translate(1 1)" stroke-width="2">
+                                <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+                                <path d="M36 18c0-9.94-8.06-18-18-18">
+                                    <animateTransform
+                                        attributeName="transform"
+                                        type="rotate"
+                                        from="0 18 18"
+                                        to="360 18 18"
+                                        dur="1s"
+                                        repeatCount="indefinite"/>
+                                </path>
+                            </g>
+                        </g>
+                    </svg>
+                </div>
+
                 <div class="side-menu-category" v-for="category in items">
                     <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
 

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ü"
@@ -57,3 +57,5 @@
 "Use my selection": "Verwende meine Auswahl"
 "Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
 "Use the avatar instead of the logo": "Verwenden Sie den Avatar anstelle des Logos"
+"You do not have permission to change the settings.": "Sie haben keine Berechtigung zum Ändern der Einstellungen."
+"Force this configuration to users": "Erzwingen Sie diese Konfiguration für Benutzer"

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"
@@ -57,3 +57,5 @@
 "Use my selection": "Utiliser ma sélection"
 "Show and hide the list of applications": "Afficher et masquer la liste des applications"
 "Use the avatar instead of the logo": "Utiliser l'avatar à la place du logo"
+"You do not have permission to change the settings.": "Vous n'avez pas la permission de changer les paramètres."
+"Force this configuration to users": "Forcer cette configuration aux utilisateurs"

templates/js/_alwaysDisplayed.js

@@ -41,4 +41,28 @@ var alwaysDisplayed = function() {
     }
 }
 
-window.setTimeout(alwaysDisplayed, 200)
+let content = document.getElementById('content')
+
+if (content && content.classList.contains('app-settings')) {
+    let loaded = false
+    const config = {attributes: false, childList: true, subtree: true}
+    const observer = new MutationObserver(() => {
+        if (loaded) {
+            return;
+        }
+
+        const element = content.querySelector('#app-category-your-apps')
+            || content.querySelector('#app-navigation ul')
+
+        if (element) {
+            loaded = true
+
+            alwaysDisplayed()
+        }
+    })
+
+    observer.observe(content, config)
+} else {
+    window.setTimeout(alwaysDisplayed, 200)
+}
+

templates/js/_topMenuApps.js

@@ -108,6 +108,28 @@ var updateTopMenu = function() {
         k++
     })
 
+    // Hack for https://github.com/nextcloud/server/blob/23b0b63c213f5b31eecae817ffd4a9e26f6624d0/core/src/components/MainMenu.js#L74-L96
+    menu.undelegate('li:not(#more-apps) > a', 'click')
+    menu.delegate('li:not(#more-apps) > a', 'click', function(e) {
+        var a = $(e.target)
+
+        if (!a.is('a')) {
+            a = a.closest('a')
+        }
+
+        if (a.attr('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey && a.parent('#more-apps').length === 0) {
+            a.find('svg').remove()
+            a.find('div').remove()
+            a.prepend(jQuery('<div/>').addClass(
+                OCA.Theming && OCA.Theming.inverted
+                ? 'icon-loading-small'
+                : 'icon-loading-small-dark'
+            ))
+
+            window.location.href = a.attr('href')
+        }
+    })
+
     jQuery('#apps li.app-external-site').each(function(i, app) {
         app = jQuery(app)
         var appId = app.attr('data-id')

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/admin-form.php

@@ -18,7 +18,6 @@
 
 script('side_menu', 'admin');
 style('side_menu', 'admin');
-style('side_menu', 'support');
 
 $choicesYesNo = [
     'No' => '0',
@@ -473,6 +472,20 @@ $choicesSizes = [
     </div>
 
     <div class="section">
+        <div>
+            <label for="side-menu-opener-only">
+                <?php p($l->t('Force this configuration to users')); ?>
+            </label>
+
+            <select id="side-menu-force" name="force" class="side-menu-setting">
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['force']): ?>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']); ?>" class="side-menu-setting">
 
         <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>

templates/settings/personal-form.php

@@ -18,7 +18,6 @@
 
 script('side_menu', 'admin');
 style('side_menu', 'admin');
-style('side_menu', 'support');
 
 $choicesYesNo = [
     'No' => '0',
@@ -27,125 +26,142 @@ $choicesYesNo = [
 
 ?>
 
+
 <div id="side-menu-section">
-    <div class="section">
-        <h2>
-            <?php p($l->t('Menu')); ?>
-        </h2>
+    <?php if ($_['force']): ?>
+        <div class="section">
+            <h2>
+                <?php p($l->t('Menu')); ?>
+            </h2>
 
-        <div>
-            <label for="side-menu-enabled">
-                <?php p($l->t('Enable the side menu')); ?>
-            </label>
+            <p>
+                <em><?php echo $l->t('You do not have permission to change the settings.'); ?></em>
+            </p>
         </div>
+    <?php else: ?>
+        <div class="section">
+            <h2>
+                <?php p($l->t('Menu')); ?>
+            </h2>
 
-        <p>
-            <em><?php echo $l->t('Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'); ?></em>
-        </p>
 
-        <div>
-            <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
-                <?php foreach ($choicesYesNo as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label); ?>
-                    </option>
+
+            <div>
+                <label for="side-menu-enabled">
+                    <?php p($l->t('Enable the custom menu')); ?>
+                </label>
+            </div>
+
+            <p>
+                <em><?php echo $l->t('Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'); ?></em>
+            </p>
+
+            <div>
+                <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
+                    <?php foreach ($choicesYesNo as $label => $value): ?>
+                        <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
+                            <?php echo $l->t($label); ?>
+                        </option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+
+            <div>
+                <label for="side-menu-target-blank">
+                    <?php p($l->t('Open apps in new tab')); ?>
+                </label>
+            </div>
+
+            <div>
+                <?php $choices = [
+                    'Use the global setting' => '1',
+                    'Use my selection' => '2',
+                ]; ?>
+
+                <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
+                    <?php foreach ($choices as $label => $value): ?>
+                        <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
+                            <?php echo $l->t($label);  ?>
+                        </option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+
+            <p>
+                <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
+                    🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                </a>
+            </p>
+
+            <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
+                <?php foreach ($_['apps'] as $app): ?>
+                    <div>
+                        <input
+                            type="checkbox"
+                            name="target-blank-apps[]"
+                            value="<?php echo $app['id'] ?>"
+                            id="target-blank-app-<?php echo $app['id'] ?>"
+                            <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
+                        />
+
+                        <label for="target-blank-app-<?php echo $app['id'] ?>">
+                            <?php echo p($l->t($app['name'])); ?>
+                        </label>
+                    </div>
                 <?php endforeach; ?>
-            </select>
+            </div>
         </div>
 
-        <div>
-            <label for="side-menu-target-blank">
-                <?php p($l->t('Open apps in new tab')); ?>
-            </label>
-        </div>
+        <div class="section">
+            <h2>
+                <?php p($l->t('Top menu')); ?>
+            </h2>
+            <div>
+                <label for="side-menu-top-menu-apps">
+                    <?php p($l->t('Apps that not must be moved in the side menu')); ?>
+                </label>
+            </div>
 
-        <div>
-            <?php $choices = [
-                'Use the global setting' => '1',
-                'Use my selection' => '2',
-            ]; ?>
+            <p>
+                <em>
+                    <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
+                </em>
+            </p>
 
-            <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
-                <?php foreach ($choices as $label => $value): ?>
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
-                        <?php echo $l->t($label);  ?>
-                    </option>
+            <p>
+                <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
+                    🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                </a>
+            </p>
+
+            <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
+                <?php foreach ($_['apps'] as $app): ?>
+                    <div>
+                        <input
+                            type="checkbox"
+                            name="top-menu-apps[]"
+                            value="<?php echo $app['id'] ?>"
+                            id="top-menu-app-<?php echo $app['id'] ?>"
+                            <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
+                        />
+
+                        <label for="top-menu-app-<?php echo $app['id'] ?>">
+                            <?php echo $app['name'] ?>
+                        </label>
+                    </div>
                 <?php endforeach; ?>
-            </select>
+            </div>
         </div>
-
-        <p>
-            <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-            </a>
-        </p>
-
-        <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
-            <?php foreach ($_['apps'] as $app): ?>
-                <div>
-                    <input
-                        type="checkbox"
-                        name="target-blank-apps[]"
-                        value="<?php echo $app['id'] ?>"
-                        id="target-blank-app-<?php echo $app['id'] ?>"
-                        <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
-                    />
-
-                    <label for="target-blank-app-<?php echo $app['id'] ?>">
-                        <?php echo p($l->t($app['name'])); ?>
-                    </label>
-                </div>
-            <?php endforeach; ?>
-        </div>
-    </div>
+    <?php endif ?>
 
     <div class="section">
-        <h2>
-            <?php p($l->t('Top menu')); ?>
-        </h2>
-        <div>
-            <label for="side-menu-top-menu-apps">
-                <?php p($l->t('Apps that not must be moved in the side menu')); ?>
-            </label>
-        </div>
+        <?php if (!$_['force']): ?>
+            <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
 
-        <p>
-            <em>
-                <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
-            </em>
-        </p>
+            <span id="side-menu-message" class="msg"></span>
 
-        <p>
-            <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-            </a>
-        </p>
-
-        <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
-            <?php foreach ($_['apps'] as $app): ?>
-                <div>
-                    <input
-                        type="checkbox"
-                        name="top-menu-apps[]"
-                        value="<?php echo $app['id'] ?>"
-                        id="top-menu-app-<?php echo $app['id'] ?>"
-                        <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
-                    />
-
-                    <label for="top-menu-app-<?php echo $app['id'] ?>">
-                        <?php echo $app['name'] ?>
-                    </label>
-                </div>
-            <?php endforeach; ?>
-        </div>
-    </div>
-
-    <div class="section">
-        <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
-
-        <span id="side-menu-message" class="msg"></span>
-
-        <div style="height: 30px"></div>
+            <div style="height: 30px"></div>
+        <?php endif ?>
 
         <div>
             <span for="side-menu-opener">