Fix for #2463 - OrderedLayout backwards compatibility CSS issue

svn changeset:6609/svn branch:trunk

3 files changed, 46 insertions, 14 deletions

diff --git a/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css b/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
index d7fd10365f..01d9a78c5c 100644
--- a/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
+++ b/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css
@@ -1,29 +1,29 @@
-.i-horizontallayout, .i-verticallayout {
+.i-orderedlayout, .i-horizontallayout, .i-verticallayout {
 	overflow: hidden;
 }
 
-.i-horizontallayout-margin-top, .i-verticallayout-margin-top {
+.i-orderedlayout-margin-top, .i-horizontallayout-margin-top, .i-verticallayout-margin-top {
 	padding-top: 15px;
 }
 
-.i-horizontallayout-margin-right, .i-verticallayout-margin-right {
+.i-orderedlayout-margin-right, .i-horizontallayout-margin-right, .i-verticallayout-margin-right {
 	padding-right: 18px;
 }
 
-.i-horizontallayout-margin-bottom, .i-verticallayout-margin-bottom {
+.i-orderedlayout-margin-bottom, .i-horizontallayout-margin-bottom, .i-verticallayout-margin-bottom {
 	padding-bottom: 15px;
 }
 
-.i-horizontallayout-margin-left, .i-verticallayout-margin-left {
+.i-orderedlayout-margin-left, .i-horizontallayout-margin-left, .i-verticallayout-margin-left {
 	padding-left: 18px;
 }
 
-.i-horizontallayout-spacing-on, .i-verticallayout-spacing-on {
+.i-orderedlayout-spacing-on, .i-horizontallayout-spacing-on, .i-verticallayout-spacing-on {
 	padding-top: 8px;
 	padding-left: 8px;
 }
 /** This can be used to define spacing if spacing is off server side */
-.i-horizontallayout-spacing-off, .i-verticallayout-spacing-off {
+.i-orderedlayout-spacing-off, .i-horizontallayout-spacing-off, .i-verticallayout-spacing-off {
 	padding-top: 0px;
 	padding-left: 0px;
 }
diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index 19468d0eea..d925d9ad16 100644
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -961,32 +961,32 @@ input.i-modified,
 }
 
 /* ./WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css */
-.i-horizontallayout, .i-verticallayout {
+.i-orderedlayout, .i-horizontallayout, .i-verticallayout {
 	overflow: hidden;
 }
 
-.i-horizontallayout-margin-top, .i-verticallayout-margin-top {
+.i-orderedlayout-margin-top, .i-horizontallayout-margin-top, .i-verticallayout-margin-top {
 	padding-top: 15px;
 }
 
-.i-horizontallayout-margin-right, .i-verticallayout-margin-right {
+.i-orderedlayout-margin-right, .i-horizontallayout-margin-right, .i-verticallayout-margin-right {
 	padding-right: 18px;
 }
 
-.i-horizontallayout-margin-bottom, .i-verticallayout-margin-bottom {
+.i-orderedlayout-margin-bottom, .i-horizontallayout-margin-bottom, .i-verticallayout-margin-bottom {
 	padding-bottom: 15px;
 }
 
-.i-horizontallayout-margin-left, .i-verticallayout-margin-left {
+.i-orderedlayout-margin-left, .i-horizontallayout-margin-left, .i-verticallayout-margin-left {
 	padding-left: 18px;
 }
 
-.i-horizontallayout-spacing-on, .i-verticallayout-spacing-on {
+.i-orderedlayout-spacing-on, .i-horizontallayout-spacing-on, .i-verticallayout-spacing-on {
 	padding-top: 8px;
 	padding-left: 8px;
 }
 /** This can be used to define spacing if spacing is off server side */
-.i-horizontallayout-spacing-off, .i-verticallayout-spacing-off {
+.i-orderedlayout-spacing-off, .i-horizontallayout-spacing-off, .i-verticallayout-spacing-off {
 	padding-top: 0px;
 	padding-left: 0px;
 }
diff --git a/src/com/itmill/toolkit/tests/layouts/OrderedLayoutCSSCompatibility.java b/src/com/itmill/toolkit/tests/layouts/OrderedLayoutCSSCompatibility.java
new file mode 100644
index 0000000000..5c37903910
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/layouts/OrderedLayoutCSSCompatibility.java
@@ -0,0 +1,32 @@
+package com.itmill.toolkit.tests.layouts;
+
+import com.itmill.toolkit.tests.components.TestBase;
+import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.TextField;
+
+public class OrderedLayoutCSSCompatibility extends TestBase {
+
+    @Override
+    protected String getDescription() {
+        return "This test is to make sure that spacing/margins in OrderedLayout is still backwards compatible";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 2463;
+    }
+
+    @Override
+    protected void setup() {
+        OrderedLayout l = new OrderedLayout(
+                OrderedLayout.ORIENTATION_HORIZONTAL);
+        l.setMargin(true);
+        l.setSpacing(true);
+        l.addComponent(new TextField("abc"));
+        l.addComponent(new TextField("def"));
+
+        addComponent(l);
+
+    }
+
+}