This is an automated email from the ASF dual-hosted git repository.
vieiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-website.git
The following commit(s) were added to refs/heads/master by this push:
new 4f88f42 Feature/top level project (#353)
4f88f42 is described below
commit 4f88f42e7d92490db88d93ec6ef9e9ea88bb1f2b
Author: Antonio Vieiro <vie...@users.noreply.github.com>
AuthorDate: Thu Apr 18 17:24:47 2019 +0200
Feature/top level project (#353)
Adding page about NetBeans history with some screenshots.
---
.../src/content/about/gephi-metrics-small.png | Bin 0 -> 161992 bytes
.../src/content/about/gephi-metrics.png | Bin 0 -> 434077 bytes
.../src/content/about/history.asciidoc | 259 +++++++++++++++++++++
.../src/content/about/index.asciidoc | 98 ++++++++
.../src/content/about/nb-history-1.png | Bin 0 -> 381714 bytes
.../src/content/about/nb11-small.png | Bin 0 -> 129166 bytes
netbeans.apache.org/src/content/about/nb11.png | Bin 0 -> 161313 bytes
.../src/content/about/netbeans-2000-small.png | Bin 0 -> 38214 bytes
.../src/content/about/netbeans-2000.png | Bin 0 -> 114396 bytes
.../src/content/about/netbeans-36-filesystems.png | Bin 0 -> 5751 bytes
.../src/content/about/netbeans-40-small.png | Bin 0 -> 100389 bytes
.../src/content/about/netbeans-40.png | Bin 0 -> 53048 bytes
.../src/content/about/netbeans-8.png | Bin 0 -> 144251 bytes
netbeans.apache.org/src/content/index.asciidoc | 6 -
.../src/content/templates/footer.gsp | 5 +-
netbeans.apache.org/src/content/templates/menu.gsp | 2 +-
.../src/content/templates/page-noaside.gsp | 13 +-
.../src/content/templates/slider.gsp | 28 ++-
18 files changed, 392 insertions(+), 19 deletions(-)
diff --git a/netbeans.apache.org/src/content/about/gephi-metrics-small.png
b/netbeans.apache.org/src/content/about/gephi-metrics-small.png
new file mode 100644
index 0000000..e20d280
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/gephi-metrics-small.png differ
diff --git a/netbeans.apache.org/src/content/about/gephi-metrics.png
b/netbeans.apache.org/src/content/about/gephi-metrics.png
new file mode 100644
index 0000000..2343441
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/gephi-metrics.png differ
diff --git a/netbeans.apache.org/src/content/about/history.asciidoc
b/netbeans.apache.org/src/content/about/history.asciidoc
new file mode 100644
index 0000000..bf397d6
--- /dev/null
+++ b/netbeans.apache.org/src/content/about/history.asciidoc
@@ -0,0 +1,259 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+////
+= Apache NetBeans History
+:jbake-type: page
+:jbake-tags: about
+:jbake-status: published
+:keywords: Apache NetBeans History
+:description: Apache NetBeans History
+:toc: left
+:toc-title:
+:icons: font
+
+== Apache NetBeans History
+
+=== The student project
+
+NetBeans started as a student project (originally called Xelfi) in the Czech
+Republic, in 1996. The goal was to write a
link:https://en.wikipedia.org/wiki/Delphi_%28IDE%29[Delphi]-like Java IDE
(Integrated
+Development Environment) in Java.
+
+Xelfi was the first Java IDE written in Java, with its first pre-releases in
+1997. Xelfi was a fun project to work on, especially since the Java IDE space
+was uncharted territory at that time.
+
+image::nb-history-1.png[caption="", title="Here you see the original group of
students who constituted the original NetBeans Team"]
+
+The project attracted enough interest that the students, once they graduated,
+decided that they could market it as a commercial product selling it as
+shareware. Soliciting resources from friends and relatives for a website, they
+tried to form a company around it.
+
+=== Xelfi
+
+Soon after, they were contacted by Roman Stanek, at the time a Director of
Operation
+in an IT company, that wanted to build his own company and was looking for
+talented programmers. He was looking for a good idea to invest in, and
+discovered Xelfi. He met with the founders; they hit it off, and a business was
+born.
+
+=== NetBeans = Network + Java Beans
+
+The original business plan was to develop network-enabled JavaBeans components.
+link:http://wiki.apidesign.org/wiki/User:JaroslavTulach[Jaroslav Tulach], who
+designed the IDE's basic architecture, came up with the name *NetBeans* (from
+Network and Java Beans) to describe what the components would do. The IDE would
+be the way to deliver them.
+
+When the specification for Enterprise Java Beans came out, it made more sense
+to work with the standard for such components than to compete with it, but the
+name stuck.
+
+In the spring of 1999, NetBeans DeveloperX2 was released, adopting the
+`javax.swing.*` package names from the previous `com.sun.swing.*` ones.
+NetBeans was the first tool in on the market to support these new package
+names, and that increased a lot the awareness of NetBeans.
+
+The performance improvements that came in JDK 1.3, released in the fall of
1999,
+made NetBeans a viable choice for development tools. By the summer of 1999, the
+team was hard at work re-architecting DeveloperX2 into the more modular
+NetBeans that forms the basis of the software today.
+
+=== The First Modular Architecture
+
+Along the way, an interesting thing happened. People began building
+applications using the NetBeans IDE's platform, together with their own
+plugins, often creating applications that were not development tools at all. In
+fact, this turned out to have quite a market.
+
+Later, in 2000 and 2001, a lot of work went into stripping out pieces that made
+the assumption that an application built on NetBeans was an IDE, so that the
+platform would be a generic desktop application suitable to any purpose. This
+work turned out to be healthy for the codebase of the IDE as well, encouraging
+a clean API design and a separation of concerns. This is the reason why
+some of the modules of NetBeans are called `org.openide`.
+
+== The Sun era: open source
+
+Something else was afoot in the summer of 1999. Sun Microsystems wanted better
+Java development tools, and had become interested in NetBeans. It was a dream
+come true for the NetBeans team. NetBeans would become the flagship tool set of
+the maker of Java itself!
+
+By the Fall, with the next generation of NetBeans Developer in beta, a deal was
+struck. Sun Microsystems had also acquired another tools company, Forté, at the
+same time, and decided to rename NetBeans to Forté for Java. The name NetBeans
+was dropped... for a while.
+
+During the acqusition, the young developers who had been involved in
+open-source projects for most of their programming careers, mentioned the idea
+of open-sourcing NetBeans. Fast forward to less than six months later, the
+decision was made that NetBeans would be open sourced.
+
+While Sun had contributed considerable amounts of code to open source projects
+over the years, this was Sun's first sponsored open source project, one in
+which Sun would be paying for the site and handling the infrastructure. The
+very first decision made was that it sounded logical to call the new site:
+NetBeans.org.
+
+[.feature]
+--
+image::netbeans-2000-small.png[caption="", title"The NetBeans debugger on
Linux in 2000", link="netbeans-2000.png"]
+--
+
+In June 2000, the initial netbeans.org web site was launched.
+The years that followed focused on continual enhancements from release to
+release, as described in the section below.
+
+=== From NetBeans 3.2 to NetBeans 3.6
+
+The first year (through NetBeans 3.2), the project spent trying to find its
+feet. The next few years involved learning about what worked in terms of
+open-source processes. (In the first two years, the development process was so
+open that more time was spent debating than implementing.)
+
+image::netbeans-36-filesystems.png[caption="", title="NetBeans 3.6 structured
the projects as filesystems"]
+
+The growing pains paid off. With NetBeans 3.5, huge strides in performance were
+made, and tests and processes put in place to prevent regressions. With 3.6,
+the windowing system and property sheet were reimplemented, and the user
+interface cleaned up tremendously.
+
+=== NetBeans 4
+
+NetBeans 4, released in December 2004, was a complete change in the way the IDE
+worked. A new project system not only revamped the user experience, but also
+made it possible to replace infrastructure that had held the NetBeans back.
+
+The release introduced a project system based on Apache Ant, added JDK 1.5
Support
+and had initial support for mobility projects.
+
+[.feature]
+--
+image::netbeans-40-small.png[caption="", title"NetBeans 4.0 and the Form
Editor", link="netbeans-40.png"]
+--
+
+The NetBeans 4.1 release (may 2005) was built on top of the new project
+infrastructure of 4.0, and added more features and full J2EE support.
+
+=== NetBeans 5
+
+NetBeans 5 (january, 2006) introduced comprehensive support for developing IDE
+modules and rich client applications based on the NetBeans platform; an
+intuitive GUI builder (Matisse); new and redesigned CVS support; support for
+Sun ApplicationServer 8.2, Weblogic 9 and JBoss 4.
+
+NetBeans 5.5 (october, 2006) and 5.5.1 (may, 2007) supported the Sun Java
+System Application Server PE 9 and 9.1 (Glassfish) as well as Java EE 5 API
compliance
+(JPA, JAX-WS, EJB 3), and through "Enterprise Packs" included enhanced support
+for Mobility, C/C++ Projects, SOA applications and BPEL.
+
+=== NetBeans 6
+
+NetBeans 6 (december, 2007) focused on improved developer productivity through
a rewritten,
+smarter and faster editor, together with the integration of external NetBeans
+products into one IDE.
+
+In August, 2010, NetBeans 6.9.1 was released with
link:https://www.osgi.org/[OSGi support],
+bundling the link:http://felix.apache.org/[Apache Felix OSGi container]. It
also
+supported link:https://openjfx.io/[JavaFX 1.3.1], was Java EE 6 compliant and
+included support for PHP, Ruby, C and C++ and many other features.
+
+== The Oracle era
+
+When Oracle acquired Sun in 2010, NetBeans became part of Oracle. Oracle
+actively seeked for new developers to work on the NetBeans team and sees
+NetBeans IDE as the official IDE for the Java Platform.
+
+=== NetBeans 7
+
+NetBeans 7 was released together with JDK 7, providing editor tools for working
+with new JDK 7 language constructs, together with support for JavaFX 2.0.
+
+NetBeans 7.1 introduced link:http://wiki.netbeans.org/Netigso[Netigso] from
(Net and
+a reversed OSGi). This was reused in Oracle's JDeveloper as well,
+with link:http://wiki.apidesign.org/wiki/JDeveloper[important performance
enhancements].
+
+Releases from NetBeans 7.2 (january, 2012) to NetBeans 7.4 (october, 2015)
continued
+introducing important features (HTML5, Cordova application development,
enhanced
+JavaScript support and more) and improving performance.
+
+=== NetBeans 8
+
+NetBeans 8.0 (march, 2014) introduced full JDK 8 support for working with
+Profiles, Lambdas and Streams. Java ME Embedded 8 support and a wide
+range of JavaEE compliant application servers (WildFly, WebLogic, GlassFish,
TomcatEE).
+
+It also continued improving support for Maven, HTML5, PHP, C/C++ and
JavaScript.
+
+The 8 series last release was NetBeans 8.2 (october, 2016) that introduced
+ECMAScript 6 enhancements and experimental ECMAScript 7 support, while
+improving node.js, Oracle JET and PHP 7 support.
+
+== The Apache Incubator era
+
+In 2016 Oracle donated the source code of NetBeans to the
link:https://www.apache.org/[Apache Software Foundation],
+and started as a podling in the link:http://incubator.apache.org/[Apache
Incubator Project].
+
+During approximately two years and a half many volunteers joined the podling,
and work started to
+adapt the codebase to comply with the Apache Software Foundation Guidelines.
+The link:/community/index.html[Apache NetBeans Community] started growing, and
in april 2019 the
+podling became a Top Level Apache Project.
+
+=== NetBeans 9
+
+In July, 2018, the Apache NetBeans Team released
+link:http://netbeans.apache.org/download/nb90/[Apache NetBeans (Incubating) 9],
+the first release of the Apache NetBeans (incubating), with the main objectives
+of IP clearance from the Oracle code donation and adding Java 10 support.
+
+In October, 2018,
link:https://blogs.oracle.com/java/announcing-2018-dukes-choice-award-winners[Apache
NetBeans (incubating)] was
+honored as a Duke's Choice Award Winner.
+
+=== NetBeans 10
+
+In December, 2018, the Apache NetBeans Team released
+link:http://netbeans.apache.org/download/nb100/[Apache NetBeans (Incubating)
10], the second release of the Apache NetBeans (incubating),
+focusing in adding support for JDK 11, JUnit 5, PHP, JavaScript and Groovy,
while solving many issues.
+
+=== NetBeans 11
+
+In March, 2019, link:http://netbeans.apache.org/nb110/[Apache NetBeans
(Incubating) 11] was announced as the
+ third release of Apache NetBeans, sporting a renewed Gradle Support, a Maven
First project wizard,
+ Java EE and JDK 12 support, as well as initial versions of NetBeans Maven
Plugins the Apache NetBeans Tutorials.
+
+[.feature]
+--
+image::nb11-small.png[caption="", title"Apache NetBeans (incubating) 11
showing the Lookup", link="nb11.png"]
+--
+
+
+== The Apache Top Level Project era
+
+In April, 2019, the Apache NetBeans (Incubating) podling became a Top Level
Apache Project.
+
+Today, the Apache NetBeans Team couldn't be prouder of how far the NetBeans
project
+and community has come. It is also worth noting that many of the original
+architects are still involved in the project, and can be found participating on
+the NetBeans mailing lists.
+
+Welcome to Apache NetBeans! The Apache NetBeans Community
link:/participate/index.html[is inviting you to participate!].
+
+
+
diff --git a/netbeans.apache.org/src/content/about/index.asciidoc
b/netbeans.apache.org/src/content/about/index.asciidoc
new file mode 100644
index 0000000..0f9084d
--- /dev/null
+++ b/netbeans.apache.org/src/content/about/index.asciidoc
@@ -0,0 +1,98 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+////
+= About Apache NetBeans
+:jbake-type: page
+:jbake-tags: about
+:jbake-status: published
+:keywords: Apache NetBeans About
+:description: About Apache NetBeans
+:toc: left
+:toc-title:
+:icons: font
+
+== Welcome to Apache NetBeans
+
+In June 2000, NetBeans was made open source by Sun Microsystems, which remained
+the project sponsor until January 2010 when Sun Microsystems became a
+subsidiary of Oracle.
+
+Throughout its history in Sun Microsystems and Oracle, NetBeans has been free
+and open source and has been leveraged by its sponsor as a mechanism for
+driving the Java ecosystem forward.
+
+In 2016, Oracle donated the NetBeans source code to the
link:https://www.apache.org/[Apache Software Foundation].
+In April 2019 Apache NetBeans became a top level Apache project. Please see
+our link:history.html[History section] for more information.
+
+== About Apache NetBeans
+
+Apache NetBeans is top level Apache Project dedicated to providing rock solid
+software development products (the Apache NetBeans IDE and the Apache NetBeans
+Platform) that address the needs of developers, users and the businesses who
+rely on NetBeans as a basis for their products; particularly, to enable them to
+develop these products quickly, efficiently and easily by leveraging the
+strengths of the Java platform and other relevant industry standards.
+
+The two base products, the Apache NetBeans IDE and Apache NetBeans Platform,
+are free for commercial and non-commercial use, under the
link:https://www.apache.org/licenses/[Apache license].
+The source code to both is available to anyone to reuse as they see fit,
within the terms of use.
+
+The Apache NetBeans project is also a vibrant community in which people from
across
+the globe can ask questions, give advice, contribute and ultimately share in
+the success of our products. On the
link:/community/mailing-lists.html[NetBeans mailing lists] and forums, you will
+find posts from students, developers from top companies, and individuals
+looking to expand their skills.
+
+=== The Apache NetBeans IDE
+
+With over 18 million downloads of the NetBeans IDE to date, and over 800,000
+participating developers, the NetBeans project is thriving and continues to
+grow, thanks to the individuals and partner companies. To be a part of the
+community, simply register for free.
+
+Most developers recognize the NetBeans IDE as the original free Java IDE. It is
+that, and much more! The Apache NetBeans IDE provides support for several
languages
+(Java, PHP, JavaFX, JavaScript, etc.) and frameworks, and more (C/C++) will be
+incorporated soon.
+
+=== The Apache NetBeans Platform
+
+The Apache NetBeans Platform is a generic framework for Swing applications. It
+provides the "plumbing" that, before, every developer had to write
+themselves—saving state, connecting actions to menu items, toolbar items and
+keyboard shortcuts; window management, and so on.
+
+[.feature]
+--
+image::gephi-metrics-small.png[role="left", link="gephi-metrics.png"]
+---
+
+The NetBeans Platform provides all of these out of the box. You don't need to
+manually code these or other basic features, yourself, anymore. See what some
+NetBeans-based applications look like. The platform does not add a lot of
+overhead to your application — but it can save a huge amount of time and work.
+
+The Apache NetBeans Platform provides a reliable and flexible application
+architecture. Your application does not have to look anything like an IDE. It
+can save you years of development time. The NetBeans Platform gives you a
+time-tested architecture for free. An architecture that encourages sustainable
+development practices. Because the NetBeans Platform architecture is modular,
+it's easy to create applications that are robust and extensible.
+
+
diff --git a/netbeans.apache.org/src/content/about/nb-history-1.png
b/netbeans.apache.org/src/content/about/nb-history-1.png
new file mode 100644
index 0000000..c0bd579
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/nb-history-1.png differ
diff --git a/netbeans.apache.org/src/content/about/nb11-small.png
b/netbeans.apache.org/src/content/about/nb11-small.png
new file mode 100644
index 0000000..9da5952
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/nb11-small.png differ
diff --git a/netbeans.apache.org/src/content/about/nb11.png
b/netbeans.apache.org/src/content/about/nb11.png
new file mode 100644
index 0000000..7869a39
Binary files /dev/null and b/netbeans.apache.org/src/content/about/nb11.png
differ
diff --git a/netbeans.apache.org/src/content/about/netbeans-2000-small.png
b/netbeans.apache.org/src/content/about/netbeans-2000-small.png
new file mode 100644
index 0000000..2816601
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/netbeans-2000-small.png differ
diff --git a/netbeans.apache.org/src/content/about/netbeans-2000.png
b/netbeans.apache.org/src/content/about/netbeans-2000.png
new file mode 100644
index 0000000..9d92184
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/netbeans-2000.png differ
diff --git a/netbeans.apache.org/src/content/about/netbeans-36-filesystems.png
b/netbeans.apache.org/src/content/about/netbeans-36-filesystems.png
new file mode 100644
index 0000000..862fa9a
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/netbeans-36-filesystems.png differ
diff --git a/netbeans.apache.org/src/content/about/netbeans-40-small.png
b/netbeans.apache.org/src/content/about/netbeans-40-small.png
new file mode 100644
index 0000000..c015795
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/netbeans-40-small.png differ
diff --git a/netbeans.apache.org/src/content/about/netbeans-40.png
b/netbeans.apache.org/src/content/about/netbeans-40.png
new file mode 100644
index 0000000..e31eac2
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/netbeans-40.png differ
diff --git a/netbeans.apache.org/src/content/about/netbeans-8.png
b/netbeans.apache.org/src/content/about/netbeans-8.png
new file mode 100644
index 0000000..912902b
Binary files /dev/null and
b/netbeans.apache.org/src/content/about/netbeans-8.png differ
diff --git a/netbeans.apache.org/src/content/index.asciidoc
b/netbeans.apache.org/src/content/index.asciidoc
index bab9795..8e3859f 100644
--- a/netbeans.apache.org/src/content/index.asciidoc
+++ b/netbeans.apache.org/src/content/index.asciidoc
@@ -28,12 +28,6 @@
:hero.title: Apache NetBeans
:hero.subtitle: Fits the Pieces Together
-[.text-center]
-== Fits the Pieces Together
-
-[.text-center]
-=== Development environment, tooling platform, application framework.
-
// See https://fontawesome.com/icons?d=gallery for more icons (not all of
those are available, though)
[.cards]
diff --git a/netbeans.apache.org/src/content/templates/footer.gsp
b/netbeans.apache.org/src/content/templates/footer.gsp
index 06f4254..ce61cb4 100644
--- a/netbeans.apache.org/src/content/templates/footer.gsp
+++ b/netbeans.apache.org/src/content/templates/footer.gsp
@@ -22,7 +22,6 @@
The Apache NetBeans site must comply with the
"Apache Website Navigation Links Policy"
https://www.apache.org/foundation/marks/pmcs#navigation
- "Incubator Branding Guide" http://incubator.apache.org/guides/branding.html
This seems to be a good place to comply with the policy.
@@ -96,10 +95,8 @@
<div class="footer-disclaimer-content">
<p>Copyright © 2017-2019 <a href="https://www.apache.org";>The
Apache Software Foundation</a>.</p>
<p>Licensed under the Apache <a
href="https://www.apache.org/licenses/";>license</a>, version 2.0</p>
- <p><a href="https://incubator.apache.org/"; alt="Apache Incubator"><img
src='/images/incubator_feather_egg_logo_bw_crop.png' title='Apache
Incubator'></img></a></p>
<div style='max-width: 40em; margin: 0 auto'>
- <p>Apache NetBeans 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 [...]
- <p>Apache Incubator, Apache, Apache NetBeans, NetBeans, the Apache
feather logo, the Apache NetBeans logo, and the Apache Incubator project logo
are trademarks of <a href="https://www.apache.org";>The Apache Software
Foundation</a>.</p>
+ <p>Apache, Apache NetBeans, NetBeans, the Apache feather logo and
the Apache NetBeans logo are trademarks of <a href="https://www.apache.org";>The
Apache Software Foundation</a>.</p>
<p>Oracle and Java are registered trademarks of Oracle and/or its
affiliates.</p>
</div>
<%
diff --git a/netbeans.apache.org/src/content/templates/menu.gsp
b/netbeans.apache.org/src/content/templates/menu.gsp
index bc71949..cb1154c 100644
--- a/netbeans.apache.org/src/content/templates/menu.gsp
+++ b/netbeans.apache.org/src/content/templates/menu.gsp
@@ -25,7 +25,7 @@
</div>
<div class="top-bar" id="responsive-menu">
<div class='top-bar-left'>
- <a class='title' href="/"><img src='/images/apache-netbeans.svg'
style='padding: 8px; height: 48px;'></img> Apache NetBeans (incubating)</a>
+ <a class='title' href="/"><img src='/images/apache-netbeans.svg'
style='padding: 8px; height: 48px;'></img> Apache NetBeans</a>
</div>
<div class="top-bar-right">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
diff --git a/netbeans.apache.org/src/content/templates/page-noaside.gsp
b/netbeans.apache.org/src/content/templates/page-noaside.gsp
index 489baa1..79c4f3a 100644
--- a/netbeans.apache.org/src/content/templates/page-noaside.gsp
+++ b/netbeans.apache.org/src/content/templates/page-noaside.gsp
@@ -28,9 +28,18 @@
<%include "head.gsp"%>
<body>
<%include "menu.gsp"%>
- <%include "slider.gsp"%>
<div class='grid-container'>
- ${content.body}
+ <div style='margin: 2rem 0' class='grid-x grid-margin-x
align-middle'>
+ <div class='cell large-2 medium-3 small-5'><img
src='/images/apache-netbeans.svg'></img></div>
+ <div class='cell large-10 medium-9 small-7'>
+ <h1>Apache NetBeans</h1>
+ <h2 style='color: #a1c535'>Fits the Pieces Together</h2>
+ <p>Development Environment, Tooling Platform and Application
Framework.</p>
+ </div>
+ </div>
+ </div>
+ <div class='grid-container'>
+ ${content.body}
</div>
<%include "tools.gsp"%>
<%include "footer.gsp"%>
diff --git a/netbeans.apache.org/src/content/templates/slider.gsp
b/netbeans.apache.org/src/content/templates/slider.gsp
index 0043450..f1d2cf6 100644
--- a/netbeans.apache.org/src/content/templates/slider.gsp
+++ b/netbeans.apache.org/src/content/templates/slider.gsp
@@ -30,13 +30,13 @@
<section class='hero alternate netbeans-bg'>
<div class='grid-container'>
<div class='cell'>
- <div class='annotation'>Duke's Choice Award</div>
- <h1>Apache NetBeans - A 2018 Winner!</h1>
+ <div class='annotation'>Top Level Project</div>
+ <h1>Apache NetBeans is now a Top Level Apache
Project</h1>
<p>
- In keeping with its 16-year history, the 2018 Duke's
- Choice Award winners were announced at the
Groundbreakers Hub at Code One.
- Apache NetBeans is one of the winners! </p>
- <p><a class='button success'
href="https://blogs.oracle.com/java/announcing-2018-dukes-choice-award-winners";>Read
more</a></p>
+ After two years and a half as an Apache Incubator
Podling, Apache
+ NetBeans is now a Top Level Apache Project.
+ </p>
+ <!-- <p><a class='button success'
href="https://blogs.apache.org/netbeans/";>Read more</a></p> -->
</div>
</div>
</section>
@@ -56,6 +56,21 @@
</section>
</li>
<li class="orbit-slide">
+ <section class='hero alternate netbeans-bg'>
+ <div class='grid-container'>
+ <div class='cell'>
+ <div class='annotation'>Duke's Choice Award</div>
+ <h1>Apache NetBeans - A 2018 Winner!</h1>
+ <p>
+ In keeping with its 16-year history, the 2018 Duke's
+ Choice Award winners were announced at the
Groundbreakers Hub at Code One.
+ Apache NetBeans is one of the winners! </p>
+ <p><a class='button success'
href="https://blogs.oracle.com/java/announcing-2018-dukes-choice-award-winners";>Read
more</a></p>
+ </div>
+ </div>
+ </section>
+ </li>
+ <li class="orbit-slide">
<section class='hero alternate netbeans-bg-1'>
<div class='grid-container'>
<div class='cell'>
@@ -88,5 +103,6 @@
<button data-slide="1"><span class="show-for-sr">Second slide
details.</span></button>
<button data-slide="2"><span class="show-for-sr">Third slide
details.</span></button>
<button data-slide="3"><span class="show-for-sr">Fourth slide
details.</span></button>
+ <button data-slide="4"><span class="show-for-sr">Fifth slide
details.</span></button>
</nav>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
