From: Stephen Cameron <stephen@cubedesigners.com>
Date: Thu, 19 Sep 2019 08:26:47 +0000 (+0200)
Subject: Convert contact details schema to JSON-LD. Done #2954 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=227fe4274937910ff997db0a6ef87c086dc730a5;p=pmi.git

Convert contact details schema to JSON-LD. Done #2954 @0.25
---

diff --git a/resources/views/partials/contact-details.blade.php b/resources/views/partials/contact-details.blade.php
index c1712ae..9972b33 100644
--- a/resources/views/partials/contact-details.blade.php
+++ b/resources/views/partials/contact-details.blade.php
@@ -1,33 +1,35 @@
-<div itemscope itemtype="http://schema.org/Organization">
+<map-link class="contact-details-block" :address="$global->address">
+    @svg('icon-address', 'contact-details-icon')
+    <div class="contact-details-text">
+        <div class="contact-details-title">{{ __('Adresse') }}</div>
+        {!! nl2br($global->address) !!}
+    </div>
+</map-link>
 
-    <map-link class="contact-details-block" :address="$global->address">
-        @svg('icon-address', 'contact-details-icon')
-        <div class="contact-details-text">
-            <div class="contact-details-title">{{ __('Adresse') }}</div>
-            <div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
-                {!! nl2br($global->address) !!}
-            </div>
-        </div>
-    </map-link>
+<a data-ga="event" data-ga-category="contact" data-ga-action="click"
+   data-ga-label="email" class="contact-details-block" href="mailto:{{ $global->email }}">
+    @svg('icon-email', 'contact-details-icon')
+    <div class="contact-details-text">
+        <div class="contact-details-title">{{ __('Email') }}</div>
+        {{ $global->email }}
+    </div>
+</a>
 
-    <a data-ga="event" data-ga-category="contact" data-ga-action="click"
-       data-ga-label="email" class="contact-details-block" href="mailto:{{ $global->email }}">
-        @svg('icon-email', 'contact-details-icon')
-        <div class="contact-details-text">
-            <div class="contact-details-title">{{ __('Email') }}</div>
-            {{-- No microdata properties for e-mail because this value is obfuscated --}}
-            {{ $global->email }}
-        </div>
-    </a>
+<phone-link class="contact-details-block" :number="$global->phone" country-code="33">
+    @svg('icon-phone', 'contact-details-icon')
+    <div class="contact-details-text">
+        <div class="contact-details-title">{{ __('Téléphone') }}</div>
+        {{ $global->phone }}
+    </div>
+</phone-link>
 
-    <phone-link class="contact-details-block" :number="$global->phone" country-code="33">
-        @svg('icon-phone', 'contact-details-icon')
-        <div class="contact-details-text">
-            <div class="contact-details-title">{{ __('Téléphone') }}</div>
-            <div itemprop="telephone">
-                {{ $global->phone }}
-            </div>
-        </div>
-    </phone-link>
-
-</div>
+{{-- Note: e-mail is ommitted from schema data because we want it to remain obfuscated --}}
+<script type="application/ld+json">
+    {
+      "@context": "https://schema.org",
+      "@type": "Organization",
+      "url": "{{ url('/') }}",
+      "address": "{{ preg_replace("/\r|\n/", " ", $global->address) }}",
+      "telephone": "{{ $global->phone }}",
+    }
+</script>