kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 01:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Add embedded mode (hides menu and so on), maybe need for #98

Browse Source
This commit is contained in:
Bernd Bestel 2018-11-17 12:57:35 +01:00
parent 0f73d849eb
commit 973f07b360
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/BaseController.php
View File

@ -42,9 +42,18 @@ class BaseController
return $container->UrlManager->ConstructUrl($relativePath, $isResource); 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(); $usersService = new UsersService();
if (defined('GROCY_USER_ID')) { if (defined('GROCY_USER_ID'))
{
$container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID)); $container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID));
} }
} }

10
public/css/grocy.css
View File

@ -72,6 +72,16 @@ button.disabled {
pointer-events: none; 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 */ /* Hide the default up/down arrow buttons for number inputs because we use our own buttons in numberpicker */
input[type='number'] { input[type='number'] {
-moz-appearance: textfield; -moz-appearance: textfield;

4
views/layout/default.blade.php
View File

@ -46,7 +46,8 @@
</script> </script>
</head> </head>
<body class="fixed-nav @if(boolval($userSettings['night_mode_enabled']) || (boolval($userSettings['auto_night_mode_enabled']) && boolval($userSettings['currently_inside_night_mode_range']))) night-mode @endif"> <body class="fixed-nav @if(boolval($userSettings['night_mode_enabled']) || (boolval($userSettings['auto_night_mode_enabled']) && boolval($userSettings['currently_inside_night_mode_range']))) night-mode @endif @if($embedded) embedded @endif">
@if(!($embedded))
<nav id="mainNav" class="navbar navbar-expand-lg navbar-light fixed-top"> <nav id="mainNav" class="navbar navbar-expand-lg navbar-light fixed-top">
<a class="navbar-brand py-0" href="{{ $U('/') }}"><img src="{{ $U('/img/grocy_logo.svg?v=', true) }}{{ $version }}" height="30"></a> <a class="navbar-brand py-0" href="{{ $U('/') }}"><img src="{{ $U('/img/grocy_logo.svg?v=', true) }}{{ $version }}" height="30"></a>
@ -264,6 +265,7 @@
</ul> </ul>
</div> </div>
</nav> </nav>
@endif
<div class="content-wrapper"> <div class="content-wrapper">
<div class="container-fluid"> <div class="container-fluid">

2
views/purchase.blade.php
View File

@ -54,7 +54,7 @@
</form> </form>
</div> </div>
<div class="col-xs-12 col-md-6 col-xl-4"> <div class="col-xs-12 col-md-6 col-xl-4 hide-when-embedded">
@include('components.productcard') @include('components.productcard')
</div> </div>
</div> </div>