From 78fb240e4c3206c685b4025356ed6f7e1d37b734 Mon Sep 17 00:00:00 2001
From: Mahesh Deore <mahesh.deore@trigyn.com>
Date: Tue, 27 Aug 2024 12:57:14 +0530
Subject: [PATCH] Header and Footer Changes

---
 composer.json                                 |  2 +-
 composer.lock                                 | 14 ++---
 .../custom/gms_ocha_common/css/styles.css     |  7 ++-
 .../cd/cd-footer/cd-footer.html.twig          |  2 +-
 .../templates/cd/cd-footer/cd-ocha.html.twig  | 56 +++++++++++++++++++
 5 files changed, 71 insertions(+), 10 deletions(-)
 create mode 100644 html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-ocha.html.twig

diff --git a/composer.json b/composer.json
index e1a29aba..5806d396 100644
--- a/composer.json
+++ b/composer.json
@@ -183,7 +183,7 @@
         "drush/drush": "^12",
         "oomphinc/composer-installers-extender": "^2.0",
         "symfony/flex": "^1.17",
-        "unocha/common_design": "9.2.6",
+        "unocha/common_design": "^9.4",
         "unocha/gtm_barebones": "^1.0",
         "unocha/ocha_monitoring": "^1.0",
         "unocha/ocha_snap": "^8.3.0",
diff --git a/composer.lock b/composer.lock
index 92f3cfc9..1b5de132 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1e9e30ae7304c58308a110d4923c58a5",
+    "content-hash": "095448978cf017267cc29243a1bc97e4",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -12829,16 +12829,16 @@
         },
         {
             "name": "unocha/common_design",
-            "version": "v9.2.6",
+            "version": "v9.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "0762c16c230980c5d1e2b3780fa5959a55f8db47"
+                "reference": "15592bea6f10db7c6bb4b58abd2b4a1962979c7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/0762c16c230980c5d1e2b3780fa5959a55f8db47",
-                "reference": "0762c16c230980c5d1e2b3780fa5959a55f8db47",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/15592bea6f10db7c6bb4b58abd2b4a1962979c7d",
+                "reference": "15592bea6f10db7c6bb4b58abd2b4a1962979c7d",
                 "shasum": ""
             },
             "require": {
@@ -12853,9 +12853,9 @@
             "description": "OCHA Common Design base theme for Drupal 9+",
             "support": {
                 "issues": "https://github.com/UN-OCHA/common_design/issues",
-                "source": "https://github.com/UN-OCHA/common_design/tree/v9.2.6"
+                "source": "https://github.com/UN-OCHA/common_design/tree/v9.4.3"
             },
-            "time": "2024-08-12T09:29:03+00:00"
+            "time": "2024-08-08T09:37:46+00:00"
         },
         {
             "name": "unocha/gtm_barebones",
diff --git a/html/themes/custom/gms_ocha_common/css/styles.css b/html/themes/custom/gms_ocha_common/css/styles.css
index ca89f727..ad111636 100644
--- a/html/themes/custom/gms_ocha_common/css/styles.css
+++ b/html/themes/custom/gms_ocha_common/css/styles.css
@@ -1068,6 +1068,12 @@ svg.icons-sprite,
   display: none
 }
 
+.cd-ocha-services {
+    position: relative;
+    margin-block-end: 3rem !important;
+    padding-block-end: 1rem !important;
+}
+
 .visually-hidden,
 .cd-footer__section--menu h2,
 .cd-search--inline__form label,
@@ -7778,7 +7784,6 @@ display: block;}
 
 .gms-home-page h1 {font-family: 'Roboto', serif; font-size: 30px; font-weight: 300;}
 .gms-home-page h1 span {font-weight: 600;}
