From 89e264a7cf8777b6a0bcd505edbfea41489d42b0 Mon Sep 17 00:00:00 2001
From: Olivier Goulet <olivier.goulet@eclipse-foundation.org>
Date: Wed, 18 Jan 2023 16:45:07 +0000
Subject: [PATCH] Move OpenChain and add redirect
---
config/nginx/default.conf | 3 +++
content/{projects => }/openchain/_index.md | 6 +++---
.../openchain/images/banner-rings.jpg | Bin
.../openchain/images/icons/communication-center.png | Bin
.../openchain/images/icons/copyright.png | Bin
.../images/icons/intellectual-property-2.png | Bin
.../images/icons/intellectual-property-3.png | Bin
.../images/icons/intellectual-property.png | Bin
.../openchain/images/openchain-color.svg | 0
.../openchain.less => openchain/styles.less} | 2 +-
webpack.mix.js | 2 +-
11 files changed, 8 insertions(+), 5 deletions(-)
rename content/{projects => }/openchain/_index.md (92%)
rename content/{projects => }/openchain/images/banner-rings.jpg (100%)
rename content/{projects => }/openchain/images/icons/communication-center.png (100%)
rename content/{projects => }/openchain/images/icons/copyright.png (100%)
rename content/{projects => }/openchain/images/icons/intellectual-property-2.png (100%)
rename content/{projects => }/openchain/images/icons/intellectual-property-3.png (100%)
rename content/{projects => }/openchain/images/icons/intellectual-property.png (100%)
rename content/{projects => }/openchain/images/openchain-color.svg (100%)
rename less/page_css_file/{projects/openchain.less => openchain/styles.less} (91%)
diff --git a/config/nginx/default.conf b/config/nginx/default.conf
index 5b1c74c6..2055c8f2 100644
--- a/config/nginx/default.conf
+++ b/config/nginx/default.conf
@@ -80,6 +80,9 @@ server {
rewrite /contribute/cla https://accounts.eclipse.org/user/eca redirect;
rewrite /contribute/cla/index.php https://accounts.eclipse.org/user/eca redirect;
+ # www.eclipse.org/openchain
+ rewrite /projects/openchain /openchain redirect;
+
root /usr/share/nginx/html/;
index index.html index.htm;
}
diff --git a/content/projects/openchain/_index.md b/content/openchain/_index.md
similarity index 92%
rename from content/projects/openchain/_index.md
rename to content/openchain/_index.md
index 7464cc8d..c1af07db 100644
--- a/content/projects/openchain/_index.md
+++ b/content/openchain/_index.md
@@ -52,7 +52,7 @@ page_css_file: "/public/css/projects-openchain.css"
</div>
</div>
<div class="col-sm-18 what-makes-us-text">
- <p>Our well-defined <a href="https://www.eclipse.org/org/documents/Eclipse_IP_Policy.pdf">Intellectual Property Policy</a>;</p>
+ <p>Our well-defined <a href="/org/documents/Eclipse_IP_Policy.pdf">Intellectual Property Policy</a>;</p>
</div>
</div>
</div>
@@ -64,7 +64,7 @@ page_css_file: "/public/css/projects-openchain.css"
</div>
</div>
<div class="col-sm-18 what-makes-us-text">
- <p>Our well-defined intellectual property <a href="https://www.eclipse.org/projects/handbook/#ip">due diligence process</a>;</p>
+ <p>Our well-defined intellectual property <a href="/projects/handbook/#ip">due diligence process</a>;</p>
</div>
</div>
</div>
@@ -137,7 +137,7 @@ OpenChain conformance is just one more way the Eclipse Foundation is helping dri
Learn More and Get Involved
-* Review the [Eclipse Foundation Development Process](https://www.eclipse.org/projects/dev_process/)
+* Review the [Eclipse Foundation Development Process](/projects/dev_process/)
* Get the [ISO/IEC 5230:2020 OpenChain Specification](https://www.iso.org/standard/81039.html)
* Read more about the [OpenChain Project and community](https://www.openchainproject.org/)
diff --git a/content/projects/openchain/images/banner-rings.jpg b/content/openchain/images/banner-rings.jpg
similarity index 100%
rename from content/projects/openchain/images/banner-rings.jpg
rename to content/openchain/images/banner-rings.jpg
diff --git a/content/projects/openchain/images/icons/communication-center.png b/content/openchain/images/icons/communication-center.png
similarity index 100%
rename from content/projects/openchain/images/icons/communication-center.png
rename to content/openchain/images/icons/communication-center.png
diff --git a/content/projects/openchain/images/icons/copyright.png b/content/openchain/images/icons/copyright.png
similarity index 100%
rename from content/projects/openchain/images/icons/copyright.png
rename to content/openchain/images/icons/copyright.png
diff --git a/content/projects/openchain/images/icons/intellectual-property-2.png b/content/openchain/images/icons/intellectual-property-2.png
similarity index 100%
rename from content/projects/openchain/images/icons/intellectual-property-2.png
rename to content/openchain/images/icons/intellectual-property-2.png
diff --git a/content/projects/openchain/images/icons/intellectual-property-3.png b/content/openchain/images/icons/intellectual-property-3.png
similarity index 100%
rename from content/projects/openchain/images/icons/intellectual-property-3.png
rename to content/openchain/images/icons/intellectual-property-3.png
diff --git a/content/projects/openchain/images/icons/intellectual-property.png b/content/openchain/images/icons/intellectual-property.png
similarity index 100%
rename from content/projects/openchain/images/icons/intellectual-property.png
rename to content/openchain/images/icons/intellectual-property.png
diff --git a/content/projects/openchain/images/openchain-color.svg b/content/openchain/images/openchain-color.svg
similarity index 100%
rename from content/projects/openchain/images/openchain-color.svg
rename to content/openchain/images/openchain-color.svg
diff --git a/less/page_css_file/projects/openchain.less b/less/page_css_file/openchain/styles.less
similarity index 91%
rename from less/page_css_file/projects/openchain.less
rename to less/page_css_file/openchain/styles.less
index d61d5974..e336acd5 100644
--- a/less/page_css_file/projects/openchain.less
+++ b/less/page_css_file/openchain/styles.less
@@ -153,7 +153,7 @@
//Custom jumbotron
.header-rings-bg-img {
- background-image: url("../../../content/projects/openchain/images/banner-rings.jpg");
+ background-image: url("../../../content/openchain/images/banner-rings.jpg");
}
.header-no-split {
diff --git a/webpack.mix.js b/webpack.mix.js
index b3248de4..8bdc6cc3 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -21,7 +21,7 @@ mix.setResourceRoot('../');
mix.less('./less/styles.less', 'static/public/css/styles.css');
mix.less('./less/page_css_file/collaborations/styles.less', 'static/public/css/collaborations-styles.css');
-mix.less('./less/page_css_file/projects/openchain.less', 'static/public/css/projects-openchain.css');
+mix.less('./less/page_css_file/openchain/styles.less', 'static/public/css/projects-openchain.css');
mix.less('./less/page_css_file/europe/styles.less', 'static/public/css/europe-styles.css');
mix.less('./less/page_css_file/research/styles.less', 'static/public/css/research-styles.css');
--
GitLab