This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 2002830 PLC4X-105 - Website has Parent menu that does nothing -
Removed the empty "Parent" menu
2002830 is described below
commit 20028305e714ffa35071db9c900194a9ff9a3e0b
Author: Christofer Dutz <[email protected]>
AuthorDate: Sun Mar 17 12:27:07 2019 +0100
PLC4X-105 - Website has Parent menu that does nothing
- Removed the empty "Parent" menu
NO-JIRA:
- Added some of the bottom menus back
- Reduced the Font size of the incubation disclaimer to match the rest
- Moved the trademarks remark to the copyright footer
- Added some CSS to move the "to top" link so it doesn't interfere with the
rest
---
src/site/resources/css/site.css | 6 ++++++
src/site/site.xml | 16 +++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index 1eedee8..4ccb634 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -66,3 +66,9 @@ under the License.
top: 20px;
left: 83px
}
+
+body > div.container.subfooter > div > div > p.pull-right {
+ width: 100px;
+ height: 60px;
+ text-align: right;
+}
diff --git a/src/site/site.xml b/src/site/site.xml
index f3f48c6..e57e2f0 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -41,10 +41,10 @@
<slogan position="bannerLeft">The industrial IoT adapter</slogan>
<showApacheEvents>true</showApacheEvents>
<toc>top</toc>
- <bottomNav maxSpan="3">
- <!-- <column>reports</column>
+ <bottomNav maxSpan="6">
+ <!--column>reports</column-->
<column>Apache</column>
- <column>modules</column> -->
+ <column>modules</column>
<column>Protocols</column>
</bottomNav>
<brand>
@@ -53,10 +53,7 @@
</brand>
<bottomDescription>
<![CDATA[
- <p id="apacheTrademarks">
- Apache PLC4X, PLC4X, Apache, the Apache feather logo, and the Apache
PLC4X project logo are either registered trademarks or trademarks of The Apache
Software Foundation in the United States and other countries. All other marks
mentioned may be trademarks or registered trademarks of their respective owners.
- </p>
- <p id="bottomNote">
+ <p id="bottomNote" style="font-size: 15px">
Apache PLC4X is an effort undergoing incubation at The Apache
Software Foundation (ASF), sponsored by the Apache 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 [...]
</p>
]]>
@@ -91,9 +88,11 @@
<head>
<![CDATA[
<script>
- /* Add an image for promoting Apache events below the right banner */
document.addEventListener("DOMContentLoaded", function(event) {
+ /* Add an image for promoting Apache events below the right banner
*/
$("#bannerRight").append('<p id="apacheEvents"><a
href="//www.apache.org/events/current-event.html"><img
src="//www.apache.org/events/current-event-234x60.png"/></a></p>');
+ /* Append the trademarks info to the copyright section */
+ $(".copyright").append('<p>Apache PLC4X, PLC4X, Apache, the Apache
feather logo, and the Apache PLC4X project logo are either registered
trademarks or trademarks of The Apache Software Foundation in the United States
and other countries. All other marks mentioned may be trademarks or registered
trademarks of their respective owners.</p>');
});
</script>
]]>
@@ -141,7 +140,6 @@
<item name="Sponsoring Apache"
href="http://www.apache.org/foundation/sponsorship.html"/>
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
</menu>
- <menu name="Parent" ref="parent" inherit="top"/>
<menu ref="modules" inherit="bottom"/>
</body>
