Skip to content

Fix bugs issues #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −11
Open

Fix bugs issues #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1503686
Fix minor bug in header.blade
MichaelPluz May 15, 2021
cc71b8b
Fix potential issue in FreelyPositionedMenus
MichaelPluz May 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/MenuBuilder/FreelyPositionedMenus.php
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ private static function renderDropdown($data, $prefixClass){
echo '<li class="' . $prefixClass . 'nav-item dropdown px-3">';
echo '<a class="' . $prefixClass . 'nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" href="#">';
if($data['hasIcon'] === true && $data['iconType'] === 'coreui'){
echo '<i class="' . $data['icon'] . ' ' . $prefixClass . 'nav-icon"></i>';
echo '<i class="' . $data['icon'] . ' ' . $prefixClass . 'nav-icon"></i>';
}
echo $data['name'] . '</a>';
echo '<div class="dropdown-menu">';
@@ -22,7 +22,7 @@ private static function renderDropdown($data, $prefixClass){
}else{
for($i = 0; $i < count($data); $i++){
if( $data[$i]['slug'] === 'link' ){
echo '<a class="' . $prefixClass . 'nav-link dropdown-item" href="' . env('APP_URL', '') . $data[$i]['href'] . '">';
echo '<a class="' . $prefixClass . 'nav-link dropdown-item" href="' . url($data[$i]['href']) . '">';
echo '<span class="' . $prefixClass . 'nav-icon"></span>' . $data[$i]['name'] . '</a>';
}elseif( $data[$i]['slug'] === 'dropdown' ){
self::renderDropdown( $data[$i], $prefixClass );
@@ -35,19 +35,19 @@ private static function renderDropdown($data, $prefixClass){
* Render menu nav
* @param $data - array, result of GetSidebarMenu->get function
* @param $prefixClass - prefix to be placed before detailed classes
* @param $navClass - class to be placed in nav
* @param $navClass - class to be placed in nav
*/
public static function render($data, $prefixClass = '', $navClass = ''){
echo '<ul class="' . $prefixClass . 'nav ' . $navClass . '">';
foreach($data as $d){
if($d['slug'] === 'link'){
echo '<li class="' . $prefixClass .'nav-item px-3">';
echo '<a class="' . $prefixClass . 'nav-link" href="' . env('APP_URL', '') . $d['href'] . '">';
echo '<a class="' . $prefixClass . 'nav-link" href="' . url( $d['href'] ) . '">';
if($d['hasIcon'] === true){
if($d['iconType'] === 'coreui'){
echo '<i class="' . $d['icon'] . ' ' . $prefixClass . 'nav-icon"></i>';
}
}
}
echo $d['name'];
echo '</a>';
echo '</li>';
@@ -59,12 +59,12 @@ public static function render($data, $prefixClass = '', $navClass = ''){
if($d['iconType'] === 'coreui'){
echo '<i class="' . $d['icon'] . ' ' . $prefixClass . 'nav-icon"></i>';
}
}
}
echo $d['name'];
echo '</li>';
}
}
echo '</ul>';
}

}
}
10 changes: 6 additions & 4 deletions resources/views/dashboard/shared/header.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@


<div class="c-wrapper">
<header class="c-header c-header-light c-header-fixed c-header-with-subheader">
<button class="c-header-toggler c-class-toggler d-lg-none mr-auto" type="button" data-target="#sidebar" data-class="c-sidebar-show"><span class="c-header-toggler-icon"></span></button><a class="c-header-brand d-sm-none" href="#"><img class="c-header-brand" src="{{ url('/assets/brand/coreui-base.svg" width="97" height="46" alt="CoreUI Logo"></a>
<button class="c-header-toggler c-class-toggler d-lg-none mr-auto" type="button" data-target="#sidebar" data-class="c-sidebar-show"><span class="c-header-toggler-icon"></span></button>
<a class="c-header-brand d-sm-none" href="#"><img class="c-header-brand" src="{{ url('/assets/brand/coreui-base.svg') }}" width="97" height="46" alt="CoreUI Logo"></a>

<button class="c-header-toggler c-class-toggler ml-3 d-md-down-none" type="button" data-target="#sidebar" data-class="c-sidebar-lg-show" responsive="true"><span class="c-header-toggler-icon"></span></button>
<?php
use App\MenuBuilder\FreelyPositionedMenus;
if(isset($appMenus['top menu'])){
FreelyPositionedMenus::render( $appMenus['top menu'] , 'c-header-', 'd-md-down-none');
}
?>
?>
<ul class="c-header-nav ml-auto mr-4">
<li class="c-header-nav-item d-md-down-none mx-2"><a class="c-header-nav-link">
<svg class="c-icon">
@@ -77,4 +79,4 @@
@endfor
</ol>
</div>
</header>
</header>