merge master

7 files changed, 62 insertions, 57 deletions

diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index 653063ccb5..55728e3264 100644
--- a/WebContent/VAADIN/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
@@ -241,6 +241,11 @@
 .v-off {
 	color: #ddd;
 }
+
+.v-table .v-checkbox {
+	display: inline-block;
+}
+
 /*************************************
  * Drag'n'drop styles
  *************************************/
diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/richtext.css
index a304fa2a57..6a236886cc 100644
--- a/WebContent/VAADIN/themes/base/textfield/richtext.css
+++ b/WebContent/VAADIN/themes/base/textfield/richtext.css
@@ -6,7 +6,9 @@
 	background: #fff;
 	border: none;
 }
-
+.v-richtextarea .gwt-HTML {
+	height: 100%;
+}
 .v-richtextarea .gwt-RichTextToolbar {
 	white-space: nowrap;
 	background: #959595 url(img/richtext-toolbar-bg.png) repeat-x 0 -42px;
diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.css b/WebContent/VAADIN/themes/base/treetable/treetable.css
index de505ba774..4d9ad5031b 100644
--- a/WebContent/VAADIN/themes/base/treetable/treetable.css
+++ b/WebContent/VAADIN/themes/base/treetable/treetable.css
@@ -4,14 +4,17 @@
     height: 10px;
     /* defines the amount of indent per level */
     width: 18px;
+    position: absolute;
+    left: 0;
+    top: 5px;
 }
 
 .v-treetable-node-closed {
-    background: url(../treetable/img/arrow-right.png) right center no-repeat;
+    background: url(../treetable/img/arrow-right.png) right top no-repeat;
 }
 
 .v-treetable-node-open {
-    background: url(../treetable/img/arrow-down.png) right center no-repeat;
+    background: url(../treetable/img/arrow-down.png) right top no-repeat;
 }
 
 .v-treetable .v-checkbox {
@@ -25,6 +28,10 @@
     z-index: 10;
 }
 
+.v-treetable .v-table-cell-wrapper {
+	position: relative;
+}
+
 .v-treetable .v-table-body .v-table-table .v-table-row-animating {
 	zoom:1;
 	z-index:1;
diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css
index 9b78d86e34..5d67cfe564 100644
--- a/WebContent/VAADIN/themes/reindeer/table/table.css
+++ b/WebContent/VAADIN/themes/reindeer/table/table.css
@@ -112,9 +112,9 @@
     text-shadow: #f3f5f8 0 1px 0;
     line-height: normal;
 }
