ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1062860 - in /incubator/ace/trunk: ace-target-devserver/ ace-webui-vaadin/ ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/ ace-webui-vaadin/src/main/resources/VAADIN/themes/ace/ ace-webui-vaadin/src/main/resources/VAADIN/themes...
Date Mon, 24 Jan 2011 16:31:54 GMT
Author: marrs
Date: Mon Jan 24 16:31:53 2011
New Revision: 1062860

URL: http://svn.apache.org/viewvc?rev=1062860&view=rev
Log:
Updated to Vaadin 6.5.0. Look in the VaadinResourceHandler for more details on the changed
way in which resources are handled.

Removed:
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/ace/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/base/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/default/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/a-sprite-definitions/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/accordion/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/button/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/common/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/datefield/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/favicon.ico
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/formlayout/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/label/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/layouts/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/link/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/menubar/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/notification/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/panel/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/popupview/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/progressindicator/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/select/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/slider/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/splitpanel/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/table/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/tabsheet/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/textfield/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/tree/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/window/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/runo/
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/widgetsets/
Modified:
    incubator/ace/trunk/ace-target-devserver/pom.xml
    incubator/ace/trunk/ace-webui-vaadin/pom.xml
    incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
    incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java
    incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/styles.css

Modified: incubator/ace/trunk/ace-target-devserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/pom.xml?rev=1062860&r1=1062859&r2=1062860&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devserver/pom.xml Mon Jan 24 16:31:53 2011
@@ -412,7 +412,7 @@
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin</artifactId>
-            <version>6.4.6</version>
+            <version>6.5.0</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/ace/trunk/ace-webui-vaadin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/pom.xml?rev=1062860&r1=1062859&r2=1062860&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/pom.xml (original)
+++ incubator/ace/trunk/ace-webui-vaadin/pom.xml Mon Jan 24 16:31:53 2011
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin</artifactId>
-            <version>6.4.6</version>
+            <version>6.5.0</version>
         </dependency>
     </dependencies>
     <repositories>

