From 722d2f83902d9ed3dd19235a66e34fed7751fdc4 Mon Sep 17 00:00:00 2001
From: Sneha Sharma <sne12394@gmail.com>
Date: Thu, 11 Apr 2024 17:52:12 +0530
Subject: [PATCH] [Update][m]: Feedbacks implemented

---
 ckanext/ubdc/assets/css/style.css              | 18 +++++++++++++++++-
 ckanext/ubdc/helpers.py                        |  4 ++++
 ckanext/ubdc/plugin.py                         |  1 +
 ckanext/ubdc/public/base/scss/_footer.scss     | 14 ++++++++++++--
 ckanext/ubdc/public/base/scss/_homepage.scss   |  4 ++++
 ckanext/ubdc/templates/footer.html             | 14 +++++++-------
 .../templates/home/snippets/newsletter.html    |  2 +-
 7 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/ckanext/ubdc/assets/css/style.css b/ckanext/ubdc/assets/css/style.css
index 371208b..2bce504 100644
--- a/ckanext/ubdc/assets/css/style.css
+++ b/ckanext/ubdc/assets/css/style.css
@@ -10500,6 +10500,10 @@ h4 small {
   line-height: 1.5;
   display: flex;
 }
+.homepage .funding .funded_logo img {
+  object-fit: contain;
+  max-width: 11em;
+}
 .homepage .funding .wrap {
   padding-top: 3em;
   padding-bottom: 3em;
@@ -11003,13 +11007,25 @@ h4 small {
   font-weight: 300;
 }
 .site-footer__bottom ul li:last-child::after {
-  content: "";
+  content: " ";
   margin: 0;
 }
 .site-footer__bottom .attribution {
   padding-top: 20px;
   display: flex;
   justify-content: space-between;
+  text-transform: capitalize;
+}
+
+.footer_link-block-head {
+  color: #09090b;
+  margin-top: 0;
+  margin-bottom: 1.5vw;
+  font-family: Inter, sans-serif;
+  font-size: 1em;
+  font-weight: 600;
+  line-height: 1.5;
+  text-decoration: none;
 }
 
 @media (max-width: 768px) {
diff --git a/ckanext/ubdc/helpers.py b/ckanext/ubdc/helpers.py
index 257c9a8..302d1d0 100644
--- a/ckanext/ubdc/helpers.py
+++ b/ckanext/ubdc/helpers.py
@@ -44,6 +44,10 @@ def get_gtm_id():
     """Return the Google Tag Manager ID."""
     return tk.config.get("ckanext.ubdc.gtm_id", "")
 
+def get_newsletter_link():
+    """Return the Newsletter Link."""
+    return tk.config.get("ckanext.ubdc.newsletter_link", "")
+
 
 def get_cookie_control_config():
     cookie_control_config = {}
diff --git a/ckanext/ubdc/plugin.py b/ckanext/ubdc/plugin.py
index 7369446..1796640 100644
--- a/ckanext/ubdc/plugin.py
+++ b/ckanext/ubdc/plugin.py
@@ -69,6 +69,7 @@ def get_helpers(self):
             "get_cookie_control_config": helpers.get_cookie_control_config,
             "get_field_to_question": helpers.get_field_to_question,
             "get_data_providers": helpers.get_data_providers,
+            "get_newsletter_link": helpers.get_newsletter_link
         }
 
     # IValidators
diff --git a/ckanext/ubdc/public/base/scss/_footer.scss b/ckanext/ubdc/public/base/scss/_footer.scss
index 82b9663..25f8e69 100644
--- a/ckanext/ubdc/public/base/scss/_footer.scss
+++ b/ckanext/ubdc/public/base/scss/_footer.scss
@@ -137,7 +137,7 @@
           font-weight: 300;
         }
         &:last-child::after {
-          content: "";
+          content: " ";
           margin: 0;
         }
       }
@@ -146,10 +146,20 @@
       padding-top: 20px;
       display: flex;
       justify-content: space-between;
+      text-transform: capitalize;
     }
   }
 }
