From 973f07b3605e954d08e6c8e2deb5aaf12baadd14 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 17 Nov 2018 12:57:35 +0100 Subject: [PATCH] Add embedded mode (hides menu and so on), maybe need for #98 --- controllers/BaseController.php | 13 +++++++++++-- public/css/grocy.css | 10 ++++++++++ views/layout/default.blade.php | 4 +++- views/purchase.blade.php | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/controllers/BaseController.php b/controllers/BaseController.php index 2e1f9eb0..806235e8 100644 --- a/controllers/BaseController.php +++ b/controllers/BaseController.php @@ -42,9 +42,18 @@ class BaseController return $container->UrlManager->ConstructUrl($relativePath, $isResource); }); - try { + $embedded = false; + if (isset($container->request->getQueryParams()['embedded'])) + { + $embedded = true; + } + $container->view->set('embedded', $embedded); + + try + { $usersService = new UsersService(); - if (defined('GROCY_USER_ID')) { + if (defined('GROCY_USER_ID')) + { $container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID)); } } diff --git a/public/css/grocy.css b/public/css/grocy.css index 51dc9cf1..f43fc046 100644 --- a/public/css/grocy.css +++ b/public/css/grocy.css @@ -72,6 +72,16 @@ button.disabled { pointer-events: none; } +.embedded .hide-when-embedded { + display: none; +} +body.embedded.fixed-nav { + padding-top: 0; +} +.embedded .content-wrapper { + margin-left: 0; +} + /* Hide the default up/down arrow buttons for number inputs because we use our own buttons in numberpicker */ input[type='number'] { -moz-appearance: textfield; diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php index ff211688..3d6145bd 100644 --- a/views/layout/default.blade.php +++ b/views/layout/default.blade.php @@ -46,7 +46,8 @@ - + + @if(!($embedded)) + @endif
diff --git a/views/purchase.blade.php b/views/purchase.blade.php index bbcc742b..e5d209ce 100644 --- a/views/purchase.blade.php +++ b/views/purchase.blade.php @@ -54,7 +54,7 @@
-
+
@include('components.productcard')