From 7894a8583d5006e777b1bee8ae300b708b2bcf93 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 26 Dec 2008 20:51:36 +0000
Subject: [PATCH] Test case and fix for #2407 - Caption missing for required
 field when using a non-default layout inside a Form

svn changeset:6357/svn branch:trunk
---
 .../themes/default/formlayout/formlayout.css  |  2 +-
 WebContent/ITMILL/themes/default/styles.css   |  2 +-
 .../toolkit/tests/tickets/Ticket2407.java     | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 src/com/itmill/toolkit/tests/tickets/Ticket2407.java

diff --git a/WebContent/ITMILL/themes/default/formlayout/formlayout.css b/WebContent/ITMILL/themes/default/formlayout/formlayout.css
index 9175ceb9fc..50598dc7a9 100644
--- 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 7aaec3d898..d8ce92f8d5 100644
--- 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
index 0000000000..b0f194ceb7
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2407.java
@@ -0,0 +1,21 @@
+package com.itmill.toolkit.tests.tickets;
+
+import com.itmill.toolkit.ui.Form;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.TextField;
+import com.itmill.toolkit.ui.VerticalLayout;
+import com.itmill.toolkit.ui.Window;
+
+public class Ticket2407 extends com.itmill.toolkit.Application {
+
+    public void init() {
+        final Window main = new Window("Ticket2407");
+        setMainWindow(main);
+
+        Form form = new Form(new VerticalLayout());
+        TextField text = new TextField("This caption shall be visible");
+        text.setRequired(true);
+        form.addField("test", text);
+        main.addComponent(form);
+    }
+}
-- 
2.39.5