feat(talk): add support for event address

Forms part of the transition from Microdata to JSON-LD. See academicpages#413
niazi-ali · Sep 9, 2019 · ec4f5a1 · ec4f5a1
1 parent d8fa0b9
commit ec4f5a1
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/archetypes/talk/index.md b/archetypes/talk/index.md
@@ -5,6 +5,12 @@ title: "{{ replace .Name "-" " " | title }}"
 event:
 event_url:
 location:
+address:
+  street:
+  city:
+  region:
+  postcode:
+  country:
 summary:
 abstract:
 

diff --git a/exampleSite/content/talk/example/index.md b/exampleSite/content/talk/example/index.md
@@ -2,7 +2,15 @@
 title: Example Talk
 event: Academic Theme Conference
 event_url: https://example.org
-location: London, United Kingdom
+
+location: Source Themes HQ
+address:
+  street: 450 Serra Mall
+  city: Stanford
+  region: CA
+  postcode: '94305'
+  country: United States
+
 summary: An example talk using Academic's Markdown slides feature.
 abstract: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis posuere tellusac convallis placerat. Proin tincidunt magna sed ex sollicitudin condimentum. Sed ac faucibus dolor, scelerisque sollicitudin nisi. Cras purus urna, suscipit quis sapien eu, pulvinar tempor diam."
 

diff --git a/layouts/partials/jsonld/event.html b/layouts/partials/jsonld/event.html
@@ -28,7 +28,16 @@
   {{ with $page.Params.location }}
   "location": {
     "@type": "Place",
-    "name": {{. | plainify}}
+    "name": {{. | plainify}}{{if $page.Params.address}},
+    "address": {
+      "@type": "PostalAddress",
+      "streetAddress": {{$page.Params.address.street | default ""}},
+      "addressLocality": {{$page.Params.address.city | default ""}},
+      "postalCode": {{$page.Params.address.postcode | default ""}},
+      "addressRegion": {{$page.Params.address.region | default ""}},
+      "addressCountry": {{$page.Params.address.country | default ""}}
+    }
+    {{end}}
   },
   {{end}}
   {{ if $featured_image }}

diff --git a/layouts/talk/single.html b/layouts/talk/single.html
@@ -43,13 +43,24 @@ <h3>{{ i18n "abstract" }}</h3>
     </div>
     <div class="d-md-none space-below"></div>
 
-    {{ with .Params.location }}
+    {{ if .Params.location }}
     <div class="row">
       <div class="col-md-1"></div>
       <div class="col-md-10">
         <div class="row">
           <div class="col-12 col-md-3 pub-row-heading">{{ i18n "location" }}</div>
-          <div class="col-12 col-md-9">{{ . | markdownify }}</div>
+          <div class="col-12 col-md-9">{{ .Params.location | markdownify }}</div>
+          {{ if .Params.address }}
+            {{ $addr := slice }}
+            {{with .Params.address.street}}{{$addr = $addr | append .}}{{end}}
+            {{with .Params.address.city}}{{$addr = $addr | append .}}{{end}}
+            {{with .Params.address.region}}{{$addr = $addr | append .}}{{end}}
+            {{with .Params.address.postcode}}{{$addr = $addr | append .}}{{end}}
+            {{with .Params.address.country}}{{$addr = $addr | append .}}{{end}}
+            {{ $addr_formatted := delimit $addr (site.Params.address_delimiter | default ", ") }}
+            <div class="col-md-3"></div>
+            <div class="col-12 col-md-9">{{$addr_formatted}}</div>
+          {{end}}
         </div>
       </div>
       <div class="col-md-1"></div>