ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1401207 - in /ace/trunk/org.apache.ace.webui.vaadin: bnd.bnd resources/VAADIN/themes/reindeer/styles.css src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
Date Tue, 23 Oct 2012 09:00:39 GMT
Author: jawi
Date: Tue Oct 23 09:00:39 2012
New Revision: 1401207

URL: http://svn.apache.org/viewvc?rev=1401207&view=rev
Log:
Fixed the theme and added some hacks in order to get the table associations to work again (more or less); needs some additional TLC in order to finish it up...

Modified:
    ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
    ace/trunk/org.apache.ace.webui.vaadin/resources/VAADIN/themes/reindeer/styles.css
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java

Modified: ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd?rev=1401207&r1=1401206&r2=1401207&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd Tue Oct 23 09:00:39 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	com.vaadin,\
+	com.vaadin;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\

Modified: ace/trunk/org.apache.ace.webui.vaadin/resources/VAADIN/themes/reindeer/styles.css
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/resources/VAADIN/themes/reindeer/styles.css?rev=1401207&r1=1401206&r2=1401207&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/resources/VAADIN/themes/reindeer/styles.css (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/resources/VAADIN/themes/reindeer/styles.css Tue Oct 23 09:00:39 2012
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_0";}
-.v-theme-version-6_5_0 {display: none;}
+.v-theme-version:after {content:"6_8_4";}
+.v-theme-version-6_8_4 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -251,6 +251,13 @@
 	display: inline;
 }
 
