From d1253e7fba055174f0e2492c1ed3f2768d381e5a Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 30 Aug 2019 18:03:49 +0200 Subject: [PATCH] done #2967 @0.5 --- resources/views/head/head.blade.php | 2 -- resources/views/head/meta.blade.php | 30 ++++++++-------------- resources/views/head/opengraph.blade.php | 0 resources/views/head/social.blade.php | 15 +++++++++++ resources/views/head/twittercard.blade.php | 0 5 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 resources/views/head/opengraph.blade.php create mode 100644 resources/views/head/social.blade.php delete mode 100644 resources/views/head/twittercard.blade.php diff --git a/resources/views/head/head.blade.php b/resources/views/head/head.blade.php index 11a0dee..9e238fa 100644 --- a/resources/views/head/head.blade.php +++ b/resources/views/head/head.blade.php @@ -1,7 +1,5 @@ @include('cubist::head.meta') -@include('cubist::head.opengraph') -@include('cubist::head.twittercard') @include('cubist::head.link') @include('cubist::head.pwa') @favicon diff --git a/resources/views/head/meta.blade.php b/resources/views/head/meta.blade.php index fd4a994..e50b3e4 100644 --- a/resources/views/head/meta.blade.php +++ b/resources/views/head/meta.blade.php @@ -21,27 +21,19 @@ $t=explode('\\',get_class($page->getEntity())); $type=mb_strtolower(array_pop($t)); } - - if(isset($page)){ - $title= $meta_title ?? $page->meta_title ?? $page_short_title.' - '.$global->meta_title; - $description= $meta_description ?? $page->meta_description ?? $global->meta_description; - $robots= $meta_robots ?? $page->robots == '1'; - }else{ - $title= $meta_title ?? $title.' - '.$global->meta_title; - $description= $meta_description ?? $global->meta_description; - $robots= $meta_robots ?? true; - } @endphp -{{$title}} - - - - - +{{ $page->getMetaLongTitle() }} + + + + + +@stack('head.meta') @if($search_enabled) + data-breadcrumbs='@json($search_breadcrumbs)'/> @endif -@stack('head.meta') - \ No newline at end of file + +@include('cubist::head.social') + \ No newline at end of file diff --git a/resources/views/head/opengraph.blade.php b/resources/views/head/opengraph.blade.php deleted file mode 100644 index e69de29..0000000 diff --git a/resources/views/head/social.blade.php b/resources/views/head/social.blade.php new file mode 100644 index 0000000..4a4f693 --- /dev/null +++ b/resources/views/head/social.blade.php @@ -0,0 +1,15 @@ +@php + $image=$page->getSocialImage(); +@endphp + + + +@if($image) + +@endif + + +@if($image) + + +@endif diff --git a/resources/views/head/twittercard.blade.php b/resources/views/head/twittercard.blade.php deleted file mode 100644 index e69de29..0000000 -- 2.39.5