Merge branch 'release-0.2.3' into main

unepwcmc · Jan 19, 2023 · 17c0142 · 17c0142
2 parents 1962a40 + bdf003c
commit 17c0142
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### 0.3.1 (2023-01-19)
+
+- add contact-us email address to the footer
+
 ### 0.3.0
 
 - Add GoogleAnalytics tag

diff --git a/app/assets/stylesheets/components/_nav.scss b/app/assets/stylesheets/components/_nav.scss
@@ -133,7 +133,6 @@
 
   .nav__li {
     margin: 0 rem-calc(14);
-
     display: inline;
 
     &:first-child {
@@ -162,4 +161,10 @@
     margin-right: rem-calc(30);
     margin-bottom: rem-calc(8);
   }
+
 }
+
+.nav__contact-us {
+  @include nav-basic;
+  text-transform: none;
+}
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -11,6 +11,12 @@ def footer_nav
     navPresenter.nav_footer
   end
 
+  def contact_email
+    navPresenter = NavigationPresenter.new
+
+    navPresenter.contact_us
+  end
+
   def footer_icons; end
 
   def site_logos

diff --git a/app/presenters/navigation_presenter.rb b/app/presenters/navigation_presenter.rb
@@ -55,4 +55,8 @@ def nav_footer
       }
     ]
   end
+
+  def contact_us
+   'CONTACT US: nature.commitments@unep-wcmc.org'
+  end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -30,7 +30,8 @@
       <% else %>
         <%= render partial:'partials/global/footer', locals: {
           links: footer_nav, 
-          logos: site_logos
+          logos: site_logos,
+          email: contact_email
         } %>
       <% end %>
     </div>

diff --git a/app/views/partials/global/_footer.html.erb b/app/views/partials/global/_footer.html.erb
@@ -1,14 +1,17 @@
 <footer class="footer">
   <div class="footer__container">
-    <nav class="nav--footer">
-      <ul class="nav__ul">
-        <% links.each do |link| %>
-          <li class="nav__li">
-            <%= link_to link[:title], link[:url], class: 'nav__a' %>
-          </li>
-        <% end %>
-      </ul>
-    </nav>
+    <div>
+      <nav class="nav--footer">
+        <ul class="nav__ul">
+          <% links.each do |link| %>
+            <li class="nav__li">
+              <%= link_to link[:title], link[:url], class: 'nav__a' %>
+            </li>
+          <% end %>
+        </ul>
+      </nav>
+      <a class="nav__contact-us"><%= email %></a>
+    </div>
 
     <div class="list--footer-logos">
       <ul class="list__ul">