From 5c4599772ab02c4783e6b02b6f35617a97bd9fcd Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 13 Apr 2010 06:34:03 +0000
Subject: [PATCH] Updates based on feedback

svn changeset:12492/svn branch:6.3
---
 WebContent/index.html | 85 ++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 30 deletions(-)

diff --git a/WebContent/index.html b/WebContent/index.html
index e02a370550..8358a37f30 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -56,7 +56,7 @@
 					<span class="mask"></span>
 				</div>
 				<h2>Sampler</h2>
-				<p>See all Vaadin <strong>core components</strong> and their <strong>features</strong> in action in the Sampler! <strong>Sources for all samples</strong> are available for you to see and use.</p>
+				<p>See all Vaadin Framework <strong>core components</strong> and their <strong>features</strong> in action in the Sampler! <strong>Sources for all samples</strong> are available for you to see and use.</p>
 				<strong class="start">Start Sampler &raquo;</strong>
 				<!--<strong class="new"><em>Notable In This Release</em> &bull;&nbsp;Drag'n'drop &bull;&nbsp;Keyboard&nbsp;Shortcuts &bull;&nbsp;AbsoluteLayout &bull;&nbsp;GWT 2.0</strong>-->
 				</a>
@@ -70,7 +70,7 @@
 			<ul id="reasons">
 			
 				<li id="programming-model" class="tab">
-					<h4 title="Write Java">Programming Model</h4>
+					<h4 title="Pure Java">Programming Model</h4>
 					
 					<div class="col2">
 						<h5>Server-side Java</h5>
@@ -102,7 +102,7 @@
 					
 					<div class="col2">
 						<h5>Short Development Example</h5>
-						<p>Watch how to create a document editor in less than 10 minutes using the Eclipse IDE, using the <a href="#development">Vaadin Eclipse Plugin</a>.</p>
+						<p>Watch how to create a document editor application from scratch in less than 10 minutes using Eclipse and the <a href="#development">Vaadin Eclipse Plugin</a>.</p>
 						<a class="thumb video" href="http://www.youtube.com/watch?v=u-a3VQF90kw" rel="zoombox">
 							<img src="demo/img/icons/dev-video.png" />
 							<span>Vaadin step-by-step (10 min)</span>
@@ -150,7 +150,7 @@
 								<img src="demo/img/icons/chameleon.png" />
 								<span><strong>Chameleon Theme</strong>Create your own theme in seconds</span>
 							</a>
-							<a class="thumb-rel" href="http://vaadin.com/directory#addon/106">Available in the Directory</a>
+							<a class="thumb-rel" href="http://vaadin.com/directory#addon/106">Available in Vaadin Directory</a>
 						</div>
 						<div class="col2">
 							<a class="thumb demoapp" href="VaadinTunes">
@@ -164,7 +164,10 @@
 					<div class="col4">
 						<h5>More?</h5>
 						<ul>
-							<li><a href="http://vaadin.com/directory#browse/type/2">Browse the themes category in the Directory</a></li>
+							<li><a href="http://vaadin.com/directory#browse/type/2">Browse the themes category in Vaadin Directory</a></li>
+						</ul>
+						<ul>
+							<li><a href="http://vaadin.com/book/-/page/themes.html">Themes section of Book of Vaadin</a></li>
 						</ul>
 					</div>
 				</li>
@@ -172,30 +175,41 @@
 				<li id="add-ons" class="tab">
 					<h4 title="Add-ons">Extending, Packaging and Distributing</h4>
 					<div class="col2">
-						<h5>Add-on Architecture</h5>
-						<p>Vaadin has a unique add-on architecture. Add-ons, such as new components/widgets can be packaged as single JARs, which can then be used in other projects just by adding them to the project's classpath.</p>
+						<h5>Extend or Create your Own Components</h5>
+						<p>Extend the existing components or create brand new ones using Java and GWT. Server communication is handled automatically, you only provide the state information to be sent.</p>
+						<ul>
+							<li><a href="http://vaadin.com/book/-/page/gwt.html">More information on developing components</a></li>
+						</ul>
 					</div>
 					<div class="col2">
+						<h5>Add-on Architecture</h5>
+						<p>Vaadin has a unique add-on architecture. Add-ons, such as new components can be packaged as single JARs, which can then be used in other projects just by adding them to the project's classpath.</p>
+					</div>
+					<div class="newline col2">
 						<h5>Vaadin Directory</h5>
-						<p>Choose from the dozens of useful add-ons found in the Vaadin Add-on Directory. Distribute your own add-on for others to use.</p>
+						<p>Vaadin Directory contains dozens of useful add-ons of all kinds. See what others have done or distribute your own add-ons for others to use.</p>
 						<a href="http://vaadin.com/directory"><img src="demo/img/directory.png" /></a>
 					</div>
 					<div class="newline col2">
-						<h5>Packaging Add-ons</h5>
-						<p>Create re-usable add-ons that you can share in the Directory.</p>
-						<a class="thumb video" href="http://www.youtube.com/watch?v=0deldJZhydE" rel="zoombox">
-							<img src="demo/img/icons/packaging-video.png" />
-							<span>Creating and packaging a custom Vaadin widget (2 min)</span>
-						</a>
-					</div>
-					<div class="col2">
 						<h5>Integrating Add-ons</h5>
-						<p>Add new functionality
-						to your application with
-						add-ons.</p>
+						<p>Integrating add-ons from Vaadin Directory into your project is as easy as downloading them and recompiling the widgetset. The video below demonstrates the process.</p>
+						<ul>
+							<li><a href="http://vaadin.com/directory/help/using-vaadin-add-ons">Using Vaadin add-ons</a></li>
+						</ul>
 						<a class="thumb video" href="http://www.youtube.com/watch?v=LSXCNL6Q1w0" rel="zoombox">
 							<img src="demo/img/icons/integrating-video.png" />