+.v-ie9 .v-gridlayout-margin>div>div>.v-caption,
+.v-ie9 .v-verticallayout>div>div>.v-caption,
+.v-ie9 .v-horizontallayout>div>div>.v-caption {
+	/* Fix possible sub pixel rounding errors that cause error indicators to drop */
+	margin-right:-0.5px;
+}
+
 /* References the BODY tag generated by Vaadin application servlet */
 .v-generated-body {
 	width: 100%;
@@ -276,6 +283,8 @@ div.v-app-loading {
 	background-image: url(../base/common/img/loading-indicator.gif);
 	background-repeat: no-repeat;
 	background-position: 50%;
+	width: 100%;
+	height: 100%;
 }
 .v-view {
 	height: 100%;
@@ -476,12 +485,21 @@ div.v-app-loading {
 
 .v-drag-element {
 	z-index: 60000;
-	position: absolute;
-    opacity: 0.5;
-    filter: alpha(opacity=50);
-    cursor: default;
+	/* override any other position: properties */
+	position: absolute !important;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+	cursor: default;
 }
 
+.v-scrollable {
+	overflow: auto;
+}
+/* Enable kinetic scrolling on Mobile Safari 6 */ 
+.v-ios.v-sa6 .v-scrollable { 
+        -webkit-overflow-scrolling: touch; 
+} 
+
 .v-csslayout {
 	overflow: hidden;
 }
@@ -530,7 +548,7 @@ div.v-app-loading {
 	padding: 0;
 	margin: 0;
 }
-.v-datefield-calendarpanel:focus{
+.v-datefield-calendarpanel:focus {
 	outline:none;	
 }
 .v-datefield-calendarpanel-header td {
@@ -568,6 +586,20 @@ div.v-app-loading {
 .v-datefield-calendarpanel-day-focused {
 	outline: 1px dotted black;
 }
+.v-datefield-calendarpanel-day-offmonth {
+    color: #666;
+}
+
+.v-ie6 .v-datefield-calendarpanel-day,
+.v-ie7 .v-datefield-calendarpanel-day {
+	margin: 1px;
+}
+.v-ie6 .v-datefield-calendarpanel-day-focused,
+.v-ie7 .v-datefield-calendarpanel-day-focused {
+	border: 1px dotted black;
+	margin: 0px;
+}
+
 .v-datefield-time {
 	white-space: nowrap;
 }
@@ -604,6 +636,27 @@ div.v-app-loading {
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
 	border-radius: 4px;
+	position: relative;
+}
+[draggable=true] {
+	-khtml-user-drag: element;
+	-webkit-user-drag: element;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+}
+.v-ie .v-ddwrapper a.drag-start {
+	display: block;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+    left: 0;
+	right: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+	/* Some color needed to make it draggable */
+	background-color:cyan;
+	filter: alpha(opacity=0);
 }
 .v-ddwrapper-over {
 	border: 2px solid #1d9dff;
@@ -737,6 +790,12 @@ div.v-app-loading {
 	display: none;
 }
 
+
+.v-table .v-embedded-image {
+    /* make embeddeds be centered in centered table cells. */
+	display: inline-block;
+}
+
 .v-formlayout-cell .v-errorindicator {
 	display: block;
 }
@@ -751,32 +810,53 @@ div.v-app-loading {
 .v-formlayout-captioncell .v-caption {
 	overflow: visible;
 }
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, 
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell,
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell {
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-captioncell, 
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-contentcell,
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-errorcell {
 	padding-top: 6px;
 }
-.v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, 
-.v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell,
-.v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-errorcell {
+.v-formlayout-spacing > tbody > .v-formlayout-firstrow > .v-formlayout-captioncell, 
+.v-formlayout-spacing > tbody > .v-formlayout-firstrow > .v-formlayout-contentcell,
+.v-formlayout-spacing > tbody > .v-formlayout-firstrow > .v-formlayout-errorcell {
 	padding-top: 0;
 }
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, 
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell,
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell {
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-captioncell, 
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-contentcell,
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-errorcell {
 	padding-top: 12px;
 }
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell,
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell,
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell {
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-captioncell,
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-contentcell,
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-errorcell {
 	padding-bottom: 12px;
 }
-.v-formlayout-margin-left .v-formlayout-captioncell {
+.v-ie6 .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, 
+.v-ie6 .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell,
+.v-ie6 .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell {
+	padding-top: expression(/v-formlayout-spacing/.test(this.parentNode.parentNode.parentNode.className) ? "6px" : "0px");
+}
+.v-ie6 .v-formlayout-margin-top .v-formlayout-row .v-formlayout-captioncell, 
+.v-ie6 .v-formlayout-margin-top .v-formlayout-row .v-formlayout-contentcell,
+.v-ie6 .v-formlayout-margin-top .v-formlayout-row .v-formlayout-errorcell {
+	padding-top: expression((/v-formlayout-firstrow/.test(this.parentNode.className) && /v-formlayout-margin-top/.test(this.parentNode.parentNode.parentNode.className)) ? "12px" : (/v-formlayout-spacing/.test(this.parentNode.parentNode.parentNode.className) ? "6px" : "0px"));
+}
+.v-ie6 .v-formlayout-margin-bottom .v-formlayout-row .v-formlayout-captioncell,
+.v-ie6 .v-formlayout-margin-bottom .v-formlayout-row .v-formlayout-contentcell,
+.v-ie6 .v-formlayout-margin-bottom .v-formlayout-row .v-formlayout-errorcell {
+	padding-bottom: expression((/v-formlayout-lastrow/.test(this.parentNode.className) && /v-formlayout-margin-bottom/.test(this.parentNode.parentNode.parentNode.className)) ? "12px" : "0px");
+}
+.v-formlayout-margin-left > tbody > .v-formlayout-row > .v-formlayout-captioncell {
 	padding-left: 12px;
 } 
-.v-formlayout-margin-right .v-formlayout-contentcell {
+.v-formlayout-margin-right > tbody > .v-formlayout-row > .v-formlayout-contentcell {
 	padding-right: 12px;
 }
+.v-ie6 .v-formlayout-margin-left .v-formlayout-row .v-formlayout-captioncell {
+	padding-left: expression(/v-formlayout-margin-left/.test(this.parentNode.parentNode.parentNode.className) ? "12px" : "0px");
+}
+.v-ie6 .v-formlayout-margin-right .v-formlayout-row .v-formlayout-contentcell {
+	padding-right: expression(/v-formlayout-margin-right/.test(this.parentNode.parentNode.parentNode.className) ? "12px" : "0px");
+}
 .v-formlayout-captioncell .v-caption .v-required-field-indicator {
 	float: none;
 }
@@ -853,7 +933,7 @@ div.v-app-loading {
 	display: inline-block;
 	zoom: 1;
 }
-.v-menubar .v-menubar-menuitem-caption * {
+.v-menubar .v-menubar-menuitem-caption .v-icon {
 	vertical-align: middle;
 	white-space: nowrap;
 }
@@ -917,11 +997,23 @@ div.v-app-loading {
 	margin-right: 3px;
 }
 
+.v-menubar:focus,
 .v-menubar-popup:focus,
 .v-menubar-popup .popupContent:focus,
 .v-menubar-popup .popupContent .v-menubar-submenu:focus{
 	outline: none;	
 }
+/* Checkboxes for checkable/checked menu items */
+/* Checked/unchecked requires combined style selected-(un)checked for IE6 */
+.v-menubar-submenu-check-column .v-menubar-menuitem {
+	padding-left: 6px;
+}
+.v-menubar-submenu-check-column .v-menubar-menuitem-caption {
+	padding-left: 18px;
+}
+.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { 
+	background: transparent url(../base/menubar/img/check.gif) no-repeat left;
+}
 
 .v-Notification {
 	background: #999;
@@ -1070,7 +1162,6 @@ div.v-app-loading {
 	overflow: hidden; /* for IE6 */
 	background: #ddd;
 }
-
 .v-progressindicator-invisible {
 	display: none;
 }
@@ -1105,6 +1196,11 @@ div.v-progressindicator-indeterminate-di
 	display: block;
 	white-space: nowrap;
 }
+.v-select-optiongroup .v-icon {
+	vertical-align: middle;
+	white-space: nowrap;
+	margin: 0 2px;	
+}
 .v-ie .v-select-optiongroup .v-select-option {
 	zoom: 1;
 }
@@ -1227,6 +1323,10 @@ div.v-progressindicator-indeterminate-di
 	text-align: center;
 }
 
+.v-filterselect-no-input .v-filterselect-input {
+	cursor: default;
+}
+
 /* Error styles (disabled by default)
 
 .v-filterselect-error .v-filterselect-input,
@@ -1513,13 +1613,19 @@ div.v-progressindicator-indeterminate-di
 	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;
 	border-top: none;
 	background: #efefef;
 }
-.v-table-footer table{
+.v-table-footer table {
 	border-spacing: 0;
 	border-collapse: collapse;
 	margin: 0;
@@ -1530,10 +1636,10 @@ div.v-progressindicator-indeterminate-di
 	padding: 0;
 	border-right: 1px solid #aaa;
 }
-.v-table-footer-cell{
+.v-table-footer-cell {
 	cursor: pointer;
 }
-.v-table-footer-container{	
+.v-table-footer-container {	
 	float:right;	
 	padding-right:6px;
 	overflow:hidden;
@@ -1549,6 +1655,9 @@ div.v-progressindicator-indeterminate-di
 	width: 1px;
 	overflow: hidden;
 }
+.v-table.v-disabled .v-table-resizer {
+	cursor: default;	
+}
 .v-table-caption-container {
 	overflow: hidden;
 	white-space: nowrap;
@@ -1597,12 +1706,17 @@ div.v-progressindicator-indeterminate-di
 }
 .v-table-row,
 .v-table-row-odd {
+    background: #fff;
 	border: 0;
 	margin: 0;
 	padding: 0;
 	cursor: pointer;
 }
 
+.v-table-generated-row {
+	   background: #efefef;
+}
+
 .v-table-body-noselection .v-table-row,
 .v-table-body-noselection .v-table-row-odd {
 	cursor: default;
@@ -1637,13 +1751,20 @@ div.v-progressindicator-indeterminate-di
 	position: relative; /* hide this from IE, it works without it */
 	cursor: pointer;
 }
+.v-table.v-disabled .v-table-column-selector {
+	cursor: default;
+}
 .v-ie6 .v-table-column-selector,
 .v-ie7 .v-table-column-selector {
 	position: static;
 }
 .v-table-focus-slot-left {
 	border-left: 2px solid #999;
-	margin-right: -2px;
+	float: none;
+	margin-bottom: -1.2em;
+	width: auto;
+	background: transparent;
+	border-right: 1px solid #aaa;
 }
 .v-table-focus-slot-right {
 	border-right: 2px solid #999;
@@ -1681,6 +1802,10 @@ div.v-progressindicator-indeterminate-di
 	border-top: 1px dotted #0066bd;
 	border-bottom: 1px dotted #0066bd;
 }
+.v-table-focus .v-table-cell-wrapper {
+	margin-top: -1px;
+	margin-bottom: -1px;
+}
 /* row in column selector */
 .v-on {
 	
@@ -1688,6 +1813,11 @@ div.v-progressindicator-indeterminate-di
 .v-off {
 	color: #ddd;
 }
+
+.v-table .v-checkbox {
+	display: inline-block;
+}
+
 /*************************************
  * Drag'n'drop styles
  *************************************/
@@ -1740,6 +1870,9 @@ div.v-progressindicator-indeterminate-di
 	width: 100%;
 	overflow:hidden;
 }
+.v-tabsheet-tabitemcell:focus {
+	outline: none;
+}
 .v-tabsheet-tabitemcell,
 .v-tabsheet-spacertd {
 	margin: 0;
@@ -1822,7 +1955,11 @@ div.v-progressindicator-indeterminate-di
 	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;
@@ -1838,6 +1975,10 @@ div.v-progressindicator-indeterminate-di
 	border-bottom: none;
 	position: relative;
 }
+.v-ie6 .v-tabsheet-content,
+.v-ie7 .v-tabsheet-content {
+	zoom: 1;
+}
 .v-tabsheet-deco {
 	height: 1px;
 	background: #aaa;
@@ -1855,6 +1996,7 @@ div.v-progressindicator-indeterminate-di
 	text-align: left /* Force default alignment */
 }
 .v-textarea {
+	resize: none;
 }
 .v-textfield-focus,
 .v-textarea-focus {
@@ -1906,7 +2048,9 @@ textarea.v-textarea-readonly:focus {
 	background: #fff;
 	border: none;
 }
-
+.v-richtextarea .gwt-HTML {
+	height: 100%;
+}
 .v-richtextarea .gwt-RichTextToolbar {
 	white-space: nowrap;
 	background: #959595 url(../base/textfield/img/richtext-toolbar-bg.png) repeat-x 0 -42px;
@@ -1955,6 +2099,7 @@ textarea.v-textarea-readonly:focus {
 	border: none;
 }
 
+
 .v-tree {
 	text-align: left; /* Force default alignment */
 	overflow: hidden;
@@ -1965,12 +2110,15 @@ textarea.v-textarea-readonly:focus {
 	background: transparent url(../base/common/img/sprites.png) no-repeat 5px -37px;
 	padding: 1px 0;
 }
-.v-tree-node-expanded {
-	background-position: -5px -10px;
+.v-tree-node-caption:focus {
+	outline: none;
 }
 div.v-tree-node-leaf {
 	background: transparent;
 }
+.v-tree-node-expanded {
+	background: transparent url(../base/common/img/sprites.png) no-repeat -5px -10px;
+}
 .v-tree-node-caption {
 	margin-left: 1em;
 }
@@ -2072,6 +2220,130 @@ div.v-tree-node-leaf {
 	border-color: rgba(0,109,232,.6);
 }
 
+/* Make item caption height an even number (so that the connector dots overlap nicely) */
+.v-tree-connectors .v-tree-node-caption {
+	padding-top: 1px;
+}
+.v-tree-connectors .v-tree-node {
+	background: transparent url(../base/tree/img/connector-expand.png) no-repeat 2px -52px;
+}
+.v-tree-connectors .v-tree-node-expanded {
+	background: transparent url(../base/tree/img/connector-collapse.png) no-repeat 2px -52px;
+}
+.v-tree-connectors .v-tree-node-last {
+	background: transparent url(../base/tree/img/connector-expand-last.png) no-repeat 2px -52px;
+}
+.v-tree-connectors .v-tree-node-expanded.v-tree-node-last {
+	background: transparent url(../base/tree/img/connector-collapse-last.png) no-repeat 2px -52px;
+}
+.v-tree-connectors .v-tree-node-leaf {
+	background: transparent url(../base/tree/img/connector-leaf.png) repeat-y 2px 50%;
+}
+.v-tree-connectors .v-tree-node-leaf-last {
+	background: transparent url(../base/tree/img/connector-leaf-last.png) repeat-y 2px 50%;
+}
+.v-tree-connectors .v-tree-node-children {
+	background: transparent url(../base/tree/img/connector.png) repeat-y 2px 0;
+}
+.v-tree-connectors .v-tree-node-children-last {
+	background: transparent;
+}
+.v-tree-connectors .v-tree-node-drag-top,
+.v-tree-connectors .v-tree-node-expanded.v-tree-node-drag-top {
+	background-position: 2px -53px;
+}
+.v-tree-connectors .v-tree-node-drag-top.v-tree-node-leaf {
+	background-position: 2px 50%;
+}
+
+/* IE6 */
+.v-ie6 .v-tree-connectors .v-tree-node {
+	background: transparent url(../base/tree/img/connector-expand-ie6.png) no-repeat 2px -52px;
+}
+.v-ie6 .v-tree-connectors .v-tree-node-expanded {
+	background: transparent url(../base/tree/img/connector-collapse-ie6.png) no-repeat 2px -52px;
+}
+.v-ie6 .v-tree-connectors .v-tree-node-last {
+	background: transparent url(../base/tree/img/connector-expand-last-ie6.png) no-repeat 2px -52px;
+}
+.v-ie6 .v-tree-connectors .v-tree-node-last.v-tree-node-expanded {
+	background: transparent url(../base/tree/img/connector-collapse-last-ie6.png) no-repeat 2px -52px;
+}
+
+.v-treetable-treespacer {
+    display: inline-block;
+    background: transparent;
+    height: 10px;
+    /* defines the amount of indent per level */
+    width: 18px;
+    position: absolute;
+    left: 0;
+    top: 5px;
+}
+
+.v-treetable-node-closed {
+    background: url(../base/treetable/img/arrow-right.png) right top no-repeat;
+}
+
+.v-ie6 .v-treetable-node-closed {
+	background-image: url(../base/treetable/img/arrow-right.gif); 
+} 
+
+.v-treetable-node-open {
+    background: url(../base/treetable/img/arrow-down.png) right top no-repeat;
+}
+
+.v-ie6 .v-treetable-node-open {
+	background-image: url(../base/treetable/img/arrow-down.gif); 
+} 
+
+.v-treetable .v-checkbox {
+	display: inline-block;
+	padding-bottom: 4px;
+}
+
+.v-treetable .v-table-row .v-table-cell-content,
+.v-treetable .v-table-row-odd .v-table-cell-content {
+    position: relative;
+    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;
+}
+
+.v-treetable .v-table-body .v-table-table .v-table-row-animating,
+.v-treetable .v-table-body .v-table-table .v-table-row-animating .v-table-cell-content {
+    background:transparent;
+}
+
+.v-treetable-animation-clone {
+	border-spacing: 0;
+	zoom:1;
+}
+
+div.v-treetable-animation-clone-wrapper {
+	position: absolute;
+    z-index: 2;
+    background-color:#fff;
+}
+
+div.v-treetable-animation-clone-wrapper table.v-treetable-animation-clone {
+    background-color:#fff;
+}
+
+div table.v-treetable-animation-clone tr.v-table-row,
+div table.v-treetable-animation-clone tr.v-table-row-odd,
+div table.v-treetable-animation-clone tr.v-table-row td.v-table-cell-content,
+div table.v-treetable-animation-clone tr.v-table-row-odd td.v-table-cell-content {
+	visibility: visible;
+}
+
 .v-upload {
 	white-space: nowrap;
 }
@@ -2117,10 +2389,15 @@ div.v-tree-node-leaf {
 	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;
 }
@@ -2155,16 +2432,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;
 }
@@ -2777,7 +3060,8 @@ div.v-window-header {
 .v-contextmenu,
 .v-Notification,
 .v-menubar-submenu,
-.v-drag-element {
+.v-drag-element,
+.v-table-header-drag {
 	font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
 	font-size: 12px;
 	line-height: normal;
@@ -3153,7 +3437,8 @@ td.v-datefield-calendarpanel-nextyear {
 .v-datefield-full .v-datefield-textfield {
 	width: 12em;
 }
-.v-datefield-popupcalendar input.v-datefield-textfield {
+.v-datefield-popupcalendar input.v-datefield-textfield,
+div.v-table-full-height-fields .v-datefield-popupcalendar input.v-datefield-textfield {
 	border-right-width: 0;
 	-moz-border-radius-topright: 0;
 	-moz-border-radius-bottomright: 0;
@@ -3328,27 +3613,48 @@ td.v-datefield-calendarpanel-nextyear {
 	text-align: right;
 	white-space: nowrap;
 }
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, 
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell,
-.v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell {
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-captioncell, 
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-contentcell,
+.v-formlayout-spacing > tbody > .v-formlayout-row > .v-formlayout-errorcell {
 	padding-top: 8px;
 }
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, 
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell,
-.v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell {
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-captioncell, 
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-contentcell,
+.v-formlayout-margin-top > tbody > .v-formlayout-firstrow > .v-formlayout-errorcell {
 	padding-top: 15px;
 }
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell,
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell,
-.v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell {
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-captioncell,
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-contentcell,
+.v-formlayout-margin-bottom > tbody > .v-formlayout-lastrow > .v-formlayout-errorcell {
 	padding-bottom: 15px;
 }
-.v-formlayout-margin-left .v-formlayout-captioncell {
+.v-ie6 .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, 
+.v-ie6 .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell,
+.v-ie6 .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell {
+	padding-top: expression(/v-formlayout-spacing/.test(this.parentNode.parentNode.parentNode.className) ? "8px" : "0px");
+}
+.v-ie6 .v-formlayout-margin-top .v-formlayout-row .v-formlayout-captioncell, 
+.v-ie6 .v-formlayout-margin-top .v-formlayout-row .v-formlayout-contentcell,
+.v-ie6 .v-formlayout-margin-top .v-formlayout-row .v-formlayout-errorcell {
+	padding-top: expression((/v-formlayout-firstrow/.test(this.parentNode.className) && /v-formlayout-margin-top/.test(this.parentNode.parentNode.parentNode.className)) ? "15px" : (/v-formlayout-spacing/.test(this.parentNode.parentNode.parentNode.className) ? "8px" : "0px"));
+}
+.v-ie6 .v-formlayout-margin-bottom .v-formlayout-row .v-formlayout-captioncell,
+.v-ie6 .v-formlayout-margin-bottom .v-formlayout-row .v-formlayout-contentcell,
+.v-ie6 .v-formlayout-margin-bottom .v-formlayout-row .v-formlayout-errorcell {
+	padding-bottom: expression((/v-formlayout-lastrow/.test(this.parentNode.className) && /v-formlayout-margin-bottom/.test(this.parentNode.parentNode.parentNode.className)) ? "15px" : "0px");
+}
+.v-formlayout-margin-left > tbody > .v-formlayout-row > .v-formlayout-captioncell {
 	padding-left: 18px;
 } 
-.v-formlayout-margin-right .v-formlayout-contentcell {
+.v-formlayout-margin-right > tbody > .v-formlayout-row > .v-formlayout-contentcell {
 	padding-right: 18px;
 }
+.v-ie6 .v-formlayout-margin-left .v-formlayout-row .v-formlayout-captioncell {
+	padding-left: expression(/v-formlayout-margin-left/.test(this.parentNode.parentNode.parentNode.className) ? "18px" : "0px");
+}
+.v-ie6 .v-formlayout-margin-right .v-formlayout-row .v-formlayout-contentcell {
+	padding-right: expression(/v-formlayout-margin-right/.test(this.parentNode.parentNode.parentNode.className) ? "18px" : "0px");
+}
 /* form */
 .v-form-errormessage {
 	background: transparent url(common/icons/error.png) no-repeat 3px 2px;
@@ -3377,6 +3683,9 @@ td.v-datefield-calendarpanel-nextyear {
 	font-weight: bold;
 	color: #222;
 }
+.black .v-form legend {
+	color: #e3e6e8;
+}
 
 .v-label {
 	line-height: 18px;
@@ -3632,7 +3941,7 @@ td.v-datefield-calendarpanel-nextyear {
 	padding: 1px 26px 1px 10px;
 	line-height: 16px;
 }
-.v-menubar-submenu .v-menubar-menuitem-caption * { 
+.v-menubar-submenu .v-menubar-menuitem-caption .v-icon { 
 	vertical-align: middle;
 }
 .v-menubar .v-menubar-menuitem-selected,
@@ -3659,6 +3968,26 @@ td.v-datefield-calendarpanel-nextyear {
 	background-image: url(menubar/img/submenu-icon-hover.png);
 }
 
+/* Checkboxes for checkable/checked menu items */
+.v-menubar-submenu-check-column .v-menubar-menuitem {
+	padding-left: 6px;
+}
+.v-menubar-submenu-check-column .v-menubar-menuitem-caption {
+	padding-left: 18px;
+}
+.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { 
+	background: transparent url(menubar/img/checked.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-unchecked .v-menubar-menuitem-caption {
+	background: transparent url(menubar/img/unchecked.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-selected-checked .v-menubar-menuitem-caption { 
+	background: transparent url(menubar/img/checked-selected.png) no-repeat left;
+}
+.v-menubar-submenu .v-menubar-menuitem-selected-unchecked .v-menubar-menuitem-caption {
+	background: transparent url(menubar/img/unchecked-selected.png) no-repeat left;
+}
+
 .v-Notification {
 	color: #fff;
 	border-radius: 4px;
@@ -3668,6 +3997,12 @@ td.v-datefield-calendarpanel-nextyear {
 	background: #c8ccd0;
 	font-weight: bold;
 }
+
+.v-ie9 .v-Notification H1 {
+	/* Fix for #6793 */
+	font-weight: bold;
+}
+	
 .v-Notification p {
 	line-height: 1.3;
 }
@@ -3707,26 +4042,30 @@ td.v-datefield-calendarpanel-nextyear {
 .v-panel-nocaption,
 .white .v-panel-caption,
 .white .v-panel-nocaption {
-	border-bottom: 1px solid #dcdcdc;
+	border-bottom: 1px solid #e5e5e5;
 	line-height: 16px; /* accommodate minimum icon size */
 }
-.v-sa .v-panel-caption,
-.v-sa .v-panel-nocaption,
-.v-ff3 .v-panel-caption,
-.v-ff3 .v-panel-nocaption {
-	border-bottom-color: rgba(0,0,0,.1);
+.v-webkit .v-panel-caption,
+.v-webkit .v-panel-nocaption,
+.v-gecko .v-panel-caption,
+.v-gecko .v-panel-nocaption,
+.v-ie9 .v-panel-caption,
+.v-ie9 .v-panel-nocaption {
+	border-bottom-color: rgba(0,0,0,.08);
 }
 .v-panel-caption {
 	padding-bottom: 2px;
 }
-.v-panel-content {
+.v-panel-content,
+.white .v-panel-content {
 	border: 1px solid #dcdcdc;
 	border-bottom: none;
 	border-top: none;
 }
-.v-sa .v-panel-content,
-.v-ff3 .v-panel-content {
-	border-color: rgba(0,0,0,.1);
+.v-webkit .v-panel-content,
+.v-gecko .v-panel-content,
+.v-ie9 .v-panel-content {
+	border-top-color: rgba(0,0,0,.07);
 }
 .v-panel-content > div {
 	background: #fff;
@@ -3735,18 +4074,20 @@ td.v-datefield-calendarpanel-nextyear {
 .v-ie6 .v-panel-content {
 	background: #fff;
 }
-.v-panel-deco {
+.blue .v-panel-deco {
+	border-color: #92a3ac;
+	background: #adc2cd;
+}
+.v-panel-deco,
+.white .v-panel-deco {
 	height: 1px;
 	border-top: 1px solid #bebebe;
 	background: #e2e2e2;
 	overflow: hidden;
 }
-.blue .v-panel-deco {
-	border-color: #92a3ac;
-	background: #adc2cd;
-}
-.v-sa .v-panel-deco,
-.v-ff3 .v-panel-deco {
+.v-webkit .v-panel-deco,
+.v-gecko .v-panel-deco,
+.v-ie9 .v-panel-deco {
 	border-top-color: rgba(0,0,0,.1);
 	background: rgba(0,0,0,.08);
 }
@@ -3761,16 +4102,13 @@ td.v-datefield-calendarpanel-nextyear {
 .v-ie6 .v-panel-caption .v-errorindicator {
 	background-image: url(common/icons/error-ie6.png);
 }
-.v-ff2 .v-panel-caption .v-errorindicator  {
-	display: -moz-inline-stack;
-}
 
 /* Light style */
-.v-panel-caption-light,
-.v-panel-nocaption-light {
+.v-panel-light .v-panel-caption-light,
+.v-panel-light .v-panel-nocaption-light {
 	border: none;
 }
-.v-panel-content-light {
+.v-panel-light .v-panel-content-light {
 	border: none;
 }
 .v-panel-content-light > div {
@@ -3779,7 +4117,7 @@ td.v-datefield-calendarpanel-nextyear {
 .v-ie6 .v-panel-content-light {
 	background: transparent;
 }
-.v-panel-deco-light {
+.v-panel-light .v-panel-deco-light {
 	height: 0;
 	border: none;
 }
@@ -4290,7 +4628,8 @@ td.v-datefield-calendarpanel-nextyear {
 .v-table-header-wrap,
 .white .v-table-header-wrap,
 .v-table-footer-wrap,
-.white .v-table-footer-wrap {
+.white .v-table-footer-wrap,
+.v-table-header-drag {
 	border-color: #c2c3c4;
 	background: transparent repeat-x;
   background-image: url(common/img/vertical-sprites.png);
@@ -4305,6 +4644,24 @@ td.v-datefield-calendarpanel-nextyear {
 	line-height: normal;
 }
 
+.v-ie6 .v-table,
+.v-ie6 .v-table-header-wrap,
+.v-ie6 .v-table-footer-wrap,
+.v-ie6 .v-table-column-selector {
+	/* The header will overflow the Table due to a bug in IE6 after changes in #3003. To fix this (#7314) 
+	 * we need to apply position:relative to the wrappers and selector to make them appear on top of the 
+	 * header. We also need to apply it to the table root div to get rid of a really weird IE6 rendering bug
+	 * caused by all this relativeness (see attachment in #7314).  
+	 */
+	position: relative;
+}
+
+.v-ie6 .v-table.v-disabled,
+.v-ie7 .v-table.v-disabled {
+	/* Fixes ie issue #7324 where disabled shim does not cover table body */ 
+	position: relative;
+}
+
 .v-table-footer-wrap,
 .white .v-table-footer-wrap {
 	text-transform: none;
@@ -4321,28 +4678,28 @@ td.v-datefield-calendarpanel-nextyear {
 	padding-right: 7px;
 }
 
+
 .v-table-header,
 .v-table-footer,
 .v-table-footer table {
 	height: 20px;
 }
 
-.v-table-caption-container {
-	heigth: 16px;
+.v-table-caption-container,
+.v-table-header-drag {
 	padding-top: 4px;
 	padding-right: 4px;
 }
-.v-table-caption-container .v-icon {
+.v-table-caption-container .v-icon,
+.v-table-header-drag .v-icon {
 	height: 16px;
 	margin: -4px 3px 0 0;
 	vertical-align: middle;
 }
-.v-ie .v-table-caption-container .v-icon {
+.v-ie .v-table-caption-container .v-icon,
+.v-ie .v-table-header-drag .v-icon {
 	margin-top: -3px;
 }
-.v-table-footer-container {
-	heigth: 16px;	
-}
 .v-table-resizer {
 	height: 20px;
 	width: 2px;
@@ -4380,6 +4737,9 @@ td.v-datefield-calendarpanel-nextyear {
 	border-right-color: #d3d4d5;
 	vertical-align: top;
 }
+.v-table.full-height-fields .v-table-cell-content {
+	height: 32px;
+}
 .v-table-cell-wrapper {
 	padding-top: 3px;
 	padding-bottom: 3px;
@@ -4387,6 +4747,19 @@ td.v-datefield-calendarpanel-nextyear {
 .v-table-row-odd {
 	background: #eff0f1;
 }
+.v-table-generated-row {
+    background: #dcdee0;
+    text-transform: uppercase;
+    font-size: 10px;
+    font-weight: bold;
+    color: #222;
+    text-shadow: #f3f5f8 0 1px 0;
+    line-height: normal;
+}
+.v-table-generated-row .v-table-cell-wrapper {
+    padding-top: 4px;
+    padding-bottom: 5px;
+}
 .v-table-cell-content:last-child {
 	border-right-color: transparent;
 }
@@ -4399,10 +4772,6 @@ td.v-datefield-calendarpanel-nextyear {
 .v-table .v-selected .v-table-cell-content {
 	border-right-color: #466c90;
 }
-.v-table-focus .v-table-cell-wrapper {
-	padding-top: 2px;
-	padding-bottom: 2px;	
-}
 .v-table-column-selector {
 	width: 16px;
 	height: 20px;
@@ -4418,29 +4787,17 @@ td.v-datefield-calendarpanel-nextyear {
   background-position: left -1005px;
 }
 .v-table-focus-slot-left {
-	border-left-color: #222;
-	margin-left: 0;
+	border-left: 1px solid #222;
+	margin-bottom: -20px;
+	width: auto;
 }
 .v-table-focus-slot-right {
 	border-right-color: #222;
 	margin-right: 0;
 }
 .v-table-header-drag {
-	font-family: arial, helvetica, verdana, sans-serif;
-	background: transparent repeat-x;
-  background-image: url(common/img/vertical-sprites.png);
-  -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1025px;
-	padding: 4px;
-	text-transform: uppercase;
-	font-size: 10px;
-	font-weight: bold;
-	color: #222;
-	text-shadow: #fff 0 1px 0;
-	line-height: normal;
-}
-.v-table-header-drag * {
-	vertical-align: middle;
+	padding-left: 6px;
+	height: 16px;
 }
 .v-table-header-drag img {
 	height: 16px;
@@ -4455,7 +4812,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1045px;
+  background-position: left -1025px;
 	border: 1px solid #939494;
 	border: none;
 	border-radius-bottomleft: 4px;
@@ -4466,9 +4823,9 @@ td.v-datefield-calendarpanel-nextyear {
 	-webkit-border-bottom-right-radius: 4px;
 	height: 13px;
 	padding: 4px 30px;
+	white-space: nowrap;
 	color: #222;
 	text-shadow: #fff 0 1px 0;
-	width: 100px;
 	position: relative;
 	top: 1px;
 	-webkit-box-shadow: rgba(0,0,0,.5) 0 1px 2px;
@@ -4480,11 +4837,12 @@ td.v-datefield-calendarpanel-nextyear {
 /* row in column selector */
 .v-contextmenu .v-on,
 .v-contextmenu .v-off {
-	display: block;
+	display: inline-block;
+	zoom: 1;
 	background: transparent no-repeat 0 4px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1067px;
+  background-position: left -1047px;
 	padding-left: 12px;
 	padding-right: 4px;
 }
@@ -4495,17 +4853,18 @@ td.v-datefield-calendarpanel-nextyear {
 .v-contextmenu .gwt-MenuItem-selected .v-on {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1081px;
+  background-position: left -1061px;
 }
 
 
 /* Strong style */
-.v-table-strong .v-table-header-wrap {
+.v-table-strong .v-table-header-wrap,
+.v-table-strong .v-table-header-drag {
 	border-color: #2b3033;
 	border-top-color: #2b3033;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1096px;
+  background-position: left -1076px;
 	color: #e7e9ea;
 	text-shadow: #000 0 -1px 0;
 }
@@ -4518,29 +4877,22 @@ td.v-datefield-calendarpanel-nextyear {
 .v-table-strong .v-table-header-cell-asc .v-table-sort-indicator {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -1116px;
+  background-position: right -1096px;
 }
 .v-table-strong .v-table-header-cell-desc .v-table-sort-indicator {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -1135px;
+  background-position: right -1115px;
 }
 .v-table-strong .v-table-column-selector {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1154px;
+  background-position: left -1134px;
 }
 .v-table-strong .v-table-column-selector:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1174px;
-}
-.v-table-strong .v-table-header-drag {
-  background-image: url(common/img/vertical-sprites.png);
-  -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1194px;
-	color: #e7e9ea;
-	text-shadow: #000 0 -1px 0;
+  background-position: left -1154px;
 }
 .v-table-strong .v-table-focus-slot-left,
 .v-table-strong .v-table-focus-slot-right {
@@ -4549,7 +4901,8 @@ td.v-datefield-calendarpanel-nextyear {
 
 
 /* Table on black background (normal style) */
-.black .v-table-header-wrap {
+.black .v-table-header-wrap,
+.black .v-table-header-drag {
 	border-color: #252729;
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
@@ -4580,13 +4933,6 @@ td.v-datefield-calendarpanel-nextyear {
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
   background-position: left -700px;
 }
-.black .v-table-header-drag {
-  background-image: url(common/img/black-vertical-sprites.png);
-  -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -720px;
-	color: #e7eaee;
-	text-shadow: #000 0 -1px 0;
-}
 .black .v-table-focus-slot-left,
 .black .v-table-focus-slot-right {
 	border-color: #9ca1a5;
@@ -4605,20 +4951,17 @@ td.v-datefield-calendarpanel-nextyear {
 .black .v-table-row-odd {
 	background: transparent;
 }
-/* Selection background-color combined with default style selector, so we don't have to duplicate the sprite image in the final sprite collection */
+/* Selection background-color combined with the default (white) style selector, so we don't have to duplicate the sprite image in the final sprite collection */
 .black .v-table .v-selected .v-table-cell-content {
 	border-bottom: 1px solid #4d749f;
 }
 
-
 /* Borderless style */
 .v-table-borderless .v-table-header-wrap,
 .v-table-borderless .v-table-body {
 	border: none;
 }
 
-
-
 /* These styles get catenated together on build */
 
 /* Default Tabsheet styles */
@@ -4631,14 +4974,14 @@ td.v-datefield-calendarpanel-nextyear {
 	background: no-repeat;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1214px;
+  background-position: left -1174px;
 	padding-left: 3px;
 }
 .v-tabsheet-tabitemcell-first {
 	padding-left: 10px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1246px;
+  background-position: left -1206px;
 }
 .v-tabsheet-tabitem,
 .v-tabsheet-spacertd div {
@@ -4647,7 +4990,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1278px;
+  background-position: left -1238px;
 	padding: 0;
 	color: #222;
 	text-shadow: #fff 0 1px 0;
@@ -4658,7 +5001,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background: no-repeat right top;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -1310px;
+  background-position: right -1270px;
 	padding: 9px 8px 0 6px;
 }
 .v-tabsheet-tabitem .v-caption-closable {
@@ -4678,7 +5021,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1342px;
+  background-position: left -1302px;
 	cursor: default;
 	text-indent: -999px;
 	overflow: hidden;
@@ -4695,48 +5038,48 @@ td.v-datefield-calendarpanel-nextyear {
 .v-tabsheet-caption-close:hover {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1360px;
+  background-position: left -1320px;
 }
 .v-tabsheet-caption-close:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1378px;
+  background-position: left -1338px;
 }
 .v-tabsheet-tabitem-selected .v-tabsheet-caption-close {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1396px;
+  background-position: left -1356px;
 }
 .v-tabsheet-tabitem-selected .v-tabsheet-caption-close:hover {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1414px;
+  background-position: left -1374px;
 }
 .v-tabsheet-tabitem-selected .v-tabsheet-caption-close:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1432px;
+  background-position: left -1392px;
 }
 .v-tabsheet-tabitemcell-selected {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1450px;
+  background-position: left -1410px;
 }
 .v-tabsheet-tabitemcell-selected-first {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1482px;
+  background-position: left -1442px;
 }
 .v-tabsheet-tabitem-selected {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1514px;
+  background-position: left -1474px;
 	color: #232930;
 }
 .v-tabsheet-tabitem-selected .v-caption {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -1546px;
+  background-position: right -1506px;
 }
 .v-tabsheet-spacertd div {
 	margin-right: 4px;
@@ -4745,7 +5088,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent no-repeat right top;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -1578px;
+  background-position: right -1538px;
 }
 .blue .v-tabsheet-content {
 	border-color: #a8bcc5;
@@ -4815,7 +5158,8 @@ td.v-datefield-calendarpanel-nextyear {
 	zoom: 1;
 	display: inline;
 }
-.v-ie8 .v-tabsheet-tabs .v-errorindicator {
+.v-ie8 .v-tabsheet-tabs .v-errorindicator,
+.v-ie9 .v-tabsheet-tabs .v-errorindicator {
 	display: inline-block;
 }
 
@@ -4843,11 +5187,10 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1610px;
+  background-position: left -1570px;
 	width: 18px;
 	height: 17px;
 	overflow: hidden;
-	cursor: default;
 }
 .v-tabsheet-scroller button::-moz-focus-inner {
 	border: none;
@@ -4855,23 +5198,23 @@ td.v-datefield-calendarpanel-nextyear {
 .v-tabsheet-scrollerNext {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1627px;
+  background-position: left -1587px;
 }
 .v-tabsheet-scrollerPrev:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1644px;
+  background-position: left -1604px;
 }
 .v-tabsheet-scrollerNext:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1661px;
+  background-position: left -1621px;
 }
 .v-tabsheet-scrollerPrev-disabled,
 .v-tabsheet-scrollerPrev-disabled:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1678px;
+  background-position: left -1638px;
 	opacity: 1;
 	filter: none;
 }
@@ -4879,7 +5222,7 @@ td.v-datefield-calendarpanel-nextyear {
 .v-tabsheet-scrollerNext-disabled:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1695px;
+  background-position: left -1655px;
 	opacity: 1;
 	filter: none;
 }
@@ -5065,20 +5408,20 @@ td.v-datefield-calendarpanel-nextyear {
 .v-tabsheet-tabs-bar .v-tabsheet-tabitemcell {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1713px;
+  background-position: left -1673px;
 }
 .v-tabsheet-tabs-bar .v-tabsheet-tabitemcell-first {
 	padding-left: 6px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1733px;
+  background-position: left -1693px;
 }
 .v-tabsheet-tabs-bar .v-tabsheet-tabitem,
 .v-tabsheet-tabs-bar .v-tabsheet-spacertd div {
 	height: 20px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1753px;
+  background-position: left -1713px;
 	font-size: 11px;
 	margin: 0;
 }
@@ -5086,7 +5429,7 @@ td.v-datefield-calendarpanel-nextyear {
 	height: 18px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -1773px;
+  background-position: right -1733px;
 	padding: 2px 12px 0 10px;
 }
 .v-tabsheet-tabs-bar .v-tabsheet-tabitem .v-caption-closable,
@@ -5138,23 +5481,23 @@ td.v-datefield-calendarpanel-nextyear {
 .v-tabsheet-tabs-bar .v-tabsheet-tabitemcell-selected {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1793px;
+  background-position: left -1753px;
 }
 .v-tabsheet-tabs-bar .v-tabsheet-tabitemcell-selected-first {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1813px;
+  background-position: left -1773px;
 }
 .v-tabsheet-tabs-bar .v-tabsheet-tabitem-selected {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1833px;
+  background-position: left -1793px;
 	color: #232930;
 }
 .v-tabsheet-tabs-bar .v-tabsheet-tabitem-selected .v-caption {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -1853px;
+  background-position: right -1813px;
 }
 .v-tabsheet-tabcontainer-bar .v-tabsheet-scroller {
 	margin-top: -20px;
@@ -5162,7 +5505,7 @@ td.v-datefield-calendarpanel-nextyear {
 	border-right: none;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1873px;
+  background-position: left -1833px;
 }
 .v-tabsheet-tabcontainer-bar .v-tabsheet-scroller button {
 	margin-top: 1px;
@@ -5208,7 +5551,8 @@ td.v-datefield-calendarpanel-nextyear {
 .v-textfield,
 .v-textarea,
 .white .v-textfield,
-.white .v-textarea {
+.white .v-textarea,
+div.v-table-full-height-fields input.v-textfield {
 	border: 1px solid #bcbdbe;
 	border-top-color: #a2a3a4;
 	border-bottom-color: #d2d3d4;
@@ -5216,7 +5560,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background-repeat: repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1893px;
+  background-position: left -1853px;
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
@@ -5233,7 +5577,8 @@ td.v-datefield-calendarpanel-nextyear {
 .v-app input.v-textfield,
 .v-window input.v-textfield,
 .v-app textarea.v-textarea,
-.v-window textarea.v-textarea  {
+.v-window textarea.v-textarea,
+div.v-table-full-height-fields input.v-textfield  {
 	padding: 3px 3px 4px;
 }
 .v-app .v-textfield-focus,
@@ -5289,7 +5634,7 @@ textarea.v-textarea-prompt {
 	background: #151717;
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -740px;
+  background-position: left -720px;
 	color: #c9ccce;
 	text-shadow: #000 0 0 1px;
 }
@@ -5346,7 +5691,7 @@ textarea.v-textarea-readonly,
 	background: #4d749f repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1916px;
+  background-position: left -1876px;
 	color: #fff;
 	padding: 1px 2px;
 	-webkit-border-radius: 2px;
@@ -5383,6 +5728,13 @@ textarea.v-textarea-readonly,
 .v-tree .v-tree-node-drag-top.v-tree-node-expanded {
 	background-position: -7px 4px;
 }
+.v-tree-connectors .v-tree-node-drag-top,
+.v-tree-connectors .v-tree-node-expanded.v-tree-node-drag-top {
+	background-position: 2px -53px;
+}
+.v-tree-connectors .v-tree-node-drag-top.v-tree-node-leaf {
+	background-position: 2px 50%;
+}
 
 .v-window {
 	background: transparent;
@@ -5421,7 +5773,7 @@ textarea.v-textarea-readonly,
 	background: black repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1936px;
+  background-position: left -1896px;
 }
 .v-window-header {
 	font-weight: bold;
@@ -5448,14 +5800,14 @@ textarea.v-textarea-readonly,
 	background: transparent;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1973px;
+  background-position: left -1933px;
 }
 .v-window-footer {
 	background-color:white;
 	background-repeat: repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1988px;
+  background-position: left -1948px;
 	height: 15px;
 }
 .v-window-closebox {
@@ -5466,17 +5818,17 @@ textarea.v-textarea-readonly,
 	background: transparent;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2003px;
+  background-position: left -1963px;
 }
 .v-window-closebox:hover {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2019px;
+  background-position: left -1979px;
 }
 .v-window-closebox:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2035px;
+  background-position: left -1995px;
 }
 .v-window-contents {
 	background: #fff;
@@ -5509,7 +5861,7 @@ textarea.v-textarea-readonly,
 	height: 12px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2051px;
+  background-position: left -2011px;
 }
 .v-window-light .v-window-footer {
 	background: transparent;
@@ -5522,17 +5874,17 @@ textarea.v-textarea-readonly,
 	height: 15px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2063px;
+  background-position: left -2023px;
 }
 .v-window-light .v-window-closebox:hover {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2078px;
+  background-position: left -2038px;
 }
 .v-window-light .v-window-closebox:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2093px;
+  background-position: left -2053px;
 }
 .v-window-light .v-window-contents {
 	background: transparent;
@@ -5542,7 +5894,7 @@ textarea.v-textarea-readonly,
 	background: #f7f7f8 repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2108px;
+  background-position: left -2068px;
 }
 .v-ie6 .v-window-light .v-window-wrap2 {
 	background-image: none;
@@ -5585,7 +5937,7 @@ textarea.v-textarea-readonly,
 	background: transparent repeat-x;
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -763px;
+  background-position: left -743px;
 	text-align: center;
 	-moz-border-radius-topright: 7px;
 	-moz-border-radius-topleft: 7px;
@@ -5611,14 +5963,14 @@ textarea.v-textarea-readonly,
 	background: transparent no-repeat;
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -792px;
+  background-position: left -772px;
 	width: 14px;
 	height: 14px;
 }
 .v-ie6 .v-window-black .v-window-resizebox {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -806px;
+  background-position: left -786px;
 }
 .v-ie6 .v-window-black .v-window-contents {
 	background: transparent url(window/img/black/content-bg-ie6.png) repeat-x;
@@ -5629,10 +5981,9 @@ textarea.v-textarea-readonly,
 	background: transparent repeat-x;
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
-  background-position: left -820px;
+  background-position: left -800px;
 }
 
-
 /* extra ace styles */
 .v-table-row-associated {
     background: #88aacc;

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java?rev=1401207&r1=1401206&r2=1401207&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java Tue Oct 23 09:00:39 2012
@@ -223,6 +223,19 @@ abstract class BaseObjectPanel<REPO_OBJ 
                 }
             });
         }
+        
+        addListener(new ItemClickListener() {
+            @Override
+            public void itemClick(ItemClickEvent event) {
+                refreshRowCache();
+                if (m_leftTable != null) {
+                    m_leftTable.refreshRowCache();
+                }
+                if (m_rightTable != null) {
+                    m_rightTable.refreshRowCache();
+                }
+            }
+        });
     }
 
     /**
@@ -323,7 +336,10 @@ abstract class BaseObjectPanel<REPO_OBJ 
     final void removeLeftSideAssociation(REPO_OBJ object, RepositoryObject other) {
         if (doRemoveLeftSideAssociation(object, other)) {
             m_associations.removeAssociatedItem(object);
-            requestRepaint();
+            refreshRowCache();
+            if (m_leftTable != null) {
+                m_leftTable.refreshRowCache();
+            }
         }
     }
 
@@ -336,7 +352,10 @@ abstract class BaseObjectPanel<REPO_OBJ 
     final void removeRightSideAssocation(REPO_OBJ object, RepositoryObject other) {
         if (doRemoveRightSideAssociation(object, other)) {
             m_associations.removeAssociatedItem(object);
-            requestRepaint();
+            refreshRowCache();
+            if (m_rightTable != null) {
+                m_rightTable.refreshRowCache();
+            }
         }
     }
 



Mime
View raw message