layouts/partials/astro/socials.html

@@ -76,7 +76,7 @@
 
 <div class="footer-end-social">
   <p class="footer-end-social-text hidden-xs">Follow Us:</p>
-  <ul class="footer-end-social-links list-inline">
+  <ul class="footer-end-social-links list-unstyled">
     {{ range $socials }}
       {{ $text := i18n "footer-sr-social-account" .name | default (printf "%s account" .name) }}
       <li>

layouts/partials/footer_links/footer-copyright.html

@@ -14,7 +14,7 @@
 
 <div class="col-sm-24 margin-top-20">
   <div class="row">
-    <div id="copyright" class="col-md-16">
+    <div id="copyright" class="col-sm-16">
       <p id="copyright-text">{{ i18n "footer-copyright-text" | safeHTML}}</p>
     </div>
     {{ if eq $layout_style "quicksilver" }}

layouts/partials/quicksilver/socials.html

@@ -11,29 +11,81 @@
   SPDX-License-Identifier: EPL-2.0
 */}}
 
+{{ $twitter_url := $.Site.Params.twitter_url }}
+{{ $facebook_url := $.Site.Params.facebook_url }}
 {{ $instagram_url := $.Site.Params.instagram_url }}
+{{ $youtube_url := $.Site.Params.youtube_url }}
+{{ $linkedin_url := $.Site.Params.linkedin_url }}
+{{ $bluesky_url := $.Site.Params.bluesky_url }}
 
-<div class="col-md-8 social-media">
-    <ul class="list-inline">
-      <li><a class="social-media-link fa-stack fa-lg" href="{{ $.Site.Params.twitter_url | default "https://twitter.com/EclipseFdn" }}"> <i class="fa-regular fa-circle fa-stack-2x"></i> <i
-          class="fa-brands fa-x-twitter fa-stack-1x"></i> <span class="sr-only">{{ i18n "footer-sr-twitter-text" }}</span>
-      </a></li>
-      <li><a class="social-media-link fa-stack fa-lg" href="{{ $.Site.Params.bluesky_url | default "https://bsky.app/profile/eclipsefdn.bsky.social" }}" title="{{ i18n "footer-sr-bluesky-account" }}">
-          <i class="fa-regular fa-circle fa-stack-2x"></i> <i class="fa-brands fa-bluesky fa-stack-1x"></i> <span class="sr-only">{{ i18n "footer-sr-bluesky-text" }}</span>
-      </a></li>
-      <li><a class="social-media-link fa-stack fa-lg" href="{{ $.Site.Params.facebook_url | default "https://www.facebook.com/eclipse.org" }}"> <i class="fa-regular fa-circle fa-stack-2x"></i> <i
-          class="fa-brands fa-facebook-f fa-stack-1x"></i> <span class="sr-only">{{ i18n "footer-sr-facebook-text" }}</span>
-      </a></li>
-      {{ if $instagram_url }}
-        <li><a class="social-media-link fa-stack fa-lg" href="{{ $instagram_url }}"> <i class="fa-regular fa-circle fa-stack-2x"></i> <i
-            class="fa-brands fa-instagram fa-stack-1x"></i> <span class="sr-only">{{ i18n "footer-sr-instagram-text" }}</span>
+{{/* To support the legacy "socialmedia_url" params */}}
+{{ $socials := slice }}
+{{ $using_legacy_socials := cond (or (ne $facebook_url nil) (ne $twitter_url nil) (ne $instagram_url nil) (ne $youtube_url nil) (ne $linkedin_url nil) (ne $bluesky_url nil)) true false }}
+
+{{ if $using_legacy_socials }}
+  {{ with $twitter_url }}
+    {{ $x := (dict 
+      "name" "X"
+      "url" .
+      "icon" "fa-brands fa-x-twitter"
+    ) }}
+    {{ $socials = $socials | append $x }}
+  {{ end }}
+  {{ with $facebook_url }}
+    {{ $facebook := (dict 
+      "name" "Facebook"
+      "url" .
+      "icon" "fa-brands fa-facebook-f"
+    ) }}
+    {{ $socials = $socials | append $facebook }}
+  {{ end }}
+  {{ with $instagram_url }}
+    {{ $instagram := (dict
+      "name" "Instagram"
+      "url" .
+      "icon" "fa-brands fa-instagram"
+    ) }}
+    {{ $socials = $socials | append $instagram }}
+  {{ end }}
+  {{ with $youtube_url }}
+    {{ $youtube := (dict
+      "name" "YouTube"
+      "url" .
+      "icon" "fa-brands fa-youtube"
+    ) }}
+    {{ $socials = $socials | append $youtube }}
+  {{ end }}
+  {{ with $linkedin_url }}
+    {{ $linkedin := (dict
+      "name" "LinkedIn"
+      "url" .
+      "icon" "fa-brands fa-linkedin-in"
+    ) }}
+    {{ $socials = $socials | append $linkedin }}
+  {{ end }}
+  {{ with $bluesky_url }}
+    {{ $bluesky := (dict
+      "name" "Bluesky"
+      "url" .
+      "icon" "fa-brands fa-bluesky"
+    ) }}
+    {{ $socials = $socials | append $bluesky }}
+  {{ end }}
+{{ else }}
+  {{ $socials = $.Site.Params.socials }}
+{{ end }}
+
+<div class="col-sm-8 social-media">
+    <ul class="list-unstyled social-links">
+      {{ range $socials }}
+        {{ $i18n_key := printf "footer-sr-%s-text" (urlize (lower .name)) }}
+        {{ $text := i18n $i18n_key | default .name }}
+        {{ $title_key := printf "footer-sr-%s-account" (urlize (lower .name)) }}
+        <li><a class="social-media-link fa-stack fa-lg" href="{{ .url }}" {{ with (i18n $title_key) }}title="{{ . }}"{{ end }}>
+            <i class="fa-regular fa-circle fa-stack-2x"></i>
+            <i class="{{ .icon }} fa-stack-1x"></i>
+            <span class="sr-only">{{ $text }}</span>
         </a></li>
       {{ end }}