-
+.footer_link-block-head {
+    color: #09090b;
+    margin-top: 0;
+    margin-bottom: 1.5vw;
+    font-family: Inter, sans-serif;
+    font-size: 1em;
+    font-weight: 600;
+    line-height: 1.5;
+    text-decoration: none;
+}
 @media (max-width: $screen-sm-min) {
   .site-footer {
     all: unset;
diff --git a/ckanext/ubdc/public/base/scss/_homepage.scss b/ckanext/ubdc/public/base/scss/_homepage.scss
index 27bbbdb..7da4a63 100644
--- a/ckanext/ubdc/public/base/scss/_homepage.scss
+++ b/ckanext/ubdc/public/base/scss/_homepage.scss
@@ -404,6 +404,10 @@
       font-size: 1em;
       line-height: 1.5;
       display: flex;
+      img {
+        object-fit: contain;
+        max-width: 11em;
+      }
     }
     .wrap {
       padding-top: 3em;
diff --git a/ckanext/ubdc/templates/footer.html b/ckanext/ubdc/templates/footer.html
index bc93a9a..9248c3e 100644
--- a/ckanext/ubdc/templates/footer.html
+++ b/ckanext/ubdc/templates/footer.html
@@ -8,7 +8,7 @@
                         title="{{ g.site_title }}" /></a>
             </div>
             <div class="site-footer__col-2">
-                <h4>Data</h4>
+                <h4 class="footer_link-block-head">Data</h4>
                 <ul class="footer__list">
                     <li>
                         <a href="https://ubdc.ac.uk/data-services" target="_blank">Data Services</a>
@@ -19,7 +19,7 @@ <h4>Data</h4>
                 </ul>
             </div>
             <div class="site-footer__col-2">
-                <h4>Research</h4>
+                <h4 class="footer_link-block-head">Research</h4>
                 <ul class="footer__list">
                     <li>
                         <a href="https://www.ubdc.ac.uk/research-themes" target="_blank">Research Themes</a>
@@ -33,7 +33,7 @@ <h4>Research</h4>
                 </ul>
             </div>
             <div class="site-footer__col-2">
-                <h4>Education &amp; Events</h4>
+                <h4 class="footer_link-block-head">Education &amp; Events</h4>
                 <ul class="footer__list">
                     <li>
                         <a href="https://www.ubdc.ac.uk/education" target="_blank">MSc and PhD</a>
@@ -44,18 +44,18 @@ <h4>Education &amp; Events</h4>
                 </ul>
             </div>
             <div class="site-footer__col-2">
-                <h4>Impact</h4>
+                <h4 class="footer_link-block-head">Impact</h4>
                 <ul class="footer__list">
                     <li>
-                        <a href="https://www.ubdc.ac.uk/news" target="_blank">News</a>
+                        <a href="https://www.ubdc.ac.uk/news" class="footer_link-block-head" target="_blank">News</a>
                     </li>
                     <li>
-                        <a href="https://www.ubdc.ac.uk/events" target="_blank">Events</a>
+                        <a href="https://www.ubdc.ac.uk/events" class="footer_link-block-head" target="_blank">Events</a>
                     </li>
                 </ul>
             </div>
             <div class="site-footer__col-2">
-                <h4>About UBDC</h4>
+                <h4 class="footer_link-block-head">About UBDC</h4>
                 <ul class="footer__list">
                     <li>
                         <a href="mailto: ubdc-dataservice@glasgow.ac.uk" target="_blank">Contact Us</a>
diff --git a/ckanext/ubdc/templates/home/snippets/newsletter.html b/ckanext/ubdc/templates/home/snippets/newsletter.html
index c61c3dc..58b86ac 100644
--- a/ckanext/ubdc/templates/home/snippets/newsletter.html
+++ b/ckanext/ubdc/templates/home/snippets/newsletter.html
@@ -9,7 +9,7 @@ <h2 class="head-h2">UBDC Newsletter</h2>
         </p>
       </div>
       <div class="">
-        <a class="btn btn-primary btn-newsletter" href="https://ubdc.ac.uk/subscribe"
+        <a class="btn btn-primary btn-newsletter" href="{{h.get_newsletter_link()}}"
           >SIGN UP</a
         >
       </div>