From 8b20b11ce26ddaaeeb455386bef77a061b796570 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Thu, 16 Apr 2020 12:18:10 +0200
Subject: [PATCH] fix #7: Opener icon not visible in Safari

---
 lib/Controller/CssController.php | 6 ++++++
 templates/css/stylesheet.php     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php
index f201547..3d3e28a 100644
--- a/lib/Controller/CssController.php
+++ b/lib/Controller/CssController.php
@@ -38,6 +38,7 @@ class CssController extends Controller
     public function __construct($appName, IRequest $request, IConfig $config)
     {
         parent::__construct($appName, $request);
+
         $this->config = $config;
     }
 
@@ -50,6 +51,10 @@ 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 = [
             'vars' => [
                 'background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
@@ -58,6 +63,7 @@ class CssController extends Controller
                 'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
             ],
             'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1),
+            'assetsRoot' => $assetsRoot,
         ];
 
         $response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');
diff --git a/templates/css/stylesheet.php b/templates/css/stylesheet.php
index d347ae0..ccb4864 100644
--- a/templates/css/stylesheet.php
+++ b/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('../img/<?php echo $value ?>.svg');
+            --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; ?>