aboutsummaryrefslogtreecommitdiffstats
path: root/documentation/layout
diff options
context:
space:
mode:
authorelmot <elmot@vaadin.com>2015-09-25 16:40:44 +0300
committerelmot <elmot@vaadin.com>2015-09-25 16:40:44 +0300
commita1b265c318dbda4a213cec930785b81e4c0f7d2b (patch)
treeb149daf5a4f50b4f6446c906047cf86495fe0433 /documentation/layout
parentb9743a48a1bd0394f19c54ee938c6395a80f3cd8 (diff)
downloadvaadin-framework-a1b265c318dbda4a213cec930785b81e4c0f7d2b.tar.gz
vaadin-framework-a1b265c318dbda4a213cec930785b81e4c0f7d2b.zip
Framework documentation IN
Change-Id: I767477c1fc3745f9e1f58075fe30c9ac8da63581
Diffstat (limited to 'documentation/layout')
-rw-r--r--documentation/layout/chapter-layout.asciidoc124
-rw-r--r--documentation/layout/img/absolutelayout-area.pngbin0 -> 2057 bytes
-rw-r--r--documentation/layout/img/absolutelayout-bottomright.pngbin0 -> 10436 bytes
-rw-r--r--documentation/layout/img/absolutelayout-proportional.pngbin0 -> 4604 bytes
-rw-r--r--documentation/layout/img/accordion-example1.pngbin0 -> 139197 bytes
-rw-r--r--documentation/layout/img/csslayout-basic.pngbin0 -> 3626 bytes
-rw-r--r--documentation/layout/img/csslayout-getcss.pngbin0 -> 1548 bytes
-rw-r--r--documentation/layout/img/csslayout-styling.pngbin0 -> 1136 bytes
-rw-r--r--documentation/layout/img/customlayout-example1.pngbin0 -> 13410 bytes
-rw-r--r--documentation/layout/img/formlayout-example1.pngbin0 -> 14405 bytes
-rw-r--r--documentation/layout/img/gridlayout.pngbin0 -> 32066 bytes
-rw-r--r--documentation/layout/img/gridlayout_sizing_expanding.pngbin0 -> 6754 bytes
-rw-r--r--documentation/layout/img/horizontallayout_sizing.pngbin0 -> 75710 bytes
-rw-r--r--documentation/layout/img/horizontallayout_width_defined.pngbin0 -> 18974 bytes
-rw-r--r--documentation/layout/img/horizontallayout_width_expand_percentage.pngbin0 -> 2798 bytes
-rw-r--r--documentation/layout/img/horizontallayout_width_expand_ratios-2.pngbin0 -> 3105 bytes
-rw-r--r--documentation/layout/img/horizontallayout_width_expand_ratios.pngbin0 -> 3068 bytes
-rw-r--r--documentation/layout/img/horizontallayout_width_expand_uniform.pngbin0 -> 3003 bytes
-rw-r--r--documentation/layout/img/horizontallayout_width_expanding.pngbin0 -> 17689 bytes
-rw-r--r--documentation/layout/img/horizontallayout_width_undefined.pngbin0 -> 18642 bytes
-rw-r--r--documentation/layout/img/layout-intro-example-1.pngbin0 -> 21093 bytes
-rw-r--r--documentation/layout/img/layout_alignment.pngbin0 -> 6926 bytes
-rw-r--r--documentation/layout/img/layout_margin.pngbin0 -> 11608 bytes
-rw-r--r--documentation/layout/img/layout_size_undefined_vs_defined.pngbin0 -> 8747 bytes
-rw-r--r--documentation/layout/img/layout_spacing.pngbin0 -> 12028 bytes
-rw-r--r--documentation/layout/img/orderedlayout-sizing-undefined.pngbin0 -> 7051 bytes
-rw-r--r--documentation/layout/img/orderedlayout_horizontal.pngbin0 -> 2473 bytes
-rw-r--r--documentation/layout/img/orderedlayout_vertical.pngbin0 -> 3673 bytes
-rw-r--r--documentation/layout/img/panel-scrolling.pngbin0 -> 304197 bytes
-rw-r--r--documentation/layout/img/panel.pngbin0 -> 12204 bytes
-rw-r--r--documentation/layout/img/splitpanel-example1.pngbin0 -> 9393 bytes
-rw-r--r--documentation/layout/img/splitpanel-splitposition.pngbin0 -> 4032 bytes
-rw-r--r--documentation/layout/img/subwindow-basic.pngbin0 -> 55720 bytes
-rw-r--r--documentation/layout/img/subwindow-modal.pngbin0 -> 32156 bytes
-rw-r--r--documentation/layout/img/tabsheet-example1.pngbin0 -> 54413 bytes
-rw-r--r--documentation/layout/img/tabsheet-example2.pngbin0 -> 3402 bytes
-rw-r--r--documentation/layout/img/tabsheet-tabclose.pngbin0 -> 13179 bytes
-rw-r--r--documentation/layout/layout-absolutelayout.asciidoc144
-rw-r--r--documentation/layout/layout-accordion.asciidoc85
-rw-r--r--documentation/layout/layout-csslayout.asciidoc179
-rw-r--r--documentation/layout/layout-customlayout.asciidoc100
-rw-r--r--documentation/layout/layout-formlayout.asciidoc94
-rw-r--r--documentation/layout/layout-gridlayout.asciidoc239
-rw-r--r--documentation/layout/layout-orderedlayout.asciidoc356
-rw-r--r--documentation/layout/layout-overview.asciidoc74
-rw-r--r--documentation/layout/layout-panel.asciidoc137
-rw-r--r--documentation/layout/layout-root-layout.asciidoc61
-rw-r--r--documentation/layout/layout-settings.asciidoc376
-rw-r--r--documentation/layout/layout-splitpanel.asciidoc135
-rw-r--r--documentation/layout/layout-sub-window.asciidoc211
-rw-r--r--documentation/layout/layout-tabsheet.asciidoc250
51 files changed, 2565 insertions, 0 deletions
diff --git a/documentation/layout/chapter-layout.asciidoc b/documentation/layout/chapter-layout.asciidoc
new file mode 100644
index 0000000000..176a29a4fa
--- /dev/null
+++ b/documentation/layout/chapter-layout.asciidoc
@@ -0,0 +1,124 @@
+[[layout]]
+== Managing Layout
+
+ifdef::web[]
+Ever since the ancient xeroxians invented graphical user interfaces, programmers
+have wanted to make GUI programming ever easier for themselves. Solutions
+started simple. When GUIs appeared on PC desktops, practically all screens were
+of the VGA type and fixed into 640x480 size. Mac or X Window System on UNIX were
+not much different. Everyone was so happy with such awesome graphics resolutions
+that they never thought that an application would have to work on a radically
+different screen size. At worst, screens could only grow, they thought, giving
+more space for more windows. In the 80s, the idea of having a computer screen in
+your pocket was simply not realistic. Hence, the GUI APIs allowed placing UI
+components using screen coordinates. Visual Basic and some other systems
+provided an easy way for the designer to drag and drop components on a
+fixed-sized window. One would have thought that at least translators would have
+complained about the awkwardness of such a solution, but apparently they were
+not, as non-engineers, heard or at least cared about. At best, engineers could
+throw at them a resource editor that would allow them to resize the UI
+components by hand. Such was the spirit back then.
+endif::web[]
+
+ifdef::web[]
+After the web was born, layout design was doomed to change for ever. At first,
+layout didn't matter much, as everyone was happy with plain headings,
+paragraphs, and a few hyperlinks here and there. Designers of HTML wanted the
+pages to run on any screen size. The screen size was actually not pixels but
+rows and columns of characters, as the baby web was really just hyper __text__,
+not graphics. That was soon to be changed. The first GUI-based browser, NCSA
+Mosaic, launched a revolution that culminated in Netscape Navigator. Suddenly,
+people who had previously been doing advertisement brochures started writing
+HTML. This meant that layout design had to be easy not just for programmers, but
+also allow the graphics designer to do his or her job without having to know a
+thing about programming. The W3C committee designing web standards came up with
+the CSS (Cascading Style Sheet) specification, which allowed trivial separation
+of appearance from content. Later versions of HTML followed, XHTML and HTML 5
+appeared, as did countless other standards.
+endif::web[]
+
+ifdef::web[]
+Page description and markup languages are a wonderful solution for static
+presentations, such as books and most web pages. Real applications, however,
+need to have more control. They need to be able to change the state of user
+interface components and even their layout on the run. This creates a need to
+separate the presentation from content on exactly the right
+level.////
+Vaadin provides a solution for this, using themes and CSS, but let us first look
+at what Java did for UI
+programming.
+////
+////
+Changing the layout steps right on the feet of the graphics designers, so we
+have a conflict. We will discuss this conflict later, but let us first look at
+what Java did for UI
+programming.
+////
+endif::web[]
+
+ifdef::web[]
+Thanks to the attack of graphics designers, desktop applications were, when it
+comes to appearance, far behind web design. Sun Microsystems had come in 1995
+with a new programming language, Java, for writing cross-platform desktop
+applications. Java's original graphical user interface toolkit, AWT (Abstract
+Windowing Toolkit), was designed to work on multiple operating systems as well
+as embedded in web browsers. One of the special aspects of AWT was the layout
+manager, which allowed user interface components to be flexible, growing and
+shrinking as needed. This made it possible for the user to resize the windows of
+an application flexibly and also served the needs of localization, as text
+strings were not limited to some fixed size in pixels. It became even possible
+to resize the pixel size of fonts, and the rest of the layout adapted to the new
+size.
+endif::web[]
+
+Layout management of Vaadin is a direct successor of the web-based concept for
+separation of content and appearance and of the Java AWT solution for binding
+the layout and user interface components into objects in programs. Vaadin layout
+components allow you to position your UI components on the screen in a
+hierarchical fashion, much like in conventional Java UI toolkits such as AWT,
+Swing, or SWT. In addition, you can approach the layout from the direction of
+the web with the [classname]#CustomLayout# component, which you can use to write
+your layout as a template in HTML that provides locations of any contained
+components. The [classname]#AbsoluteLayout# allows the old-style pixel-position
+based layouting, but it also supports percentual values, which makes it usable
+for scalable layouts. It is also useful as an area on which the user can
+position items with drag and drop.
+
+ifdef::web[]
+The moral of the story is that, because Vaadin is intended for web applications,
+appearance is of high importance. The solutions have to be the best of both
+worlds and satisfy artists of both kind: code and graphics. On the API side, the
+layout is controlled by UI components, particularly the layout components. On
+the visual side, it is controlled by themes. Themes can contain any HTML, Sass,
+CSS, and JavaScript that you or your web artists create to make people feel good
+about your software.
+endif::web[]
+
+
+include::layout-overview.asciidoc[leveloffset=+2]
+
+include::layout-root-layout.asciidoc[leveloffset=+2]
+
+include::layout-orderedlayout.asciidoc[leveloffset=+2]
+
+include::layout-gridlayout.asciidoc[leveloffset=+2]
+
+include::layout-formlayout.asciidoc[leveloffset=+2]
+
+include::layout-panel.asciidoc[leveloffset=+2]
+
+include::layout-sub-window.asciidoc[leveloffset=+2]
+
+include::layout-splitpanel.asciidoc[leveloffset=+2]
+
+include::layout-tabsheet.asciidoc[leveloffset=+2]
+
+include::layout-accordion.asciidoc[leveloffset=+2]
+
+include::layout-absolutelayout.asciidoc[leveloffset=+2]
+
+include::layout-csslayout.asciidoc[leveloffset=+2]
+
+include::layout-settings.asciidoc[leveloffset=+2]
+
+include::layout-customlayout.asciidoc[leveloffset=+2]
diff --git a/documentation/layout/img/absolutelayout-area.png b/documentation/layout/img/absolutelayout-area.png
new file mode 100644
index 0000000000..7788d0de98
--- /dev/null
+++ b/documentation/layout/img/absolutelayout-area.png
Binary files differ
diff --git a/documentation/layout/img/absolutelayout-bottomright.png b/documentation/layout/img/absolutelayout-bottomright.png
new file mode 100644
index 0000000000..c2402d7c1e
--- /dev/null
+++ b/documentation/layout/img/absolutelayout-bottomright.png
Binary files differ
diff --git a/documentation/layout/img/absolutelayout-proportional.png b/documentation/layout/img/absolutelayout-proportional.png
new file mode 100644
index 0000000000..0298e94914
--- /dev/null
+++ b/documentation/layout/img/absolutelayout-proportional.png
Binary files differ
diff --git a/documentation/layout/img/accordion-example1.png b/documentation/layout/img/accordion-example1.png
new file mode 100644
index 0000000000..c6bc6db39f
--- /dev/null
+++ b/documentation/layout/img/accordion-example1.png
Binary files differ
diff --git a/documentation/layout/img/csslayout-basic.png b/documentation/layout/img/csslayout-basic.png
new file mode 100644
index 0000000000..0f71568279
--- /dev/null
+++ b/documentation/layout/img/csslayout-basic.png
Binary files differ
diff --git a/documentation/layout/img/csslayout-getcss.png b/documentation/layout/img/csslayout-getcss.png
new file mode 100644
index 0000000000..64c3a7255c
--- /dev/null
+++ b/documentation/layout/img/csslayout-getcss.png
Binary files differ
diff --git a/documentation/layout/img/csslayout-styling.png b/documentation/layout/img/csslayout-styling.png
new file mode 100644
index 0000000000..435947f80c
--- /dev/null
+++ b/documentation/layout/img/csslayout-styling.png
Binary files differ
diff --git a/documentation/layout/img/customlayout-example1.png b/documentation/layout/img/customlayout-example1.png
new file mode 100644
index 0000000000..adad457f5d
--- /dev/null
+++ b/documentation/layout/img/customlayout-example1.png
Binary files differ
diff --git a/documentation/layout/img/formlayout-example1.png b/documentation/layout/img/formlayout-example1.png
new file mode 100644
index 0000000000..6ebc4aaddb
--- /dev/null
+++ b/documentation/layout/img/formlayout-example1.png
Binary files differ
diff --git a/documentation/layout/img/gridlayout.png b/documentation/layout/img/gridlayout.png
new file mode 100644
index 0000000000..6d1f283918
--- /dev/null
+++ b/documentation/layout/img/gridlayout.png
Binary files differ
diff --git a/documentation/layout/img/gridlayout_sizing_expanding.png b/documentation/layout/img/gridlayout_sizing_expanding.png
new file mode 100644
index 0000000000..8467d7b0dd
--- /dev/null
+++ b/documentation/layout/img/gridlayout_sizing_expanding.png
Binary files differ
diff --git a/documentation/layout/img/horizontallayout_sizing.png b/documentation/layout/img/horizontallayout_sizing.png
new file mode 100644
index 0000000000..2461577ed7
--- /dev/null
+++ b/documentation/layout/img/horizontallayout_sizing.png
Binary files differ
diff --git a/documentation/layout/img/horizontallayout_width_defined.png b/documentation/layout/img/horizontallayout_width_defined.png
new file mode 100644
index 0000000000..160dd6a005
--- /dev/null
+++ b/documentation/layout/img/horizontallayout_width_defined.png
Binary files differ
diff --git a/documentation/layout/img/horizontallayout_width_expand_percentage.png b/documentation/layout/img/horizontallayout_width_expand_percentage.png
new file mode 100644
index 0000000000..ee3a817cee
--- /dev/null
+++ b/documentation/layout/img/horizontallayout_width_expand_percentage.png
Binary files differ
diff --git a/documentation/layout/img/horizontallayout_width_expand_ratios-2.png b/documentation/layout/img/horizontallayout_width_expand_ratios-2.png
new file mode 100644
index 0000000000..2d7b496232
--- /dev/null
+++ b/documentation/layout/img/horizontallayout_width_expand_ratios-2.png
Binary files differ
diff --git a/documentation/layout/img/horizontallayout_width_expand_ratios.png b/documentation/layout/img/horizontallayout_width_expand_ratios.png
new file mode 100644
index 0000000000..92fef5c91d
--- /dev/null
+++ b/documentation/layout/img/horizontallayout_width_expand_ratios.png
Binary files differ
diff --git a/documentation/layout/img/horizontallayout_width_expand_uniform.png b/documentation/layout/img/horizontallayout_width_expand_uniform.png
new file mode 100644
index 0000000000..7d2ecc398d
--- /dev/null
+++ b/documentation/layout/img/horizontallayout_width_expand_uniform.png
Binary files differ
diff --git a/documentation/layout/img/horizontallayout_width_expanding.png b/documentation/layout/img/horizontallayout_width_expanding.png
new file mode 100644
index 0000000000..4a7a44c8aa
--- /dev/null
+++ b/documentation/layout/img/horizontallayout_width_expanding.png
Binary files differ
diff --git a/documentation/layout/img/horizontallayout_width_undefined.png b/documentation/layout/img/horizontallayout_width_undefined.png
new file mode 100644
index 0000000000..f0009f54c1
--- /dev/null
+++ b/documentation/layout/img/horizontallayout_width_undefined.png
Binary files differ
diff --git a/documentation/layout/img/layout-intro-example-1.png b/documentation/layout/img/layout-intro-example-1.png
new file mode 100644
index 0000000000..e69ffb1ba1
--- /dev/null
+++ b/documentation/layout/img/layout-intro-example-1.png
Binary files differ
diff --git a/documentation/layout/img/layout_alignment.png b/documentation/layout/img/layout_alignment.png
new file mode 100644
index 0000000000..79d9f49aed
--- /dev/null
+++ b/documentation/layout/img/layout_alignment.png
Binary files differ
diff --git a/documentation/layout/img/layout_margin.png b/documentation/layout/img/layout_margin.png
new file mode 100644
index 0000000000..27937c72d7
--- /dev/null
+++ b/documentation/layout/img/layout_margin.png
Binary files differ
diff --git a/documentation/layout/img/layout_size_undefined_vs_defined.png b/documentation/layout/img/layout_size_undefined_vs_defined.png
new file mode 100644
index 0000000000..ef81d1c012
--- /dev/null
+++ b/documentation/layout/img/layout_size_undefined_vs_defined.png
Binary files differ
diff --git a/documentation/layout/img/layout_spacing.png b/documentation/layout/img/layout_spacing.png
new file mode 100644
index 0000000000..f7220adf85
--- /dev/null
+++ b/documentation/layout/img/layout_spacing.png
Binary files differ
diff --git a/documentation/layout/img/orderedlayout-sizing-undefined.png b/documentation/layout/img/orderedlayout-sizing-undefined.png
new file mode 100644
index 0000000000..82f594b9a8
--- /dev/null
+++ b/documentation/layout/img/orderedlayout-sizing-undefined.png
Binary files differ
diff --git a/documentation/layout/img/orderedlayout_horizontal.png b/documentation/layout/img/orderedlayout_horizontal.png
new file mode 100644
index 0000000000..dc91a62f54
--- /dev/null
+++ b/documentation/layout/img/orderedlayout_horizontal.png
Binary files differ
diff --git a/documentation/layout/img/orderedlayout_vertical.png b/documentation/layout/img/orderedlayout_vertical.png
new file mode 100644
index 0000000000..2798ac4f3d
--- /dev/null
+++ b/documentation/layout/img/orderedlayout_vertical.png
Binary files differ
diff --git a/documentation/layout/img/panel-scrolling.png b/documentation/layout/img/panel-scrolling.png
new file mode 100644
index 0000000000..16f695fdd9
--- /dev/null
+++ b/documentation/layout/img/panel-scrolling.png
Binary files differ
diff --git a/documentation/layout/img/panel.png b/documentation/layout/img/panel.png
new file mode 100644
index 0000000000..5bc85a1f66
--- /dev/null
+++ b/documentation/layout/img/panel.png
Binary files differ
diff --git a/documentation/layout/img/splitpanel-example1.png b/documentation/layout/img/splitpanel-example1.png
new file mode 100644
index 0000000000..d0a90586af
--- /dev/null
+++ b/documentation/layout/img/splitpanel-example1.png
Binary files differ
diff --git a/documentation/layout/img/splitpanel-splitposition.png b/documentation/layout/img/splitpanel-splitposition.png
new file mode 100644
index 0000000000..35bf6ffb29
--- /dev/null
+++ b/documentation/layout/img/splitpanel-splitposition.png
Binary files differ
diff --git a/documentation/layout/img/subwindow-basic.png b/documentation/layout/img/subwindow-basic.png
new file mode 100644
index 0000000000..b2fc46a263
--- /dev/null
+++ b/documentation/layout/img/subwindow-basic.png
Binary files differ
diff --git a/documentation/layout/img/subwindow-modal.png b/documentation/layout/img/subwindow-modal.png
new file mode 100644
index 0000000000..6571e16ee6
--- /dev/null
+++ b/documentation/layout/img/subwindow-modal.png
Binary files differ
diff --git a/documentation/layout/img/tabsheet-example1.png b/documentation/layout/img/tabsheet-example1.png
new file mode 100644
index 0000000000..a1eb00e05d
--- /dev/null
+++ b/documentation/layout/img/tabsheet-example1.png
Binary files differ
diff --git a/documentation/layout/img/tabsheet-example2.png b/documentation/layout/img/tabsheet-example2.png
new file mode 100644
index 0000000000..9819a637ae
--- /dev/null
+++ b/documentation/layout/img/tabsheet-example2.png
Binary files differ
diff --git a/documentation/layout/img/tabsheet-tabclose.png b/documentation/layout/img/tabsheet-tabclose.png
new file mode 100644
index 0000000000..28689c9e82
--- /dev/null
+++ b/documentation/layout/img/tabsheet-tabclose.png
Binary files differ
diff --git a/documentation/layout/layout-absolutelayout.asciidoc b/documentation/layout/layout-absolutelayout.asciidoc
new file mode 100644
index 0000000000..8576cfb09b
--- /dev/null
+++ b/documentation/layout/layout-absolutelayout.asciidoc
@@ -0,0 +1,144 @@
+---
+title: AbsoluteLayout
+order: 11
+layout: page
+---
+
+[[layout.absolutelayout]]
+= [classname]#AbsoluteLayout#
+
+[classname]#AbsoluteLayout# allows placing components in arbitrary positions in
+the layout area. The positions are specified in the [methodname]#addComponent()#
+method with horizontal and vertical coordinates relative to an edge of the
+layout area. The positions can include a third depth dimension, the __z-index__,
+which specifies which components are displayed in front and which behind other
+components.
+
+The positions are specified by a CSS absolute position string, using the
+[literal]#++left++#, [literal]#++right++#, [literal]#++top++#,
+[literal]#++bottom++#, and [literal]#++z-index++# properties known from CSS. In
+the following example, we have a 300 by 150 pixels large layout and position a
+text field 50 pixels from both the left and the top edge:
+
+
+[source, java]
+----
+// A 400x250 pixels size layout
+AbsoluteLayout layout = new AbsoluteLayout();
+layout.setWidth("400px");
+layout.setHeight("250px");
+
+// A component with coordinates for its top-left corner
+TextField text = new TextField("Somewhere someplace");
+layout.addComponent(text, "left: 50px; top: 50px;");
+----
+
+The [literal]#++left++# and [literal]#++top++# specify the distance from the
+left and top edge, respectively. The [literal]#++right++# and
+[literal]#++bottom++# specify the distances from the right and top edge.
+
+
+[source, java]
+----
+// At the top-left corner
+Button button = new Button( "left: 0px; top: 0px;");
+layout.addComponent(button, "left: 0px; top: 0px;");
+
+// At the bottom-right corner
+Button buttCorner = new Button( "right: 0px; bottom: 0px;");
+layout.addComponent(buttCorner, "right: 0px; bottom: 0px;");
+
+// Relative to the bottom-right corner
+Button buttBrRelative = new Button( "right: 50px; bottom: 50px;");
+layout.addComponent(buttBrRelative, "right: 50px; bottom: 50px;");
+
+// On the bottom, relative to the left side
+Button buttBottom = new Button( "left: 50px; bottom: 0px;");
+layout.addComponent(buttBottom, "left: 50px; bottom: 0px;");
+
+// On the right side, up from the bottom
+Button buttRight = new Button( "right: 0px; bottom: 100px;");
+layout.addComponent(buttRight, "right: 0px; bottom: 100px;");
+----
+
+The result of the above code examples is shown in
+<<figure.layout.absolutelayout.bottomright>>.
+
+[[figure.layout.absolutelayout.bottomright]]
+.Components Positioned Relative to Various Edges
+image::img/absolutelayout-bottomright.png[]
+
+Drag and drop is very useful for moving the components contained in an
+[classname]#AbsoluteLayout#. Check out the example in
+<<dummy/../../../framework/advanced/advanced-dragndrop#advanced.dragndrop.drop-on-component,"Dropping
+on a Component">>.
+
+[[layout.absolutelayout.area]]
+== Placing a Component in an Area
+
+Earlier, we had components of undefined size and specified the positions of
+components by a single pair of coordinates. The other possibility is to specify
+an area and let the component fill the area by specifying a proportinal size for
+the component, such as " [literal]#++100%++#". Normally, you use
+[methodname]#setSizeFull()# to take the entire area given by the layout.
+
+
+[source, java]
+----
+// Specify an area that a component should fill
+Panel panel = new Panel("A Panel filling an area");
+panel.setSizeFull(); // Fill the entire given area
+layout.addComponent(panel, "left: 25px; right: 50px; "+
+ "top: 100px; bottom: 50px;");
+----
+
+The result is shown in <<figure.layout.absolutelayout.area>>
+
+[[figure.layout.absolutelayout.area]]
+.Component Filling an Area Specified by Coordinates
+image::img/absolutelayout-area.png[]
+
+
+[[layout.absolutelayout.proportional]]
+== Proportional Coordinates
+
+You can also use proportional coordinates to specify the placement of
+components:
+
+
+[source, java]
+----
+// A panel that takes 30% to 90% horizontally and
+// 20% to 80% vertically
+Panel panel = new Panel("A Panel");
+panel.setSizeFull(); // Fill the specified area
+layout.addComponent(panel, "left: 30%; right: 10%;" +
+ "top: 20%; bottom: 20%;");
+----
+
+The result is shown in <<figure.layout.absolutelayout.proportional>>
+
+[[figure.layout.absolutelayout.proportional]]
+.Specifying an Area by Proportional Coordinates
+image::img/absolutelayout-proportional.png[]
+
+
+[[layout.absolutelayout.css]]
+== Styling with CSS
+
+
+[source, css]
+----
+.v-absolutelayout {}
+.v-absolutelayout-wrapper {}
+----
+
+The [classname]#AbsoluteLayout# component has [literal]#++v-absolutelayout++#
+root style. Each component in the layout is contained within an element that has
+the [literal]#++v-absolutelayout-wrapper++#. The component captions are outside
+the wrapper elements, in a separate element with the usual
+[literal]#++v-caption++# style.
+
+
+
+
diff --git a/documentation/layout/layout-accordion.asciidoc b/documentation/layout/layout-accordion.asciidoc
new file mode 100644
index 0000000000..37bbe9e529
--- /dev/null
+++ b/documentation/layout/layout-accordion.asciidoc
@@ -0,0 +1,85 @@
+---
+title: Accordion
+order: 10
+layout: page
+---
+
+[[layout.accordion]]
+= [classname]#Accordion#
+
+[classname]#Accordion# is a multicomponent container similar to
+[classname]#TabSheet#, except that the "tabs" are arranged vertically. Clicking
+on a tab opens its contained component in the space between the tab and the next
+one. You can use an [classname]#Accordion# identically to a
+[classname]#TabSheet#, which it actually inherits. See
+<<dummy/../../../framework/layout/layout-tabsheet#layout.tabsheet,"TabSheet">>
+for more information.
+
+The following example shows how you can create a simple accordion. As the
+[classname]#Accordion# is rather naked alone, we put it inside a Panel that acts
+as its caption and provides it a border.
+
+
+[source, java]
+----
+// Create the accordion
+Accordion accordion = new Accordion();
+
+// Create the first tab, specify caption when adding
+Layout tab1 = new VerticalLayout(); // Wrap in a layout
+tab1.addComponent(new Image(null, // No component caption
+ new ThemeResource("img/planets/Mercury.jpg")));
+accordion.addTab(tab1, "Mercury",
+ new ThemeResource("img/planets/Mercury_symbol.png"));
+
+// This tab gets its caption from the component caption
+Component tab2 = new Image("Venus",
+ new ThemeResource("img/planets/Venus.jpg"));
+accordion.addTab(tab2).setIcon(
+ new ThemeResource("img/planets/Venus_symbol.png"));
+
+// And so forth the other tabs...
+String[] tabs = {"Earth", "Mars", "Jupiter", "Saturn"};
+for (String caption: tabs) {
+ String basename = "img/planets/" + caption;
+ VerticalLayout tab = new VerticalLayout();
+ tab.addComponent(new Embedded(null,
+ new ThemeResource(basename + ".jpg")));
+ accordion.addTab(tab, caption,
+ new ThemeResource(basename + "_symbol.png"));
+}
+----
+
+<<figure.accordion.example1>> shows what the example would look like with the
+default theme.
+
+[[figure.accordion.example1]]
+.An Accordion
+image::img/accordion-example1.png[]
+
+== CSS Style Rules
+
+
+[source, css]
+----
+.v-accordion {}
+ .v-accordion-item,
+ .v-accordion-item-open,
+ .v-accordion-item-first {}
+ .v-accordion-item-caption {}
+ .v-caption {}
+ .v-accordion-item-content {}
+ .v-scollable {}
+----
+
+The top-level element of [classname]#Accordion# has the
+[literal]#++v-accordion++# style. An [classname]#Accordion# consists of a
+sequence of item elements, each of which has a caption element (the tab) and a
+content area element.
+
+The selected item (tab) has also the [literal]#++v-accordion-open++# style. The
+content area is not shown for the closed items.
+
+
+
+
diff --git a/documentation/layout/layout-csslayout.asciidoc b/documentation/layout/layout-csslayout.asciidoc
new file mode 100644
index 0000000000..0b60f78245
--- /dev/null
+++ b/documentation/layout/layout-csslayout.asciidoc
@@ -0,0 +1,179 @@
+---
+title: CssLayout
+order: 12
+layout: page
+---
+
+[[layout.csslayout]]
+= [classname]#CssLayout#
+
+[classname]#CssLayout# allows strong control over styling of the components
+contained inside the layout. The components are contained in a simple DOM
+structure consisting of [literal]#++<div>++# elements. By default, the contained
+components are laid out horizontally and wrap naturally when they reach the
+width of the layout, but you can control this and most other behaviour with CSS.
+You can also inject custom CSS for each contained component. As
+[classname]#CssLayout# has a very simple DOM structure and no dynamic rendering
+logic, relying purely on the built-in rendering logic of the browsers, it is the
+fastest of the layout components.
+
+The basic use of [classname]#CssLayout# is just like with any other layout
+component:
+
+
+[source, java]
+----
+CssLayout layout = new CssLayout();
+
+// Component with a layout-managed caption and icon
+TextField tf = new TextField("A TextField");
+tf.setIcon(new ThemeResource("icons/user.png"));
+layout.addComponent(tf);
+
+// Labels are 100% wide by default so must unset width
+Label label = new Label("A Label");
+label.setWidth(Sizeable.SIZE_UNDEFINED, 0);
+layout.addComponent(label);
+
+layout.addComponent(new Button("A Button"));
+----
+
+The result is shown in <<figure.layout.csslayout.basic>>. Notice that the
+default spacing and alignment of the layout is quite crude and CSS styling is
+nearly always needed.
+
+[[figure.layout.csslayout.basic]]
+.Basic Use of [classname]#CssLayout#
+image::img/csslayout-basic.png[]
+
+The [literal]#++display++# attribute of [classname]#CssLayout# is
+[literal]#++inline-block++# by default, so the components are laid out
+horizontally following another. [classname]#CssLayout# has 100% width by
+default. If the components reach the width of the layout, they are wrapped to
+the next "line" just as text would be. If you add a component with 100% width,
+it will take an entire line by wrapping before and after the component.
+
+[[layout.csslayout.injection]]
+== CSS Injection
+
+Overriding the [methodname]#getCss()# method allows injecting custom CSS for
+each component. The CSS returned by the method is inserted in the
+[parameter]#style# attribute of the [literal]#++<div>++# element of the
+component, so it will override any style definitions made in CSS files.
+
+
+[source, java]
+----
+CssLayout layout = new CssLayout() {
+ @Override
+ protected String getCss(Component c) {
+ if (c instanceof Label) {
+ // Color the boxes with random colors
+ int rgb = (int) (Math.random()*(1<<24));
+ return "background: #" + Integer.toHexString(rgb);
+ }
+ return null;
+ }
+};
+layout.setWidth("400px"); // Causes to wrap the contents
+
+// Add boxes of various sizes
+for (int i=0; i<40; i++) {
+ Label box = new Label("&nbsp;", ContentMode.HTML);
+ box.addStyleName("flowbox");
+ box.setWidth((float) Math.random()*50,
+ Sizeable.UNITS_PIXELS);
+ box.setHeight((float) Math.random()*50,
+ Sizeable.UNITS_PIXELS);
+ layout.addComponent(box);
+}
+----
+
+The style name added to the components allows making common styling in a CSS
+file:
+
+
+[source, css]
+----
+.v-label-flowbox {
+ border: thin black solid;
+}
+----
+
+<<figure.layout.csslayout.getcss>> shows the rendered result.
+
+[[figure.layout.csslayout.getcss]]
+.Use of [methodname]#getCss()# and line wrap
+image::img/csslayout-getcss.png[]
+
+
+[[layout.csslayout.compatibility]]
+== Browser Compatibility
+
+The stregth of the [classname]#CssLayout# is also its weakness. Much of the
+logic behind the other layout components is there to give nice default behaviour
+and to handle the differences in different browsers. Some browsers, no need to
+say which, are notoriously incompatible with the CSS standards, so they require
+a lot of custom CSS. You may need to make use of the browser-specific style
+classes in the root element of the
+application.////
+TODO: described in &lt;xref
+linkend="advanced.browserinfo"/&gt;
+////
+Some features in the other layouts are not even solvable in pure CSS, at least
+in all browsers.
+
+
+[[layout.csslayout.css]]
+== Styling with CSS
+
+
+[source, css]
+----
+.v-csslayout {}
+.v-csslayout-margin {}
+.v-csslayout-container {}
+----
+
+The [classname]#CssLayout# component has [literal]#++v-csslayout++# root style.
+The margin element with [literal]#++v-csslayout-margin++# style is always
+enabled. The components are contained in an element with
+[literal]#++v-csslayout-container++# style.
+
+For example, we could style the basic [classname]#CssLayout# example shown
+earlier as follows:
+
+
+[source, css]
+----
+/* Have the caption right of the text box, bottom-aligned */
+.csslayoutexample .mylayout .v-csslayout-container {
+ direction: rtl;
+ line-height: 24px;
+ vertical-align: bottom;
+}
+
+/* Have some space before and after the caption */
+.csslayoutexample .mylayout .v-csslayout-container .v-caption {
+ padding-left: 3px;
+ padding-right: 10px;
+}
+----
+
+The example would now be rendered as shown in
+<<figure.layout.csslayout.styling>>.
+
+[[figure.layout.csslayout.styling]]
+.Styling [classname]#CssLayout#
+image::img/csslayout-styling.png[]
+
+Captions and icons that are managed by the layout are contained in an element
+with [literal]#++v-caption++# style. These caption elements are contained flat
+at the same level as the actual component elements. This may cause problems with
+wrapping in [literal]#++inline-block++# mode, as wrapping can occur between the
+caption and its corresponding component element just as well as between
+components. Such use case is therefore not feasible.
+
+
+
+
diff --git a/documentation/layout/layout-customlayout.asciidoc b/documentation/layout/layout-customlayout.asciidoc
new file mode 100644
index 0000000000..e5acff75d1
--- /dev/null
+++ b/documentation/layout/layout-customlayout.asciidoc
@@ -0,0 +1,100 @@
+---
+title: Custom Layouts
+order: 14
+layout: page
+---
+
+[[layout.customlayout]]
+= Custom Layouts
+
+While it is possible to create almost any typical layout with the standard
+layout components, it is sometimes best to separate the layout completely from
+code. With the [classname]#CustomLayout# component, you can write your layout as
+a template in HTML that provides locations of any contained components. The
+layout template is included in a theme. This separation allows the layout to be
+designed separately from code, for example using WYSIWYG web designer tools such
+as Adobe Dreamweaver.
+
+A template is a HTML file located under [filename]#layouts# folder under a theme
+folder under the [filename]#WebContent/VAADIN/themes/# folder, for example,
+[filename]#WebContent/VAADIN/themes/__themename/layouts/mylayout.html__#.
+(Notice that the root path [filename]#WebContent/VAADIN/themes/# for themes is
+fixed.) A template can also be provided dynamically from an
+[classname]#InputStream#, as explained below. A template includes
+[literal]#++<div>++# elements with a [parameter]#location# attribute that
+defines the location identifier. All custom layout HTML-files must be saved
+using UTF-8 character encoding.
+
+[subs="normal"]
+----
+&lt;table width="100%" height="100%"&gt;
+ &lt;tr height="100%"&gt;
+ &lt;td&gt;
+ &lt;table align="center"&gt;
+ &lt;tr&gt;
+ &lt;td align="right"&gt;User&amp;nbsp;name:&lt;/td&gt;
+ &lt;td&gt;**&lt;div location="username"&gt;&lt;/div&gt;**&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td align="right"&gt;Password:&lt;/td&gt;
+ &lt;td&gt;**&lt;div location="password"&gt;&lt;/div&gt;**&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+ &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td align="right" colspan="2"&gt;
+ **&lt;div location="okbutton"&gt;**&lt;/div&gt;
+ &lt;/td&gt;
+ &lt;/tr&gt;
+&lt;/table&gt;
+----
+The client-side engine of Vaadin will replace contents of the location elements
+with the components. The components are bound to the location elements by the
+location identifier given to [methodname]#addComponent()#, as shown in the
+example below.
+
+
+[source, java]
+----
+Panel loginPanel = new Panel("Login");
+CustomLayout content = new CustomLayout("layoutname");
+content.setSizeUndefined();
+loginPanel.setContent(content);
+loginPanel.setSizeUndefined();
+
+// No captions for fields is they are provided in the template
+content.addComponent(new TextField(), "username");
+content.addComponent(new TextField(), "password");
+content.addComponent(new Button("Login"), "okbutton");
+----
+
+The resulting layout is shown below in <<figure.layout.customlayout>>.
+
+[[figure.layout.customlayout]]
+.Example of a Custom Layout Component
+image::img/customlayout-example1.png[]
+
+You can use [methodname]#addComponent()# also to replace an existing component
+in the location given in the second parameter.
+
+In addition to a static template file, you can provide a template dynamically
+with the [classname]#CustomLayout# constructor that accepts an
+[classname]#InputStream# as the template source. For example:
+
+
+[source, java]
+----
+new CustomLayout(new ByteArrayInputStream("<b>Template</b>".getBytes()));
+----
+
+or
+
+
+[source, java]
+----
+new CustomLayout(new FileInputStream(file));
+----
+
+
+
diff --git a/documentation/layout/layout-formlayout.asciidoc b/documentation/layout/layout-formlayout.asciidoc
new file mode 100644
index 0000000000..b22750f2c8
--- /dev/null
+++ b/documentation/layout/layout-formlayout.asciidoc
@@ -0,0 +1,94 @@
+---
+title: FormLayout
+order: 5
+layout: page
+---
+
+[[layout.formlayout]]
+= [classname]#FormLayout#
+
+[classname]#FormLayout# lays the components and their captions out in two
+columns, with optional indicators for required fields and errors that can be
+shown for each field. The field captions can have an icon in addition to the
+text. [classname]#FormLayout# is an ordered layout and much like
+[classname]#VerticalLayout#. For description of margins, spacing, and other
+features in ordered layouts, see
+<<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout,"VerticalLayout
+and HorizontalLayout">>.
+
+The following example shows typical use of [classname]#FormLayout# in a form:
+
+
+[source, java]
+----
+FormLayout form = new FormLayout();
+TextField tf1 = new TextField("Name");
+tf1.setIcon(FontAwesome.USER);
+tf1.setRequired(true);
+tf1.addValidator(new NullValidator("Must be given", false));
+form.addComponent(tf1);
+
+TextField tf2 = new TextField("Street address");
+tf2.setIcon(FontAwesome.ROAD);
+form.addComponent(tf2);
+
+TextField tf3 = new TextField("Postal code");
+tf3.setIcon(FontAwesome.ENVELOPE);
+tf3.addValidator(new IntegerRangeValidator("Doh!", 1, 99999));
+form.addComponent(tf3);
+----
+
+The resulting layout will look as follows. The error message shows in a tooptip
+when you hover the mouse pointer over the error indicator.
+
+[[figure.layout.formlayout]]
+.A [classname]#FormLayout# Layout for Forms
+image::img/formlayout-example1.png[]
+
+[[layout.formlayout.css]]
+== CSS Style Rules
+
+
+[source, css]
+----
+.v-formlayout {}
+.v-formlayout .v-caption {}
+
+/* Columns in a field row. */
+.v-formlayout-contentcell {} /* Field content. */
+.v-formlayout-captioncell {} /* Field caption. */
+.v-formlayout-errorcell {} /* Field error indicator. */
+
+/* Overall style of field rows. */
+.v-formlayout-row {}
+.v-formlayout-firstrow {}
+.v-formlayout-lastrow {}
+
+/* Required field indicator. */
+.v-formlayout .v-required-field-indicator {}
+.v-formlayout-captioncell .v-caption
+ .v-required-field-indicator {}
+
+/* Error indicator. */
+.v-formlayout-cell .v-errorindicator {}
+.v-formlayout-error-indicator .v-errorindicator {}
+----
+
+The top-level element of [classname]#FormLayout# has the
+[literal]#++v-formlayout++# style. The layout is tabular with three columns: the
+caption column, the error indicator column, and the field column. These can be
+styled with [literal]#++v-formlayout-captioncell++#,
+[literal]#++v-formlayout-errorcell++#, and
+[literal]#++v-formlayout-contentcell++#, respectively. While the error indicator
+is shown as a dedicated column, the indicator for required fields is currently
+shown as a part of the caption column.
+
+For information on setting margins and spacing, see also
+<<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout.spacing,"Spacing
+in Ordered Layouts">> and
+<<dummy/../../../framework/layout/layout-settings#layout.settings.margins,"Layout
+Margins">>.
+
+
+
+
diff --git a/documentation/layout/layout-gridlayout.asciidoc b/documentation/layout/layout-gridlayout.asciidoc
new file mode 100644
index 0000000000..17666d0e8e
--- /dev/null
+++ b/documentation/layout/layout-gridlayout.asciidoc
@@ -0,0 +1,239 @@
+---
+title: GridLayout
+order: 4
+layout: page
+---
+
+[[layout.gridlayout]]
+= [classname]#GridLayout#
+
+[classname]#GridLayout# container lays components out on a grid, defined by the
+number of columns and rows. The columns and rows of the grid serve as
+coordinates that are used for laying out components on the grid. Each component
+can use multiple cells from the grid, defined as an area (x1,y1,x2,y2), although
+they typically take up only a single grid cell.
+
+The grid layout maintains a cursor for adding components in left-to-right,
+top-to-bottom order. If the cursor goes past the bottom-right corner, it will
+automatically extend the grid downwards by adding a new row.
+
+The following example demonstrates the use of [classname]#GridLayout#. The
+[methodname]#addComponent# takes a component and optional coordinates. The
+coordinates can be given for a single cell or for an area in x,y (column,row)
+order. The coordinate values have a base value of 0. If coordinates are not
+given, the cursor will be used.
+
+
+[source, java]
+----
+// Create a 4 by 4 grid layout.
+GridLayout grid = new GridLayout(4, 4);
+grid.addStyleName("example-gridlayout");
+
+// Fill out the first row using the cursor.
+grid.addComponent(new Button("R/C 1"));
+for (int i = 0; i < 3; i++) {
+ grid.addComponent(new Button("Col " + (grid.getCursorX() + 1)));
+}
+
+// Fill out the first column using coordinates.
+for (int i = 1; i < 4; i++) {
+ grid.addComponent(new Button("Row " + i), 0, i);
+}
+
+// Add some components of various shapes.
+grid.addComponent(new Button("3x1 button"), 1, 1, 3, 1);
+grid.addComponent(new Label("1x2 cell"), 1, 2, 1, 3);
+InlineDateField date = new InlineDateField("A 2x2 date field");
+date.setResolution(DateField.RESOLUTION_DAY);
+grid.addComponent(date, 2, 2, 3, 3);
+----
+
+The resulting layout will look as follows. The borders have been made visible to
+illustrate the layout cells.
+
+[[figure.ui.gridlayout]]
+.The Grid Layout Component
+image::img/gridlayout.png[]
+
+A component to be placed on the grid must not overlap with existing components.
+A conflict causes throwing a [classname]#GridLayout.OverlapsException#.
+
+== Sizing Grid Cells
+
+You can define the size of both a grid layout and its components in either fixed
+or percentual units, or leave the size undefined altogether, as described in
+<<dummy/../../../framework/components/components-features#components.features.sizeable,"Sizing
+Components">>.
+<<dummy/../../../framework/layout/layout-settings#layout.settings.size,"Layout
+Size">> gives an introduction to sizing of layouts.
+
+The size of the [classname]#GridLayout# component is undefined by default, so it
+will shrink to fit the size of the components placed inside it. In most cases,
+especially if you set a defined size for the layout but do not set the contained
+components to full size, there will be some unused space. The position of the
+non-full components within the grid cells will be determined by their
+__alignment__. See
+<<dummy/../../../framework/layout/layout-settings#layout.settings.alignment,"Layout
+Cell Alignment">> for details on how to align the components inside the cells.
+
+The components contained within a [classname]#GridLayout# layout can be laid out
+in a number of different ways depending on how you specify their height or
+width. The layout options are similar to [classname]#HorizontalLayout# and
+[classname]#VerticalLayout#, as described in
+<<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout,"VerticalLayout
+and HorizontalLayout">>.
+
+
+[WARNING]
+.A layout that contains components with percentual size must have a defined size!
+====
+If a layout has undefined size and a contained component has, say, 100% size,
+the component would fill the space given by the layout, while the layout would
+shrink to fit the space taken by the component, which is a paradox. This
+requirement holds for height and width separately. The debug mode allows
+detecting such invalid cases; see
+<<dummy/../../../framework/advanced/advanced-debug#advanced.debug.mode,"Enabling
+the Debug Mode">>.
+
+====
+
+
+
+Often, you want to have one or more rows or columns that take all the available
+space left over from non-expanding rows or columns. You need to set the rows or
+columns as __expanding__ with [methodname]#setRowExpandRatio()# and
+[methodname]#setColumnExpandRatio()#. The first parameter for these methods is
+the index of the row or column to set as expanding. The second parameter for the
+methods is an expansion ratio, which is relevant if there are more than one
+expanding row or column, but its value is irrelevant if there is only one. With
+multiple expanding rows or columns, the ratio parameter sets the relative
+portion how much a specific row/column will take in relation with the other
+expanding rows/columns.
+
+
+[source, java]
+----
+GridLayout grid = new GridLayout(3,2);
+
+// Layout containing relatively sized components must have
+// a defined size, here is fixed size.
+grid.setWidth("600px");
+grid.setHeight("200px");
+
+// Add some content
+String labels [] = {
+ "Shrinking column<br/>Shrinking row",
+ "Expanding column (1:)<br/>Shrinking row",
+ "Expanding column (5:)<br/>Shrinking row",
+ "Shrinking column<br/>Expanding row",
+ "Expanding column (1:)<br/>Expanding row",
+ "Expanding column (5:)<br/>Expanding row"
+};
+for (int i=0; i<labels.length; i++) {
+ Label label = new Label(labels[i], ContentMode.HTML);
+ label.setWidth(null); // Set width as undefined
+ grid.addComponent(label);
+}
+
+// Set different expansion ratios for the two columns
+grid.setColumnExpandRatio(1, 1);
+grid.setColumnExpandRatio(2, 5);
+
+// Set the bottom row to expand
+grid.setRowExpandRatio(1, 1);
+
+// Align and size the labels.
+for (int col=0; col<grid.getColumns(); col++) {
+ for (int row=0; row<grid.getRows(); row++) {
+ Component c = grid.getComponent(col, row);
+ grid.setComponentAlignment(c, Alignment.TOP_CENTER);
+
+ // Make the labels high to illustrate the empty
+ // horizontal space.
+ if (col != 0 || row != 0)
+ c.setHeight("100%");
+ }
+}
+----
+
+[[figure.ui.gridlayout.sizing.expanding]]
+.Expanding Rows and Columns in [classname]#GridLayout#
+image::img/gridlayout_sizing_expanding.png[]
+
+If the size of the contained components is undefined or fixed, the expansion
+ratio is of the __excess__ space, as in
+<<figure.ui.gridlayout.sizing.expanding>> (excess horizontal space is shown in
+white). However, if the size of the all the contained components in the
+expanding rows or columns is defined as a percentage, the ratio is calculated
+from the __overall__ space available for the percentually sized components. For
+example, if we had a 100 pixels wide grid layout with two columns with 1.0 and
+4.0 respective expansion ratios, and all the components in the grid were set as
+[methodname]#setWidth("100%")#, the columns would have respective widths of 20
+and 80 pixels, regardless of the minimum size of their contained components.
+
+
+== CSS Style Rules
+
+
+[source, css]
+----
+.v-gridlayout {}
+.v-gridlayout-margin {}
+----
+
+The v-gridlayout is the root element of the [classname]#GridLayout# component.
+The v-gridlayout-margin is a simple element inside it that allows setting a
+padding between the outer element and the cells.
+
+For styling the individual grid cells, you should style the components inserted
+in the cells. The implementation structure of the grid can change, so depending
+on it, as is done in the example below, is not generally recommended. Normally,
+if you want to have, for example, a different color for a certain cell, just
+make set the component inside it [methodname]#setSizeFull()#, and add a style
+name for it. Sometimes you may need to use a layout component between a cell and
+its actual component just for styling.
+
+The following example shows how to make the grid borders visible, as in
+<<figure.ui.gridlayout.sizing.expanding>>.
+
+
+[source, java]
+----
+.v-gridlayout-gridexpandratio {
+ background: blue; /* Creates a "border" around the grid. */
+ margin: 10px; /* Empty space around the layout. */
+}
+
+/* Add padding through which the background color shows. */
+.v-gridlayout-gridexpandratio .v-gridlayout-margin {
+ padding: 2px;
+}
+
+/* Add cell borders and make the cell backgrounds white.
+ * Warning: This depends heavily on the HTML structure. */
+.v-gridlayout-gridexpandratio > div > div > div {
+ padding: 2px; /* Layout background will show through. */
+ background: white; /* The cells will be colored white. */
+}
+
+/* Components inside the layout are a safe way to style cells. */
+.v-gridlayout-gridexpandratio .v-label {
+ text-align: left;
+ background: #ffffc0; /* Pale yellow */
+}
+----
+
+You should beware of [literal]#++margin++#, [literal]#++padding++#, and
+[literal]#++border++# settings in CSS as they can mess up the layout. The
+dimensions of layouts are calculated in the Client-Side Engine of Vaadin and
+some settings can interfere with these calculations. For more information, on
+margins and spacing, see
+<<dummy/../../../framework/layout/layout-settings#layout.settings.spacing,"Layout
+Cell Spacing">> and
+<<dummy/../../../framework/layout/layout-settings#layout.settings.margins,"Layout
+Margins">>
+
+
+
+
diff --git a/documentation/layout/layout-orderedlayout.asciidoc b/documentation/layout/layout-orderedlayout.asciidoc
new file mode 100644
index 0000000000..7cd2c7772d
--- /dev/null
+++ b/documentation/layout/layout-orderedlayout.asciidoc
@@ -0,0 +1,356 @@
+---
+title: VerticalLayout and HorizontalLayout
+order: 3
+layout: page
+---
+
+[[layout.orderedlayout]]
+= [classname]#VerticalLayout# and [classname]#HorizontalLayout#
+
+[classname]#VerticalLayout# and [classname]#HorizontalLayout# are ordered
+layouts for laying components out either vertically or horizontally,
+respectively. They both extend from [classname]#AbstractOrderedLayout#, together
+with the [classname]#FormLayout#. These are the two most important layout
+components in Vaadin, and typically you have a [classname]#VerticalLayout# as
+the root content of a UI.
+
+[classname]#VerticalLayout# has 100% default width and undefined height, so it
+fills the containing layout (or UI) horizontally, and fits its content
+vertically. [classname]#HorizontalLayout# has undefined size in both dimensions.
+
+Typical use of the layouts goes as follows:
+
+
+[source, java]
+----
+VerticalLayout vertical = new VerticalLayout ();
+vertical.addComponent(new TextField("Name"));
+vertical.addComponent(new TextField("Street address"));
+vertical.addComponent(new TextField("Postal code"));
+layout.addComponent(vertical);
+----
+See the http://demo.vaadin.com/book-examples-vaadin7/book#layout.orderedlayout.basic[on-line example, window="_blank"].
+
+The component captions are placed above the component, so the layout will look
+as follows:
+
+image::img/orderedlayout_vertical.png[]
+
+Using [classname]#HorizontalLayout# gives the following layout:
+
+image::img/orderedlayout_horizontal.png[]
+
+[[layout.orderedlayout.properties]]
+== Properties or Attributes
+
+Ordered layouts have the following properties:
+
+[[layout.orderedlayout.properties.table]]
+.Properties and Declarative Attributes
+
+|===============
+|Property|Declarative Attribute
+|[parameter]#componentAlignment#|In child components:[literal]#++:left++#(default),[literal]#++:center++#,[literal]#++:right++#,[literal]#++:top++#(default),[literal]#++:middle++#,[literal]#++:bottom++#
+|[parameter]#spacing#|[parameter]#spacing#[replaceable]#[=&lt;boolean&gt;]#
+|[parameter]#margin#|[parameter]#margin#[replaceable]#[=&lt;boolean&gt;]#
+|[parameter]#expandRatio#|In child components:[parameter]#:expand#=[replaceable]#&lt;integer&gt;#or[parameter]#:expand#(implies ratio 1)
+
+|===============
+
+
+
+
+[[layout.orderedlayout.spacing]]
+== Spacing in Ordered Layouts
+
+The ordered layouts can have spacing between the horizontal or vertical cells.
+The spacing can be enabled with [methodname]#setSpacing(true)# or declaratively
+with the [literal]#++spacing++# attribute.
+
+The spacing as a default height or width, which can be customized in CSS. You
+need to set the height or width for spacing elements with
+[literal]#++v-spacing++# style. You also need to specify an enclosing rule
+element in a CSS selector, such as [literal]#++v-verticallayout++# for a
+[classname]#VerticalLayout# or [literal]#++v-horizontallayout++# for a
+[classname]#HorizontalLayout#. You can also use [literal]#++v-vertical++# and
+[literal]#++v-horizontal++# for all vertically or horizontally ordered layouts,
+such as [classname]#FormLayout#.
+
+For example, the following sets the amount of spacing for all
+[classname]#VerticalLayout#s, as well as [classname]#FormLayout#, in the UI:
+
+
+[source, css]
+----
+.v-vertical > .v-spacing {
+ height: 30px;
+}
+----
+
+Or for [classname]#HorizontalLayout#:
+
+
+[source, css]
+----
+.v-horizontal > .v-spacing {
+ width: 50px;
+}
+----
+
+
+[[layout.orderedlayout.sizing]]
+== Sizing Contained Components
+
+The components contained within an ordered layout can be laid out in a number of
+different ways depending on how you specify their height or width in the primary
+direction of the layout component.
+
+[[figure.layout.orderedlayout.size.summary]]
+.Component Widths in [classname]#HorizontalLayout#
+image::img/horizontallayout_sizing.png[]
+
+<<figure.layout.orderedlayout.size.summary>> gives a summary of the sizing
+options for a [classname]#HorizontalLayout#. The figure is broken down in the
+following subsections.
+
+[[layout.orderedlayout.sizing.undefined]]
+=== Layout with Undefined Size
+
+If a [classname]#VerticalLayout# has undefined height or
+[classname]#HorizontalLayout# undefined width, the layout will shrink to fit the
+contained components so that there is no extra space between them.
+
+
+[source, java]
+----
+HorizontalLayout fittingLayout = new HorizontalLayout();
+fittingLayout.setWidth(Sizeable.SIZE_UNDEFINED, 0); // Default
+fittingLayout.addComponent(new Button("Small"));
+fittingLayout.addComponent(new Button("Medium-sized"));
+fittingLayout.addComponent(new Button("Quite a big component"));
+parentLayout.addComponent(fittingLayout);
+----
+
+The both layouts actually have undefined height by default and
+[classname]#HorizontalLayout# has also undefined width, while
+[classname]#VerticalLayout# has 100% relative width.
+
+If such a vertical layout with undefined height continues below the bottom of a
+window (a [classname]#Window# object), the window will pop up a vertical scroll
+bar on the right side of the window area. This way, you get a "web page". The
+same applies to [classname]#Panel#.
+
+
+[WARNING]
+.A layout that contains components with percentual size must have a defined size!
+====
+If a layout has undefined size and a contained component has, say, 100% size,
+the component would fill the space given by the layout, while the layout would
+shrink to fit the space taken by the component, which would be a paradox. This
+requirement holds for height and width separately. The debug window allows
+detecting such invalid cases; see
+<<dummy/../../../framework/advanced/advanced-debug#advanced.debug.hierarchy,"Inspecting
+Component Hierarchy">>.
+
+====
+
+
+
+An exception to the above rule is a case where you have a layout with undefined
+size that contains a component with a fixed or undefined size together with one
+or more components with relative size. In this case, the contained component
+with fixed (or undefined) size in a sense defines the size of the containing
+layout, removing the paradox. That size is then used for the relatively sized
+components.
+
+The technique can be used to define the width of a [classname]#VerticalLayout#
+or the height of a [classname]#HorizontalLayout#.
+
+
+[source, java]
+----
+// Vertical layout would normally have 100% width
+VerticalLayout vertical = new VerticalLayout();
+
+// Shrink to fit the width of contained components
+vertical.setWidth(Sizeable.SIZE_UNDEFINED, 0);
+
+// Label has normally 100% width, but we set it as
+// undefined so that it will take only the needed space
+Label label =
+ new Label("\u2190 The VerticalLayout shrinks to fit "+
+ "the width of this Label \u2192");
+label.setWidth(Sizeable.SIZE_UNDEFINED, 0);
+vertical.addComponent(label);
+
+// Button has undefined width by default
+Button butt = new Button("\u2190 This Button takes 100% "+
+ "of the width \u2192");
+butt.setWidth("100%");
+vertical.addComponent(butt);
+----
+See the http://demo.vaadin.com/book-examples-vaadin7/book#layout.orderedlayout.sizing.sizing-undefined-defining[on-line example, window="_blank"].
+
+[[figure.layout.orderedlayout.sizing.undefined.defining]]
+.Defining the Size with a Component
+image::img/orderedlayout-sizing-undefined.png[]
+
+
+=== Layout with Defined Size
+
+If you set a [classname]#HorizontalLayout# to a defined size horizontally or a
+[classname]#VerticalLayout# vertically, and there is space left over from the
+contained components, the extra space is distributed equally between the
+component cells. The components are aligned within these cells according to
+their alignment setting, top left by default, as in the example below.
+
+
+[source, java]
+----
+fixedLayout.setWidth("400px");
+----
+
+Using percentual sizes for components contained in a layout requires answering
+the question, "Percentage of what?" There is no sensible default answer for this
+question in the current implementation of the layouts, so in practice, you may
+not define "100%" size alone.
+
+
+=== Expanding Components
+
+Often, you want to have one component that takes all the available space left
+over from other components. You need to set its size as 100% and set it as
+__expanding__ with [methodname]#setExpandRatio()#. The second parameter for the
+method is an expansion ratio, which is relevant if there are more than one
+expanding component, but its value is irrelevant for a single expanding
+component.
+
+
+[source, java]
+----
+HorizontalLayout layout = new HorizontalLayout();
+layout.setWidth("400px");
+
+// These buttons take the minimum size.
+layout.addComponent(new Button("Small"));
+layout.addComponent(new Button("Medium-sized"));
+
+// This button will expand.
+Button expandButton = new Button("Expanding component");
+
+// Use 100% of the expansion cell's width.
+expandButton.setWidth("100%");
+
+// The component must be added to layout before setting the ratio.
+layout.addComponent(expandButton);
+
+// Set the component's cell to expand.
+layout.setExpandRatio(expandButton, 1.0f);
+
+parentLayout.addComponent(layout);
+----
+
+In the declarative format, you need to specify the [literal]#++:expand++#
+attribute in the child components. The attribute defaults to expand ratio 1.
+
+Notice that you can not call [methodname]#setExpandRatio()# before you have
+added the component to the layout, because it can not operate on an component
+that it doesn't yet have.
+
+
+=== Expand Ratios
+
+If you specify an expand ratio for multiple components, they will all try to use
+the available space according to the ratio.
+
+
+[source, java]
+----
+HorizontalLayout layout = new HorizontalLayout();
+layout.setWidth("400px");
+
+// Create three equally expanding components.
+String[] captions = { "Small", "Medium-sized",
+ "Quite a big component" };
+for (int i = 1; i <= 3; i++) {
+ Button button = new Button(captions[i-1]);
+ button.setWidth("100%");
+ layout.addComponent(button);
+
+ // Have uniform 1:1:1 expand ratio.
+ layout.setExpandRatio(button, 1.0f);
+}
+----
+
+As the example used the same ratio for all components, the ones with more
+content may have the content cut. Below, we use differing ratios:
+
+
+[source, java]
+----
+// Expand ratios for the components are 1:2:3.
+layout.setExpandRatio(button, i * 1.0f);
+----
+
+If the size of the expanding components is defined as a percentage (typically
+"100%"), the ratio is calculated from the __overall__ space available for the
+relatively sized components. For example, if you have a 100 pixels wide layout
+with two cells with 1.0 and 4.0 respective expansion ratios, and both the
+components in the layout are set as [methodname]#setWidth("100%")#, the cells
+will have respective widths of 20 and 80 pixels, regardless of the minimum size
+of the components.
+
+However, if the size of the contained components is undefined or fixed, the
+expansion ratio is of the __excess__ available space. In this case, it is the
+excess space that expands, not the components.
+
+
+[source, java]
+----
+for (int i = 1; i <= 3; i++) {
+ // Button with undefined size.
+ Button button = new Button(captions[i - 1]);
+
+ layout4.addComponent(button);
+
+ // Expand ratios are 1:2:3.
+ layout4.setExpandRatio(button, i * 1.0f);
+}
+----
+
+It is not meaningful to combine expanding components with percentually defined
+size and components with fixed or undefined size. Such combination can lead to a
+very unexpected size for the percentually sized components.
+
+
+=== Percentage of Cells
+
+A percentual size of a component defines the size of the component __within its
+cell__. Usually, you use "100%", but a smaller percentage or a fixed size
+(smaller than the cell size) will leave an empty space in the cell and align the
+component within the cell according to its alignment setting, top left by
+default.
+
+
+[source, java]
+----
+HorizontalLayout layout50 = new HorizontalLayout();
+layout50.setWidth("400px");
+
+String[] captions1 = { "Small 50%", "Medium 50%",
+ "Quite a big 50%" };
+for (int i = 1; i <= 3; i++) {
+ Button button = new Button(captions1[i-1]);
+ button.setWidth("50%");
+ layout50.addComponent(button);
+
+ // Expand ratios for the components are 1:2:3.
+ layout50.setExpandRatio(button, i * 1.0f);
+}
+parentLayout.addComponent(layout50);
+----
+
+
+
+
+
diff --git a/documentation/layout/layout-overview.asciidoc b/documentation/layout/layout-overview.asciidoc
new file mode 100644
index 0000000000..ba1bb603ae
--- /dev/null
+++ b/documentation/layout/layout-overview.asciidoc
@@ -0,0 +1,74 @@
+---
+title: Overview
+order: 1
+layout: page
+---
+
+[[layout.overview]]
+= Overview
+
+The user interface components in Vaadin can roughly be divided in two groups:
+components that the user can interact with and layout components for placing the
+other components to specific places in the user interface. The layout components
+are identical in their purpose to layout managers in regular desktop frameworks
+for Java and you can use plain Java to accomplish sophisticated component
+layouting.
+
+You start by creating a content layout for the UI and then add other layout
+components hierarchically, and finally the interaction components as the leaves
+of the component tree.
+
+
+[source, java]
+----
+// Set the root layout for the UI
+VerticalLayout content = new VerticalLayout();
+setContent(content);
+
+// Add the topmost component.
+content.addComponent(new Label("The Ultimate Cat Finder"));
+
+// Add a horizontal layout for the bottom part.
+HorizontalLayout bottom = new HorizontalLayout();
+content.addComponent(bottom);
+
+bottom.addComponent(new Tree("Major Planets and Their Moons"));
+bottom.addComponent(new Panel());
+...
+----
+
+Or in the declarative format:
+
+
+[source, html]
+----
+<v-vertical-layout>
+ <v-label>The Ultimate Cat Finder</v-label>
+
+ <v-horizontal-layout>
+ <v-tree caption="Major Planets and Their Moons"/>
+ <v-panel/>
+ </v-horizontal-layout>
+</v-vertical-layout>
+----
+
+You will usually need to tune the layout components a bit by setting sizes,
+expansion ratios, alignments, spacings, and so on. The general settings are
+described in
+<<dummy/../../../framework/layout/layout-settings#layout.settings,"Layout
+Formatting">>.
+
+Layouts are coupled with themes that specify various layout features, such as
+backgrounds, borders, text alignment, and so on. Definition and use of themes is
+described in
+<<dummy/../../../framework/themes/themes-overview.asciidoc#themes.overview,"Themes">>.
+
+You can see a finished version of the above example in
+<<figure.layout.intro.simple>>.
+
+[[figure.layout.intro.simple]]
+.Layout Example
+image::img/layout-intro-example-1.png[]
+
+
+
diff --git a/documentation/layout/layout-panel.asciidoc b/documentation/layout/layout-panel.asciidoc
new file mode 100644
index 0000000000..8d7f3d6f06
--- /dev/null
+++ b/documentation/layout/layout-panel.asciidoc
@@ -0,0 +1,137 @@
+---
+title: Panel
+order: 6
+layout: page
+---
+
+[[layout.panel]]
+= [classname]#Panel#
+
+[classname]#Panel# is a single-component container with a frame around the
+content. It has an optional caption and an icon which are handled by the panel
+itself, not its containing layout. The panel itself does not manage the caption
+of its contained component. You need to set the content with
+[methodname]#setContent()#.
+
+[classname]#Panel# has 100% width and undefined height by default. This
+corresponds with the default sizing of [classname]#VerticalLayout#, which is
+perhaps most commonly used as the content of a [classname]#Panel#. If the width
+or height of a panel is undefined, the content must have a corresponding
+undefined or fixed size in the same direction to avoid a sizing paradox.
+
+
+[source, java]
+----
+Panel panel = new Panel("Astronomer Panel");
+panel.addStyleName("mypanelexample");
+panel.setSizeUndefined(); // Shrink to fit content
+layout.addComponent(panel);
+
+// Create the content
+FormLayout content = new FormLayout();
+content.addStyleName("mypanelcontent");
+content.addComponent(new TextField("Participant"));
+content.addComponent(new TextField("Organization"));
+content.setSizeUndefined(); // Shrink to fit
+content.setMargin(true);
+panel.setContent(content);
+----
+
+The resulting layout is shown in <<figure.layout.panel>>.
+
+[[figure.layout.panel]]
+.A [classname]#Panel#
+image::img/panel.png[]
+
+[[layout.panel.scrolling]]
+== Scrolling the Panel Content
+
+((("scroll bars", id="term.layout.panel.scrolling.scrollbars", range="startofrange")))
+
+
+Normally, if a panel has undefined size in a direction, as it has by default
+vertically, it will fit the size of the content and grow as the content grows.
+However, if it has a fixed or percentual size and its content becomes too big to
+fit in the content area, a scroll bar will appear for the particular direction.
+Scroll bars in a [classname]#Panel# are handled natively by the browser with the
+[literal]#++overflow: auto++# property in CSS. (((overflow CSS
+property)))
+
+In the following example, we have a 300 pixels wide and very high
+[classname]#Image# component as the panel content.
+
+
+[source, java]
+----
+// Display an image stored in theme
+Image image = new Image(null,
+ new ThemeResource("img/Ripley_Scroll-300px.jpg"));
+
+// To enable scrollbars, the size of the panel content
+// must not be relative to the panel size
+image.setSizeUndefined(); // Actually the default
+
+// The panel will give it scrollbars.
+Panel panel = new Panel("Scroll");
+panel.setWidth("300px");
+panel.setHeight("300px");
+panel.setContent(image);
+
+layout.addComponent(panel);
+----
+
+The result is shown in <<figure.layout.panel.scrolling>>. Notice that also the
+horizontal scrollbar has appeared even though the panel has the same width as
+the content (300 pixels) - the 300px width for the panel includes the panel
+border and vertical scrollbar.
+
+[[figure.layout.panel.scrolling]]
+.Panel with Scroll Bars
+image::img/panel-scrolling.png[]
+
+((("[interfacename]#Scrollable#", id="term.layout.panel.scrolling.scrollable", range="startofrange")))
+
+
+[[layout.panel.scrolling.programmatic]]
+=== Programmatic Scrolling
+
+[classname]#Panel# implements the [interfacename]#Scrollable# interface to allow
+programmatic scrolling. You can set the scroll position in pixels with
+[methodname]#setScrollTop()# and [methodname]#setScrollLeft()#. You can also get
+the scroll position set previously, but scrolling the panel in the browser does
+not update the scroll position to the server-side.
+
+(((range="endofrange", startref="term.layout.panel.scrolling.scrollable")))
+(((range="endofrange", startref="term.layout.panel.scrolling.scrollbars")))
+
+
+ifdef::web[]
+[[layout.panel.css]]
+== CSS Style Rules
+
+
+[source, css]
+----
+.v-panel {}
+.v-panel-caption {}
+.v-panel-nocaption {}
+.v-panel-content {}
+.v-panel-deco {}
+----
+
+The entire panel has [literal]#++v-panel++# style. A panel consists of three
+parts: the caption, content, and bottom decorations (shadow). These can be
+styled with [literal]#++v-panel-caption++#, [literal]#++v-panel-content++#, and
+[literal]#++v-panel-deco++#, respectively. If the panel has no caption, the
+caption element will have the style [literal]#++v-panel-nocaption++#.
+
+The built-in [literal]#++light++# style in the Reindeer and Runo themes has no
+borders or border decorations for the [classname]#Panel#. You can use the
+[parameter]#Reindeer.PANEL_LIGHT# and [parameter]#Runo.PANEL_LIGHT# constants to
+add the style to a panel. Other themes may also provide the light and other
+styles for [classname]#Panel# as well.
+
+endif::web[]
+
+
+
diff --git a/documentation/layout/layout-root-layout.asciidoc b/documentation/layout/layout-root-layout.asciidoc
new file mode 100644
index 0000000000..86bab9d587
--- /dev/null
+++ b/documentation/layout/layout-root-layout.asciidoc
@@ -0,0 +1,61 @@
+---
+title: UI, Window, and Panel Content
+order: 2
+layout: page
+---
+
+[[layout.root-layout]]
+= UI, Window, and Panel Content
+
+The [classname]#UI#, [classname]#Window#, and [classname]#Panel# all have a
+single content component, which you need to set with [methodname]#setContent()#.
+The content is usually a layout component, although any component is allowed.
+
+
+[source, java]
+----
+Panel panel = new Panel("This is a Panel");
+VerticalLayout panelContent = new VerticalLayout();
+panelContent.addComponent(new Label("Hello!"));
+panel.setContent(panelContent);
+
+// Set the panel as the content of the UI
+setContent(panel);
+----
+
+The size of the content is the default size of the particular layout component,
+for example, a [classname]#VerticalLayout# has 100% width and undefined height
+by default (this coincides with the defaults for [classname]#Panel# and
+[classname]#Label#). If such a layout with undefined height grows higher than
+the browser window, it will flow out of the view and scrollbars will appear. In
+many applications, you want to use the full area of the browser view. Setting
+the components contained inside the content layout to full size is not enough,
+and would actually lead to an invalid state if the height of the content layout
+is undefined.
+
+
+[source, java]
+----
+// First set the root content for the UI
+VerticalLayout content = new VerticalLayout();
+setContent(content);
+
+// Set the content size to full width and height
+content.setSizeFull();
+
+// Add a title area on top of the screen. This takes
+// just the vertical space it needs.
+content.addComponent(new Label("My Application"));
+
+// Add a menu-view area that takes rest of vertical space
+HorizontalLayout menuview = new HorizontalLayout();
+menuview.setSizeFull();
+content.addComponent(menuview);
+----
+
+See
+<<dummy/../../../framework/layout/layout-settings#layout.settings.size,"Layout
+Size">> for more information about setting layout sizes.
+
+
+
diff --git a/documentation/layout/layout-settings.asciidoc b/documentation/layout/layout-settings.asciidoc
new file mode 100644
index 0000000000..682cf93563
--- /dev/null
+++ b/documentation/layout/layout-settings.asciidoc
@@ -0,0 +1,376 @@
+---
+title: Layout Formatting
+order: 13
+layout: page
+---
+
+[[layout.settings]]
+= Layout Formatting
+
+While the formatting of layouts is mainly done with style sheets, just as with
+other components, style sheets are not ideal or even possible to use in some
+situations. For example, CSS does not allow defining the spacing of table cells,
+which is done with the [parameter]#cellspacing# attribute in HTML.
+
+Moreover, as many layout sizes are calculated dynamically in the Client-Side
+Engine of Vaadin, some CSS settings can fail altogether.
+
+[[layout.settings.size]]
+== Layout Size
+
+The size of a layout component can be specified with the
+[methodname]#setWidth()# and [methodname]#setHeight()# methods defined in the
+[classname]#Sizeable# interface, just like for any component. It can also be
+undefined, in which case the layout shrinks to fit the component(s) inside it.
+<<dummy/../../../framework/components/components-features#components.features.sizeable,"Sizing
+Components">> gives details on the interface.
+
+[[figure.layout.settings.size.undefined]]
+.[classname]#HorizontalLayout# with Undefined vs Defined size
+image::img/layout_size_undefined_vs_defined.png[]
+
+Many layout components take 100% width by default, while they have the height
+undefined.
+
+The sizes of components inside a layout can also be defined as a percentage of
+the space available in the layout, for example with
+[methodname]#setWidth("100%");# or with the (most commonly used method)
+[methodname]#setFullSize()# that sets 100% size in both directions. If you use a
+percentage in a [classname]#HorizontalLayout#, [classname]#VerticalLayout#, or
+[classname]#GridLayout#, you will also have to set the component as
+__expanding__, as noted below.
+
+
+[WARNING]
+====
+__A layout that contains components with percentual size must have a defined
+size__!
+
+If a layout has undefined size and a contained component has, say, 100% size,
+the component will try to fill the space given by the layout, while the layout
+will shrink to fit the space taken by the component, which is a paradox. This
+requirement holds for height and width separately. The debug mode allows
+detecting such invalid cases; see
+<<dummy/../../../framework/advanced/advanced-debug#advanced.debug.hierarchy,"Inspecting
+Component Hierarchy">>.
+
+====
+
+
+
+For example:
+
+
+[source, java]
+----
+// This takes 100% width but has undefined height.
+VerticalLayout layout = new VerticalLayout();
+
+// A button that takes all the space available in the layout.
+Button button = new Button("100%x100% button");
+button.setSizeFull();
+layout.addComponent(button);
+
+// We must set the layout to a defined height vertically, in
+// this case 100% of its parent layout, which also must
+// not have undefined size.
+layout.setHeight("100%");
+----
+
+If you have a layout with undefined height, such as [classname]#VerticalLayout#,
+in a [classname]#UI#, [classname]#Window#, or [classname]#Panel#, and put enough
+content in it so that it extends outside the bottom of the view area, scrollbars
+will appear. If you want your application to use all the browser view, nothing
+more or less, you should use [methodname]#setFullSize()# for the root layout.
+
+
+[source, java]
+----
+// Create the UI content
+VerticalLayout content = new VerticalLayout();
+
+// Use entire view area
+content.setSizeFull();
+
+setContent(content);
+----
+
+
+[[layout.settings.size.expanding]]
+== Expanding Components
+
+If you set a [classname]#HorizontalLayout# to a defined size horizontally or a
+[classname]#VerticalLayout# vertically, and there is space left over from the
+contained components, the extra space is distributed equally between the
+component cells. The components are aligned within these cells, according to
+their alignment setting, top left by default, as in the example below.
+
+Often, you don't want such empty space, but want one or more components to take
+all the leftover space. You need to set such a component to 100% size and use
+[methodname]#setExpandRatio()#. If there is just one such expanding component in
+the layout, the ratio parameter is irrelevant.
+
+If you set multiple components as expanding, the expand ratio dictates how large
+proportion of the available space (overall or excess depending on whether the
+components are sized as a percentage or not) each component takes. In the
+example below, the buttons have 1:2:3 ratio for the expansion.
+
+[classname]#GridLayout# has corresponding method for both of its directions,
+[methodname]#setRowExpandRatio()# and [methodname]#setColumnExpandRatio()#.
+
+Expansion is dealt in detail in the documentation of the layout components that
+support it. See
+<<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout,"VerticalLayout
+and HorizontalLayout">> and
+<<dummy/../../../framework/layout/layout-gridlayout#layout.gridlayout,"GridLayout">>
+for details on components with relative sizes.
+
+
+[[layout.settings.alignment]]
+== Layout Cell Alignment
+
+((("Alignment", id="term.alignment", range="startofrange")))
+
+
+((("[methodname]#setComponentAlignment()#", id="term.setcomponentalignment", range="startofrange")))
+
+
+When a component in a layout cell has size (width or height) smaller than the
+size of the cell, it will by default be aligned in the top-left corner of the
+cell. You can set the alignment with the [methodname]#setComponentAlignment()#
+method. The method takes as its parameters the component contained in the cell
+to be formatted, and the horizontal and vertical alignment. The component must
+have been added to the layout before setting the alignment.
+
+<<figure.layout.settings.alignment>> illustrates the alignment of components
+within a [classname]#GridLayout#.
+
+[[figure.layout.settings.alignment]]
+.Cell Alignments
+image::img/layout_alignment.png[]
+
+Note that __a component with 100% relative size can not be aligned__, as it will
+take the entire width or height of the cell, in which case alignment is
+meaningless. This should especially be noted with the [classname]#Label#
+component, which has 100% default width, and the text alignment __within__ the
+component is separate, defined by the CSS [literal]#++text-align++# property.
+
+The easiest way to set alignments is to use the constants defined in the
+[classname]#Alignment# class. Let us look how the buttons in the top row of the
+above [classname]#GridLayout# are aligned with constants:
+
+
+[source, java]
+----
+// Create a grid layout
+GridLayout grid = new GridLayout(3, 3);
+
+grid.setWidth(400, Sizeable.UNITS_PIXELS);
+grid.setHeight(200, Sizeable.UNITS_PIXELS);
+
+Button topleft = new Button("Top Left");
+grid.addComponent(topleft, 0, 0);
+grid.setComponentAlignment(topleft, Alignment.TOP_LEFT);
+
+Button topcenter = new Button("Top Center");
+grid.addComponent(topcenter, 1, 0);
+grid.setComponentAlignment(topcenter, Alignment.TOP_CENTER);
+
+Button topright = new Button("Top Right");
+grid.addComponent(topright, 2, 0);
+grid.setComponentAlignment(topright, Alignment.TOP_RIGHT);
+...
+----
+
+The following table lists all the [classname]#Alignment# constants by their
+respective locations:
+
+.Alignment Constants
+
+|===============
+|[parameter]#TOP_LEFT#|[parameter]#TOP_CENTER#|[parameter]#TOP_RIGHT#
+|[parameter]#MIDDLE_LEFT#|[parameter]#MIDDLE_CENTER#|[parameter]#MIDDLE_RIGHT#
+|[parameter]#BOTTOM_LEFT#|[parameter]#BOTTOM_CENTER#|[parameter]#BOTTOM_RIGHT#
+
+|===============
+
+
+
+Another way to specify the alignments is to create an [classname]#Alignment#
+object and specify the horizontal and vertical alignment with separate
+constants. You can specify either of the directions, in which case the other
+alignment direction is not modified, or both with a bitmask operation between
+the two directions.
+
+
+[source, java]
+----
+Button middleleft = new Button("Middle Left");
+grid.addComponent(middleleft, 0, 1);
+grid.setComponentAlignment(middleleft,
+ new Alignment(Bits.ALIGNMENT_VERTICAL_CENTER |
+ Bits.ALIGNMENT_LEFT));
+
+Button middlecenter = new Button("Middle Center");
+grid.addComponent(middlecenter, 1, 1);
+grid.setComponentAlignment(middlecenter,
+ new Alignment(Bits.ALIGNMENT_VERTICAL_CENTER |
+ Bits.ALIGNMENT_HORIZONTAL_CENTER));
+
+Button middleright = new Button("Middle Right");
+grid.addComponent(middleright, 2, 1);
+grid.setComponentAlignment(middleright,
+ new Alignment(Bits.ALIGNMENT_VERTICAL_CENTER |
+ Bits.ALIGNMENT_RIGHT));
+----
+
+Obviously, you may combine only one vertical bitmask with one horizontal
+bitmask, though you may leave either one out. The following table lists the
+available alignment bitmask constants:
+
+.Alignment Bitmasks
+
+|===============
+|Horizontal|[parameter]#Bits.ALIGNMENT_LEFT#
+|[parameter]#Bits.ALIGNMENT_HORIZONTAL_CENTER#
+|[parameter]#Bits.ALIGNMENT_RIGHT#
+|Vertical|[parameter]#Bits.ALIGNMENT_TOP#
+|[parameter]#Bits.ALIGNMENT_VERTICAL_CENTER#
+|[parameter]#Bits.ALIGNMENT_BOTTOM#
+
+|===============
+
+
+
+You can determine the current alignment of a component with
+[methodname]#getComponentAlignment()#, which returns an [classname]#Alignment#
+object. The class provides a number of getter methods for decoding the
+alignment, which you can also get as a bitmask value.
+
+[[layout.settings.alignment.size]]
+=== Size of Aligned Components
+
+You can only align a component that is smaller than its containing cell in the
+direction of alignment. If a component has 100% width, as many components have
+by default, horizontal alignment does not have any effect. For example,
+[classname]#Label# is 100% wide by default and can not therefore be horizontally
+aligned as such. The problem can be hard to notice, as the text inside a
+[classname]#Label# is left-aligned.
+
+You usually need to set either a fixed size, undefined size, or less than a 100%
+relative size for the component to be aligned - a size that is smaller than the
+containing layout has.
+
+For example, assuming that a [classname]#Label# has short content that is less
+wide than the containing [classname]#VerticalLayout#, you could center it as
+follows:
+
+
+[source, java]
+----
+VerticalLayout layout = new VerticalLayout(); // 100% default width
+Label label = new Label("Hello"); // 100% default width
+label.setSizeUndefined();
+layout.addComponent(label);
+layout.setComponentAlignment(label, Alignment.MIDDLE_CENTER);
+----
+
+If you set the size as undefined and the component itself contains components,
+make sure that the contained components also have either undefined or fixed
+size. For example, if you set the size of a [classname]#Form# as undefined, its
+containing layout [classname]#FormLayout# has 100% default width, which you also
+need to set as undefined. But then, any components inside the
+[classname]#FormLayout# must have either undefined or fixed size.
+
+
+(((range="endofrange", startref="term.alignment")))
+(((range="endofrange", startref="term.setcomponentalignment")))
+
+[[layout.settings.spacing]]
+== Layout Cell Spacing
+
+The [classname]#VerticalLayout#, [classname]#HorizontalLayout#, and
+[classname]#GridLayout# layouts offer a [methodname]#setSpacing()# method to
+enable spacing between the cells of the layout.
+
+For example:
+
+
+[source, java]
+----
+VerticalLayout layout = new VerticalLayout();
+layout.setSpacing(true);
+layout.addComponent(new Button("Component 1"));
+layout.addComponent(new Button("Component 2"));
+layout.addComponent(new Button("Component 3"));
+----
+
+The effect of spacing in [classname]#VerticalLayout# and
+[classname]#HorizontalLayout# is illustrated in <<figure.layout.spacing>>.
+
+[[figure.layout.spacing]]
+.Layout Spacings
+image::img/layout_spacing.png[]
+
+The exact amount of spacing is defined in CSS. If the default is not suitable,
+you can customize it in a custom theme.
+
+In the Valo theme, you can specify the spacing with the
+$v-layout-spacing-vertical and $v-layout-spacing-horizontal parameters, as
+described in
+<<dummy/../../../framework/themes/themes-valo#themes.valo.variables,"Common
+Settings">>. The spacing defaults to the $v-unit-size measure.
+
+When adjusting spacing in other themes, you should note that it is implemented
+in a bit different ways in different layouts. In the ordered layouts, it is done
+with spacer elements, while in the [classname]#GridLayout# it has special
+handling. Please see the sections on the individual components for more details.
+
+
+[[layout.settings.margins]]
+== Layout Margins
+
+Most layout components do not have any margin around them by default. The
+ordered layouts, as well as [classname]#GridLayout#, support enabling a margin
+with [methodname]#setMargin()#. This enables CSS classes for each margin in the
+HTML element of the layout component.
+
+In the Valo theme, the margin sizes default to $v-unit-size. You can customize
+them with $v-layout-margin-top, right, bottom, and left. See
+<<dummy/../../../framework/themes/themes-valo#themes.valo.variables,"Common
+Settings">> for a description of the parameters.
+
+To customize the default margins in other themes, you can define each margin
+with the [literal]#++padding++# property in CSS. You may want to have a custom
+CSS class for the layout component to enable specific customization of the
+margins, as is done in the following with the [literal]#++mymargins++# class:
+
+[subs="normal"]
+----
+
+.**mymargins**.v-margin-left {padding-left: **10**px;}
+.**mymargins**.v-margin-right {padding-right: **20**px;}
+.**mymargins**.v-margin-top {padding-top: **40**px;}
+.**mymargins**.v-margin-bottom {padding-bottom: **80**px;}
+----
+You can enable only specific margins by passing a [classname]#MarginInfo# to the
+[methodname]#setMargin()#. The margins are specified in clockwise order for top,
+right, bottom, and left margin. The following would enable the left and right
+margins:
+
+
+[source, java]
+----
+layout.setMargin(new MarginInfo(false, true, false, true));
+----
+
+The resulting margins are shown in <<figure.layout.margin>> below. The two ways
+produce identical margins.
+
+[[figure.layout.margin]]
+.Layout Margins
+image::img/layout_margin.png[]
+
+
+
+
diff --git a/documentation/layout/layout-splitpanel.asciidoc b/documentation/layout/layout-splitpanel.asciidoc
new file mode 100644
index 0000000000..34768d9b70
--- /dev/null
+++ b/documentation/layout/layout-splitpanel.asciidoc
@@ -0,0 +1,135 @@
+---
+title: HorizontalSplitPanel and VerticalSplitPanel
+order: 8
+layout: page
+---
+
+[[layout.splitpanel]]
+= [classname]#HorizontalSplitPanel# and [classname]#VerticalSplitPanel#
+
+((("[classname]#HorizontalSplitPanel#", id="term.layout.splitpanel.horizontal", range="startofrange")))
+
+
+((("[classname]#VerticalSplitPanel#", id="term.layout.splitpanel.vertical", range="startofrange")))
+
+
+[classname]#HorizontalSplitPanel# and [classname]#VerticalSplitPanel# are a
+two-component containers that divide the available space into two areas to
+accomodate the two components. [classname]#HorizontalSplitPanel# makes the split
+horizontally with a vertical splitter bar, and [classname]#VerticalSplitPanel#
+vertically with a horizontal splitter bar. The user can drag the bar to adjust
+its position.
+
+You can set the two components with the [methodname]#setFirstComponent()# and
+[methodname]#setSecondComponent()# methods, or with the regular
+[methodname]#addComponent()# method.
+
+
+[source, java]
+----
+// Have a panel to put stuff in
+Panel panel = new Panel("Split Panels Inside This Panel");
+
+// Have a horizontal split panel as its content
+HorizontalSplitPanel hsplit = new HorizontalSplitPanel();
+panel.setContent(hsplit);
+
+// Put a component in the left panel
+Tree tree = new Tree("Menu", TreeExample.createTreeContent());
+hsplit.setFirstComponent(tree);
+
+// Put a vertical split panel in the right panel
+VerticalSplitPanel vsplit = new VerticalSplitPanel();
+hsplit.setSecondComponent(vsplit);
+
+// Put other components in the right panel
+vsplit.addComponent(new Label("Here's the upper panel"));
+vsplit.addComponent(new Label("Here's the lower panel"));
+----
+See the http://demo.vaadin.com/book-examples-vaadin7/book#layout.splitpanel.basic[on-line example, window="_blank"].
+
+The result is shown in <<figure.splitpanel.basic>>. Observe that the tree is cut
+horizontally as it can not fit in the layout. If its height exceeds the height
+of the panel, a vertical scroll bar will appear automatically. If horizontal
+scroll bar is necessary, you could put the content in a [classname]#Panel#,
+which can have scroll bars in both directions.
+
+[[figure.splitpanel.basic]]
+.[classname]#HorizontalSplitPanel# and [classname]#VerticalSplitPanel#
+image::img/splitpanel-example1.png[]
+
+You can set the split position with [methodname]#setSplitPosition()#. It accepts
+any units defined in the [classname]#Sizeable# interface, with percentual size
+relative to the size of the component.
+
+
+[source, java]
+----
+// Have a horizontal split panel
+HorizontalSplitPanel hsplit = new HorizontalSplitPanel();
+hsplit.setFirstComponent(new Label("75% wide panel"));
+hsplit.setSecondComponent(new Label("25% wide panel"));
+
+// Set the position of the splitter as percentage
+hsplit.setSplitPosition(75, Sizeable.UNITS_PERCENTAGE);
+----
+See the http://demo.vaadin.com/book-examples-vaadin7/book#layout.splitpanel.splitposition[on-line example, window="_blank"].
+
+Another version of the [methodname]#setSplitPosition()# method allows leaving
+out the unit, using the same unit as previously. The method also has versions
+take take a boolean parameter, [parameter]#reverse#, which allows defining the
+size of the right or bottom panel instead of the left or top panel.
+
+The split bar allows the user to adjust the split position by dragging the bar
+with mouse. To lock the split bar, use [methodname]#setLocked(true)#. When
+locked, the move handle in the middle of the bar is disabled.
+
+
+[source, java]
+----
+// Lock the splitter
+hsplit.setLocked(true);
+----
+See the http://demo.vaadin.com/book-examples-vaadin7/book#layout.splitpanel.splitposition[on-line example, window="_blank"].
+
+Setting the split position programmatically and locking the split bar is
+illustrated in <<figure.component.splitpanel.splitposition>>.
+
+[[figure.component.splitpanel.splitposition]]
+.A Layout With Nested SplitPanels
+image::img/splitpanel-splitposition.png[]
+
+Notice that the size of a split panel must not be undefined in the split
+direction.
+
+== CSS Style Rules
+
+
+[source, css]
+----
+/* For a horizontal SplitPanel. */
+.v-splitpanel-horizontal {}
+.v-splitpanel-hsplitter {}
+.v-splitpanel-hsplitter-locked {}
+
+/* For a vertical SplitPanel. */
+.v-splitpanel-vertical {}
+.v-splitpanel-vsplitter {}
+.v-splitpanel-vsplitter-locked {}
+
+/* The two container panels. */
+.v-splitpanel-first-container {} /* Top or left panel. */
+.v-splitpanel-second-container {} /* Bottom or right panel. */
+----
+
+The entire split panel has the style [literal]#++v-splitpanel-horizontal++# or
+[literal]#++v-splitpanel-vertical++#, depending on the panel direction. The
+split bar or __splitter__ between the two content panels has either the
+[literal]#++...-splitter++# or [literal]#++...-splitter-locked++# style,
+depending on whether its position is locked or not.
+
+
+(((range="endofrange", startref="term.layout.splitpanel.horizontal")))
+(((range="endofrange", startref="term.layout.splitpanel.vertical")))
+
+
diff --git a/documentation/layout/layout-sub-window.asciidoc b/documentation/layout/layout-sub-window.asciidoc
new file mode 100644
index 0000000000..09ec09ead0
--- /dev/null
+++ b/documentation/layout/layout-sub-window.asciidoc
@@ -0,0 +1,211 @@
+---
+title: Sub-Windows
+order: 7
+layout: page
+---
+
+[[layout.sub-window]]
+= Sub-Windows
+
+__Sub-windows__ are floating panels within a native browser window. Unlike
+native browser windows, sub-windows are managed by the client-side runtime of
+Vaadin using HTML features. Vaadin allows opening, closing, resizing, maximizing
+and restoring sub-windows, as well as scrolling the window content.
+
+[[figure.layout.sub-window.basic]]
+.A Sub-Window
+image::img/subwindow-basic.png[]
+
+Sub-windows are typically used for __Dialog Windows__ and __Multiple Document
+Interface__ applications. Sub-windows are by default not modal; you can set them
+modal as described in <<layout.sub-window.modal>>.
+
+[[layout.sub-window.openclose]]
+== Opening and Closing Sub-Windows
+
+You can open a new sub-window by creating a new [classname]#Window# object and
+adding it to the UI with [methodname]#addWindow()#, typically in some event
+listener. A sub-window needs a content component, which is typically a layout.
+
+In the following, we display a sub-window immediately when a UI opens:
+
+
+[source, java]
+----
+public static class SubWindowUI extends UI {
+ @Override
+ protected void init(VaadinRequest request) {
+ // Some other UI content
+ setContent(new Label("Here's my UI"));
+
+ // Create a sub-window and set the content
+ Window subWindow = new Window("Sub-window");
+ VerticalLayout subContent = new VerticalLayout();
+ subContent.setMargin(true);
+ subWindow.setContent(subContent);
+
+ // Put some components in it
+ subContent.addComponent(new Label("Meatball sub"));
+ subContent.addComponent(new Button("Awlright"));
+
+ // Center it in the browser window
+ subWindow.center();
+
+ // Open it in the UI
+ addWindow(subWindow);
+ }
+}
+----
+
+The result was shown in <<figure.layout.sub-window.basic>>. Sub-windows by
+default have undefined size in both dimensions, so they will shrink to fit the
+content.
+
+The user can close a sub-window by clicking the close button in the upper-right
+corner of the window. The button is controlled by the __closable__ property, so
+you can disable it with [methodname]#setClosable(false)#.
+
+You close a sub-window also programmatically by calling the
+[methodname]#close()# for the sub-window, typically in a click listener for an
+[guibutton]#OK# or [guibutton]#Cancel# button. You can also call
+[methodname]#removeWindow()# for the current [classname]#UI#.
+
+ifdef::web[]
+[[layout.sub-window.openclose.example]]
+=== Sub-Window Management
+
+Usually, you would extend the [classname]#Window# class for your specific
+sub-window as follows:
+
+
+[source, java]
+----
+// Define a sub-window by inheritance
+class MySub extends Window {
+ public MySub() {
+ super("Subs on Sale"); // Set window caption
+ center();
+
+ // Some basic content for the window
+ VerticalLayout content = new VerticalLayout();
+ content.addComponent(new Label("Just say it's OK!"));
+ content.setMargin(true);
+ setContent(content);
+
+ // Disable the close button
+ setClosable(false);
+
+ // Trivial logic for closing the sub-window
+ Button ok = new Button("OK");
+ ok.addClickListener(new ClickListener() {
+ public void buttonClick(ClickEvent event) {
+ close(); // Close the sub-window
+ }
+ });
+ content.addComponent(ok);
+ }
+}
+----
+
+You could open the window as follows:
+
+
+[source, java]
+----
+// Some UI logic to open the sub-window
+final Button open = new Button("Open Sub-Window");
+open.addClickListener(new ClickListener() {
+ public void buttonClick(ClickEvent event) {
+ MySub sub = new MySub();
+
+ // Add it to the root component
+ UI.getCurrent().addWindow(sub);
+ }
+});
+----
+
+endif::web[]
+
+
+[[layout.sub-window.position]]
+== Window Positioning
+
+When created, a sub-window will have an undefined default size and position. You
+can specify the size of a window with [methodname]#setHeight()# and
+[methodname]#setWidth()# methods. You can set the position of the window with
+[methodname]#setPositionX()# and [methodname]#setPositionY()# methods.
+
+
+[source, java]
+----
+// Create a new sub-window
+mywindow = new Window("My Dialog");
+
+// Set window size.
+mywindow.setHeight("200px");
+mywindow.setWidth("400px");
+
+// Set window position.
+mywindow.setPositionX(200);
+mywindow.setPositionY(50);
+
+UI.getCurrent().addWindow(mywindow);
+----
+
+
+[[layout.sub-window.scrolling]]
+== Scrolling Sub-Window Content
+
+((("scroll bars", id="term.layout.sub-window.scrolling.scrollbars", range="startofrange")))
+
+
+If a sub-window has a fixed or percentual size and its content becomes too big
+to fit in the content area, a scroll bar will appear for the particular
+direction. On the other hand, if the sub-window has undefined size in the
+direction, it will fit the size of the content and never get a scroll bar.
+Scroll bars in sub-windows are handled with regular HTML features, namely
+[literal]#++overflow: auto++# property in CSS.
+((("overflow")))
+
+((("[interfacename]#Scrollable#")))
+As [classname]#Window# extends [classname]#Panel#, windows are also
+[interfacename]#Scrollable#. Note that the interface defines __programmatic
+scrolling__, not scrolling by the user. Please see
+<<dummy/../../../framework/layout/layout-panel#layout.panel,"Panel">>.
+
+(((range="endofrange", startref="term.layout.sub-window.scrolling.scrollbars")))
+
+[[layout.sub-window.modal]]
+== Modal Sub-Windows
+
+A modal window is a sub-window that prevents interaction with the other UI.
+Dialog windows, as illustrated in <<figure.layout.sub-window.modal>>, are
+typical cases of modal windows. The advantage of modal windows is limiting the
+scope of user interaction to a sub-task, so changes in application state are
+more limited. The disadvantage of modal windows is that they can restrict
+workflow too much.
+
+You can make a sub-window modal with [methodname]#setModal(true)#.
+
+[[figure.layout.sub-window.modal]]
+.Modal Sub-Window
+image::img/subwindow-modal.png[]
+
+Depending on the theme, the parent window may be grayed when the modal window is
+open.
+
+
+[WARNING]
+.Security Warning
+====
+Modality of child windows is purely a client-side feature and can be
+circumvented with client-side attack code. You should not trust in the modality
+of child windows in security-critical situations such as login windows.
+
+====
+
+
+
+
+
+
diff --git a/documentation/layout/layout-tabsheet.asciidoc b/documentation/layout/layout-tabsheet.asciidoc
new file mode 100644
index 0000000000..6fa324c4e7
--- /dev/null
+++ b/documentation/layout/layout-tabsheet.asciidoc
@@ -0,0 +1,250 @@
+---
+title: TabSheet
+order: 9
+layout: page
+---
+
+[[layout.tabsheet]]
+= [classname]#TabSheet#
+
+The [classname]#TabSheet# is a multicomponent container that allows switching
+between the components with "tabs". The tabs are organized as a tab bar at the
+top of the tab sheet. Clicking on a tab opens its contained component in the
+main display area of the layout. If there are more tabs than fit in the tab bar,
+navigation buttons will appear.
+
+[[figure.tabsheet.example1]]
+.A Simple TabSheet Layout
+image::img/tabsheet-example1.png[]
+
+[[layout.tabsheet.adding]]
+== Adding Tabs
+
+You add new tabs to a tab sheet with the [methodname]#addTab()# method. The
+simple version of the method takes as its parameter the root component of the
+tab. You can use the root component to retrieve its corresponding
+[classname]#Tab# object. Typically, you put a layout component as the root
+component.
+
+You can also give the caption and the icon as parameters for the
+[methodname]#addTab()# method. The following example demonstrates the creation
+of a simple tab sheet, where each tab shows a different [classname]#Label#
+component. The tabs have an icon, which are (in this example) loaded as Java
+class loader resources from the application.
+
+
+[source, java]
+----
+TabSheet tabsheet = new TabSheet();
+layout.addComponent(tabsheet);
+
+// Create the first tab
+VerticalLayout tab1 = new VerticalLayout();
+tab1.addComponent(new Embedded(null,
+ new ThemeResource("img/planets/Mercury.jpg")));
+tabsheet.addTab(tab1, "Mercury",
+ new ThemeResource("img/planets/Mercury_symbol.png"));
+
+// This tab gets its caption from the component caption
+VerticalLayout tab2 = new VerticalLayout();
+tab2.addComponent(new Embedded(null,
+ new ThemeResource("img/planets/Venus.jpg")));
+tab2.setCaption("Venus");
+tabsheet.addTab(tab2).setIcon(
+ new ThemeResource("img/planets/Venus_symbol.png"));
+...
+----
+
+
+[[layout.tabsheet.tab]]
+== Tab Objects
+
+Each tab in a tab sheet is represented as a [classname]#Tab# object, which
+manages the tab caption, icon, and attributes such as hidden and visible. You
+can set the caption with [methodname]#setCaption()# and the icon with
+[methodname]#setIcon()#. If the component added with [methodname]#addTab()# has
+a caption or icon, it is used as the default for the [classname]#Tab# object.
+However, changing the attributes of the root component later does not affect the
+tab, but you must make the setting through the [classname]#Tab# object. The
+[methodname]#addTab()# returns the new [classname]#Tab# object, so you can
+easily set an attribute using the reference.
+
+
+[source, java]
+----
+// Set an attribute using the returned reference
+tabsheet.addTab(myTab).setCaption("My Tab");
+----
+
+[[layout.tabsheet.tab.disabling]]
+=== Disabling and Hiding Tabs
+
+A tab can be disabled by setting [methodname]#setEnabled(false)# for the
+[classname]#Tab# object, thereby disallowing selecting it.
+
+A tab can be made invisible by setting [methodname]#setVisible(false)# for the
+[classname]#Tab# object. The [methodname]#hideTabs()# method allows hiding the
+tab bar entirely. This can be useful in tabbed document interfaces (TDI) when
+there is only one tab.
+
+ifdef::web[]
+[[figure.tabsheet.example2]]
+.A TabSheet with Hidden and Disabled Tabs
+image::img/tabsheet-example2.png[]
+endif::web[]
+
+
+
+[[layout.tabsheet.events]]
+== Tab Change Events
+
+Clicking on a tab selects it. This fires a
+[classname]#TabSheet.SelectedTabChangeEvent#, which you can handle by
+implementing the [classname]#TabSheet.SelectedTabChangeListener# interface. You
+can access the tabsheet of the event with [methodname]#getTabSheet()#, and find
+the new selected tab with [methodname]#getSelectedTab()#.
+
+You can programmatically select a tab with [methodname]#setSelectedTab()#, which
+also fires the [classname]#SelectedTabChangeEvent# (beware of recursive events).
+Reselecting the currently selected tab does not fire the event.
+
+Notice that when the first tab is added, it is selected and the change event is
+fired, so if you want to catch that, you need to add your listener before adding
+any tabs.
+
+ifdef::web[]
+[[layout.tabsheet.events.dynamic]]
+=== Creating Tab Content Dynamically
+
+In the following example, we create the tabs as empty content layouts, and add
+the tab content dynamically when a tab is selected:
+
+
+[source, java]
+----
+TabSheet tabsheet = new TabSheet();
+
+// Create tab content dynamically when tab is selected
+tabsheet.addSelectedTabChangeListener(
+ new TabSheet.SelectedTabChangeListener() {
+ public void selectedTabChange(SelectedTabChangeEvent event) {
+ // Find the tabsheet
+ TabSheet tabsheet = event.getTabSheet();
+
+ // Find the tab (here we know it's a layout)
+ Layout tab = (Layout) tabsheet.getSelectedTab();
+
+ // Get the tab caption from the tab object
+ String caption = tabsheet.getTab(tab).getCaption();
+
+ // Fill the tab content
+ tab.removeAllComponents();
+ tab.addComponent(new Image(null,
+ new ThemeResource("img/planets/"+caption+".jpg")));
+ }
+});
+
+// Have some tabs
+String[] tabs = {"Mercury", "Venus", "Earth", "Mars"};
+for (String caption: tabs)
+ tabsheet.addTab(new VerticalLayout(), caption,
+ new ThemeResource("img/planets/"+caption+"_symbol.png"));
+----
+
+endif::web[]
+
+
+[[layout.tabsheet.closing]]
+== Enabling and Handling Closing Tabs
+
+You can enable a close button for individual tabs with the
+[literal]#++closable++# property in the [classname]#TabSheet.Tab# objects.
+
+
+[source, java]
+----
+// Enable closing the tab
+tabsheet.getTab(tabComponent).setClosable(true);
+----
+
+[[figure.layout.tabsheet.closing]]
+.TabSheet with Closable Tabs
+image::img/tabsheet-tabclose.png[]
+
+[[layout.tabsheet.closing.handling]]
+=== Handling Tab Close Events
+
+You can handle closing tabs by implementing a custom
+[classname]#TabSheet.CloseHandler#. The default implementation simply calls
+[methodname]#removeTab()# for the tab to be closed, but you can prevent the
+close by not calling it. This allows, for example, opening a dialog window to
+confirm the close.
+
+
+[source, java]
+----
+tabsheet.setCloseHandler(new CloseHandler() {
+ @Override
+ public void onTabClose(TabSheet tabsheet,
+ Component tabContent) {
+ Tab tab = tabsheet.getTab(tabContent);
+ Notification.show("Closing " + tab.getCaption());
+
+ // We need to close it explicitly in the handler
+ tabsheet.removeTab(tab);
+ }
+});
+----
+
+
+
+ifdef::web[]
+[[layout.tabsheet.css]]
+== CSS Style Rules
+
+
+[source, css]
+----
+.v-tabsheet {}
+.v-tabsheet-tabs {}
+.v-tabsheet-content {}
+.v-tabsheet-deco {}
+.v-tabsheet-tabcontainer {}
+.v-tabsheet-tabsheetpanel {}
+.v-tabsheet-hidetabs {}
+
+.v-tabsheet-scroller {}
+.v-tabsheet-scrollerPrev {}
+.v-tabsheet-scrollerNext {}
+.v-tabsheet-scrollerPrev-disabled{}
+.v-tabsheet-scrollerNext-disabled{}
+
+.v-tabsheet-tabitem {}
+.v-tabsheet-tabitem-selected {}
+.v-tabsheet-tabitemcell {}
+.v-tabsheet-tabitemcell-first {}
+
+.v-tabsheet-tabs td {}
+.v-tabsheet-spacertd {}
+----
+
+The entire tabsheet has the [literal]#++v-tabsheet++# style. A tabsheet consists
+of three main parts: the tabs on the top, the main content pane, and decorations
+around the tabsheet.
+
+The tabs area at the top can be styled with [literal]#++v-tabsheet-tabs++#,
+[literal]#++v-tabsheet-tabcontainer++# and [literal]#++v-tabsheet-tabitem*++#.
+
+The style [literal]#++v-tabsheet-spacertd++# is used for any empty space after
+the tabs. If the tabsheet has too little space to show all tabs, scroller
+buttons enable browsing the full tab list. These use the styles
+[literal]#++v-tabsheet-scroller*++#.
+
+The content area where the tab contents are shown can be styled with
+[literal]#++v-tabsheet-content++#, and the surrounding decoration with
+[literal]#++v-tabsheet-deco++#.
+
+endif::web[]
+
+
+