From b30b02d0eee819448cc578f8c8c922fc9ab19700 Mon Sep 17 00:00:00 2001
From: Christopher Guindon <chris.guindon@eclipse-foundation.org>
Date: Mon, 7 Jun 2021 14:40:11 -0400
Subject: [PATCH 1/2] add flexibility to footer

Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>
---
 layouts/_default/baseof.html                  |   3 +-
 layouts/partials/footer.html                  | 105 +-----------------
 layouts/partials/footer_js.html               |  45 ++++++++
 .../footer_links/footer-copyright.html        |   8 ++
 .../footer-eclipse-foundation.html            |  13 +++
 .../partials/footer_links/footer-legal.html   |  10 ++
 .../partials/footer_links/footer-other.html   |  11 ++
 .../footer_links/footer-useful-links.html     |  11 ++
 layouts/partials/footer_links/links.html      |   6 +
 layouts/partials/footer_links/prefix.html     |   0
 layouts/partials/footer_links/suffix.html     |   0
 11 files changed, 112 insertions(+), 100 deletions(-)
 create mode 100644 layouts/partials/footer_js.html
 create mode 100644 layouts/partials/footer_links/footer-copyright.html
 create mode 100644 layouts/partials/footer_links/footer-eclipse-foundation.html
 create mode 100644 layouts/partials/footer_links/footer-legal.html
 create mode 100644 layouts/partials/footer_links/footer-other.html
 create mode 100644 layouts/partials/footer_links/footer-useful-links.html
 create mode 100644 layouts/partials/footer_links/links.html
 create mode 100644 layouts/partials/footer_links/prefix.html
 create mode 100644 layouts/partials/footer_links/suffix.html

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index b567a255..5f70e0b4 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,4 +1,4 @@
-<!-- 
+<!--
   Copyright (c) 2018 Eclipse Foundation, Inc.
 
   This program and the accompanying materials are made available under the
@@ -28,6 +28,7 @@
   {{ block "featured_footer" . }}{{ partial "featured_footer.html" . }}{{ end }}
   {{ block "footer" . }}{{ partial "footer.html" . }}{{ end }}
   {{ block "footer-suffix" . }}{{ partial "footer_suffix.html" . }}{{ end }}
+  {{ block "footer-js" . }}{{ partial "footer_js.html" . }}{{ end }}
 </body>
 </html>
 
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index cd2c3565..deaa9f3d 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,4 +1,4 @@
-<!-- 
+<!--
   Copyright (c) 2018 Eclipse Foundation, Inc.
 
   This program and the accompanying materials are made available under the
@@ -14,105 +14,12 @@
   <a class="visible-xs" href="#top">{{ i18n "navigation-back-to-top" }}</a>
 </p>
 <footer id="{{- .Params.footer_id | default .Site.Params.footer_id | default "solstice-footer"}}" class="{{- .Params.footer_class | default .Site.Params.footer_class | default ""}}">
-  <div class="container">
+  <div class="{{- .Params.footer_container_class | default .Site.Params.footer_container_class | default "container"}}">
     <div class="row">
