]> _ Git - cubist_cms-front.git/commitdiff
done #2967 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 30 Aug 2019 16:03:49 +0000 (18:03 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 30 Aug 2019 16:03:49 +0000 (18:03 +0200)
resources/views/head/head.blade.php
resources/views/head/meta.blade.php
resources/views/head/opengraph.blade.php [deleted file]
resources/views/head/social.blade.php [new file with mode: 0644]
resources/views/head/twittercard.blade.php [deleted file]

index 11a0dee6aa06b680b73e68b2df3b6a16111dba70..9e238fad3195c6a4e9661577dbd0bf8e93e6bd04 100644 (file)
@@ -1,7 +1,5 @@
 <head>
 @include('cubist::head.meta')
-@include('cubist::head.opengraph')
-@include('cubist::head.twittercard')
 @include('cubist::head.link')
 @include('cubist::head.pwa')
 @favicon
index fd4a994aa1a3a78afb320e599305de4ea606abf6..e50b3e442f04873b68419f9c63c81483b4be3ed4 100644 (file)
         $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>{{$title}}</title>
-<meta http-equiv="x-ua-compatible" content="ie=edge">
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width,initial-scale=1.0,shrink-to-fit=no">
-<meta name="description" content="{{ $description }}">
-<meta name="robots" content="{{ ($global_robots && $robots)?'index,follow':'noindex,nofollow' }}">
+<title>{{ $page->getMetaLongTitle() }}</title>
+<meta http-equiv="x-ua-compatible" content="ie=edge"/>
+<meta charset="utf-8"/>
+<meta name="viewport" content="width=device-width,initial-scale=1.0,shrink-to-fit=no"/>
+<meta name="description" content="{{ $page->getMetaDescription() }}"/>
+<meta name="robots" content="{{ $page->getRobots() }}"/>
+@stack('head.meta')
 @if($search_enabled)
     <meta data-search="{{ $search_page }}" data-keywords="{{ $search_keywords }}"
           data-short-title="{{ $search_short_title }}" data-type="{{ $type }}"
-          data-breadcrumbs='@json($search_breadcrumbs)'>
+          data-breadcrumbs='@json($search_breadcrumbs)'/>
 @endif
-@stack('head.meta')
-<meta name="csrf-token" content="{{ csrf_token() }}">
\ No newline at end of file
+
+@include('cubist::head.social')
+<meta name="csrf-token" content="{{ csrf_token() }}"/>
\ 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 (file)
index e69de29..0000000
diff --git a/resources/views/head/social.blade.php b/resources/views/head/social.blade.php
new file mode 100644 (file)
index 0000000..4a4f693
--- /dev/null
@@ -0,0 +1,15 @@
+@php
+    $image=$page->getSocialImage();
+@endphp
+
+<meta property="og:title" content="{{$page->getSocialTitle()}}"/>
+<meta property="og:description" content="{{$page->getSocialDescription()}}"/>
+@if($image)
+    <meta property="og:image" content="{{$image}}"/>
+@endif
+<meta name="twitter:title" content="{{$page->getSocialTitle()}}"/>
+<meta name="twitter:description" content="{{$page->getSocialDescription()}}"/>
+@if($image)
+    <meta name="twitter:image" content="{{$image}}"/>
+    <meta name="twitter:card" content="summary_large_image"/>
+@endif
diff --git a/resources/views/head/twittercard.blade.php b/resources/views/head/twittercard.blade.php
deleted file mode 100644 (file)
index e69de29..0000000