Fix applet html pages, add gears and gearsjoal NApplet.

1 files changed, 15 insertions, 7 deletions

diff --git a/www/index.html b/www/index.html
index d205fd5..65dd32e 100644
--- a/www/index.html
+++ b/www/index.html
@@ -37,10 +37,10 @@
                     <ul>
                         <li><a href="../../wiki/index.php/Jogl_Tutorial">JOGL Tutorial</a></li>
                         <li><a href="../doc/readme.html">Demo Documentation</a></li>
-                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">JOGL JNLP Applet test incl. Applet-Launcher fallback</a></li>
-                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears-launcheronly.html">JOGL Applet-Launcher only test</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears-napplet.html">JOGL NApplet Test</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">JOGL JNLP Applet Test</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-napplet.html">JOGL / JOAL NApplet Test</a></li>
                         <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal.html">JOGL / JOAL JNLP Applet</a></li>
-                        <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-launcheronly.html">JOGL / JOAL Applet-Launcher only test</a></li>
                         <li><a href="http://ak.kiet.le.googlepages.com/theredbookinjava.html">OpenGL Red Book examples using JOGL</a></li>
                         <li><a href="http://pepijn.fab4.be/software/nehe-java-ports/">NeHe examples ported to JOGL</a></li>
                         <!--
@@ -99,17 +99,25 @@
                 <ul>
                     <li><a href="../../deployment/jogamp-current/jogl-test-applets.html">JOGL Applet Tests</a>
                         (<a href="../../deployment/jogamp-next/jogl-test-applets.html"><i>next version</i></a>)</li>
+                    <li>NApplet w/ AWT: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-napplet.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-napplet.html">Gears w/ JOAL</a></li>
+                    <li>NApplet w/ <a href="../../jogl/doc/NEWT-Overview.html">NEWT's</a> 
+                        <a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">Applet Runner</a>:
+                    <ul>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-gears.html">Gears</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-angelesgl2es1.html">Angeles</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-fbcubes.html">FBO Cubes</a></li>
+                        <li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-cube.html">Cube</a></li>
+                    </ul></li>
                     <li>JNLP Applet with Applet-Launcher fallback: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal.html">Gears w/ JOAL</a></li>
-                    <li>Applet-Launcher Only: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-launcheronly.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-launcheronly.html">Gears w/ JOAL</a></li>
-                    <li>Simple Applet w/ auto native JAR loading, using <i>Applets Runner</i> <a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">JOGLNewtApplet1Run</a> and <a href="../../jogl/doc/NEWT-Overview.html">NEWT</a>: <a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-cube.html">Cube</a>, <a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-fbcubes.html">FBO Cubes</a>, <a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-angelesgl2es1.html">Angeles</a>, <a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-gears.html">Gears</a></li>
+                    <!--li>Applet-Launcher Only: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-launcheronly.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-launcheronly.html">Gears w/ JOAL</a></li-->
                     <li><a href="../../deployment/jogamp-current/jogl-demos/test.html">Plain test page</a>
                         (<a href="../../deployment/jogamp-next/jogl-demos/test.html"><i>next version</i></a>)</li>
                 </ul>
 
                 <p>
-                Quick Version Info: Current [ <a href="../../deployment/jogamp-current/jogl-applet-version.html">Applet</a>, 
+                Quick Version Info: Current [ <a href="../../deployment/jogamp-current/jogl-applet-version-napplet.html">NApplet</a>, 
                                               <a href="../../deployment/jogamp-current/jogl-application-version.jnlp">Application</a> ], 
-                                    Next [ <a href="../../deployment/jogamp-next/jogl-applet-version.html">Applet</a>, 
+                                    Next [ <a href="../../deployment/jogamp-next/jogl-applet-version-napplet.html">NApplet</a>, 
                                            <a href="../../deployment/jogamp-next/jogl-application-version.jnlp">Application</a> ].
                 </p>