13 changed files with 21 additions and 76 deletions
--- a/content/blog/2016/happy-new-year.md
+++ b/content/blog/2016/happy-new-year.md
@ -9,7 +9,7 @@ categories:
 tags: []
 ---
-<div style="width: 628px" class="wp-caption alignnone"><img fetchpriority="high" decoding="async" class="" src="https://www.techicy.com/assets/uploads/2014/12/happy-New-Year-greetings-2015-3.jpg" alt="Happy New Year 2016 greeting" width="618" height="453" /><p class="wp-caption-text">Happy New Year 2016!</p></div>
+<div style="width: 628px" class="wp-caption alignnone"><img fetchpriority="high" decoding="async" class="" src="https://www.techicy.com/assets/uploads/2014/12/happy-New-Year-greetings-2015-3.jpg" alt="" width="618" height="453" /><p class="wp-caption-text">Happy New Year 2016!</p></div>
 <h4>Let go of the past year and bring on the new! Check out this article by Dplife.info:</h4>
 <h1><a title="dplife.info/2015 Wasn't What I thought" href="http://dplife.info/blog/view/2015-wasnt-what-i-thought-it-would-be/" target="_blank">2015 Wasn’t What I Thought It Would Be </a></h1>
 <h3><a title="dplife.info/2015 Wasn't What I thought" href="http://dplife.info/blog/view/2015-wasnt-what-i-thought-it-would-be/" target="_blank">&#8230;and That&#8217;s Okay.</a></h3>