-							<span>Vaadin Directory Demo (4 min)</span>
+							<span>Downloading and integrating an add-on from Vaadin Directory (4 min)</span>
+						</a>
+					</div>
+					<div class="col2">
+						<h5>Packaging Add-ons</h5>
+						<p>Create re-usable add-ons that you can share in Vaadin Directory. Visit the link or see the video for an example on how to package your add-on.</p>
+						<ul>
+							<li><a href="http://vaadin.com/directory/help/creating-vaadin-add-ons">How to create Vaadin add-ons</a></li>
+						</ul>
+						<a class="thumb video" href="http://www.youtube.com/watch?v=0deldJZhydE" rel="zoombox">
+							<img src="demo/img/icons/packaging-video.png" />
+							<span>Creating and packaging a Vaadin component (2 min)</span>
 						</a>
 					</div>
 				</li>
@@ -232,27 +246,28 @@
 					<h4 title="Deployment">Easy Deployment</h4>
 					<div class="col">
 						<h5>Single JAR</h5>
-						<p>Vaadin is a single JAR file without external dependencies. Deploy the JAR with your application and you are ready to go.</p>
+						<p>Vaadin is a single JAR file without external dependencies. Add the JAR to your web application project and you are ready to start creating the user interface.</p>
 					</div>
 					<div class="col">
 						<h5>Servlet deployment</h5>
-						<p>Vaadin provides a single servlet which runs the application. An application can be deployed to any servlet 2.3 container such as Jetty, Tomcat, and others.</p>
+						<p>Vaadin provides a single servlet which runs the application. An application can be deployed to any Java application server that supports servlet 2.3 or newer.</p>
+						<ul><li><a href="http://vaadin.com/features">Full list of supported application servers</a></li></ul>
 					</div>						
 					<div class="col">
 						<h5>Portlet support</h5>
-						<p>Vaadin applications can be deployed as portlets in portals such as Liferay. No code modifications are needed to deploy a Vaadin application to a portal and both portlet standards 1.0 (JSR-168) and 2.0 (JSR-286) are supported.</p>	
+						<p>Vaadin applications can be deployed as portlets in portals such as Liferay. No code modifications are needed to deploy a Vaadin application to a portal and both portlet standards 1.0 (JSR-168) and 2.0 (JSR-286) are supported. Vaadin is included in Liferay 6.0 as a standard feature.</p>						
 					</div>
 					<div class="col">					
 						<h5>Google App Engine</h5>						
-						<p>The same servlet and portlet Vaadin applications can be deployed to Google App Engine. This requires that all application classes are serializable.</p>
+						<p>The same servlet and portlet Vaadin applications can be deployed to Google App Engine, provided they are built to be serializable.</p>
 					</div>
 				</li>
 				
 				<li id="development" class="tab">
-					<h4 title="Development">Compatible With Tools You Already Know</h4>
+					<h4 title="Development">Develop With Tools You Already Know</h4>
 					<div class="col2">
 						<h5>Eclipse</h5>
-						<p>Vaadin provides an Eclipse plugin which can automatically set up your project, compile your widgetset and more.</p> 
+						<p>Vaadin provides an Eclipse plugin which automatically sets up your project, compiles your widgetset and more.</p> 
 						<ul><li><a href="http://vaadin.com/eclipse/">Eclipse plugin update site and instructions</a></li></ul>
 						<br/>
 						<h5>NetBeans</h5>
@@ -264,16 +279,18 @@
 						<p>Vaadin is in the central Maven repository, providing archetypes for creating Vaadin projects and a widgetset compilation plugin for Maven.</p>
 						<ul><li><a href="http://vaadin.com/wiki/-/wiki/Main/Using%20Vaadin%20with%20Maven">Using Vaadin with Maven</a></li></ul>
 						<br/>
-						<h5>Ant</h5>
-						<p>Ant integration is provided for users of other IDEs and for automatic builds.</p>
+						<h5>Any IDE / automated build system (Ant)</h5>
+						<p>Ant integration is provided for users of any IDE, for automatic build systems and for users preferring to not using an IDE.</p>
 						<ul><li><a href="docs/example-source/build-widgetset.xml">Example widgetset build script</a></li></ul>
 						
 					</div>	
 				</li>
 				<li id="License" class="tab">
 					<h4 title="Open Source">Free for Everybody</h4>
-						<h5>Apache2</h5>
-						<p>Vaadin is licensed under the Apache2 license which means you can use it both for non-commercial and commercial projects free of charge.</p>
+						<h5>Apache Software License 2.0</h5>
+						<p>Vaadin is licensed under the Apache Software License 2.0 which means you can use it both for non-commercial and commercial projects free of charge.</p>
+						<ul><li><a href="http://vaadin.com/license">License information</a></li></ul>
+						
 				</li>
 				<li id="Community" class="tab">
 					<h4 title="Community">Be a Part of the Vaadin Community</h4>
@@ -297,6 +314,14 @@
 						<p>Found a problem in Vaadin? Maybe you fixed it yourself already? Report it through the Vaadin bug tracker so everybody else also can benefit from your findings.</p>
 						<ul><li><a href="http://dev.vaadin.com/">Vaadin bug tracker</a></li></ul>
 					</div>
+					<div class="col4">
+						<h5>More resources</h5>
+						<ul>
+							<li><a href="http://vaadin.com/blog">Read the Vaadin Blog</a></li>
+							<li><a href="http://vaadin.com/twitter">Follow Vaadin on Twitter</a></li>
+							<li><a href="http://vaadin.com/chat">Chat with other Vaadin users</a></li>
+						</ul>
+					</div>
 				</li>
 				
 			</ul>
-- 
2.39.5