From bbb1ad3313d1a40a20979993671e3781a44fbaad Mon Sep 17 00:00:00 2001
From: Christopher Guindon <chris.guindon@eclipse-foundation.org>
Date: Mon, 26 Jun 2023 14:32:22 +0000
Subject: [PATCH] move collaborations images with content
---
.../images}/icons/collaboration.png | Bin
.../images}/icons/compatibility.png | Bin
.../collaborations/images}/icons/ecosystem.png | Bin
.../collaborations/images}/icons/icon-bg.png | Bin
.../images}/icons/specification.png | Bin
.../collaborations/images}/icons/vendor.png | Bin
.../eclipsefdn.weighted-working-groups.js | 14 +++++++-------
.../pages/collaborations/collaborating.html | 4 ++--
8 files changed, 9 insertions(+), 9 deletions(-)
rename {static/images/collaborations => content/collaborations/images}/icons/collaboration.png (100%)
rename {static/images/collaborations => content/collaborations/images}/icons/compatibility.png (100%)
rename {static/images/collaborations => content/collaborations/images}/icons/ecosystem.png (100%)
rename {static/images/collaborations => content/collaborations/images}/icons/icon-bg.png (100%)
rename {static/images/collaborations => content/collaborations/images}/icons/specification.png (100%)
rename {static/images/collaborations => content/collaborations/images}/icons/vendor.png (100%)
diff --git a/static/images/collaborations/icons/collaboration.png b/content/collaborations/images/icons/collaboration.png
similarity index 100%
rename from static/images/collaborations/icons/collaboration.png
rename to content/collaborations/images/icons/collaboration.png
diff --git a/static/images/collaborations/icons/compatibility.png b/content/collaborations/images/icons/compatibility.png
similarity index 100%
rename from static/images/collaborations/icons/compatibility.png
rename to content/collaborations/images/icons/compatibility.png
diff --git a/static/images/collaborations/icons/ecosystem.png b/content/collaborations/images/icons/ecosystem.png
similarity index 100%
rename from static/images/collaborations/icons/ecosystem.png
rename to content/collaborations/images/icons/ecosystem.png
diff --git a/static/images/collaborations/icons/icon-bg.png b/content/collaborations/images/icons/icon-bg.png
similarity index 100%
rename from static/images/collaborations/icons/icon-bg.png
rename to content/collaborations/images/icons/icon-bg.png
diff --git a/static/images/collaborations/icons/specification.png b/content/collaborations/images/icons/specification.png
similarity index 100%
rename from static/images/collaborations/icons/specification.png
rename to content/collaborations/images/icons/specification.png
diff --git a/static/images/collaborations/icons/vendor.png b/content/collaborations/images/icons/vendor.png
similarity index 100%
rename from static/images/collaborations/icons/vendor.png
rename to content/collaborations/images/icons/vendor.png
diff --git a/js/src/collaborations/eclipsefdn.weighted-working-groups.js b/js/src/collaborations/eclipsefdn.weighted-working-groups.js
index 9ed652a9..91a088d9 100644
--- a/js/src/collaborations/eclipsefdn.weighted-working-groups.js
+++ b/js/src/collaborations/eclipsefdn.weighted-working-groups.js
@@ -37,7 +37,7 @@ const weights = {
sparkplug: 50,
};
-// An object which uses WG aliases as keys and logo urls as value. Use this only for WGs which do not yet have a logo.
+// An object which uses WG aliases as keys and logo urls as value. Use this only for WGs which do not yet have a logo.
const fallbackLogos = {};
const removeDuplicates = (value, index, self) => self.indexOf(value) === index;
@@ -54,7 +54,7 @@ const getWeightedRandomIndex = (weightBuckets, categorizedArrayByWeight) => {
const weightBucketSelectionIndex = weightBuckets.indexOf(closest);
const weightBucketSelection = weightBuckets[weightBucketSelectionIndex];
const selectionIndex = Math.floor(Math.random() * categorizedArrayByWeight[weightBucketSelection].length);
-
+
return categorizedArrayByWeight[weightBucketSelection][selectionIndex];
}
@@ -112,7 +112,7 @@ async function getWeightedRandomWorkingGroups(count) {
const matchHeightForLogos = (baseElement) => {
const imgElements = baseElement.querySelectorAll('.weighted-working-group-logo');
- imgElements.forEach(el => {
+ imgElements.forEach(el => {
el.addEventListener('load', () => {
$('.weighted-working-group-block-wrapper').matchHeight();
});
@@ -130,8 +130,8 @@ const getWorkingGroupLogo = ({ alias, logo } = workingGroup) => {
const element = document.querySelector('.eclipsefdn-weighted-working-groups');
if (!element) return;
- const options = {
- ...defaultOptions,
+ const options = {
+ ...defaultOptions,
...element.dataset,
count: +element.dataset.count
};
@@ -139,7 +139,7 @@ const getWorkingGroupLogo = ({ alias, logo } = workingGroup) => {
element.innerHTML = template({ isFetching: true, items: new Array(options.count) , wrapperClass: options.wrapperClass })
const [workingGroups, error] = await getWeightedRandomWorkingGroups(options.count);
-
+
if (error) {
element.innerHTML = `<p class="alert alert-danger">Error when attempting to load working groups.</p>`;
console.error(error);
@@ -156,6 +156,6 @@ const getWorkingGroupLogo = ({ alias, logo } = workingGroup) => {
}))
};
- element.innerHTML = template(data);
+ element.innerHTML = template(data);
matchHeightForLogos(element);
})();
\ No newline at end of file
diff --git a/layouts/shortcodes/pages/collaborations/collaborating.html b/layouts/shortcodes/pages/collaborations/collaborating.html
index c62d1c71..62090583 100644
--- a/layouts/shortcodes/pages/collaborations/collaborating.html
+++ b/layouts/shortcodes/pages/collaborations/collaborating.html
@@ -15,8 +15,8 @@
<div class="col-md-12 collaborations-collaborating-item-col">
<div class="collaborations-collaborating-item">
<div class="item-icon-wrapper">
- <img class="item-icon-bg" src="/images/collaborations/icons/icon-bg.png" alt="" />
- <img class="item-icon" src="/images/collaborations/icons/{{ $item.icon }}" alt="" />
+ <img class="item-icon-bg" src="/collaborations/images/icons/icon-bg.png" alt="" />
+ <img class="item-icon" src="/collaborations/images/icons/{{ $item.icon }}" alt="" />
</div>
<div class="item-content">
<h3 class="item-content-title">{{ $item.title }}</h3>
--
GitLab