--- a/src/components/SiteLayout.astro
+++ b/src/components/SiteLayout.astro
@ -4,40 +4,22 @@ import SiteNav from "./SiteNav.astro";
 const {
  title,
  description,
  bodyClass,
-  pathname = "/",
+  pathname,
  canonical,
  robots = "max-image-preview:large",
  ogType = "website",
  image = "/assets/uploads/2013/10/BannerFamilyFed_23_10c1.jpg",
  parabolaSettings = { masonry: "0", magazine: "0", mobile: "1", fitvids: "1" },
 } = Astro.props;
 const parabolaSettingsScript = `var parabola_settings = ${JSON.stringify(parabolaSettings)};`;
 const canonicalUrl = canonical ?? pathname;
 const metaTitle = title
  .replace(/&#8211;|&ndash;/g, "-")
  .replace(/&#8216;|&#8217;|&lsquo;|&rsquo;/g, "'")
  .replace(/&#8220;|&#8221;|&ldquo;|&rdquo;/g, '"')
  .replace(/&amp;/g, "&");
 ---
 <!DOCTYPE html>
 <html lang="en-US">
  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <slot name="head" />
    <title set:html={title} />
-    {description && <meta name="description" content={description} />}
+    <meta name="robots" content="max-image-preview:large" />
    {robots && <meta name="robots" content={robots} />}
    <meta property="og:site_name" content="FFWPU Ireland" />
    <meta property="og:title" content={metaTitle} />
    {description && <meta property="og:description" content={description} />}
    {canonicalUrl && <meta property="og:url" content={canonicalUrl} />}
    {image && <meta property="og:image" content={image} />}
    <meta property="og:type" content={ogType} />
    <meta name="twitter:card" content="summary_large_image" />
    <link rel="stylesheet" id="content-blocks-css" href="/css/block-library.css?ver=6.6.5" type="text/css" media="all" />
    <link rel="stylesheet" id="pdfprnt_frontend-css" href="/assets/vendor/pdf/css/frontend.css?ver=2.4.0" type="text/css" media="all" />
    <link rel="stylesheet" id="parabola-fonts-css" href="/assets/theme/parabola/fonts/fontfaces.css?ver=2.4.1" type="text/css" media="all" />
@ -48,7 +30,7 @@ const metaTitle = title
    <script is:inline type="text/javascript" src="/js/jquery.min.js?ver=2.0.2" id="jquery-js"></script>
    <script is:inline type="text/javascript" id="parabola-frontend-js-extra" set:html={parabolaSettingsScript}></script>
    <script is:inline type="text/javascript" src="/assets/theme/parabola/js/frontend.js?ver=2.4.1" id="parabola-frontend-js"></script>
-    {canonicalUrl && <link rel="canonical" href={canonicalUrl} />}
+    {canonical && <link rel="canonical" href={canonical} />}
  </head>
  <body class={bodyClass}>
    <div id="toTop"> </div>
@ -57,13 +39,13 @@ const metaTitle = title
        <header id="header">
          <div id="masthead">
            <div id="branding" role="banner">
-              <img id="bg_image" alt="Family Federation for World Peace and Unification Ireland" src="/assets/uploads/2013/10/BannerFamilyFed_23_10c1.jpg" />
+              <img id="bg_image" alt="FFWPU Ireland" title="FFWPU Ireland" src="/assets/uploads/2013/10/BannerFamilyFed_23_10c1.jpg" />
              <div id="header-container">
-                <a href="/index.html" id="linky" aria-label="FFWPU Ireland home page"></a>
+                <a href="/index.html" id="linky"></a>
              </div>
              <div style="clear:both;"></div>
            </div>
-            <a id="nav-toggle" href="#access" role="button" aria-label="Toggle navigation menu"><span>&nbsp;</span></a>
+            <a id="nav-toggle"><span>&nbsp;</span></a>
            <SiteNav pathname={pathname} />
          </div>
          <div style="clear:both;height:1px;width:1px;"> </div>
--- a/src/components/SiteNav.astro
+++ b/src/components/SiteNav.astro
@ -36,8 +36,8 @@ function isCurrent(item) {
 }
 ---
-<nav id="access" class="jssafe" role="navigation" aria-label="Primary navigation">
+<nav id="access" class="jssafe" role="navigation">
-  <div class="skip-link screen-reader-text"><a href="#content">Skip to content</a></div>
+  <div class="skip-link screen-reader-text"><a href="#content" title="Skip to content">Skip to content</a></div>
  <div class="menu">
    <ul id="prime_nav" class="menu">
      {
--- a/src/content/pages/index.html
+++ b/src/content/pages/index.html
@ -26,9 +26,9 @@
 		 <div class="ribbon"></div>
 		 <div id="slider" class="nivoSlider">
 						<a href='/the-founders.html'>
-					 <img src='/assets/uploads/2013/10/TrueParentsSlider.jpg' alt="Rev. Sun Myung Moon and Dr. Hak Ja Han Moon"  />
+					 <img src='/assets/uploads/2013/10/TrueParentsSlider.jpg' alt=""  />
 				</a>						<a href='/about-us-organizations.html'>
-					 <img src='/assets/uploads/2013/10/Little-Angels-Presentationlight1.jpg' alt="The Little Angels children's folk ballet performance" title="#caption1"  />
+					 <img src='/assets/uploads/2013/10/Little-Angels-Presentationlight1.jpg' alt="The Little Angels" title="#caption1"  />
 				</a>						<a href='/the-founders.html'>
 					 <img src='/assets/uploads/2013/10/father-Seung-Hwa_Presentation.jpg' alt="Rev. Sun Myung Moon" title="#caption2"  />
 				</a>				 </div>
@ -46,7 +46,7 @@
 		<div class="ppcolumn column1" id="column1">
 			<a href="/the-founders.html" >
 									<div class="column-image">
-					 <img src="/assets/uploads/2013/10/True_Parents.jpg" id="columnImage1" alt="Rev. Sun Myung Moon and Dr. Hak Ja Han Moon, founders of FFWPU International" />
+						<img src="/assets/uploads/2013/10/True_Parents.jpg" id="columnImage1" alt="Founders of FFWPU International" />
 													<h3 class='column-header-image'>Founders of FFWPU International</h3>
 											</div>
 							</a> <!-- link -->
@ -64,7 +64,7 @@
 		<div class="ppcolumn column2" id="column2">
 			<a href="/videos.html" >
 									<div class="column-image">
-						<img src="/assets/uploads/2013/10/DP-Screenshot.jpg" id="columnImage2" alt="Divine Principle video presentation screenshot" />
+						<img src="/assets/uploads/2013/10/DP-Screenshot.jpg" id="columnImage2" alt="The Divine Principle and Other teachings." />
 													<h3 class='column-header-image'>The Divine Principle and Other teachings.</h3>
 											</div>
 							</a> <!-- link -->
@ -82,7 +82,7 @@
 		<div class="ppcolumn column3" id="column3">
 			<a href="/about-us-organizations.html" >
 									<div class="column-image">
-						<img src="/assets/uploads/2013/10/UPF-Prayer-Evening.jpg" id="columnImage3" alt="UPF prayer evening gathering" />
+						<img src="/assets/uploads/2013/10/UPF-Prayer-Evening.jpg" id="columnImage3" alt="Activities and Organizations" />
 													<h3 class='column-header-image'>Activities and Organizations</h3>
 											</div>
 							</a> <!-- link -->
--- a/src/pages/about.astro
+++ b/src/pages/about.astro
@ -6,10 +6,8 @@ import articleHtml from "../content/pages/about.html?raw";
 <SiteLayout
  title="About Us &#8211; FFWPU Ireland"
  description="Learn about the Family Federation for World Peace and Unification in Ireland, its teachings, and its focus on God-centered families."
  bodyClass="page-template page-template-templates page-template-template-twocolumns-right page-template-templatestemplate-twocolumns-right-php page page-id-29 page-parent custom-background tribe-no-js metaslider-plugin parabola-image-three caption-light meta-light parabola_triagles parabola-menu-left"
  pathname="/about.html"
  canonical="/about.html"
 >
  <TwoColumnPage articleHtml={articleHtml} />
 </SiteLayout>
--- a/src/pages/blog/[year]/[month]/[day]/[slug].astro
+++ b/src/pages/blog/[year]/[month]/[day]/[slug].astro
@ -32,30 +32,6 @@ function slugify(value: string): string {
    .replace(/^-|-$/g, "");
 }
 function descriptionFromHtml(value: string, fallbackTitle: string): string {
  const text = value
    .replace(/<[^>]*>/g, " ")
    .replace(/&nbsp;/g, " ")
    .replace(/&#8211;|&ndash;/g, "-")
    .replace(/&#8216;|&#8217;|&lsquo;|&rsquo;/g, "'")
    .replace(/&#8220;|&#8221;|&ldquo;|&rdquo;/g, '"')
    .replace(/&amp;/g, "&")
    .replace(/\s+/g, " ")
    .trim();
  if (!text) {
    return `${fallbackTitle} from FFWPU Ireland.`;
  }
  if (text.length <= 155) {
    return text;
  }
  const clipped = text.slice(0, 152);
  const finalSpace = clipped.lastIndexOf(" ");
  return `${finalSpace > 80 ? clipped.slice(0, finalSpace) : clipped}...`;
 }
 function categoryHref(entry, category: string): string {
  if (entry.data.type === "speech") {
    if (entry.data.speechCollection === "mrs-hak-ja-han-moon" || category.includes("Mrs. Hak Ja Han Moon")) {
@ -116,10 +92,9 @@ const categories = entry.data.categories ?? [];
 const tags = entry.data.tags ?? [];
 const canonical = entry.data.source;
 const pdfHref = canonical ? `${canonical}?print=pdf` : undefined;
 const description = descriptionFromHtml(entry.body ?? "", title);
 ---
-<SiteLayout title={`${title} &#8211; FFWPU Ireland`} description={description} bodyClass={bodyClass} pathname={canonical} canonical={canonical} ogType="article">
+<SiteLayout title={`${title} &#8211; FFWPU Ireland`} bodyClass={bodyClass} pathname={canonical} canonical={canonical}>
  <div id="main">
    <div id="forbottom">
      <div style="clear:both;"> </div>
@ -158,7 +133,7 @@ const description = descriptionFromHtml(entry.body ?? "", title);
                pdfHref && (
                  <div class="pdfprnt-buttons pdfprnt-buttons-post pdfprnt-top-bottom-left">
                    <a href={pdfHref} class="pdfprnt-button pdfprnt-button-pdf" target="_blank">
-                      <img decoding="async" src="/assets/vendor/pdf/images/pdf.png" alt="Download PDF" title="Download PDF" />
+                      <img decoding="async" src="/assets/vendor/pdf/images/pdf.png" alt="image_pdf" title="Download PDF" />
                    </a>
                  </div>
                )
@ -168,7 +143,7 @@ const description = descriptionFromHtml(entry.body ?? "", title);
                pdfHref && (
                  <div class="pdfprnt-buttons pdfprnt-buttons-post pdfprnt-top-bottom-left">
                    <a href={pdfHref} class="pdfprnt-button pdfprnt-button-pdf" target="_blank">
-                      <img decoding="async" src="/assets/vendor/pdf/images/pdf.png" alt="Download PDF" title="Download PDF" />
+                      <img decoding="async" src="/assets/vendor/pdf/images/pdf.png" alt="image_pdf" title="Download PDF" />
                    </a>
                  </div>
                )
--- a/src/pages/contact.astro
+++ b/src/pages/contact.astro
@ -6,7 +6,6 @@ import articleHtml from "../content/pages/contact.html?raw";
 <SiteLayout
  title="Contact &#8211; FFWPU Ireland"
  description="Contact FFWPU Ireland at Unity House in Dublin city centre or email the community with questions, appointments, and event enquiries."
  bodyClass="page-template-default page page-id-63 custom-background tribe-no-js metaslider-plugin parabola-image-three caption-light meta-light parabola_triagles parabola-menu-left"
  pathname="/contact.html"
  canonical="/contact.html"
--- a/src/pages/events.astro
+++ b/src/pages/events.astro
@ -5,13 +5,13 @@ import mainHtml from "../content/pages/events.html?raw";
 <SiteLayout
  title="Upcoming Events &#8211; FFWPU Ireland"
  description="See upcoming FFWPU Ireland community events and calendar listings."
  bodyClass="archive post-type-archive post-type-archive-tribe_events custom-background tribe-events-page-template tribe-no-js tribe-filter-live metaslider-plugin parabola-image-three caption-light meta-light parabola_triagles parabola-menu-left"
  pathname="/events.html"
  canonical="/events.html"
  robots="noindex, follow, max-image-preview:large"
 >
  <Fragment slot="head">
    <script is:inline>
      document.head.insertAdjacentHTML("beforeend", '<meta name="robots" id="tec_noindex" content="noindex, follow" />');
    </script>
    <link rel="stylesheet" id="tec-variables-skeleton-css" href="/assets/vendor/events-calendar/common/src/resources/css/variables-skeleton.min.css?ver=6.3.2" type="text/css" media="all" />
    <link rel="stylesheet" id="tec-variables-full-css" href="/assets/vendor/events-calendar/common/src/resources/css/variables-full.min.css?ver=6.3.2" type="text/css" media="all" />
    <link rel="stylesheet" id="tribe-common-skeleton-style-css" href="/assets/vendor/events-calendar/common/src/resources/css/common-skeleton.min.css?ver=6.3.2" type="text/css" media="all" />
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@ -5,10 +5,8 @@ import mainHtml from "../content/pages/index.html?raw";
 <SiteLayout
  title="FFWPU Ireland &#8211; Official website of FFWPU Ireland"
  description="Official website of FFWPU Ireland, sharing teachings, activities, videos, Sunday services, and resources for families in Ireland."
  bodyClass="home blog custom-background tribe-no-js metaslider-plugin parabola-image-three caption-light meta-light parabola_triagles magazine-layout parabola-menu-left"
  pathname="/index.html"
  canonical="/index.html"
  parabolaSettings={{ masonry: "1", magazine: "1", mobile: "1", fitvids: "1" }}
 >
  <script is:inline slot="head" type="text/javascript" src="/assets/theme/parabola/js/nivo-slider.js?ver=2.4.1" id="parabola-nivoSlider-js"></script>
--- a/src/pages/services.astro
+++ b/src/pages/services.astro
@ -6,10 +6,8 @@ import articleHtml from "../content/pages/services.html?raw";
 <SiteLayout
  title="Sunday Services &#8211; FFWPU Ireland"
  description="Find FFWPU Ireland Sunday service videos and archived Sunday service messages from the Dublin community."
  bodyClass="page-template-default page page-id-33 custom-background tribe-no-js metaslider-plugin parabola-image-three caption-light meta-light parabola_triagles parabola-menu-left"
  pathname="/services.html"
  canonical="/services.html"
 >
  <TwoColumnPage articleHtml={articleHtml} />
 </SiteLayout>
--- a/src/pages/speeches/index.astro
+++ b/src/pages/speeches/index.astro
@ -10,7 +10,6 @@ const categories = uniqueSorted(speeches.flatMap((speech) => speech.categories.l
 <SiteLayout
  title="Speeches Archive &#8211; FFWPU Ireland"
  description="Search the FFWPU Ireland archive of speeches by Rev. Sun Myung Moon and Dr. Hak Ja Han Moon by year, speaker, category, and text."
  bodyClass="page-template page-template-templates page-template-template-onecolumn page-template-templatestemplate-onecolumn-php page custom-background tribe-no-js metaslider-plugin parabola-image-three caption-light meta-light parabola_triagles parabola-menu-left"
  pathname="/speeches/"
  canonical="/speeches/"
--- a/src/pages/the-founders.astro
+++ b/src/pages/the-founders.astro
@ -6,10 +6,8 @@ import articleHtml from "../content/pages/the-founders.html?raw";
 <SiteLayout
  title="The Founders &#8211; FFWPU Ireland"
  description="Read about Rev. Sun Myung Moon and Dr. Hak Ja Han Moon, the founders of the Family Federation for World Peace and Unification."
  bodyClass="page-template-default page page-id-71 custom-background tribe-no-js metaslider-plugin parabola-image-three caption-light meta-light parabola_triagles parabola-menu-left"
  pathname="/the-founders.html"
  canonical="/the-founders.html"
 >
  <link slot="head" rel="stylesheet" id="su-shortcodes-css" href="/assets/vendor/shortcodes/includes/css/shortcodes.css?ver=7.3.1" type="text/css" media="all" />
  <TwoColumnPage articleHtml={articleHtml} />
--- a/src/pages/videos.astro
+++ b/src/pages/videos.astro
@ -6,10 +6,8 @@ import articleHtml from "../content/pages/videos.html?raw";
 <SiteLayout
  title="Videos &#8211; FFWPU Ireland"
  description="Watch FFWPU Ireland videos on faith, family, the Divine Principle, Rev. Sun Myung Moon, and inspirational teaching resources."
  bodyClass="page-template-default page page-id-44 custom-background tribe-no-js metaslider-plugin parabola-image-three caption-light meta-light parabola_triagles parabola-menu-left"
  pathname="/videos.html"
  canonical="/videos.html"
 >
  <TwoColumnPage articleHtml={articleHtml} />
 </SiteLayout>