From d8e26588767a0273383b8400560b45d16ae0cf3a Mon Sep 17 00:00:00 2001
From: Kelly Stathis <kelly.a.stathis@gmail.com>
Date: Wed, 20 Sep 2023 10:01:10 -0700
Subject: [PATCH 1/2] update footer template

---
 app/views/layouts/datacite/_footer.html.erb | 33 +++++++++++----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/views/layouts/datacite/_footer.html.erb b/app/views/layouts/datacite/_footer.html.erb
index 4b3fda84..a446dfe7 100644
--- a/app/views/layouts/datacite/_footer.html.erb
+++ b/app/views/layouts/datacite/_footer.html.erb
@@ -1,7 +1,7 @@
 <div class='row footer'>
   <div class="container-fluid">
     <div class='col-sm-3'>
-      <h4>About DataCite</h4>
+      <h4>About Us</h4>
       <ul>
       <% settings.about_links.each do |link| %>
         <li><%= link_to link.name, "#{ENV["HOMEPAGE_URL"]}#{link.url}" %></a></li>
@@ -9,7 +9,7 @@
       </ul>
     </div>
     <div class='col-sm-3'>
-      <h4>Services</h4>
+      <h4>Work With Us</h4>
       <ul>
       <% settings.services_links.each do |link| %>
         <li><%= link_to link.name, "#{ENV["HOMEPAGE_URL"]}#{link.url}" %></a></li>
@@ -17,39 +17,42 @@
       </ul>
     </div>
     <div class='col-sm-3'>
-      <h4>Resources</h4>
+      <h4>Membership</h4>
       <ul>
-      <% settings.resources_links.each do |link| %>
-        <li><%= link_to link.name, link.url %></a></li>
+      <% settings.community_links.each do |link| %>
+        <li><%= link_to link.name, "#{ENV["HOMEPAGE_URL"]}#{link.url}" %></a></li>
       <% end %>
       </ul>
-      <h4>Community</h4>
+      <h4>Resources</h4>
       <ul>
-      <% settings.community_links.each do |link| %>
-        <li><%= link_to link.name, "#{ENV["HOMEPAGE_URL"]}#{link.url}" %></a></li>
+      <% settings.resources_links.each do |link| %>
+        <li><%= link_to link.name, link.url %></a></li>
       <% end %>
       </ul>
     </div>
     <div class='col-sm-3'>
-      <h4 class="share">Contact us</h4>
+      <h4 class="share">Contact Us</h4>
       <a href='mailto:support@datacite.org' class="share">
         <i class='fas fa-envelope'></i>
       </a>
-      <a href='https://blog.datacite.org' class="share">
+      <a href='https://datacite.org/blog/' class="share">
         <i class='fas fa-blog'></i>
       </a>
-      <a href='https://twitter.com/datacite' class="share">
-        <i class='fab fa-twitter'></i>
-      </a>
       <a href='https://github.com/datacite/datacite' class="share">
         <i class='fab fa-github'></i>
       </a>
-      <a href='https://www.youtube.com/channel/UCVsSDZhIN_WbnD_v5o9eB_A' class="share">
-        <i class='fab fa-youtube'></i>
+      <a href='https://twitter.com/datacite' class="share">
+        <svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 512 512" style="fill: #a3acb2;position: relative;bottom: -3;"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"></path></svg>
+      </a>
+      <a href="https://openbiblio.social/@datacite" class="share">
+        <i class='fab fa-mastodon'></i>
       </a>
       <a href='https://www.linkedin.com/company/datacite' class="share">
         <i class='fab fa-linkedin'></i>
       </a>
+      <a href='https://www.youtube.com/@DataCiteChannel' class="share">
+        <i class='fab fa-youtube'></i>
+      </a>
       <ul class="share">
       <% settings.contact_links.each do |link| %>
         <li><%= link_to link.name, "#{ENV["HOMEPAGE_URL"]}#{link.url}" %></a></li>

From 2473d69d591b485e62e541477a814d21a1cccac6 Mon Sep 17 00:00:00 2001
From: Kelly Stathis <kelly.a.stathis@gmail.com>
Date: Wed, 20 Sep 2023 11:28:36 -0700
Subject: [PATCH 2/2] fix footer URL construction

---
 app/views/layouts/datacite/_footer.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/datacite/_footer.html.erb b/app/views/layouts/datacite/_footer.html.erb
index a446dfe7..a5267f8a 100644
--- a/app/views/layouts/datacite/_footer.html.erb
+++ b/app/views/layouts/datacite/_footer.html.erb
@@ -4,7 +4,7 @@
       <h4>About Us</h4>
       <ul>
       <% settings.about_links.each do |link| %>
-        <li><%= link_to link.name, "#{ENV["HOMEPAGE_URL"]}#{link.url}" %></a></li>
+        <li><%= link_to link.name, link.url %></a></li>
       <% end %>
       </ul>
     </div>
@@ -12,7 +12,7 @@
       <h4>Work With Us</h4>
       <ul>
       <% settings.services_links.each do |link| %>
-        <li><%= link_to link.name, "#{ENV["HOMEPAGE_URL"]}#{link.url}" %></a></li>
+        <li><%= link_to link.name, link.url %></a></li>
       <% end %>
       </ul>
     </div>
@@ -20,7 +20,7 @@
       <h4>Membership</h4>
       <ul>
       <% settings.community_links.each do |link| %>
-        <li><%= link_to link.name, "#{ENV["HOMEPAGE_URL"]}#{link.url}" %></a></li>
+        <li><%= link_to link.name, link.url %></a></li>
       <% end %>
       </ul>
       <h4>Resources</h4>