Modified: incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java?rev=1062860&r1=1062859&r2=1062860&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
(original)
+++ incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
Mon Jan 24 16:31:53 2011
@@ -555,37 +555,32 @@ public class VaadinClient extends com.va
                 }
             }
             private void add(ArtifactObject artifact) {
-                Item item = addItem(artifact.getName());
                 String resourceProcessorPID = artifact.getAttribute(BundleHelper.KEY_RESOURCE_PROCESSOR_PID);
-                item.getItemProperty(OBJECT_NAME).setValue(artifact.getName());
-                // for now, for resource processors, let's say so in the description
                 if (resourceProcessorPID != null) {
-                    item.getItemProperty(OBJECT_DESCRIPTION).setValue("Resource Processor");
-                }
-                else {
-                    item.getItemProperty(OBJECT_DESCRIPTION).setValue(artifact.getDescription());
+                	// if it's a resource processor we don't add it to our list, as resource
processors don't
+                	// show up there (you can query for them separately)
+                	return;
                 }
+                Item item = addItem(artifact.getName());
+                item.getItemProperty(OBJECT_NAME).setValue(artifact.getName());
+                item.getItemProperty(OBJECT_DESCRIPTION).setValue(artifact.getDescription());
                 HorizontalLayout buttons = new HorizontalLayout();
-                // resource processors can never be directly associated with anything, so
we only need
-                // buttons to remove links for any other type of artifact
-                if (resourceProcessorPID == null) {
-                    Button removeLinkButton = new RemoveLinkButton<ArtifactObject>(artifact,
null, m_featuresPanel) {
-                        @Override
-                        protected void removeLinkFromLeft(ArtifactObject object, RepositoryObject
other) {}
-                        
-                        @Override
-                        protected void removeLinkFromRight(ArtifactObject object, RepositoryObject
other) {
-                            List<Artifact2GroupAssociation> associations = object.getAssociationsWith((GroupObject)
other);
-                            for (Artifact2GroupAssociation association : associations) {
-                                System.out.println("> " + association.getLeft() + " <->
" + association.getRight());
-                                m_artifact2GroupAssociationRepository.remove(association);
-                            }
-                            m_associations.removeAssociatedItem(object);
-                            m_table.requestRepaint();
+                Button removeLinkButton = new RemoveLinkButton<ArtifactObject>(artifact,
null, m_featuresPanel) {
+                    @Override
+                    protected void removeLinkFromLeft(ArtifactObject object, RepositoryObject
other) {}
+                    
+                    @Override
+                    protected void removeLinkFromRight(ArtifactObject object, RepositoryObject
other) {
+                        List<Artifact2GroupAssociation> associations = object.getAssociationsWith((GroupObject)
other);
+                        for (Artifact2GroupAssociation association : associations) {
+                            System.out.println("> " + association.getLeft() + " <->
" + association.getRight());
+                            m_artifact2GroupAssociationRepository.remove(association);
                         }
-                    };
-                    buttons.addComponent(removeLinkButton);
-                }
+                        m_associations.removeAssociatedItem(object);
+                        m_table.requestRepaint();
+                    }
+                };
+                buttons.addComponent(removeLinkButton);
                 buttons.addComponent(new RemoveItemButton<ArtifactObject, ArtifactRepository>(artifact,
m_artifactRepository));
                 Map<String, Object> context = new HashMap<String, Object>();
                 context.put("object", artifact);

Modified: incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java?rev=1062860&r1=1062859&r2=1062860&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java
(original)
+++ incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java
Mon Jan 24 16:31:53 2011
@@ -41,14 +41,25 @@ public class VaadinResourceHandler {
                     return m_context.getMimeType(name);
                 }
 
+                /**
+                 * ACE uses a slightly modified version of the 'reindeer' theme. To avoid
having
+                 * to copy all resources in the Vaadin jar, we only override the files we
changed
+                 * and do replace the theme name 'ace' with 'reindeer' before we go looking
for the
+                 * original files.
+                 * 
+                 * When updating to a new Vaadin version, usually you need to copy the styles.css
+                 * file from the original archive again and append the ACE changes to the
end, as this
+                 * file tends to change considerably between versions.
+                 */
                 public URL getResource(String name) {
                     URL resource = null;
                     String prefix = "/VAADIN/";
                     if (name.startsWith(prefix)) {
-                        resource = getClass().getResource(name);
+                    	String originalName = name.replace("/ace/", "/reindeer/");
+                        resource = getClass().getResource(originalName);
                         if (resource == null) {
                             // try to find the resource in the Vaadin bundle instead
-                            resource = com.vaadin.Application.class.getResource(name);
+                            resource = com.vaadin.Application.class.getResource(originalName);
                         }
                     }
                     return resource;

Modified: incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/styles.css
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/styles.css?rev=1062860&r1=1062859&r2=1062860&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/styles.css
(original)
+++ incubator/ace/trunk/ace-webui-vaadin/src/main/resources/VAADIN/themes/reindeer/styles.css
Mon Jan 24 16:31:53 2011
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_4_6";}
-.v-theme-version-6_4_6 {display: none;}
+.v-theme-version:after {content:"6_5_0";}
+.v-theme-version-6_5_0 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -106,7 +106,11 @@
 	background: transparent;
 	padding: 0;
 	color: inherit;
-	}
+	-khtml-user-select: text;
+	-moz-user-select: text;
+	-ie-user-select: text;
+	user-select: text;
+}
 
 /* Inset Safari focus outline a bit */
 .v-sa .v-button-link:focus{
@@ -446,6 +450,7 @@ div.v-app-loading {
 .v-debug-console-content {
 	font-size: x-small;
 	overflow: auto;
+	white-space: pre;
 }
 .v-debug-console-content input {
 	font-size: xx-small;
@@ -1107,9 +1112,19 @@ div.v-progressindicator-indeterminate-di
 .v-select-twincol-options {
 	float: left;
 }
+.v-select-twincol-caption-left {
+	float: left;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
 .v-select-twincol-selections {
 	font-weight: bold;
 }
+.v-select-twincol-caption-right {
+	float: right;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
 .v-select-twincol-buttons {
 	float: left;
 	text-align: center;
@@ -1139,6 +1154,7 @@ div.v-progressindicator-indeterminate-di
 .v-window .v-filterselect-input,
 .v-popupview-popup .v-filterselect-input {
 	float: left;
+	-webkit-border-radius: 0px;
 }
 .v-filterselect-prompt .v-filterselect-input {
 	color: #999;
@@ -1410,6 +1426,9 @@ div.v-progressindicator-indeterminate-di
 	cursor: e-resize;
 	cursor: col-resize;
 }
+.v-disabled .v-splitpanel-hsplitter div {
+	cursor: default;
+}
 .v-splitpanel-vsplitter {
 	height: 6px;
 	font-size: 1px; /* for IE6 */
@@ -1421,6 +1440,9 @@ div.v-progressindicator-indeterminate-di
 	cursor: s-resize;
 	cursor: row-resize;
 }
+.v-disabled .v-splitpanel-vsplitter div {
+	cursor: default;
+}
 /* IE specific styles */
 .v-ie6 .v-splitpanel-hsplitter div {
 	height: 99%;
@@ -1523,22 +1545,39 @@ div.v-progressindicator-indeterminate-di
 	overflow: hidden;
 }
 .v-table-caption-container {
-	float: right;
 	overflow: hidden;
 	white-space: nowrap;
-	padding-right: 6px;
+	margin-left: 6px;
+}
+.v-ie7 .v-table-caption-container-align-right {
+	margin-left: 0px;
+	padding-left: 6px;
 }
-.v-table-header-cell-asc .v-table-caption-container {
+.v-table-caption-container-align-right {
+	float: right;
+}
+.v-table-sort-indicator {
+	width: 0px;
+	height: 1.2em;
+	float: right;
+}
+.v-table-header-cell-asc .v-table-sort-indicator,
+.v-table-header-cell-desc .v-table-sort-indicator {
+	width: 16px;
+	height: 1.2em;
+	float: right;
+}		
+.v-table-header-cell-asc .v-table-sort-indicator {
 	background: transparent url(../base/common/img/sprites.png) no-repeat right 6px;
 }
-.v-table-header-cell-desc .v-table-caption-container {
+.v-table-header-cell-desc .v-table-sort-indicator {
 	background: transparent url(../base/common/img/sprites.png) no-repeat right -10px;
 }
-.v-table-header-cell-asc .v-table-caption-container-align-right {
-    background: transparent url(../base/common/img/sprites.png) no-repeat -8px 6px;
+.v-table-caption-container-align-center {
+	text-align: center;
 }
-.v-table-header-cell-desc .v-table-caption-container-align-right {
-    background: transparent url(../base/common/img/sprites.png) no-repeat -8px -10px;
+.v-table-caption-container-align-right {
+	text-align: right;
 }
 .v-table-caption-container .v-icon,
 .v-table-header-drag .v-icon {
@@ -1578,6 +1617,12 @@ div.v-progressindicator-indeterminate-di
 	white-space: nowrap;
 	overflow: hidden;
 }
+.v-table-cell-wrapper-align-center {
+	text-align: center;
+}
+.v-table-cell-wrapper-align-right {
+	text-align: right;
+}
 .v-table-column-selector {
 	float: right;
 	background: transparent url(../base/common/img/sprites.png) no-repeat 4px -37px;
@@ -3603,7 +3648,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent url(menubar/img/submenu-icon.png) no-repeat right 70%;
 	width: 26px;
 	height: 16px;
-	text-indent: -999px;
+	text-indent: -9999px;
 }
 .v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator {
 	background-image: url(menubar/img/submenu-icon-hover.png);
@@ -3761,13 +3806,13 @@ td.v-datefield-calendarpanel-nextyear {
 	background-repeat: no-repeat;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -449px;
+  background-position: left -450px;
 	padding-left: 2px;
 }
 .v-ie6 .v-filterselect {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -474px;
+  background-position: left -475px;
 }
 .v-app .v-filterselect-input,
 .v-window .v-filterselect-input,
@@ -3775,7 +3820,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 -498px;
+  background-position: left -499px;
 	border: none;
 	height: 16px;
 }
@@ -3794,17 +3839,17 @@ td.v-datefield-calendarpanel-nextyear {
 .v-filterselect-focus {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -522px;
+  background-position: left -524px;
 }
 .v-ie6 .v-filterselect-focus {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -547px;
+  background-position: left -549px;
 }
 .v-filterselect-focus .v-filterselect-input {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -571px;
+  background-position: left -573px;
 }
 .v-filterselect-button {
 	overflow: hidden;
@@ -3812,39 +3857,39 @@ td.v-datefield-calendarpanel-nextyear {
 	height: 24px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -595px;
+  background-position: left -597px;
 	cursor: default;
 }
 .v-filterselect-button:hover {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -619px;
+  background-position: left -622px;
 }
 .v-filterselect-button:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -643px;
+  background-position: left -646px;
 }
 .v-filterselect-focus .v-filterselect-button {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -667px;
+  background-position: left -670px;
 }
 .v-filterselect-focus .v-filterselect-button:hover {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -691px;
+  background-position: left -694px;
 }
 .v-filterselect-focus .v-filterselect-button:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -715px;
+  background-position: left -718px;
 }
 .v-disabled .v-filterselect-button:hover,
 .v-readonly .v-filterselect-button:hover {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -739px;
+  background-position: left -742px;
 }
 .v-filterselect-suggestpopup {
 	background: #f8f8f9;
@@ -3876,7 +3921,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 -763px;
+  background-position: left -766px;
 	color: #fff;
 	text-shadow: #3b5a7a 0 1px 0;
 }
@@ -3897,25 +3942,25 @@ 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 -783px;
+  background-position: left -786px;
 }
 .v-filterselect-prevpage:hover {
 	background-repeat: repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -794px;
+  background-position: left -797px;
 }
 .v-filterselect-nextpage:active {
 	background-repeat: repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -805px;
+  background-position: left -808px;
 }
 .v-filterselect-prevpage:active {
 	background-repeat: repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -816px;
+  background-position: left -819px;
 }
 .v-filterselect-nextpage-off span,
 .v-filterselect-prevpage-off span {
@@ -3931,7 +3976,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent no-repeat center 3px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: center -827px;
+  background-position: center -830px;
 	user-select: none;
 	-moz-user-select: none;
 	-webkit-user-select: none;
@@ -3939,17 +3984,17 @@ td.v-datefield-calendarpanel-nextyear {
 .v-filterselect-prevpage span {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: center -838px;
+  background-position: center -841px;
 }
 .v-filterselect-nextpage:hover span {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: center -849px;
+  background-position: center -852px;
 }
 .v-filterselect-prevpage:hover span {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: center -860px;
+  background-position: center -863px;
 }
 .v-filterselect-status {
 	text-shadow: #e9eaeb 0 1px 0;
@@ -3962,7 +4007,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 -871px;
+  background-position: left -874px;
 	-moz-border-radius-bottomleft: 3px;
 	-moz-border-radius-bottomright: 3px;
 	-webkit-border-bottom-left-radius: 3px;
@@ -4124,7 +4169,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 -888px;
+  background-position: left -891px;
 	width: 10px;
 	height: 10px;
 	margin-top: -5px;
@@ -4132,7 +4177,7 @@ td.v-datefield-calendarpanel-nextyear {
 .v-slider-handle-active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -898px;
+  background-position: left -901px;
 }
 .v-slider-vertical {
 	width: 2px;
@@ -4163,6 +4208,7 @@ td.v-datefield-calendarpanel-nextyear {
 }
 .v-splitpanel-hsplitter div {
 	width: 7px;
+	height: 100%; /* for Opera */
 	background: transparent;
 	background-repeat: no-repeat;
 	background-position: 50%;
@@ -4175,7 +4221,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 -908px;
+  background-position: left -911px;
 }
 .v-splitpanel-vsplitter div {
 	height: 7px;
@@ -4184,7 +4230,7 @@ td.v-datefield-calendarpanel-nextyear {
 	background-position: 50%;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: center -915px;
+  background-position: center -918px;
 }
 
 
@@ -4244,7 +4290,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 -922px;
+  background-position: left -925px;
 	height: 20px;
 	text-transform: uppercase;
 	font-size: 10px;
@@ -4298,29 +4344,26 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent;
 	border-right: 1px solid #c2c3c4;
 }
-.v-table-header-cell-asc .v-table-caption-container {
-	background: transparent no-repeat right 7px;
-  background-image: url(common/img/vertical-sprites.png);
-  -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -942px;
+
+.v-table-sort-indicator {
+	background: transparent;
+	width: 0px;
+	height: 20px;
 }
-.v-table-header-cell-desc .v-table-caption-container {
+
+.v-table-header-cell-asc .v-table-sort-indicator {
 	background: transparent no-repeat right 7px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: right -962px;
-}
-.v-table-header-cell-asc .v-table-caption-container-align-right {
-    background: transparent no-repeat left 7px;
-  background-image: url(common/img/vertical-sprites.png);
-  -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -982px;
+  background-position: right -945px;
+	width: 16px;
 }
-.v-table-header-cell-desc .v-table-caption-container-align-right {
-    background: transparent no-repeat left 7px;
+.v-table-header-cell-desc .v-table-sort-indicator {
+	background: transparent no-repeat right 7px;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1002px;
+  background-position: right -965px;
+	width: 16px;
 }
 .v-table-body,
 .white .v-table-body {
@@ -4362,12 +4405,12 @@ td.v-datefield-calendarpanel-nextyear {
 	background: transparent no-repeat;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1022px;
+  background-position: left -985px;
 }
 .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 -1042px;
+  background-position: left -1005px;
 }
 .v-table-focus-slot-left {
 	border-left-color: #222;
@@ -4382,7 +4425,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 -1062px;
+  background-position: left -1025px;
 	padding: 4px;
 	text-transform: uppercase;
 	font-size: 10px;
@@ -4407,7 +4450,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 -1082px;
+  background-position: left -1045px;
 	border: 1px solid #939494;
 	border: none;
 	border-radius-bottomleft: 4px;
@@ -4436,7 +4479,7 @@ td.v-datefield-calendarpanel-nextyear {
 	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 -1104px;
+  background-position: left -1067px;
 	padding-left: 12px;
 	padding-right: 4px;
 }
@@ -4447,7 +4490,7 @@ 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 -1118px;
+  background-position: left -1081px;
 }
 
 
@@ -4457,7 +4500,7 @@ td.v-datefield-calendarpanel-nextyear {
 	border-top-color: #2b3033;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1133px;
+  background-position: left -1096px;
 	color: #e7e9ea;
 	text-shadow: #000 0 -1px 0;
 }
@@ -4467,40 +4510,30 @@ td.v-datefield-calendarpanel-nextyear {
 .v-table-strong .v-table-resizer {
 	border-right-color: #1c1f21;
 }
-.v-table-strong .v-table-header-cell-asc .v-table-caption-container {
+.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 -1153px;
+  background-position: right -1116px;
 }
-.v-table-strong .v-table-header-cell-desc .v-table-caption-container {
+.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 -1172px;
-}
-.v-table-strong .v-table-header-cell-asc .v-table-caption-container-align-right {
-  background-image: url(common/img/vertical-sprites.png);
-  -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1191px;
-}
-.v-table-strong .v-table-header-cell-desc .v-table-caption-container-align-right {
-  background-image: url(common/img/vertical-sprites.png);
-  -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1210px;
+  background-position: right -1135px;
 }
 .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 -1229px;
+  background-position: left -1154px;
 }
 .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 -1249px;
+  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 -1269px;
+  background-position: left -1194px;
 	color: #e7e9ea;
 	text-shadow: #000 0 -1px 0;
 }
@@ -4522,26 +4555,16 @@ td.v-datefield-calendarpanel-nextyear {
 .black .v-table-resizer {
 	border-right-color: #252729;
 }
-.black .v-table-header-cell-asc .v-table-caption-container {
+.black .v-table-header-cell-asc .v-table-sort-indicator {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
   background-position: right -642px;
 }
-.black .v-table-header-cell-desc .v-table-caption-container {
+.black .v-table-header-cell-desc .v-table-sort-indicator {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
   background-position: right -661px;
 }
-.black .v-table-header-cell-asc .v-table-caption-container-align-right {
-  background-image: url(common/img/vertical-sprites.png);
-  -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1289px;
-}
-.black .v-table-header-cell-desc .v-table-caption-container-align-right {
-  background-image: url(common/img/vertical-sprites.png);
-  -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1308px;
-}
 .black .v-table-column-selector {
   background-image: url(common/img/black-vertical-sprites.png);
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
@@ -4603,14 +4626,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 -1327px;
+  background-position: left -1214px;
 	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 -1359px;
+  background-position: left -1246px;
 }
 .v-tabsheet-tabitem,
 .v-tabsheet-spacertd div {
@@ -4619,7 +4642,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 -1391px;
+  background-position: left -1278px;
 	padding: 0;
 	color: #222;
 	text-shadow: #fff 0 1px 0;
@@ -4630,7 +4653,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 -1423px;
+  background-position: right -1310px;
 	padding: 9px 8px 0 6px;
 }
 .v-tabsheet-tabitem .v-caption-closable {
@@ -4650,7 +4673,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 -1455px;
+  background-position: left -1342px;
 	cursor: default;
 	text-indent: -999px;
 	overflow: hidden;
@@ -4667,48 +4690,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 -1473px;
+  background-position: left -1360px;
 }
 .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 -1491px;
+  background-position: left -1378px;
 }
 .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 -1509px;
+  background-position: left -1396px;
 }
 .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 -1527px;
+  background-position: left -1414px;
 }
 .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 -1545px;
+  background-position: left -1432px;
 }
 .v-tabsheet-tabitemcell-selected {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1563px;
+  background-position: left -1450px;
 }
 .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 -1595px;
+  background-position: left -1482px;
 }
 .v-tabsheet-tabitem-selected {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1627px;
+  background-position: left -1514px;
 	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 -1659px;
+  background-position: right -1546px;
 }
 .v-tabsheet-spacertd div {
 	margin-right: 4px;
@@ -4717,7 +4740,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 -1691px;
+  background-position: right -1578px;
 }
 .blue .v-tabsheet-content {
 	border-color: #a8bcc5;
@@ -4815,7 +4838,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 -1723px;
+  background-position: left -1610px;
 	width: 18px;
 	height: 17px;
 	overflow: hidden;
@@ -4827,23 +4850,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 -1740px;
+  background-position: left -1627px;
 }
 .v-tabsheet-scrollerPrev:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1757px;
+  background-position: left -1644px;
 }
 .v-tabsheet-scrollerNext:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -1774px;
+  background-position: left -1661px;
 }
 .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 -1791px;
+  background-position: left -1678px;
 	opacity: 1;
 	filter: none;
 }
@@ -4851,7 +4874,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 -1808px;
+  background-position: left -1695px;
 	opacity: 1;
 	filter: none;
 }
@@ -5037,20 +5060,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 -1826px;
+  background-position: left -1713px;
 }
 .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 -1846px;
+  background-position: left -1733px;
 }
 .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 -1866px;
+  background-position: left -1753px;
 	font-size: 11px;
 	margin: 0;
 }
@@ -5058,7 +5081,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 -1886px;
+  background-position: right -1773px;
 	padding: 2px 12px 0 10px;
 }
 .v-tabsheet-tabs-bar .v-tabsheet-tabitem .v-caption-closable,
@@ -5110,23 +5133,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 -1906px;
+  background-position: left -1793px;
 }
 .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 -1926px;
+  background-position: left -1813px;
 }
 .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 -1946px;
+  background-position: left -1833px;
 	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 -1966px;
+  background-position: right -1853px;
 }
 .v-tabsheet-tabcontainer-bar .v-tabsheet-scroller {
 	margin-top: -20px;
@@ -5134,7 +5157,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 -1986px;
+  background-position: left -1873px;
 }
 .v-tabsheet-tabcontainer-bar .v-tabsheet-scroller button {
 	margin-top: 1px;
@@ -5188,7 +5211,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 -2006px;
+  background-position: left -1893px;
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
@@ -5318,7 +5341,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 -2029px;
+  background-position: left -1916px;
 	color: #fff;
 	padding: 1px 2px;
 	-webkit-border-radius: 2px;
@@ -5390,10 +5413,10 @@ textarea.v-textarea-readonly,
 .v-window-outerheader {
 	padding: 12px 32px 0 14px;
 	height: 25px;
-	background: transparent repeat-x;
+	background: black repeat-x;
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2049px;
+  background-position: left -1936px;
 }
 .v-window-header {
 	font-weight: bold;
@@ -5420,13 +5443,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 -2086px;
+  background-position: left -1973px;
 }
 .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 -2101px;
+  background-position: left -1988px;
 	height: 15px;
 }
 .v-window-closebox {
@@ -5437,17 +5461,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 -2116px;
+  background-position: left -2003px;
 }
 .v-window-closebox:hover {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2132px;
+  background-position: left -2019px;
 }
 .v-window-closebox:active {
   background-image: url(common/img/vertical-sprites.png);
   -background-image: url(common/img/vertical-sprites-ie6.png);
-  background-position: left -2148px;
+  background-position: left -2035px;
 }
 .v-window-contents {
 	background: #fff;
@@ -5480,7 +5504,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 -2164px;
+  background-position: left -2051px;
 }
 .v-window-light .v-window-footer {
 	background: transparent;
@@ -5493,17 +5517,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 -2176px;
+  background-position: left -2063px;
 }
 .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 -2191px;
+  background-position: left -2078px;
 }
 .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 -2206px;
+  background-position: left -2093px;
 }
 .v-window-light .v-window-contents {
 	background: transparent;
@@ -5513,7 +5537,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 -2221px;
+  background-position: left -2108px;
 }
 .v-ie6 .v-window-light .v-window-wrap2 {
 	background-image: none;
@@ -5602,3 +5626,18 @@ textarea.v-textarea-readonly,
   -background-image: url(common/img/black-vertical-sprites-ie6.png);
   background-position: left -820px;
 }
+
+
+/* extra ace styles */
+.v-table-row-associated {
+    background: #88aacc;
+}
+.v-table-row-odd.v-table-row-associated {
+    background: #7799bb;
+}
+.v-table-row-related {
+    background: #99aabb;
+}
+.v-table-row-odd.v-table-row-related {
+    background: #8899aa;
+}



Mime
View raw message