chore: merge dev into main (#1703)

src/_includes/components/nav-menu.njk

@@ -1,8 +1,8 @@
 <nav class="primary-nav" aria-label="Primary Navigation">
   {% set navItems = collections.pages | eleventyNavigation %}
   {%- for item in navItems %}
-    {%- if (item.order > 0) and (item.locale === locale) %}
-    <a {% if page.url === item.url %}aria-current="page" {% endif %}href="{{ item.url }}">{{ item.key }}</a>
+    {%- if (item.order > 0) %}
+    <a {% if page.url === item.url %}aria-current="page" {% endif %}href="{{ item.url }}" {% if item.locale and item.locale !== "en-CA" %}hreflang="{{ item.locale }}" lang="{{ item.locale }}"{% endif %}>{{ item.key }}</a>
     {%- endif %}
   {%- endfor %}
 </nav>

src/_includes/layouts/page.njk

@@ -17,18 +17,38 @@
     </div>
   </article>
   <div class="homepage-cards">
-    <a href="/initiatives/" class="blue card">
-      <h2>Read current views in inclusive data science</h2>
-    </a>
-    <a href="/events/" class="yellow card">
-      <h2>Participate in our inclusion challenge initiatives</h2>
-    </a>
-    <a href="/badges/" class="azure card">
-      <h2>Earn We Count Badges</h2>
-    </a>
-    <a href="/resources/" class="green card">
-      <h2>Search the We Count Library</h2>
-    </a>
+    <div class="card blue">
+      <h2>
+        <a href="/resources/">
+          Resource Library
+        </a>
+      </h2>
+      <p>Search IDRC's library of AI and data analytics resources</p>
+    </div>
+    <div class="card green">
+      <h2>
+        <a href="/events/">
+          Events
+        </a>
+      </h2>
+      <p>Find out about IDRC events and how you can participate</p>
+    </div>
+     <div class="card azure">
+      <h2>
+        <a href="/initiatives/">
+          Events
+        </a>
+      </h2>
+      <p>Explore IDRC project activities</p>
+    </div>
+    <div class="card yellow">
+      <h2>
+        <a href="/rtdd/">
+          Regulating the Digital / <span lang="fr-CA">Réguler le numérique</span>
+        </a>
+      </h2>
+      <p>Addressing digital exclusion / <span lang="fr-CA">Lutter contre l’exclusion numérique</span></p>
+    </div>
   </div>
 </div>
 
@@ -52,7 +72,7 @@
 </article>
 
 {% else %}
-<article class="page {{ title | slugify }}">
+<article {% if locale and locale !== "en-CA" %}lang="{{ locale }}" {% endif %}class="page {{ title | slugify }}">
   <h1>{{ pageTitle }}</h1>
   <div class="api-content">
     {{ content | safe }}

src/admin/config.yml

@@ -1,6 +1,6 @@
 backend:
   name: git-gateway
-  branch: main
+  branch: dev
   squash_merges: true
   commit_messages:
     create: 'chore(cms): create "{{path}}"'
@@ -30,13 +30,23 @@ collections:
         name: excerpt
         widget: text
         hint: The excerpt is shown in search results.
+      - label: Locale
+        name: locale
+        widget: string
+        required: false
+        hint: The locale of the page. If you do not specify a locale, default will be set to en-CA.
       - label: Navigation Order
         name: menu_order
         widget: number
         default: 0
         required: true
         hint: |-
           This determines where the page should appear in the primary navigation. To hide the page from the primary navigation, set the value to zero.
+      - label: Navigation Key
+        name: key
+        widget: string
+        required: false
+        hint: The title appears in the primary navigation. If you do not specify a navigation key, title will be used.
       - label: Permanent Link
         name: permalink
         widget: string