Joshfischer/apache content (#3419)
* adding apache content to footer
* add version for 0.20.2-incubating
* adding back branch whoami block
diff --git a/website2/website/core/Footer.js b/website2/website/core/Footer.js
index 739a7f0..53ae307 100755
--- a/website2/website/core/Footer.js
+++ b/website2/website/core/Footer.js
@@ -24,17 +24,29 @@
render() {
return (
<footer className="nav-footer" id="footer">
-
- <div className="apache-disclaimer">
-Disclaimer
-Apache Heron (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF),
-sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates
-that the infrastructure, communications, and decision making process have stabilized in a manner consistent with
-other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code,
-it does indicate that the project has yet to be fully endorsed by the ASF.
-</div>
- <section className="copyright">{this.props.config.copyright}</section>
+ <div className="apache-disclaimer">
+ Apache Heron is an effort undergoing incubation at <a target="_blank" href="https://apache.org/">The Apache Software Foundation (ASF)</a> sponsored by the Apache Incubator PMC.
+ Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects.
+ While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+ <br></br>
+ <br></br>
+ Apache®, the names of Apache projects, and the feather logo are either <a rel="external" href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache Software Foundation in the United States and/or other countries.
+ <br></br>
+ <br></br>
+ <div className="copyright-box">{this.props.config.copyright}</div>
+
+ </div>
+ <div className="apache-links">
+ <a class="item" rel="external" href="https://incubator.apache.org/">Apache Incubator</a>
+ <div><a class="item" rel="external" href="https://www.apache.org/">About the ASF</a></div>
+ <div><a class="item" rel="external" href="https://www.apache.org/events/current-event">Events</a></div>
+ <div><a class="item" rel="external" href="https://www.apache.org/foundation/thanks.html">Thanks</a></div>
+ <div><a class="item" rel="external" href="https://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></div>
+ <div><a class="item" rel="external" href="https://www.apache.org/security/">Security</a></div>
+ <div><a class="item" rel="external" href="https://www.apache.org/licenses/">License</a></div>
+ </div>
+
</footer>
);
}
diff --git a/website2/website/package-lock.json b/website2/website/package-lock.json
index d71c815..0b92916 100644
--- a/website2/website/package-lock.json
+++ b/website2/website/package-lock.json
@@ -8382,7 +8382,7 @@
}
},
"react-dev-utils": {
- "version": "5.0.3",
+ "version": "5.0.2",
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-5.0.2.tgz",
"integrity": "sha512-d2FbKvYe4XAQx5gjHBoWG+ADqC3fGZzjb7i9vxd/Y5xfLkBGtQyX7aOb8lBRQPYUhjngiD3d49LevjY1stUR0Q==",
"dev": true,
diff --git a/website2/website/scripts/replace.js b/website2/website/scripts/replace.js
index 7fec8bc..08b2331 100755
--- a/website2/website/scripts/replace.js
+++ b/website2/website/scripts/replace.js
@@ -37,6 +37,7 @@
const bazelVersions = {
'0.20.0-incubating': '0.14.1',
'0.20.1-incubating': '0.26.0',
+ '0.20.2-incubating': '0.26.0',
'latest': '0.26.0',
}
diff --git a/website2/website/static/css/custom.css b/website2/website/static/css/custom.css
index d89b7b2..361c659 100755
--- a/website2/website/static/css/custom.css
+++ b/website2/website/static/css/custom.css
@@ -50,7 +50,22 @@
border-radius: 0.25rem;
}
+
.apache-disclaimer {
color: #ffffff;
padding: 25px 25px 25px 25px;
-}
\ No newline at end of file
+ width: 80%;
+ float: left;
+}
+
+.apache-links {
+ color: #ffffff;
+ padding: 25px 25px 25px 25px;
+ float: right;
+ width: 20%;
+}
+
+.copywrite-box {
+ float: left;
+}
+
diff --git a/website2/website/versions.json b/website2/website/versions.json
index 6a63039..858a64d 100644
--- a/website2/website/versions.json
+++ b/website2/website/versions.json
@@ -1,4 +1,5 @@
[
+ "0.20.2-incubating",
"0.20.1-incubating",
"0.20.0-incubating"
]
