Skip to content

Commit dcb3d91

Browse files
committed
remove some smarty warnings
1 parent 50c9589 commit dcb3d91

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

framework/modules/navigation/models/section.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ public static function navhierarchy($notyui=false) {
424424
$obj->text = $sections[$i]->name;
425425
$obj->title = $sections[$i]->page_title;
426426
$obj->description = $sections[$i]->description;
427+
// $obj->depth = 0;
427428
$obj->new_window = $sections[$i]->new_window;
428429
$obj->expFile = $sections[$i]->expFile;
429430
$obj->glyph = $sections[$i]->glyph;

framework/plugins/bootstrap4/function.bootstrap_navbar.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function build_menu($page, $params) {
8888
$menu .= ' class="nav-item disabled';
8989
else
9090
$menu .= ' class="nav-item';
91-
if ($page->depth)
91+
if (!empty($page->depth))
9292
$menu .= '"><a class="dropdown-item' . $active . '" href="'.$page->url.'"'.($page->new_window?' target="_blank"':'') . ' title="'. $page->title .'">' . $menu_item . '</a></li>'."\n";
9393
else
9494
$menu .= '"><a class="nav-link" href="'.$page->url.'"'.($page->new_window?' target="_blank"':'') . ' title="'. $page->title .'">' . $menu_item . '</a></li>'."\n";
@@ -102,12 +102,12 @@ function build_menu($page, $params) {
102102
$active = " nav-item active";
103103
$menu .= ' active';
104104
}
105-
if ($page->depth)
105+
if (!empty($page->depth))
106106
$menu .= '"><a href="'.$page->url.'" data-target="dropdownMenu' . $page->id . '" class="dropdown-item dropdown-toggle' . $active . '" href="'.$page->url.'" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"'.($page->new_window?' target="_blank"':'').' title="'. $page->title .'">' . $menu_item;
107-
else
108-
$menu .= '"><a href="'.$page->url.'" data-target="dropdownMenu' . $page->id . '" class="nav-link dropdown-toggle" href="'.$page->url.'" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"'.($page->new_window?' target="_blank"':'').' title="'. $page->title .'">' . $menu_item;
109-
if (empty($page->depth))
107+
else {
108+
$menu .= '"><a href="' . $page->url . '" data-target="dropdownMenu' . $page->id . '" class="nav-link dropdown-toggle" href="' . $page->url . '" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"' . ($page->new_window ? ' target="_blank"' : '') . ' title="' . $page->title . '">' . $menu_item;
110109
$menu .= '<b class="caret"></b>';
110+
}
111111
$menu .= '</a>'."\n".'<ul class="dropdown-menu'.($params['menualign']==='right'?' float-right':'').'" role="menu" id="dropdownMenu' . $page->id . ' aria-labelledby="dropdownMenu' . $page->id . '">'."\n";
112112
if ($page->url !== "#") { // we also need a 'menu item' for active parent pages
113113
$topmenu = new stdClass();

framework/plugins/bootstrap5/function.bootstrap_navbar.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function build_menu($page, $params) {
9090
$menu .= ' class="nav-item disabled';
9191
else
9292
$menu .= ' class="nav-item';
93-
if ($page->depth)
93+
if (!empty($page->depth))
9494
$menu .= '"><a class="dropdown-item' . $active . '" href="'.$page->url.'"'.($page->new_window?' target="_blank"':'') . ' title="'. $page->title .'">' . $menu_item . '</a></li>'."\n";
9595
else
9696
$menu .= '"><a class="nav-link" href="'.$page->url.'"'.($page->new_window?' target="_blank"':'') . ' title="'. $page->title .'">' . $menu_item . '</a></li>'."\n";
@@ -104,12 +104,12 @@ function build_menu($page, $params) {
104104
$active = " nav-item active";
105105
$menu .= ' active';
106106
}
107-
if ($page->depth)
107+
if (!empty($page->depth))
108108
$menu .= '"><a href="'.$page->url.'" data-bs-target="dropdownMenu' . $page->id . '" class="dropdown-item dropdown-toggle' . $active . '" href="'.$page->url.'" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"'.($page->new_window?' target="_blank"':'').' title="'. $page->title .'">' . $menu_item;
109-
else
110-
$menu .= '"><a href="'.$page->url.'" data-bs-target="dropdownMenu' . $page->id . '" class="nav-link dropdown-toggle" href="'.$page->url.'" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"'.($page->new_window?' target="_blank"':'').' title="'. $page->title .'">' . $menu_item;
111-
if (empty($page->depth))
109+
else {
110+
$menu .= '"><a href="' . $page->url . '" data-bs-target="dropdownMenu' . $page->id . '" class="nav-link dropdown-toggle" href="' . $page->url . '" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"' . ($page->new_window ? ' target="_blank"' : '') . ' title="' . $page->title . '">' . $menu_item;
112111
$menu .= '<b class="caret"></b>';
112+
}
113113
$menu .= '</a>'."\n".'<ul class="dropdown-menu'.($params['menualign']==='right'?' float-right':'').'" role="menu" id="dropdownMenu' . $page->id . ' aria-labelledby="dropdownMenu' . $page->id . '">'."\n";
114114
if ($page->url !== "#") { // we also need a 'menu item' for active parent pages
115115
$topmenu = new stdClass();

0 commit comments

Comments
 (0)