diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php index f6ed7b2..0bbeebf 100644 --- a/lib/Controller/JsController.php +++ b/lib/Controller/JsController.php @@ -52,6 +52,7 @@ class JsController extends Controller public function script() { $parameters = [ + 'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'), 'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'), ]; diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index c3b3207..98e47b6 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -54,6 +54,7 @@ class Admin implements ISettings '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'), + 'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'), 'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'), ]; diff --git a/src/admin.js b/src/admin.js index aa923f6..fbed5bc 100644 --- a/src/admin.js +++ b/src/admin.js @@ -20,6 +20,7 @@ const elements = [ 'side-menu-current-app-background-color', 'side-menu-text-color', 'side-menu-opener', + 'side-menu-opener-position', 'side-menu-opener-hover', 'side-menu-display-logo', 'side-menu-cache', diff --git a/templates/js/script.php b/templates/js/script.php index 6ceaff9..b93058e 100644 --- a/templates/js/script.php +++ b/templates/js/script.php @@ -7,7 +7,12 @@ body.append(sideMenuContainer) sideMenuContainer.append(sideMenu) - sideMenuOpener.insertBefore('#nextcloud') + + + sideMenuOpener.insertBefore('#nextcloud') + + sideMenuOpener.insertAfter('#nextcloud') + var isTouchDevice = window.matchMedia("(pointer: coarse)").matches diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php index bd8a012..0db40de 100644 --- a/templates/settings/admin-form.php +++ b/templates/settings/admin-form.php @@ -19,115 +19,153 @@ script('side_menu', 'admin'); style('side_menu', 'admin'); +$choicesYesNo = [ + 'No' => '0', + 'Yes' => '1', +]; ?> -