From: Stephen Cameron Date: Wed, 10 Jul 2019 16:11:53 +0000 (+0200) Subject: WIP #2738 @7 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7590273a863ebc2e08557de921d8df4bef28858f;p=pmi.git WIP #2738 @7 --- diff --git a/app/Models/Page.php b/app/Models/Page.php index 28ef895..f2fc9bb 100644 --- a/app/Models/Page.php +++ b/app/Models/Page.php @@ -6,15 +6,5 @@ use Cubist\Backpack\app\Magic\Models\CMSPage; class Page extends CMSPage { - function getImages($collectionName) { - return $this->getMedia($collectionName); - } - function getImage($collectionName) { - return $this->getImages($collectionName)->first(); - } - - function getImageURL($collectionName) { - return $this->getImage($collectionName)->getUrl(); - } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 4e44bc4..d16f283 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,6 +3,7 @@ namespace App\Providers; use Illuminate\Support\ServiceProvider; +use Illuminate\Support\Facades\View; use Spatie\BladeX\Facades\BladeX; class AppServiceProvider extends ServiceProvider @@ -24,6 +25,13 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { + // Make current view name available to all views (used for body class) + View::composer('*', function ($view) { + $view_parts = explode('.', $view->getName()); + $view_name = end($view_parts); + View::share('view_name', $view_name); + }); + try { // BladeX Component Aliases // Ref: https://docs.spatie.be/laravel-blade-x/v2/introduction diff --git a/resources/styles/components/contact-details.styl b/resources/styles/components/contact-details.styl index 9a93541..45b27bc 100644 --- a/resources/styles/components/contact-details.styl +++ b/resources/styles/components/contact-details.styl @@ -11,18 +11,18 @@ transform: scale(1.1) &-icon - @apply mr-4 + @apply mr-4 text-navy transform: scale(1) transition: transform 0.1s ease-out &-title - @apply font-display + @apply font-bold font-body text-navy -// Contact page overrides -.contact-page +// Footer overrides +.footer .contact-details &-icon - @apply text-navy + @apply text-inherit &-title - @apply font-bold font-body text-navy + @apply text-inherit font-display diff --git a/resources/views/components/intro-block.blade.php b/resources/views/components/intro-block.blade.php index 5d877b4..01c4d00 100644 --- a/resources/views/components/intro-block.blade.php +++ b/resources/views/components/intro-block.blade.php @@ -9,8 +9,8 @@ - {{-- Image sticks --}} - + {{-- Image sticks to sides on medium and small screens --}} + @if ($image) {{ $title }} @endif @@ -19,6 +19,9 @@ {{ $slot }} + + {{-- Todo: handle button / link here? Also consider if data should be passed as individual params or just the whole $intro object? --}} + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 26b3def..115599d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -8,7 +8,7 @@ - + @include('cubist::body.begin') diff --git a/resources/views/pages/contact.blade.php b/resources/views/pages/contact.blade.php index 0678582..11be5fb 100644 --- a/resources/views/pages/contact.blade.php +++ b/resources/views/pages/contact.blade.php @@ -2,45 +2,45 @@ @section('content') -
- - -

{!! nl2br($page->intro->text) !!}

-

{{ $page->intro->button->label }}

- - - - - - - - -

{{ __('Coordonnées') }}

- @include('partials.contact-details') - -

{{ __('Suivez-nous') }}

- - {{-- Social Networks --}} - {{-- Todo: consider refactoring social data structure so image, label and URL can be set from admin --}} - - @svg('icon-twitter', 'mr-3') - {{ __('Twitter') }} - - - - @svg('icon-linkedin', 'mr-3') - {{ __('LinkedIn') }} - - - - - - - (contact form) - - - - - -
+ +

{!! nl2br($page->get('intro.text')) !!}

+ + + + + + + + +

{{ __('Coordonnées') }}

+ @include('partials.contact-details') + +

{{ __('Suivez-nous') }}

+ + {{-- Social Networks --}} + {{-- Todo: consider refactoring social data structure so image, label and URL can be set from admin --}} + + @svg('icon-twitter', 'mr-3') + {{ __('Twitter') }} + + + + @svg('icon-linkedin', 'mr-3') + {{ __('LinkedIn') }} + + + + + + + (contact form) + + + + + + @endsection diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php index aef8e88..066ff39 100644 --- a/resources/views/pages/home.blade.php +++ b/resources/views/pages/home.blade.php @@ -36,12 +36,12 @@ {{-- Intro text --}} - + {{-- Todo: make a better function for converting plain text into paragraphs and breaks --}} -

{!! nl2br($page->intro->text) !!}

+

{!! nl2br($page->get('intro.text')) !!}

{{-- Todo: make a component for handling CMS links when passing an object like $page->intro->button --}} -

{{ $page->intro->button->label }}

+

{{ $page->get('intro.button.label') }}

 @@ -127,12 +127,11 @@ {{-- Services & Support --}} - -

PM instrumentation distribue depuis 1986 des Capteurs et Systèmes de haute technicité. Issue de la société Schaevitz, PM Instrumentation a su développer une gamme de capteurs et systèmes d’excellente qualité provenant principalement des Etats-Unis.

- -

Principalement dédiés aux mesures physiques, nous saurons vous conseiller dans le choix de produits adaptés à votre environnement.

- -

En savoir plus

+ +

{!! nl2br($page->get('services_support.text')) !!}

 {{-- News --}} diff --git a/resources/views/pages/solution.blade.php b/resources/views/pages/solution.blade.php index d674022..092dbdd 100644 --- a/resources/views/pages/solution.blade.php +++ b/resources/views/pages/solution.blade.php @@ -2,7 +2,7 @@ @section('content') - +

{!! nl2br($page->get('intro.text')) !!}

{{ $page->get('intro.button.label') }}

 diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php index c308196..ff30237 100644 --- a/resources/views/partials/footer.blade.php +++ b/resources/views/partials/footer.blade.php @@ -52,7 +52,7 @@