Correct some issues with open graph and schema (#242)

Fixes #234 Fixes #236 Signed-off-by: Matt Stratton <[email protected]>
devopsdays · Feb 17, 2017 · f025d7b · f025d7b
1 parent 1c77f87
commit f025d7b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -87,3 +87,4 @@ title = "los dias de devops"
   # Set to "/" on *nix and Mac, "\\" on Windows
   # Refer to https://github.com/spf13/hugo/issues/2394 for more information
   pathseperator = "/"
+  weburl = "https://dev.devopsdays.org"
diff --git a/layouts/partials/events/event_metadata.html b/layouts/partials/events/event_metadata.html
@@ -3,18 +3,33 @@
 {{ $e :=  (index $.Site.Data.events $event_slug) }}
 {{/* end site data query */}}
 
+{{ $.Scratch.Add "url" $.Site.Params.weburl }}
+{{ $.Scratch.Add "url" "/events/"}}
+{{ $.Scratch.Add "url" $event_slug }}
+
+
+
 {{- if $e.startdate -}}
 
+
+  {{ $url := $.Scratch.Get "url" }}
+  {{ $.Scratch.Add "image_url" $url }}
+  {{ $.Scratch.Add "image_url" "/logo.png" }}
+  {{ $image_url := $.Scratch.Get "image_url" }}
   <script type="application/ld+json">
   {
     "@context": "http://schema.org",
     "@type": "ExhibitionEvent",
+    {{ if $e.description }}
+      "description": {{ $e.description }}
+    {{ else }}
       "description": "The conference that brings development and operations together.",
+    {{ end }}
     "name": "DevOpsDays {{ $e.city }} {{ $e.year }}",
     "startDate": "{{ $e.startdate }}",
     "endDate": "{{ $e.enddate }}",
-    "url": {{ .Permalink }},
-    "image": {{ string ( delimit ( slice "/events/" $event_slug "/logo.png") "" ) | absURL }},
+    "url": {{ $url }},
+    "image": {{ $image_url }},
     "location": {
       "@type": "Place",
       {{ if eq $e.city $e.location }}

diff --git a/layouts/partials/head/seo/open_graph.html b/layouts/partials/head/seo/open_graph.html
@@ -2,7 +2,7 @@
 <meta property="og:title" content="{{ title .Title }}" />
 <meta property="og:description" content="{{ if .Description }}{{ .Description }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ end }}{{ end }}" />
 <meta property="og:type" content="{{ if .Params.type }}{{ .Params.type }}{{ else }}website{{ end }}" />
-<meta property="og:url" content="{{ $.Site.Params.weburl }}{{ .Permalink }}" />
+<meta property="og:url" content="{{ $.Site.Params.weburl }}{{ .Permalink | relURL }}" />
 {{ if .IsHome }}
   <meta property="og:image" content="{{ $.Site.Params.weburl }}/img/event-logo-default.png" />
 {{ else }}