From 4e95797fa9b5605fb582b2d806adc0f1b77e6226 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 16 Jul 2019 18:43:39 +0200
Subject: [PATCH] #2896

---
 resources/views/head/meta.blade.php        | 19 +++++++++++++++----
 resources/views/head/twittercard.blade.php |  7 -------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/resources/views/head/meta.blade.php b/resources/views/head/meta.blade.php
index 0bf595d..9d711fd 100644
--- a/resources/views/head/meta.blade.php
+++ b/resources/views/head/meta.blade.php
@@ -1,8 +1,19 @@
-<title>{{$page->meta_title}}</title>
+@php
+    if(isset($page)){
+        $title=$meta_title??$page->meta_title ?? $page->title.' - '.$global->meta_title;
+        $description=$meta_description ?? $page->meta_description ?? $global->meta_description;
+        $robots=$meta_robots??$page->robots=='1';
+    }else{
+        $title=$meta_description ?? $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=, shrink-to-fit=no">
-<meta name="description" content="{{$page->meta_description}}">
-<meta name="robots" content="{{$page->robots=='1'?'index,follow':'noindex,nofollow'}}">
+<meta name="viewport" content="width=device-width,initial-scale=1.0,shrink-to-fit=no">
+<meta name="description" content="{{$description}}">
+<meta name="robots" content="{{$robots?'index,follow':'noindex,nofollow'}}">
 @stack('head.meta')
 <meta name="csrf-token" content="{{ csrf_token() }}">
\ No newline at end of file
diff --git a/resources/views/head/twittercard.blade.php b/resources/views/head/twittercard.blade.php
index a077f02..e69de29 100644
--- a/resources/views/head/twittercard.blade.php
+++ b/resources/views/head/twittercard.blade.php
@@ -1,7 +0,0 @@
-<?php
-/**
- * Created by IntelliJ IDEA.
- * User: Vincent
- * Date: 25/02/2019
- * Time: 17:09
- */
\ No newline at end of file
-- 
2.39.5