Merge remote-tracking branch 'origin/6.8'

Conflicts:
	WebContent/VAADIN/themes/base/table/table.css
	WebContent/release-notes.html
	build/build.xml
	src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
	src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
	src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
	src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
	src/com/vaadin/terminal/gwt/client/ui/VSlider.java
	src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
	src/com/vaadin/terminal/gwt/client/ui/VWindow.java
	src/com/vaadin/ui/Table.java
	tests/integration_tests.xml
	tests/test.xml
	tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java

8 files changed, 60 insertions, 6 deletions

diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css
index 88d6f92c79..7af440c735 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.css
@@ -60,6 +60,9 @@
 .v-datefield-calendarpanel-day-focused {
 	outline: 1px dotted black;
 }
+.v-datefield-calendarpanel-day-offmonth {
+    color: #666;
+}
 
 .v-datefield-time {
 	white-space: nowrap;
diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index e2b2a16ffe..877faf364f 100644
--- a/WebContent/VAADIN/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
@@ -49,6 +49,12 @@
 	cursor: pointer;
 }
 
+.v-table.v-disabled .v-table-header-cell,
+.v-table.v-disabled .v-table-header-cell-asc,
+.v-table.v-disabled .v-table-header-cell-desc {
+	cursor: default;
+}
+
 .v-table-footer-wrap {
 	overflow: hidden;
 	border: 1px solid #aaa;
@@ -85,6 +91,9 @@
 	width: 1px;
 	overflow: hidden;
 }
+.v-table.v-disabled .v-table-resizer {
+	cursor: default;	
+}
 .v-table-caption-container {
 	overflow: hidden;
 	white-space: nowrap;
@@ -174,6 +183,9 @@
 	position: relative; /* hide this from IE, it works without it */
 	cursor: pointer;
 }
+.v-table.v-disabled .v-table-column-selector {
+	cursor: default;
+}
 .v-table-focus-slot-left {
 	border-left: 2px solid #999;
 	float: none;
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index 7f978076b8..892b2958a4 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
@@ -88,7 +88,11 @@
 	padding: 0.2em 0.5em;
 }
 .v-tabsheet-tabitem .v-caption {
-	cursor: pointer;
+	cursor: inherit;
+}
+.v-tabsheet.v-disabled .v-tabsheet-tabitem,
+.v-tabsheet-tabitemcell-disabled .v-tabsheet-tabitem {
+	cursor: default;
 }
 .v-tabsheet-tabitem-selected {
 	cursor: default;
diff --git a/WebContent/VAADIN/themes/base/textfield/textfield-normal.css b/WebContent/VAADIN/themes/base/textfield/textfield-normal.css
index aa787dd4dc..557a960c76 100644
--- a/WebContent/VAADIN/themes/base/textfield/textfield-normal.css
+++ b/WebContent/VAADIN/themes/base/textfield/textfield-normal.css
@@ -2,6 +2,7 @@
 	text-align: left /* Force default alignment */
 }
 .v-textarea {
+	resize: none;
 }
 .v-textfield-focus,
 .v-textarea-focus {
diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css
index d5dfd66e2b..5f014247e2 100644
--- a/WebContent/VAADIN/themes/base/window/window.css
+++ b/WebContent/VAADIN/themes/base/window/window.css
@@ -2,10 +2,15 @@
 	background: #fff;
 }
 .v-window-outerheader {
-	cursor: move;
 	padding: 0.3em 1em;
 	height: 1em;
 }
+
+.v-window-outerheader,
+.v-window-draggingCurtain {
+ 	cursor: move;	
+}
+
 .v-window-header {
 	font-weight: bold;
 }
@@ -37,16 +42,22 @@ div.v-window-header {
 	zoom: 1;
 	height: 10px;
 	position: relative;
+	cursor: move;
 }
 .v-window-resizebox {
 	width: 10px;
 	height: 10px;
-	cursor: se-resize;
 	background: #ddd;
 	overflow: hidden;
 	position: absolute;
 	right: 0;
 }
+
+.v-window-resizebox,
+.v-window-resizingCurtain {
+	cursor: se-resize;
+}
+
 .v-window div.v-window-footer-noresize {
 	height: 0;
 }
diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
index 0db9b9d960..d1697c584a 100644
--- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
@@ -93,7 +93,6 @@
 	width: 16px;
 	height: 14px;
 	overflow: hidden;
-	cursor: default;
 	opacity: .5;
 	filter: alpha(opacity=50);
 	}
diff --git a/WebContent/VAADIN/themes/reindeer-tests/styles.css b/WebContent/VAADIN/themes/reindeer-tests/styles.css
index 7d1727d4ca..243d1b87d4 100644
--- a/WebContent/VAADIN/themes/reindeer-tests/styles.css
+++ b/WebContent/VAADIN/themes/reindeer-tests/styles.css
@@ -1,4 +1,29 @@
 @import url(../reindeer/styles.css);
 
 .table-equal-rowheight .v-table-row {height: 30px;}
-.table-equal-rowheight .v-table-row-odd {height: 30px;}
\ No newline at end of file
+.table-equal-rowheight .v-table-row-odd {height: 30px;}
+
+.v-datefield-enabled-readonly-styled {
+	background: #ddd;
+}
+
+.v-datefield-enabled-readonly-styled input.v-datefield-textfield {
+	border: 1px solid black;
+}
+
+.v-datefield-enabled-readonly-styled .v-datefield.v-disabled {
+	opacity: 1;
+}
+
+.v-disabled.v-datefield-enabled-readonly-styled .v-datefield-button,
+.v-readonly.v-datefield-enabled-readonly-styled .v-datefield-button {
+	display: none;
+}
+
+.popup-style .v-datefield-calendarpanel-header,
+.v-datefield-popup-popup-style .v-datefield-calendarpanel-time {
+	background: red;
+}
+.popup-style .v-datefield-calendarpanel-body {
+	background: yellow;
+}
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css
index 217676558e..18ad5c9194 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css
@@ -24,7 +24,6 @@
 	width: 18px;
 	height: 17px;
 	overflow: hidden;
-	cursor: default;
 }
 .v-tabsheet-scroller button::-moz-focus-inner {
 	border: none;