-.gms-home-page h2 {font-family: 'Roboto Slab', serif; font-size: 24px; font-weight: 300; color:#333; border-bottom: 2px solid #c4c4c4; padding-bottom: 10px; margin-bottom: 15px;}
 
 .gms-home-page .top-panel {background-color: #fff;}
 .gms-home-page .top-panel p {font-size: 14px; font-weight: 300; line-height: 22px;}
diff --git a/html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-footer.html.twig b/html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-footer.html.twig
index ca90155f..065624c9 100644
--- a/html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-footer.html.twig
+++ b/html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-footer.html.twig
@@ -5,7 +5,7 @@
   {% endblock %}
 
   {% block ocha %}
-    {% include '@gms_ocha_common/cd/cd-header/cd-ocha.html.twig' %}
+    {% include '@gms_ocha_common/cd/cd-footer/cd-ocha.html.twig' %}
   {% endblock %}
 
 {% endembed %}
diff --git a/html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-ocha.html.twig b/html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-ocha.html.twig
new file mode 100644
index 00000000..e42fbfb6
--- /dev/null
+++ b/html/themes/custom/gms_ocha_common/templates/cd/cd-footer/cd-ocha.html.twig
@@ -0,0 +1,56 @@
+<section id="cd-ocha-services" class="cd-ocha-services cd-footer__section cd-footer__section--ocha-services" aria-label="{{ 'OCHA Services'|t }}">
+  <h2 id="cd-ocha-services-title">{{ 'OCHA Services'|t }}</h2>
+
+  <div class="cd-ocha-services__content">
+    <div class="cd-ocha-services__inner">
+      <div class="cd-ocha-services__section">
+        <p class="cd-ocha-services__heading">{{ 'Related Platforms'|t }}</p>
+        <ul class="cd-ocha-services__list">
+          {% block related_platforms %}
+          <li class="cd-ocha-services__link"><a href="https://cbpf.unocha.org" target="_blank">{{ 'CBPF Grant Management system'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://pfdata.unocha.org" target="_blank">{{ 'Pooled Fund Data Hub'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://cerf.data.unocha.org/" target="_blank">{{ 'CERF Data Hub'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://cbpf.data.unocha.org" target="_blank">{{ 'CBPF Data Hub'|t }}</a></li>
+		  <li class="cd-ocha-services__link"><a href="https://gms.unocha.org/content/home" target="_blank">{{ 'GMS Help portal'|t }}</a></li>
+          {% endblock %}
+        </ul>
+      </div>
+      <div class="cd-ocha-services__section">
+        <p class="cd-ocha-services__heading">{{ 'Other OCHA Services'|t }}</p>
+        <ul class="cd-ocha-services__list">
+          {% block other_services_first %}
+          <li class="cd-ocha-services__link"><a href="https://fts.unocha.org/" target="_blank">{{ 'Financial Tracking Service'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://data.humdata.org/" target="_blank">{{ 'Humanitarian Data Exchange'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://auth.humanitarian.id/" target="_blank">{{ 'Humanitarian ID'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://humanitarianresponse.info/" target="_blank">{{ 'Humanitarian Response'|t }}</a></li>
+          {% endblock %}
+        </ul>
+      </div>
+      <div class="cd-ocha-services__section">
+        <p class="cd-ocha-services__heading" aria-hidden="true">&nbsp;</p>
+        <ul class="cd-ocha-services__list">
+          {% block other_services_second %}
+          <li class="cd-ocha-services__link"><a href="https://interagencystandingcommittee.org" target="_blank">{{ 'Inter-Agency Standing Committee'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://unocha.org/" target="_blank">{{ 'OCHA website'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://reliefweb.int/" target="_blank">{{ 'ReliefWeb'|t }}</a></li>
+          <li class="cd-ocha-services__link"><a href="https://vosocc.unocha.org/" target="_blank">{{ 'Virtual OSOCC'|t }}</a></li>
+          {% endblock %}
+        </ul>
+      </div>
+      <div class="cd-ocha-services__section">
+        <p class="cd-ocha-services__heading" aria-hidden="true">&nbsp;</p>
+        <ul class="cd-ocha-services__list">
+          <li class="cd-ocha-services__link">
+            <a class="cd-ocha-services__see-all" href="https://www.unocha.org/ocha-digital-services" target="_blank" rel="noopener">
+              {{ 'More OCHA Services'|t }}
+              <span class="visually-hidden">Opens in a new window</span>
+              <svg class="cd-icon cd-icon--external-link" width="16" height="16" aria-hidden="true" focusable="false">
+                <use xlink:href="#cd-icon--external-link"></use>
+              </svg>
+            </a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</section>