-      <section class="col-sm-6 hidden-print" id="footer-eclipse-foundation">
-        <h2 class="section-title">{{ i18n "eclipse-foundation-text" }}</h2>
-        <ul class="nav">
-          <li><a href="https://www.eclipse.org/org/">{{ i18n "footer-foundation-about-us-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/org/foundation/contact.php">{{ i18n "footer-foundation-contact-us-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/donate">{{ i18n "footer-foundation-donate-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/membership">{{ i18n "footer-foundation-members-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/org/documents/">{{ i18n "footer-foundation-governance-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/org/documents/Community_Code_of_Conduct.php">{{ i18n "footer-foundation-code-of-conduct-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/artwork/">{{ i18n "footer-foundation-logo-artwork-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/org/foundation/directors.php">{{ i18n "footer-foundation-board-of-directors-text" }}</a></li>
-        </ul>
-      </section>
-      <section class="col-sm-6 hidden-print" id="footer-legal">
-        <h2 class="section-title">{{ i18n "footer-legal-section-text" }}</h2>
-        <ul class="nav">
-          <li><a href="https://www.eclipse.org/legal/privacy.php">{{ i18n "footer-legal-privacy-policy-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/legal/termsofuse.php">{{ i18n "footer-legal-terms-use-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/legal/copyright.php">{{ i18n "footer-legal-copyright-agent-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/legal/epl-2.0/">{{ i18n "footer-legal-epl-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/legal/">{{ i18n "footer-legal-resources-text" }} </a></li>
-        </ul>
-      </section>
-      <section class="col-sm-6 hidden-print" id="footer-useful-links">
-        <h2 class="section-title">{{ i18n "footer-useful-links-section-text" }}</h2>
-        <ul class="nav">
-          <li><a href="https://bugs.eclipse.org/bugs/">{{ i18n "footer-useful-links-report-bug-text" }}</a></li>
-          <li><a href="//help.eclipse.org/">{{ i18n "footer-useful-links-documentation-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/contribute/">{{ i18n "footer-useful-links-contribute-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/mail/">{{ i18n "footer-useful-links-mailing-list-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/forums/">{{ i18n "footer-useful-links-forums-text" }}</a></li>
-          <li><a href="//marketplace.eclipse.org">{{ i18n "footer-useful-links-marketplace-text" }}</a></li>
-        </ul>
-      </section>
-      <section class="col-sm-6 hidden-print" id="footer-other">
-        <h2 class="section-title">{{ i18n "footer-other-section-text" }}</h2>
-        <ul class="nav">
-          <li><a href="https://www.eclipse.org/ide/">{{ i18n "footer-other-tools-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/projects">{{ i18n "footer-other-community-projects-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/org/workinggroups/">{{ i18n "footer-other-working-groups-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/org/research/">{{ i18n "footer-other-research-text" }}</a></li>
-          <li><a href="https://www.eclipse.org/security/">{{ i18n "footer-other-report-vulnerability-text" }}</a></li>
-          <li><a href="https://status.eclipse.org">{{ i18n "footer-other-status-text" }}</a></li>
-        </ul>
-      </section>
-      <div class="col-sm-24 margin-top-20">
-        <div class="row">
-          <div id="copyright" class="col-md-16">
-            <p id="copyright-text">{{ i18n "footer-copyright-text" | safeHTML}}</p>
-          </div>
-          {{ partial "socials.html" . }}
-        </div>
-      </div>
+      {{ partial "footer_links/prefix.html" . }}
+      {{ partial "footer_links/links.html" . }}
+      {{ partial "footer_links/suffix.html" . }}
       <a href="#" class="scrollup">{{ i18n "navigation-back-to-top" }}</a>
     </div>
   </div>
-</footer>
-<!-- Placed at the end of the document so the pages load faster -->
-{{- with .Site.Params.js | default "https://www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/main.min.js"}}
-<script src="{{ . | relURL }}"></script>
-{{ end }}
-{{ if isset .Site.Params "hugo_js" }}
-  {{- with .Site.Params.hugo_js }}
-    <script src="{{ . | relURL }}"></script>
-  {{ end }}
-{{ else }}
-    <script src="{{ "/js/solstice.hugo.js" | relURL }}"></script>
-{{ end }}
-
-<!-- Read in mustache templates registered in page scratch -->
-{{ range $key, $value := (.Page.Scratch.Get "mustache-templates") }}
-<script id="{{ $key }}" type="text/html">
-{{ readFile $value | safeHTML}}
-</script>
-{{ end }}
-<!-- Initialize any newsroom components on the page -->
-<script>
-(function($, document) {
-  {{ range (.Page.Scratch.Get "events-container-ids") }}
-    $("#{{ . }}").eclipseFdnApi({
-      type: "filteredEvents"
-    });
-  {{ end }}
-  {{ range (.Page.Scratch.Get "news-container-ids") }}
-    $("#{{ . }}").eclipseFdnApi({
-      type: "newsItems"
-    });
-  {{ end }}
-  {{ if ne .Page.Params.show_featured_story false }}
-    $("{{ .Site.Params.featured_footer_selector | default "#featured-story" }}").eclipseFdnApi({
-      type: "featuredStory"
-    });
-  {{ end }}
-  {{ if ne .Page.Params.show_featured_footer false }}
-    $("{{ .Site.Params.featured_footer_selector | default "#featured-footer" }}").eclipseFdnApi({
-      type: "featuredFooter"
-    });
-  {{ end }}
-})(jQuery, document);
-</script>
+</footer>
\ No newline at end of file
diff --git a/layouts/partials/footer_js.html b/layouts/partials/footer_js.html
new file mode 100644
index 00000000..92b874fb
--- /dev/null
+++ b/layouts/partials/footer_js.html
@@ -0,0 +1,45 @@
+
+<!-- Placed at the end of the document so the pages load faster -->
+{{- with .Site.Params.js | default "https://www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/main.min.js"}}
+<script src="{{ . | relURL }}"></script>
+{{ end }}
+{{ if isset .Site.Params "hugo_js" }}
+  {{- with .Site.Params.hugo_js }}
+    <script src="{{ . | relURL }}"></script>
+  {{ end }}
+{{ else }}
+    <script src="{{ "/js/solstice.hugo.js" | relURL }}"></script>
+{{ end }}
+
+<!-- Read in mustache templates registered in page scratch -->
+{{ range $key, $value := (.Page.Scratch.Get "mustache-templates") }}
+<script id="{{ $key }}" type="text/html">
+{{ readFile $value | safeHTML}}
+</script>
+{{ end }}
+
+<!-- Initialize any newsroom components on the page -->
+<script>
+(function($, document) {
+  {{ range (.Page.Scratch.Get "events-container-ids") }}
+    $("#{{ . }}").eclipseFdnApi({
+      type: "filteredEvents"
+    });
+  {{ end }}
+  {{ range (.Page.Scratch.Get "news-container-ids") }}
+    $("#{{ . }}").eclipseFdnApi({
+      type: "newsItems"
+    });
+  {{ end }}
+  {{ if ne .Page.Params.show_featured_story false }}
+    $("{{ .Site.Params.featured_footer_selector | default "#featured-story" }}").eclipseFdnApi({
+      type: "featuredStory"
+    });
+  {{ end }}
+  {{ if ne .Page.Params.show_featured_footer false }}
+    $("{{ .Site.Params.featured_footer_selector | default "#featured-footer" }}").eclipseFdnApi({
+      type: "featuredFooter"
+    });
+  {{ end }}
+})(jQuery, document);
+</script>
\ No newline at end of file
diff --git a/layouts/partials/footer_links/footer-copyright.html b/layouts/partials/footer_links/footer-copyright.html
new file mode 100644
index 00000000..94cc4217
--- /dev/null
+++ b/layouts/partials/footer_links/footer-copyright.html
@@ -0,0 +1,8 @@
+<div class="col-sm-24 margin-top-20">
+  <div class="row">
+    <div id="copyright" class="col-md-16">
+      <p id="copyright-text">{{ i18n "footer-copyright-text" | safeHTML}}</p>
+    </div>
+    {{ partial "socials.html" . }}
+  </div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/footer_links/footer-eclipse-foundation.html b/layouts/partials/footer_links/footer-eclipse-foundation.html
new file mode 100644
index 00000000..8deb6872
--- /dev/null
+++ b/layouts/partials/footer_links/footer-eclipse-foundation.html
@@ -0,0 +1,13 @@
+<section class="col-sm-6 hidden-print" id="footer-eclipse-foundation">
+  <h2 class="section-title">{{ i18n "eclipse-foundation-text" }}</h2>
+  <ul class="nav">
+    <li><a href="https://www.eclipse.org/org/">{{ i18n "footer-foundation-about-us-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/org/foundation/contact.php">{{ i18n "footer-foundation-contact-us-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/donate">{{ i18n "footer-foundation-donate-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/membership">{{ i18n "footer-foundation-members-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/org/documents/">{{ i18n "footer-foundation-governance-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/org/documents/Community_Code_of_Conduct.php">{{ i18n "footer-foundation-code-of-conduct-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/artwork/">{{ i18n "footer-foundation-logo-artwork-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/org/foundation/directors.php">{{ i18n "footer-foundation-board-of-directors-text" }}</a></li>
+  </ul>
+</section>
\ No newline at end of file
diff --git a/layouts/partials/footer_links/footer-legal.html b/layouts/partials/footer_links/footer-legal.html
new file mode 100644
index 00000000..369b8c67
--- /dev/null
+++ b/layouts/partials/footer_links/footer-legal.html
@@ -0,0 +1,10 @@
+<section class="col-sm-6 hidden-print" id="footer-legal">
+  <h2 class="section-title">{{ i18n "footer-legal-section-text" }}</h2>
+  <ul class="nav">
+    <li><a href="https://www.eclipse.org/legal/privacy.php">{{ i18n "footer-legal-privacy-policy-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/legal/termsofuse.php">{{ i18n "footer-legal-terms-use-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/legal/copyright.php">{{ i18n "footer-legal-copyright-agent-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/legal/epl-2.0/">{{ i18n "footer-legal-epl-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/legal/">{{ i18n "footer-legal-resources-text" }} </a></li>
+  </ul>
+</section>
\ No newline at end of file
diff --git a/layouts/partials/footer_links/footer-other.html b/layouts/partials/footer_links/footer-other.html
new file mode 100644
index 00000000..205a3989
--- /dev/null
+++ b/layouts/partials/footer_links/footer-other.html
@@ -0,0 +1,11 @@
+<section class="col-sm-6 hidden-print" id="footer-other">
+  <h2 class="section-title">{{ i18n "footer-other-section-text" }}</h2>
+  <ul class="nav">
+    <li><a href="https://www.eclipse.org/ide/">{{ i18n "footer-other-tools-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/projects">{{ i18n "footer-other-community-projects-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/org/workinggroups/">{{ i18n "footer-other-working-groups-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/org/research/">{{ i18n "footer-other-research-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/security/">{{ i18n "footer-other-report-vulnerability-text" }}</a></li>
+    <li><a href="https://status.eclipse.org">{{ i18n "footer-other-status-text" }}</a></li>
+  </ul>
+</section>
\ No newline at end of file
diff --git a/layouts/partials/footer_links/footer-useful-links.html b/layouts/partials/footer_links/footer-useful-links.html
new file mode 100644
index 00000000..45f0bc26
--- /dev/null
+++ b/layouts/partials/footer_links/footer-useful-links.html
@@ -0,0 +1,11 @@
+<section class="col-sm-6 hidden-print" id="footer-useful-links">
+  <h2 class="section-title">{{ i18n "footer-useful-links-section-text" }}</h2>
+  <ul class="nav">
+    <li><a href="https://bugs.eclipse.org/bugs/">{{ i18n "footer-useful-links-report-bug-text" }}</a></li>
+    <li><a href="//help.eclipse.org/">{{ i18n "footer-useful-links-documentation-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/contribute/">{{ i18n "footer-useful-links-contribute-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/mail/">{{ i18n "footer-useful-links-mailing-list-text" }}</a></li>
+    <li><a href="https://www.eclipse.org/forums/">{{ i18n "footer-useful-links-forums-text" }}</a></li>
+    <li><a href="//marketplace.eclipse.org">{{ i18n "footer-useful-links-marketplace-text" }}</a></li>
+  </ul>
+</section>
\ No newline at end of file
diff --git a/layouts/partials/footer_links/links.html b/layouts/partials/footer_links/links.html
new file mode 100644
index 00000000..971af468
--- /dev/null
+++ b/layouts/partials/footer_links/links.html
@@ -0,0 +1,6 @@
+{{ partial "footer_links/footer-eclipse-foundation.html" . }}
+{{ partial "footer_links/footer-legal.html" . }}
+{{ partial "footer_links/footer-useful-links.html" . }}
+{{ partial "footer_links/footer-other.html" . }}
+{{ partial "footer_links/footer-copyright.html" . }}
+
diff --git a/layouts/partials/footer_links/prefix.html b/layouts/partials/footer_links/prefix.html
new file mode 100644
index 00000000..e69de29b
diff --git a/layouts/partials/footer_links/suffix.html b/layouts/partials/footer_links/suffix.html
new file mode 100644
index 00000000..e69de29b

From 53742aaa1c66fb8ac6e5ee63fefe66e7838e432e Mon Sep 17 00:00:00 2001
From: Christopher Guindon <chris.guindon@eclipse-foundation.org>
Date: Mon, 7 Jun 2021 14:48:55 -0400
Subject: [PATCH 2/2] add class overrides for each section

Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>
---
 layouts/partials/footer_links/footer-eclipse-foundation.html | 2 +-
 layouts/partials/footer_links/footer-legal.html              | 2 +-
 layouts/partials/footer_links/footer-other.html              | 2 +-
 layouts/partials/footer_links/footer-useful-links.html       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layouts/partials/footer_links/footer-eclipse-foundation.html b/layouts/partials/footer_links/footer-eclipse-foundation.html
index 8deb6872..d7a5bacc 100644
--- a/layouts/partials/footer_links/footer-eclipse-foundation.html
+++ b/layouts/partials/footer_links/footer-eclipse-foundation.html
@@ -1,4 +1,4 @@
-<section class="col-sm-6 hidden-print" id="footer-eclipse-foundation">
+<section class="{{- .Params.footer_section_eclipse_foundation_class | default .Site.Params.footer_section_eclipse_foundation_class | default "col-sm-6 hidden-print"}}" id="footer-eclipse-foundation">
   <h2 class="section-title">{{ i18n "eclipse-foundation-text" }}</h2>
   <ul class="nav">
     <li><a href="https://www.eclipse.org/org/">{{ i18n "footer-foundation-about-us-text" }}</a></li>
diff --git a/layouts/partials/footer_links/footer-legal.html b/layouts/partials/footer_links/footer-legal.html
index 369b8c67..20b03e86 100644
--- a/layouts/partials/footer_links/footer-legal.html
+++ b/layouts/partials/footer_links/footer-legal.html
@@ -1,4 +1,4 @@
-<section class="col-sm-6 hidden-print" id="footer-legal">
+<section class="{{- .Params.footer_section_legal_class | default .Site.Params.footer_section_legal_class | default "col-sm-6 hidden-print"}}" id="footer-legal">
   <h2 class="section-title">{{ i18n "footer-legal-section-text" }}</h2>
   <ul class="nav">
     <li><a href="https://www.eclipse.org/legal/privacy.php">{{ i18n "footer-legal-privacy-policy-text" }}</a></li>
diff --git a/layouts/partials/footer_links/footer-other.html b/layouts/partials/footer_links/footer-other.html
index 205a3989..39849eef 100644
--- a/layouts/partials/footer_links/footer-other.html
+++ b/layouts/partials/footer_links/footer-other.html
@@ -1,4 +1,4 @@
-<section class="col-sm-6 hidden-print" id="footer-other">
+<section class="{{- .Params.footer_section_other_class | default .Site.Params.footer_section_other_class | default "col-sm-6 hidden-print"}}" id="footer-other">
   <h2 class="section-title">{{ i18n "footer-other-section-text" }}</h2>
   <ul class="nav">
     <li><a href="https://www.eclipse.org/ide/">{{ i18n "footer-other-tools-text" }}</a></li>
diff --git a/layouts/partials/footer_links/footer-useful-links.html b/layouts/partials/footer_links/footer-useful-links.html
index 45f0bc26..ed5b505a 100644
--- a/layouts/partials/footer_links/footer-useful-links.html
+++ b/layouts/partials/footer_links/footer-useful-links.html
@@ -1,4 +1,4 @@
-<section class="col-sm-6 hidden-print" id="footer-useful-links">
+<section class="{{- .Params.footer_section_useful_links_class | default .Site.Params.footer_section_useful_links_class | default "col-sm-6 hidden-print"}}" id="footer-useful-links">
   <h2 class="section-title">{{ i18n "footer-useful-links-section-text" }}</h2>
   <ul class="nav">
     <li><a href="https://bugs.eclipse.org/bugs/">{{ i18n "footer-useful-links-report-bug-text" }}</a></li>