From eb2a46af09921a8699c9f9c67539418feceac563 Mon Sep 17 00:00:00 2001
From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Tue, 1 Dec 2009 09:17:21 +0000
Subject: [PATCH] VForm theme modified, fieldset now doesn't have a border if
 there is no caption for the form.

svn changeset:10116/svn branch:6.2
---
 .../VAADIN/themes/reindeer/formlayout/formlayout.css   | 10 ++++++++--
 WebContent/VAADIN/themes/reindeer/styles.css           | 10 ++++++++--
 .../VAADIN/themes/runo/formlayout/formlayout.css       |  6 ++++++
 WebContent/VAADIN/themes/runo/styles.css               |  6 ++++++
 src/com/vaadin/terminal/gwt/client/ui/VForm.java       |  4 ++--
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
index d3aa7d46d1..9f865c3484 100644
--- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
@@ -50,8 +50,14 @@
 	border: none;
 	border-top: 1px solid #babfc0;
 }
+.v-form-nocaption fieldset {
+	border: none;
+}
+.v-form-nocaption legend {
+	display: none;
+}
 .v-form legend {
-	margin: 0;
-	padding: 0 4px 0.3em 4px;
+	margin: 0 0 0 20px;
+	padding: 0 5px;
 	font-weight: bold;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index eb803d6f1f..ba50ed40be 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -2927,9 +2927,15 @@ td.v-datefield-calendarpanel-nextyear {
 	border: none;
 	border-top: 1px solid #babfc0;
 }
+.v-form-nocaption fieldset {
+	border: none;
+}
+.v-form-nocaption legend {
+	display: none;
+}
 .v-form legend {
-	margin: 0;
-	padding: 0 4px 0.3em 4px;
+	margin: 0 0 0 20px;
+	padding: 0 5px;
 	font-weight: bold;
 }
 
diff --git a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
index 4c773b2e6e..e2fde59fe2 100644
--- a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
@@ -43,6 +43,12 @@
 	border: none;
 	border-top: 1px solid #babfc0;
 }
+.v-form-nocaption fieldset {
+	border: none;
+}
+.v-form-nocaption legend {
+	display: none;
+}
 .v-form legend {
 	margin: 0;
 	padding: 0 4px 0.3em 4px;
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index c3bdf48d4f..67aacb6f45 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -2174,6 +2174,12 @@ div.v-tree-node-leaf {
 	border: none;
 	border-top: 1px solid #babfc0;
 }
+.v-form-nocaption fieldset {
+	border: none;
+}
+.v-form-nocaption legend {
+	display: none;
+}
 .v-form legend {
 	margin: 0;
 	padding: 0 4px 0.3em 4px;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VForm.java b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
index 7117d2cebf..01e6caae0d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VForm.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
@@ -100,9 +100,9 @@ public class VForm extends ComplexPanel implements Container {
             }
         }
         if (legendEmpty) {
-            DOM.setStyleAttribute(legend, "display", "none");
+            addStyleDependentName("nocaption");
         } else {
-            DOM.setStyleAttribute(legend, "display", "");
+            removeStyleDependentName("nocaption");
         }
 
         if (uidl.hasAttribute("error")) {
-- 
2.39.5