From: Teemu Pöntelin <teemu@vaadin.com>
Date: Sat, 4 Oct 2014 13:05:49 +0000 (+0300)
Subject: Fix empty table captions in Valo theme (#14812)
X-Git-Tag: 7.4.0.beta1~160
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=086228f26e933802f252401a99ac29e0a63e0819;p=vaadin-framework.git

Fix empty table captions in Valo theme (#14812)

Change-Id: I6d18e9a16ea5c4c4de0653233fefa1af8f76205a
---

diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/WebContent/VAADIN/themes/valo/components/_table.scss
index e040a62d0f..d8a673294d 100644
--- a/WebContent/VAADIN/themes/valo/components/_table.scss
+++ b/WebContent/VAADIN/themes/valo/components/_table.scss
@@ -191,7 +191,15 @@ $v-table-background-color: null !default;
   .#{$primary-stylename}-caption-container {
     overflow: hidden;
     line-height: 1;
+    min-height: $v-table-row-height;
     @include box-sizing(border-box);
+
+    .v-ie8 & {
+      // IE8 has issues with border-box and min-height
+      // -> custom calculations to subtract vertical padding from row height.
+      $vertical-padding: round(($v-table-row-height - $v-table-header-font-size)/2);
+      min-height: $v-table-row-height - ($vertical-padding - $v-table-border-width) - $vertical-padding;
+    }
   }
 
   .#{$primary-stylename}-footer-container {
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java b/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
new file mode 100644
index 0000000000..a3a81b3798
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.themes.valo;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
+
+@Theme("valo")
+public class TableWithEmptyCaption extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        Table table = new Table();
+        table.addContainerProperty("first", String.class, "");
+        table.addContainerProperty("last", String.class, "");
+        table.addContainerProperty("actions", Component.class, null);
+
+        table.addItem(new Object[] { "Teemu", "Test", new Button("Edit") }, 1);
+        table.addItem(new Object[] { "Dummy", "Test", new Button("Edit") }, 2);
+
+        table.setPageLength(0);
+        table.setColumnHeaders("First Name", "Last Name", "");
+
+        table.setFooterVisible(true);
+        table.setColumnFooter("first", "Footer");
+        table.setColumnFooter("last", "");
+        table.setColumnFooter("actions", "");
+        addComponent(table);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Test that column headers (and footers) work properly with empty captions.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 14812;
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java b/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java
new file mode 100644
index 0000000000..04de8b498c
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.themes.valo;
+
+import org.junit.Test;
+import org.openqa.selenium.TimeoutException;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import com.vaadin.testbench.By;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TableWithEmptyCaptionTest extends MultiBrowserTest {
+
+    @Test
+    public void testEmptyCaption() throws Exception {
+        openTestURL();
+
+        // Wait for the loading bar to disappear before taking the screenshot.
+        try {
+            waitUntil(ExpectedConditions.invisibilityOfElementLocated(By
+                    .className("v-loading-indicator")), 5);
+        } catch (TimeoutException e) {
+            // Just take the screenshot, PhantomJS always times out.
+        }
+
+        compareScreen("table-empty-caption");
+    }
+
+}