jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix active hierarchy in menu and megamenu

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-03-14 21:46:57 +01:00
parent 3943fc033f
commit 695d23a139
8 changed files with 74 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/css/site.css
View File

@@ -201,7 +201,7 @@ div.megamenu ul.megamenu li.megamenu.level1
cursor: pointer;
}
#navbarContent > ul > li:hover, #navbarContent > ul > li.show
#navbarContent > ul > li:hover, #navbarContent > ul > li.show, #navbarContent > ul > li.active
{
border-bottom: 3px solid #F2B90F!important;
}
@@ -217,7 +217,7 @@ div.megamenu ul.megamenu li.megamenu.level1
}
.dropdown-menu a > div.w-100:hover
.dropdown-menu a > div.w-100:hover, .dropdown-menu a > div.w-100.active
{
color: #335012;
background-color: #F2B90F;

2
resources/views/Admin/Shop/Invoices/edit.blade.php
View File

@@ -40,7 +40,7 @@
<div class="col-6">
<div class="row mb-3">
<div class="col-6" style="font-size: 1.2em; font-weight: 500;">
Facture <br/>
Facture N° {{ $invoice['ref'] }}<br/>
du {{ Carbon\Carbon::parse($invoice['created_at'])->isoFormat('LLLL') }}
</div>
<div class="col-6">

40
resources/views/Shop/Invoices/pdf.blade.php Normal file
View File

@@ -0,0 +1,40 @@
@extends('Shop.layout.print')
@section('content')
<div class="row mb-3">
<div class="col-6">
<h3>{{ $invoice['order']['customer']['last_name'] }} {{ $invoice['order']['customer']['first_name'] }}</h3>
<div class="row">
<div class="col-12">
<h6>
@if ($invoice['order']['address'])
{{ $invoice['order']['address']['address'] }}<br/>
@isset ($invoice['order']['address']['address2'])
{{ $invoice['order']['address']['address2'] }}<br/>
@endisset
{{ $invoice['order']['address']['zipcode'] }} {{ $invoice['order']['address']['city'] }}<br/>
@endif
</h6>
</div>
</div>
</div>
<div class="col-6">
<div class="row mb-3">
<div class="col-6" style="font-size: 1.2em; font-weight: 500;">
Facture N° {{ $invoice['ref'] }}<br/>
du {{ Carbon\Carbon::parse($invoice['created_at'])->isoFormat('LLLL') }}
</div>
<div class="col-6">
</div>
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-12">
@include('Admin.Shop.Orders.partials.detail', ['detail_type' => 'facture', 'order' => $invoice['order']])
</div>
</div>
@endsection

6
resources/views/Shop/layout/partials/header-nav.blade.php
View File

@@ -1,15 +1,15 @@
<div class="row bg-light">
<div class="col-5">
<div class="col-sm-6 col-lg-5">
<a href="/"><img src="/img/logo.png" height="52"></a>
<span class="green ml-3">Variétés Paysannes de la Semence à l'Assiette</span>
</div>
<div class="col-3 pt-2">
<div class="col-sm-6 col-lg-3 pt-2">
@include("Shop.layout.partials.search")
</div>
<div class="col-4 pt-2 text-right">
<div class="col-sm-12 col-lg-4 pt-2 text-right">
@include('Shop.layout.partials.header-catalog')
@include("Shop.layout.partials.header-profile")
@include("Shop.layout.partials.header-basket")

4
resources/views/Shop/layout/partials/megamenu.blade.php
View File

@@ -3,9 +3,9 @@
@endphp
<div class="container p-0">
<div class="row m-0 shadow bg-white p-2 w-100">
<div class="row m-0 shadow bg-white p-2 w-100 @if ( in_array($menu['id'], [$category['id'], $category['parent_id']])) active @endif">
<div class="col mb-4">
<a class="green-dark @if (($category['id'] ?? false) == $menu['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}">
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}">
<div class="w-100"><strong>Tous les articles</strong></div>
</a>
@for ($i = 0; $i < count($submenu[0]); $i++)

10
resources/views/Shop/layout/partials/megamenu_leafs.blade.php
View File

@@ -1,8 +1,10 @@
<a class="green-dark @if (($category['id'] ?? false) == $menu_children['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $menu_children['id']]) }}">
<div class="w-100"><strong>{{ $menu_children['name'] }}</strong></div>
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $menu_children['id']]) }}">
<div class="w-100 @if (in_array($menu_children['id'], [$category['id'], $category['parent_id']])) active @endif">
<strong>{{ $menu_children['name'] }}</strong>
</div>
</a>
@foreach ($menu_children['children'] ?? [] as $leaf)
<a class="green-dark @if (($category['id'] ?? false) == $leaf['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
<div class="w-100">{{ $leaf['name'] }}</div>
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
<div class="w-100 @if (($category['id'] ?? false) == $leaf['id']) active @endif">{{ $leaf['name'] }}</div>
</a>
@endforeach

7
resources/views/Shop/layout/partials/sections.blade.php
View File

@@ -4,16 +4,17 @@
<div class="collapse navbar-collapse" id="navbarContent">
<ul class="navbar-nav w-100">
@foreach ($categories as $menu)
<li class="nav-item dropdown megamenu p-2 col">
<li class="nav-item dropdown megamenu p-2 col
@if (in_array($menu['id'], [$category['id'], $category['parent_id'], $category['parent']['parent_id'] ?? false])) active @endif">
@if ($menu['children'] ?? false)
<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle text-uppercase @if (($category['id'] ?? false) == $menu['id']) active @endif">
<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle text-uppercase">
{{ $menu['name'] }}
</a>
<div aria-labelledby="megamenu_{{ $menu['id'] }}" class="dropdown-menu border-0 p-0 m-0">
@include('Shop.layout.partials.megamenu')
</div>
@else
<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link text-uppercase text-white @if (($category['id'] ?? false) == $menu['id']) active @endif">
<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link text-uppercase text-white">
{{ $menu['name'] }}
</a>
@endif

16
resources/views/Shop/layout/print.blade.php Normal file
View File

@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html lang="{{ App::getLocale() }}" dir="@lang('boilerplate::layout.direction')">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="robots" content="noindex, nofollow">
<title>{{ $title ?? '' }} | {{ config('app.name') }}</title>
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet">
<link rel="stylesheet" href="/assets/css/main.min.css?{{ time() }}">
</head>
<body>
@yield('content')
</body>
</html>