From c67b54956f175c4f8d043172ed15a697b15ba248 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 13 Aug 2019 16:36:54 +0200 Subject: [PATCH] done #2904 @6 --- .../views/components/flexible-image.blade.php | 7 ++- .../views/components/link-button.blade.php | 26 +++++++++-- resources/views/pages/home.blade.php | 45 ++++++++++--------- resources/views/partials/intro.blade.php | 5 ++- 4 files changed, 55 insertions(+), 28 deletions(-) diff --git a/resources/views/components/flexible-image.blade.php b/resources/views/components/flexible-image.blade.php index 41ac434..08ec906 100644 --- a/resources/views/components/flexible-image.blade.php +++ b/resources/views/components/flexible-image.blade.php @@ -8,11 +8,16 @@ @if ($src) @php + $url=$src; + if(!file_exists($src)){ + $src=public_path().$src; + } $meta = getimagesize($src); $ratio = $meta[1] / $meta[0] * 100 .'%'; // Height / Width @endphp -
+
{{-- Proportional padding only comes into effect when columns stack (small screens) --}} {{-- This makes the image more flexible when in columns... --}} diff --git a/resources/views/components/link-button.blade.php b/resources/views/components/link-button.blade.php index b1ad034..6a5a63a 100644 --- a/resources/views/components/link-button.blade.php +++ b/resources/views/components/link-button.blade.php @@ -1,3 +1,23 @@ - - {{ $slot }} - +@php + $text=$slot; + $enabled=true; + if(isset($data) && is_array($data)){ + if($data['type']=='none'){ + $enabled=false; + } else if($data['type']=='external_link'){ + $href=$data['external_link']; + }else if($data['type']=='internal_link'){ + $href='/'.ltrim($data['link'],'/'); + }else if($data['type']=='page_link'){ + $href=\Cubist\Backpack\app\Magic\Menu\Menu::internalToHref($data['page_id']); + } + $text=$data['label']; + } + +@endphp + +@if($enabled) + + {{ $text }} + +@endif diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php index 58f34d5..1607741 100644 --- a/resources/views/pages/home.blade.php +++ b/resources/views/pages/home.blade.php @@ -8,34 +8,34 @@ {{-- Slider --}} - - - - + @foreach($page->get('slideshow') as $slide) + + + + - + -

- Wheel Force Transducers (WFT) are used for measuring all wheel forces and moments. Field and - laboratory test of passenger cars, light duty trucks, heavy duty trucks, vans, SUVs, class 8 - trucks, heavy duty construction and farm equipment. -

+

+ {!! nl2br($slide['text']) !!} +

-

- Découvrir -

+

+ +

-
+
-
+
- - - + + + -
-
-
+ + + + @endforeach {{-- Intro text --}} @intro(['padding' => 'pt-5v pb-4v']) @@ -131,7 +131,8 @@
{{--Todo: handle missing images + get correct image size--}} - {{ $newsItem->title }} + {{ $newsItem->title }}

{{ $newsItem->title }}

{{ $newsItem['chapo'] }}

diff --git a/resources/views/partials/intro.blade.php b/resources/views/partials/intro.blade.php index dc7b91b..f4f3c87 100644 --- a/resources/views/partials/intro.blade.php +++ b/resources/views/partials/intro.blade.php @@ -8,6 +8,7 @@ $image = $page->getImageURL("$name.image",'',asset('storage/uploads/images/products-intro.jpg')); $class = $class ?? ''; $padding = $padding ?? null; // Pass null so it doesn't override default padding + $button=$page->get("$name.button"); @endphp @@ -22,9 +23,9 @@ - @markdown($page->get("$name.text")) +

@markdown($page->get("$name.text"))

- {{-- Todo: handle button here... $page->get("$name.button") --}} +

-- 2.39.5