Skip to content

Commit d16d976

Browse files
berrndberrnd
committed
Simplified viewjs / active page handling
1 parent ddf0ff0 commit d16d976

File tree

74 files changed

+77
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+77
-249
lines changed

‎controllers/BaseController.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ protected function getUsersService()
114114
return UsersService::getInstance();
115115
}
116116

117-
protected function render($response, $page, $data = [])
117+
protected function render($response, $viewName, $data = [])
118118
{
119119
$container = $this->AppContainer;
120120

@@ -159,8 +159,8 @@ protected function render($response, $page, $data = [])
159159
unset($constants[$constant]);
160160
}
161161
}
162-
163162
$this->View->set('featureFlags', $constants);
163+
164164
if (GROCY_AUTHENTICATED)
165165
{
166166
$this->View->set('permissions', User::PermissionList());
@@ -177,10 +177,12 @@ protected function render($response, $page, $data = [])
177177
$this->View->set('DEFAULT_MIN_AMOUNT', $defaultMinAmount);
178178
}
179179

180-
return $this->View->render($response, $page, $data);
180+
$this->View->set('viewName', $viewName);
181+
182+
return $this->View->render($response, $viewName, $data);
181183
}
182184

183-
protected function renderPage($response, $page, $data = [])
185+
protected function renderPage($response, $viewName, $data = [])
184186
{
185187
$this->View->set('userentitiesForSidebar', $this->getDatabase()->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name'));
186188
try
@@ -200,7 +202,7 @@ protected function renderPage($response, $page, $data = [])
200202
// Happens when database is not initialised or migrated...
201203
}
202204

203-
return $this->render($response, $page, $data);
205+
return $this->render($response, $viewName, $data);
204206
}
205207

206208
private static $htmlPurifierInstance = null;

‎public/js/grocy_menu_layout.js

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,12 @@ if (window.localStorage.getItem("sidebar_state") === "collapsed")
3333
$("#sidenavToggler").click();
3434
}
3535

36-
if (Grocy.ActiveNav)
36+
// Make sure the current active menu item is visible
37+
var activeMenuItem = $("li.active-page");
38+
if (activeMenuItem.length > 0)
3739
{
38-
var menuItem = $('#sidebarResponsive').find("[data-nav-for-page='" + Grocy.ActiveNav + "']");
39-
if (menuItem)
40+
if (!activeMenuItem.isVisibleInViewport(75))
4041
{
41-
menuItem.addClass('active-page');
42-
43-
var parentMenuSelector = menuItem.data("sub-menu-of");
44-
if (parentMenuSelector)
45-
{
46-
$(parentMenuSelector).collapse("show");
47-
$(parentMenuSelector).prev(".nav-link-collapse").addClass("active-page");
48-
49-
$(parentMenuSelector).on("shown.bs.collapse", function(e)
50-
{
51-
if (!menuItem.isVisibleInViewport(75))
52-
{
53-
menuItem[0].scrollIntoView();
54-
}
55-
})
56-
}
57-
else
58-
{
59-
if (!menuItem.isVisibleInViewport(75))
60-
{
61-
menuItem[0].scrollIntoView();
62-
}
63-
}
42+
activeMenuItem[0].scrollIntoView();
6443
}
6544
}

‎views/about.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@extends('layout.default')
22

33
@section('title', $__t('About Grocy'))
4-
@section('viewJsName', 'about')
54

65
@section('content')
76
<div class="row">

‎views/barcodescannertesting.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
@section('title', $__t('Barcode scanner testing'))
44

5-
@section('viewJsName', 'barcodescannertesting')
6-
75
@push('pageScripts')
86
<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
97
rel="stylesheet">

‎views/batteries.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@extends('layout.default')
22

33
@section('title', $__t('Batteries'))
4-
@section('activeNav', 'batteries')
5-
@section('viewJsName', 'batteries')
64

75
@section('content')
86
<div class="row">

‎views/batteriesjournal.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@extends('layout.default')
22

33
@section('title', $__t('Batteries journal'))
4-
@section('activeNav', 'batteriesjournal')
5-
@section('viewJsName', 'batteriesjournal')
64

75
@section('content')
86
<div class="row">

‎views/batteriesoverview.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@extends('layout.default')
22

33
@section('title', $__t('Batteries overview'))
4-
@section('activeNav', 'batteriesoverview')
5-
@section('viewJsName', 'batteriesoverview')
64

75
@push('pageStyles')
86
<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"

‎views/batteriessettings.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
@section('title', $__t('Batteries settings'))
44

5-
@section('viewJsName', 'batteriessettings')
6-
75
@section('content')
86
<div class="row">
97
<div class="col">

‎views/batteryform.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
@section('title', $__t('Create battery'))
77
@endif
88

9-
@section('viewJsName', 'batteryform')
10-
119
@section('content')
1210
<div class="row">
1311
<div class="col">

‎views/batterytracking.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@extends('layout.default')
22

33
@section('title', $__t('Battery tracking'))
4-
@section('activeNav', 'batterytracking')
5-
@section('viewJsName', 'batterytracking')
64

75
@section('content')
86
<div class="row">

0 commit comments

Comments
 (0)