Test case and fix for #2407 - Caption missing for required field when using a non...

svn changeset:6357/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/formlayout/formlayout.css b/WebContent/ITMILL/themes/default/formlayout/formlayout.css
index 9175ceb9fc163042c20b06ca1790139fd0c75860..50598dc7a9dc36db0da3a2e0aa9e0db66b56bbd8 100644 (file)
--- a/WebContent/ITMILL/themes/default/formlayout/formlayout.css
+++ b/WebContent/ITMILL/themes/default/formlayout/formlayout.css
@@ -74,6 +74,6 @@
        font-weight: bold;
 }
 
-.i-form .i-caption .i-required-field-indicator {
+.i-formlayout-captioncell .i-caption .i-required-field-indicator {
        float: none;
 }

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index 7aaec3d89810518531bbdb80b76a9e3dff05b29a..d8ce92f8d59162b9cf2f318548ca76f31fdc14b6 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -762,7 +762,7 @@ input.i-modified,
        font-weight: bold;
 }
 
-.i-form .i-caption .i-required-field-indicator {
+.i-formlayout-captioncell .i-caption .i-required-field-indicator {
        float: none;
 }
 

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2407.java b/src/com/itmill/toolkit/tests/tickets/Ticket2407.java
new file mode 100644 (file)
index 0000000..b0f194c
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2407.java
@@ -0,0 +1,21 @@
+package com.itmill.toolkit.tests.tickets;\r
+\r
+import com.itmill.toolkit.ui.Form;\r
+import com.itmill.toolkit.ui.Label;\r
+import com.itmill.toolkit.ui.TextField;\r
+import com.itmill.toolkit.ui.VerticalLayout;\r
+import com.itmill.toolkit.ui.Window;\r
+\r
+public class Ticket2407 extends com.itmill.toolkit.Application {\r
+\r
+    public void init() {\r
+        final Window main = new Window("Ticket2407");\r
+        setMainWindow(main);\r
+\r
+        Form form = new Form(new VerticalLayout());\r
+        TextField text = new TextField("This caption shall be visible");\r
+        text.setRequired(true);\r
+        form.addField("test", text);\r
+        main.addComponent(form);\r
+    }\r
+}\r