-.v-table-generated-row .v-table-cell-content {
-    padding-top: 1px;
-    padding-bottom: 2px;
+.v-table-generated-row .v-table-cell-wrapper {
+    padding-top: 4px;
+    padding-bottom: 5px;
 }
 .v-table-cell-content:last-child {
 	border-right-color: transparent;
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 6f2eb8c2cc..1e4016db90 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -71,47 +71,50 @@
       <h2 id="enhancements">Enhancements in Vaadin @version-minor@</h2>
 
       <p>
-        @version-minor@ is the second development release of the upcoming Version 7 of the
-        Vaadin Framework. It introduces the second set of new features in Vaadin 7, for the
+        @version-minor@ is the third development release of the upcoming Version 7 of the
+        Vaadin Framework. It introduces the third set of new features in Vaadin 7, for the
         purpose of receiving feedback about the changes.
       </p>
 
-      <p>The major changes in this second alpha phase are:</p>
+      <p>The major changes in this third alpha phase are:</p>
 
       <ul>
-        <li>Complete overhaul of the client-server communication architecture
+        <li>GWT is now built into Vaadin Framework
           <ul>
-            <li>All add-on components that have widgets need to be ported to Vaadin 7</li>
-            <li>Integration of a GWT widget is done in a <i>connector</i> class</li>
-            <li>Component-to-widget mapping now defined on the client-side, in the connector</li>
-            <li>No more <b style="text-decoration: line-through">Paintable</b> or <b style="text-decoration: line-through">VariableOwner</b>
-            <li>Server-side component and client-side widget can have a <emphasis>shared state</emphasis> object which is automatically synchronized</li>
-            <li>Both client-side and server-side can make RPC calls to the other side
-              <ul>
-                <li>Communicated in the next request/response</li>
-                <li>No return values
-                <li>Typically for communicating events</li>
-              </ul>
-            </li>
-            <li>UIDL is deprecated</li>
-            <li>Compatibility layer for Vaadin 6 included for easy migration</li>
+            <li>New SuperDevMode allows debugging client-side Java code in the browser without any plugins</li>
           </ul>
         </li>
-        <li>Get computed style of a component from the browser</li>
-        <li>Support for border, padding, and margin in core layout components</li>
+        <li>Support for JavaScript components - GWT integration code not required</li>
+        <li>Handle JavaScript callbacks on the server-side</li>
+        <li>Component and root extensions</li>
+        <li>Navigation API for view navigation
+          <ul>
+            <li>View navigation with bookmarking/linking with URI fragments and browser history support</li>
+            <li>Access control for views, view change confirmation</li>
+          </ul>
+        </li>
+        <li>Resource loading (JS/CSS) by the framework</li>
       </ul>
-
+        
       <p>
-        The enchancements are described in more detail in the <a
+        The enhancements are described in more detail in the <a
         href="https://vaadin.com/wiki/-/wiki/Main/Vaadin+7">mini-tutorials</a> in the
         Vaadin Wiki.
       </p>
 
+      <p>
+        Please see the release notes for <a
+        href="http://vaadin.com/download/prerelease/7.0/7.0.0/7.0.0.alpha1/release-notes.html">alpha1</a>
+        and <a
+        href="http://vaadin.com/download/prerelease/7.0/7.0.0/7.0.0.alpha2/release-notes.html">alpha2</a>
+        for a complete list of major enhancements for Vaadin 7 so far.
+      </p>
+
       <h3 id="changelog">ChangeLog</h3>
 
       <p>
         For a complete list of changes in this release, please see the <a
-        href="http://dev.vaadin.com/query?status=closed&group=resolution&milestone=Vaadin+7.0.0.alpha2">list
+        href="http://dev.vaadin.com/query?status=closed&group=resolution&milestone=Vaadin+7.0.0.alpha3">list
         of closed tickets</a>.
       </p>
 
@@ -142,18 +145,6 @@
 
       <h2 id="dependencies">Vaadin @version@ Dependencies</h2>
 
-      <h3>Google Web Toolkit (GWT)</h3>
-
-      <p>
-        Vaadin uses GWT @gwt-version@ for widget set compilation. GWT can be downloaded
-        from <a
-        href="http://code.google.com/webtoolkit/">http://code.google.com/webtoolkit/</a>.
-        GWT can also be automatically downloaded by the Vaadin Plug-in for Eclipse. Please
-        note that GWT @gwt-version@ requires the <i>validation-api-1.0.0.GA.jar</i> and
-        <i>validation-api-1.0.0.GA-sources.jar</i> files in addition to <i>gwt-dev.jar</i>
-        and <i>gwt-user.jar</i> for widget set compilation.
-      </p>
-
       <h3>Bean Validation</h3>
 
       <p>
@@ -307,9 +298,8 @@
       <h2 id="supportedversions">Supported Technologies</h2>
 
       <p>
-        Vaadin 7 is compatible with <b>Java 5</b> and it is also compatible with most other
-        operating system supporting Java 5 or newer. However, using Java 6 is recommended,
-        as it is required by widget set compilation.
+        Vaadin 7 is compatible with <b>Java 6</b> and it is also compatible with most other
+        operating system supporting Java 6 or newer. 
       </p>
 
       <p>
diff --git a/WebContent/statictestfiles/LoginFormIframe.html b/WebContent/statictestfiles/LoginFormIframe.html
new file mode 100644
index 0000000000..0d6ee9d86b
--- /dev/null
+++ b/WebContent/statictestfiles/LoginFormIframe.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>LoginForm</title>
+<script type="text/javascript">
+	window.name="LoginForm";
+</script>
+</head>
+<body>
+<p>Tests that LoginForm can be submitted even when the Application is embedded inside an iframe</p>
+<iframe src="/run/com.vaadin.tests.components.loginform.LoginFormTest?restartApplication" name="LoginForm" height="500px" width="500px"></iframe>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebContent/statictestfiles/jsconnector.js b/WebContent/statictestfiles/jsconnector.js
deleted file mode 100644
index d7f697dbf5..0000000000
--- a/WebContent/statictestfiles/jsconnector.js
+++ /dev/null
@@ -1,13 +0,0 @@
-window.com_vaadin_tests_components_javascriptcomponent_BasicJavaScriptComponent_ExampleWidget = function() {
-	var connector = this;
-	
-	var rootElement = connector.getWidgetElement();
-	rootElement.innerHTML = 'Hello world!';
-	rootElement.onclick = function() {
-		connector.getRpcProxy().onClick("message");
-		connector.onclick("another message");
-	}
-	connector.onStateChange = function() {
-		console.log('state change:', this.getState());
-	}
-}
\ No newline at end of file