fix meta tags

cloud-gov · Dec 3, 2024 · b0a0c41 · b0a0c41
1 parent 98153f9
commit b0a0c41
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/_data/site.yaml b/_data/site.yaml
@@ -5,7 +5,7 @@ description: >- # this means to ignore newlines
   Aenean et sapien a leo auctor scelerisque quis nec magna. Sed dictum ante a risus vehicula facilisis.
 
 # Twitter handle. Only the handle, not the URL.
-twitter: 18F
+# twitter: agency_name
 
 # Used to construct absolute URLs throughout the site
 url: "https://agency-production-url.gov"

diff --git a/_includes/meta.html b/_includes/meta.html
@@ -15,19 +15,25 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- Title and meta description
     ================================================== -->
-  <title>{{page.title}}</title>
-  <meta property="og:title" content="{{page.title}}" />
-  <meta name="description" content="{{page.description}}" />
-  <meta property="og:description" content="{{page.description}}" />
+  {% assign pageTitle = title | append: " | " | append: site.title  -%}
+  {%- assign pageDesc = page.description | default: site.description -%}
+  {%- assign pageUrl = site.url | append: page.url  -%}
+
+  <title>{{pageTitle}}</title>
+  <meta property="og:title" content="{{ pageTitle }}" />
+  <meta name="description" content="{{ pageDesc }}" />
+  <meta property="og:description" content="{{ pageDesc }}" />
 
   <meta name="twitter:card" content="summary" />
+  {% if site.twitter -%}
   <meta name="twitter:site" content="@{{site.twitter}}" />
-  <meta name="twitter:title" content="{{page.title}}" />
-  <meta name="twitter:description" content="{{page.description}}" />
+  {%- endif %}
+  <meta name="twitter:title" content="{{ pageTitle }}" />
+  <meta name="twitter:description" content="{{pageDesc}}" />
 
   <meta property="og:type" content="article" />
-  <link rel="canonical" href="{{ page.url }}" />
-  <meta property="og:url" content="{{ page.url }}" />
+  <link rel="canonical" href="{{ pageUrl }}" />
+  <meta property="og:url" content="{{ pageUrl }}" />
 
   <script src="{{ assetPaths['uswds-init.js'] }}"></script>
   <!-- CSS