Fixes #1895 Caption is right aligned on IE on IOrderedLayoutVertical where widget...

svn changeset:5018/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css b/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
index 591f379e5f10e78a4b4aaf0eceb58258f93be88d..635fe1a3bf55eb9ce353c728c97aaece44b6586a 100644 (file)
--- a/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
+++ b/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
@@ -26,10 +26,6 @@
        float:left;     
 }
        
-.i-orderedlayout-w1 {
-       text-align:left;        
-}
-       
 .i-orderedlayout-w2 .i-caption:after, .i-orderedlayout-w2:after {
        content: ".";
        display: block;

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index 6067792ab4971d8cd3d18e9d86b0b70c012721a1..7f1ff47834b230f54a1dba139b2c591b9eea45df 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -709,10 +709,6 @@ input.i-modified,
        float:left;     
 }
        
-.i-orderedlayout-w1 {
-       text-align:left;        
-}
-       
 .i-orderedlayout-w2 .i-caption:after, .i-orderedlayout-w2:after {
        content: ".";
        display: block;

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
index a9f196b46b8fc1eda37850add0abe1b785011381..2d73acc72c1c5544f8367078d1cfa7f10729f6a7 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -272,9 +272,6 @@ public abstract class IOrderedLayout extends Panel implements Container {
             } else {
                 setElement(DOM.createTD());
             }
-            DOM
-                    .setElementAttribute(getElement(), "class",
-                            "i-orderedlayout-w1");
         }
 
         public void updateCaption(UIDL uidl, Paintable paintable) {
@@ -307,10 +304,8 @@ public abstract class IOrderedLayout extends Panel implements Container {
                             .getChildCount(getElement()) - 2);
                     DOM.removeChild(getElement(), firstElement);
                     DOM.appendChild(getElement(), firstElement);
-                    DOM
-                            .setElementAttribute(getElement(), "class",
-                                    after ? "i-orderedlayout-w2"
-                                            : "i-orderedlayout-w1");
+                    DOM.setElementAttribute(getElement(), "class",
+                            after ? "i-orderedlayout-w2" : "");
                     if (after) {
                         widget.addStyleName("i-orderedlayout-w-e");
                     } else {
@@ -322,8 +317,7 @@ public abstract class IOrderedLayout extends Panel implements Container {
                 if (caption != null) {
                     DOM.removeChild(getElement(), caption.getElement());
                     caption = null;
-                    DOM.setElementAttribute(getElement(), "class",
-                            "i-orderedlayout-w1");
+                    DOM.setElementAttribute(getElement(), "class", "");
                     widget.removeStyleName("i-orderedlayout-w-e");
                 }
             }
@@ -343,6 +337,7 @@ public abstract class IOrderedLayout extends Panel implements Container {
         void setAlignment(String verticalAlignment, String horizontalAlignment) {
 
             // Set vertical alignment
+
             if (BrowserInfo.get().isIE()) {
                 DOM.setElementAttribute(getElement(), "vAlign",
                         verticalAlignment);
@@ -385,9 +380,7 @@ public abstract class IOrderedLayout extends Panel implements Container {
                     DOM.setStyleAttribute(table, "width", "100%");
                     DOM.setElementAttribute(itable, "cellpadding", "0");
                     DOM.setElementAttribute(itable, "cellspacing", "0");
-                    // TODO DOM.setStyleAttribute(itd, "align", "left");
-                    // TODO DEBUG DOM.setStyleAttribute(itd, "border", "1px
-                    // solid red");
+                    DOM.setElementAttribute(itd, "align", "left");
 
                     // move possible content to cell
                     while (DOM.getChildCount(getElement()) > 0) {