-      <li><a class="social-media-link fa-stack fa-lg" href="{{ $.Site.Params.youtube_url | default "https://www.youtube.com/user/EclipseFdn" }}"> <i class="fa-regular fa-circle fa-stack-2x"></i> <i
-          class="fa-brands fa-youtube fa-stack-1x"></i> <span class="sr-only">{{ i18n "footer-sr-youtube-text" }}</span>
-      </a></li>
-      <li><a class="social-media-link fa-stack fa-lg" href="{{ $.Site.Params.linkedin_url | default "https://www.linkedin.com/company/eclipse-foundation" }}" title="{{ i18n "footer-sr-linkedin-account" }}">
-          <i class="fa-regular fa-circle fa-stack-2x"></i> <i class="fa-brands fa-linkedin-in fa-stack-1x"></i> <span class="sr-only">{{ i18n "footer-sr-linkedin-text" }}</span>
-      </a></li>
     </ul>
   </div>

package.json

@@ -4,7 +4,7 @@
   "main": "webpack.min.js",
   "author": "Christopher Guindon",
   "license": "EPL-2.0",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "bugs": {
     "url": "https://gitlab.eclipse.org/eclipsefdn/it/webdev/hugo-solstice-theme/-/issues"
   },
@@ -23,7 +23,7 @@
   "readmeFilename": "README.md",
   "dependencies": {
     "axios": "^1.7.7",
-    "eclipsefdn-solstice-assets": "0.1.18",
+    "eclipsefdn-solstice-assets": "0.1.19",
     "json2yaml": "^1.1.0",
     "toml": "^3.0.0"
   },

yarn.lock

@@ -2556,10 +2556,10 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1:
     es-errors "^1.3.0"
     gopd "^1.2.0"
 
-eclipsefdn-solstice-assets@0.1.18:
-  version "0.1.18"
-  resolved "https://registry.yarnpkg.com/eclipsefdn-solstice-assets/-/eclipsefdn-solstice-assets-0.1.18.tgz#7930818dcf77aa90cfff9bc341b9129c5cd4a6b6"
-  integrity sha512-1ChAobmUjPdfGJadhfalqK2C25G+89jHsz+hwSlxwCIF6OF0n/UTS0FRxauoVKqeHtwhdLTlV2p3qV16/iKWFA==
+eclipsefdn-solstice-assets@0.1.19:
+  version "0.1.19"
+  resolved "https://registry.yarnpkg.com/eclipsefdn-solstice-assets/-/eclipsefdn-solstice-assets-0.1.19.tgz#17d7ba5c0201c87afb6e3381cba6437f2cc8d07d"
+  integrity sha512-NHieL9pKQc1/ZO/T7mqJ+0xzliwedC7wM89wUePguveWA+SjS1SgRenHTimShoRed1z0+ov/fa+NFQSt2DxyMg==
   dependencies:
     "@babel/core" "^7.23.2"
     "@babel/plugin-proposal-class-properties" "^7.18.6"