Scaled images for print edition and fixed errors up to the beginning of layouts chapter (#19835). Also major revision of Tree, CustomField, and layouts overview.

Change-Id: I19f5e9511b83f953ce4707f324d81c2821ebb69d

documentation/advanced/advanced-windows.asciidoc

@@ -43,12 +43,12 @@ linkend="advanced.windows.caveats"/>.
 ////
 
 [[advanced.windows.popup]]
-== Opening Popup Windows
+== Opening Pop-up Windows
 
 ((("popup windows")))
 ((("windows", "popup")))
-Popup windows are native browser windows or tabs opened by user interaction with
-an existing window. Due to browser security reasons, it is made incovenient for
+Pop-up windows are native browser windows or tabs opened by user interaction with
+an existing window. Due to browser security reasons, it is made inconvenient for
 a web page to open popup windows using JavaScript commands. At the least, the
 browser will ask for a permission to open the popup, if it is possible at all.
 This limitation can be circumvented by letting the browser open the new window
@@ -57,7 +57,7 @@ Vaadin with the [classname]#BrowserWindowOpener# component extension, which
 causes the browser to open a window or tab when the component is clicked.
 
 [[advanced.windows.popup.ui]]
-=== The Popup Window UI
+=== The Pop-up Window UI
 
 A popup Window displays an [classname]#UI#. The UI of a popup window is defined
 just like a main UI in a Vaadin application, and it can have a theme, title, and

documentation/application/application-architecture.asciidoc

@@ -14,7 +14,6 @@ way you like to think about it), from the [classname]#UI# class of the
 application. You normally set a layout component as the content of the UI and
 fill it with other components.
 
-
 [source, java]
 ----
 public class MyHierarchicalUI extends UI {
@@ -24,10 +23,10 @@ public class MyHierarchicalUI extends UI {
         VerticalLayout content = new VerticalLayout();
         content.setSizeFull(); // Use entire window
         setContent(content);   // Attach to the UI
-        
+
         // Add some component
         content.addComponent(new Label("Hello!"));
-        
+
         // Layout inside layout
         HorizontalLayout hor = new HorizontalLayout();
         hor.setSizeFull(); // Use all available space
@@ -64,8 +63,8 @@ UI
 The result is shown in <<figure.application.architecture.example>>.
 
 [[figure.application.architecture.example]]
-.Simple Hierarchical UI
-image::img/ui-architecture-hierarchical.png[]
+.Simple hierarchical UI
+image::img/ui-architecture-hierarchical.png[width=70%, scaledwidth=90%]
 
 Instead of building the layout in Java, you can also use a declarative design,
 as described later in
@@ -131,7 +130,7 @@ class MyView extends VerticalLayout {
         addComponent(entry);
         addComponent(display);
         addComponent(click);
-        
+
         // Configure it a bit
         setSizeFull();
         addStyleName("myview");
@@ -164,13 +163,13 @@ class MyView extends CustomComponent {
 
     public MyView() {
         Layout layout = new VerticalLayout();
-        
+
         layout.addComponent(entry);
         layout.addComponent(display);
         layout.addComponent(click);
-        
+
         setCompositionRoot(layout);
-        
+
         setSizeFull();
     }
 }
@@ -233,7 +232,7 @@ UI.getCurrent().setLocale(new Locale("en"));
 
 // Set the page title (window or tab caption)
 Page.getCurrent().setTitle("My Page");
-        
+
 // Set a session attribute
 VaadinSession.getCurrent().setAttribute("myattrib", "hello");
 
@@ -252,7 +251,3 @@ ifdef::web[]
 <<dummy/../../../framework/advanced/advanced-global#advanced.global.threadlocal,"ThreadLocal
 Pattern">>.
 endif::web[]
-
-
-
-

documentation/application/application-overview.asciidoc

@@ -19,7 +19,7 @@ by the application server or the application itself.
 
 [[figure.application.architecture]]
 .Server-Side Application Architecture
-image::img/application-architecture-hi.png[]
+image::img/application-architecture-hi.png[width=70%, scaledwidth=100%]
 
 <<figure.application.architecture>> illustrates the basic architecture of an
 application made with the Vaadin Framework, with all the major elements, which
@@ -151,8 +151,3 @@ component to an SQL query response. For a complete overview of data binding in
 Vaadin, please refer to
 <<dummy/../../../framework/datamodel/datamodel-overview.asciidoc#datamodel.overview,"Binding
 Components to Data">>.
-
-
-
-
-

documentation/application/application-resources.asciidoc

@@ -46,8 +46,7 @@ The resource classes in Vaadin are grouped under two interfaces: a generic
 
 [[figure.resource.classdiagram]]
 .Resource Interface and Class Diagram
-image::img/resource_classdiagram-hi.png[]
-
+image::img/resource_classdiagram-hi.png[width=70%, scaledwidth=90%]
 
 [[application.resources.file]]
 == File Resources
@@ -70,7 +69,6 @@ folder, which is a special folder that is never accessible using an URL, unlike
 the other folders of a web application. This is a security solution - another
 would be to store the resource elsewhere in the file system.
 
-
 [source, java]
 ----
 // Find the application directory
@@ -83,7 +81,7 @@ FileResource resource = new FileResource(new File(basepath +
 
 // Show the image in the application
 Image image = new Image("Image from file", resource);
-        
+
 // Let the user view the file in browser or download it
 Link link = new Link("Link to the image file", resource);
 ----
@@ -95,7 +93,7 @@ regular Eclipse Vaadin project, is shown in
 
 [[figure.application.resources.file]]
 .File Resource
-image::img/resource-fileresource.png[]
+image::img/resource-fileresource.png[width=50%, scaledwidth=80%]
 
 
 [[application.resources.class]]
@@ -145,7 +143,7 @@ the folder structure for the theme resource file in an Eclipse project.
 
 [[figure.application.resources.theme]]
 .Theme Resources
-image::img/resource-themeimage.png[]
+image::img/resource-themeimage.png[width=40%, scaledwidth=70%]
 
 To use theme resources, you must set the theme for the UI. See
 <<dummy/../../../framework/themes/themes-overview.asciidoc#themes.overview,"Themes">>
@@ -173,7 +171,7 @@ public class MyImageSource
              implements StreamResource.StreamSource {
     ByteArrayOutputStream imagebuffer = null;
     int reloads = 0;
-    
+
     /* We need to implement this method that returns
      * the resource as a stream. */
     public InputStream getStream () {
@@ -195,7 +193,7 @@ public class MyImageSource
             /* Write the image to a buffer. */
             imagebuffer = new ByteArrayOutputStream();
             ImageIO.write(image, "png", imagebuffer);
-            
+
             /* Return a stream from the buffer. */
             return new ByteArrayInputStream(
                          imagebuffer.toByteArray());
@@ -218,13 +216,13 @@ Below we display the image with the [classname]#Image# component.
 ----
 // Create an instance of our stream source.
 StreamResource.StreamSource imagesource = new MyImageSource ();
-	
+
 // Create a resource that uses the stream source and give it a name.
 // The constructor will automatically register the resource in
 // the application.
 StreamResource resource =
         new StreamResource(imagesource, "myimage.png");
-	
+
 // Create an image component that gets its contents
 // from the resource.
 layout.addComponent(new Image("Image title", resource));
@@ -239,7 +237,3 @@ image::img/application_streamresource.png[]
 Another way to create dynamic content is a request handler, described in
 <<dummy/../../../framework/advanced/advanced-requesthandler#advanced.requesthandler,"Request
 Handlers">>.
-
-
-
-

documentation/architecture/architecture-client-side.asciidoc

@@ -17,7 +17,7 @@ The client-side engine is illustrated in <<figure.architecture.client-side>>.
 
 [[figure.architecture.client-side]]
 .Vaadin Client-Side Engine
-image::img/clientside-arch-hi.png[]
+image::img/clientside-arch-hi.png[width=60%, scaledwidth=90%]
 
 The client-side framework includes two kinds of built-in widgets: GWT widgets
 and Vaadin-specific widgets. The two widget collections have significant
@@ -38,6 +38,3 @@ between the two sides. Integration of widgets with their server-side counterpart
 components is described in
 <<dummy/../../../framework/gwt/gwt-overview.asciidoc#gwt.overview,"Integrating
 with the Server-Side">>.
-
-
-

documentation/architecture/architecture-events.asciidoc

@@ -37,7 +37,6 @@ corresponding listener class. For example, the [classname]#Button# has
 In the following, we handle button clicks with a listener implemented as an
 anonymous class:
 
-
 [source, java]
 ----
 final Button button = new Button("Push it!");
@@ -60,15 +59,21 @@ in this case the [classname]#Button#.
 
 [[figure.eventlistenerdiagram]]
 .Class Diagram of a Button Click Listener
-image::img/events-classdiagram-hi.png[]
+image::img/events-classdiagram-hi.png[width=50%, scaledwidth=75%]
+
+In Java 8, you can implement such functional interfaces with a lambda expression:
+
+[source, java]
+----
+Button button = new Button("Push it!");
+
+button.addClickListener(event ->
+  button.setCaption("You pushed it!"));
+----
 
 In the ancient times of C programming, __callback functions__ filled largely the
 same need as listeners do now. In object-oriented languages, we usually only
 have classes and methods, not functions, so the application has to give a class
 interface instead of a callback function pointer to the framework.
 
-<<dummy/../../../framework/application/application-events#application.events,"Handling
-Events with Listeners">> goes into details of handling events in practice.
-
-
-
+<<dummy/../../../framework/application/application-events#application.events,"Handling Events with Listeners">> goes into details of handling events in practice.

documentation/architecture/architecture-overview.asciidoc

@@ -18,7 +18,7 @@ code and services, and can be mixed together easily.
 
 [[figure.architecture.detailed]]
 .Vaadin Runtime Architecture
-image::img/architecture-detailed-hi.png[]
+image::img/architecture-detailed-hi.png[width=70%, scaledwidth=100%]
 
 <<figure.architecture.detailed>> gives a basic illustration of the client-side
 and server-side communications, in a running situation where the page with the

documentation/architecture/architecture-technology.asciidoc

@@ -165,7 +165,7 @@ dynamic content. This is illustrated in
 
 [[figure.architecture.technology.servlet]]
 .Java Web Applications and Servlets
-image::img/java-servlet-hi.png[]
+image::img/java-servlet-hi.png[width=40%, scaledwidth=70%]
 
 Web applications are usually packaged and deployed to a server as __WAR__ (
 __Web application ARchive__) files, which are Java JAR packages, which in turn
@@ -202,7 +202,3 @@ widget set in technical terms, needs to be located under the
 [filename]#VAADIN/widgetsets# path in the web application. The precompiled
 default widget set is served from the [filename]#vaadin-client-compiled# JAR by
 the Vaadin Servlet.
-
-
-
-

documentation/clientside/clientside-compiling.asciidoc

@@ -35,8 +35,7 @@ The compiler compiles a __client module__, which can be either a pure
 client-side module or a Vaadin widget set, that is, the Vaadin Client-Side
 Engine that includes the widgets used in the application. The client module is
 defined with a module descriptor, which was described in
-<<dummy/../../../framework/clientside/clientside-module#clientside.module,"Client-Side
-Module Descriptor">>.
+<<clientside-module#clientside.module, "Client-Side Module Descriptor">>.
 
 The compiler writes the compilation result to a target folder that will include
 the compiled JavaScript with any static resources included in the module.
@@ -46,11 +45,9 @@ the compiled JavaScript with any static resources included in the module.
 == Compiling in Eclipse
 
 When the Vaadin Plugin is installed in Eclipse, you can simply click the
-[guibutton]#Compile Vaadin widgets# button in the toolbar. It will compile the
-widget set it finds from the project. If the project has multiple widget sets,
-such as one for custom widgets and another one for the project, you need to
-select the module descriptor of the widget set to compile before clicking the
-button.
+button in the toolbar.
+It will compile the widget set it finds from the project.
+If the project has multiple widget sets, such as one for custom widgets and another one for the project, you need to select the module descriptor of the widget set to compile before clicking the button.
 
 The compilation with Vaadin Plugin for Eclipse currently requires that the
 module descriptor has suffix [filename]#Widgetset.gwt.xml#, although you can use
@@ -62,9 +59,8 @@ written under [filename]#WebContent/VAADIN/widgetsets# folder.
 == Compiling with Ant
 
 You can find a script template for compiling widget sets with Ant and Ivy at the
-link:http://vaadin.com/download/[Vaadin download page]. You can copy the build
-script to your project and, once configured, run it with Ant.
-
+link:http://vaadin.com/download/[Vaadin download page].
+You can copy the build script to your project and, once configured, run it with Ant.
 
 [[clientside.compiling.maven]]
 == Compiling with Maven

documentation/components/components-button.asciidoc

@@ -30,23 +30,27 @@ button.addClickListener(new Button.ClickListener() {
         Notification.show("Do not press this button again");
     }
 });
+
+// Java 8
+button.addClickListener(click ->
+    Notification.show("Do not press this button again"));
 ----
 See the http://demo.vaadin.com/book-examples-vaadin7/book#component.button.basic[on-line example, window="_blank"].
 
-The result is shown in <<figure.component.button.basic>>. The listener can also
-be given in the constructor, which is often perhaps simpler.
+The listener can also be given in the constructor, which is often perhaps simpler.
+
+The button component can be styled in many ways, as illustrated in <<figure.component.button.basic>>.
 
 [[figure.component.button.basic]]
 .Button in Different Styles of Valo Theme
-image::img/button-example1.png[]
+image::img/button-example1.png[width=70%, scaledwidth=100%]
 
 If you handle several buttons in the same listener, you can differentiate
 between them either by comparing the [classname]#Button# object reference
 returned by the [methodname]#getButton()# method of
 [classname]#Button.ClickEvent# to a kept reference. For a detailed description
 of these patterns together with some examples, please see
-<<dummy/../../../framework/architecture/architecture-events#architecture.events,"Events
-and Listeners">>.
+<<dummy/../../../framework/architecture/architecture-events#architecture.events,"Events and Listeners">>.
 
 == CSS Style Rules
 
@@ -65,7 +69,3 @@ element, which may help in styling in some cases.
 Some built-in themes contain a small style, which you can enable by adding
 [parameter]#Reindeer.BUTTON_SMALL#, etc. The [classname]#BaseTheme# also has a
 [parameter]#BUTTON_LINK# style, which makes the button look like a hyperlink.
-
-
-
-

documentation/components/components-calendar.asciidoc

@@ -28,13 +28,9 @@ well as events, is handled with event listeners. Also date/time range
 selections, event dragging, and event resizing can be listened by the server.
 The weekly view has navigation buttons to navigate forward and backward in time.
 These actions are also listened by the server. Custom navigation can be
-implemented using event handlers
-
-ifdef::web[]
-, as described in
-<<components.calendar.customizing>>
-endif::web[]
-.
+implemented using event
+ifdef::web[handlers, as described in <<components.calendar.customizing>>.]
+ifndef::web[handlers.]
 
 The data source of a calendar can be practically anything, as its events are
 queried dynamically by the component. You can bind the calendar to a Vaadin
@@ -67,7 +63,7 @@ always calculated in an accuracy of one millisecond.
 
 [[figure.components.calendar.daterange.monthly]]
 .Monthly view with All-Day and Normal Events
-image::img/calendar-monthly.png[]
+image::img/calendar-monthly.png[width=60%, scaledwidth=100%]
 
 The monthly view, shown in <<figure.components.calendar.daterange.monthly>>, can
 easily be used to control all types of events, but it is best suited for events
@@ -78,7 +74,7 @@ hours. These events can not be moved by dragging in the monthly view.
 
 [[figure.components.calendar.daterange.weekly]]
 .Weekly View
-image::img/calendar-weekly.png[]
+image::img/calendar-weekly.png[width=60%, scaledwidth=100%]
 
 In <<figure.components.calendar.daterange.weekly>>, you can see four normal day
 events and also all-day events at the top of the time line grid.

documentation/components/components-checkbox.asciidoc

@@ -46,7 +46,7 @@ The result is shown in <<figure.components.checkbox.basic>>.
 
 [[figure.components.checkbox.basic]]
 .An Example of a Check Box
-image::img/checkbox-example1.png[]
+image::img/checkbox-example1.png[width=35%, scaledwidth=50%]
 
 For an example on the use of check boxes in a table, see
 <<dummy/../../../framework/components/components-table#components.table,"Table">>.
@@ -64,9 +64,4 @@ For an example on the use of check boxes in a table, see
 The top-level element of a [classname]#CheckBox# has the
 [literal]#++v-checkbox++# style. It contains two sub-elements: the actual check
 box [literal]#++input++# element and the [literal]#++label++# element. If you
-want to have the label on the left, you can change the positions with "
-[literal]#++direction: rtl++#" for the top element.
-
-
-
-
+want to have the label on the left, you can change the positions with "[literal]#++direction: rtl++#" for the top element.

documentation/components/components-combobox.asciidoc

@@ -20,7 +20,7 @@ selection component features are described in
 Components">>.
 
 .The [classname]#ComboBox# Component
-image::img/combobox-basic.png[]
+image::img/combobox-basic.png[width=35%, scaledwidth=50%]
 
 [classname]#ComboBox# supports adding new items when the user presses
 kbd:[Enter].
@@ -36,7 +36,7 @@ drop-down list by the text entered in the input box.
 
 [[figure.components.combobox.filter]]
 .Filtered Selection in [classname]#ComboBox#
-image::img/combobox-filtering.png[]
+image::img/combobox-filtering.png[width=35%, scaledwidth=50%]
 
 Pressing kbd:[Enter] will complete the item in the input box. Pressing kbd:[Up] and kbd:[Down] arrow keys can be used for selecting an item from the drop-down list. The
 drop-down list is paged and clicking on the scroll buttons will change to the
@@ -62,7 +62,7 @@ component.
 
 [parameter]#STARTSWITH#:: Matches only items that begin with the given string.
 
-[parameter]#OFF#(default):: Filtering is by default off and all items are shown all the time.
+[parameter]#OFF# (default):: Filtering is by default off and all items are shown all the time.
 
 
 

documentation/components/components-customcomponent.asciidoc

@@ -27,7 +27,6 @@ is typically a layout component that contains other components.
 
 For example:
 
-
 [source, java]
 ----
 class MyComposite extends CustomComponent {
@@ -37,7 +36,7 @@ class MyComposite extends CustomComponent {
         VerticalLayout panelContent = new VerticalLayout();
         panelContent.setMargin(true); // Very useful
         panel.setContent(panelContent);
-        
+
         // Compose from multiple components
         Label label = new Label(message);
         label.setSizeUndefined(); // Shrink
@@ -62,7 +61,6 @@ separate.
 
 You can use the component as follows:
 
-
 [source, java]
 ----
 MyComposite mycomposite = new MyComposite("Hello");
@@ -71,17 +69,14 @@ MyComposite mycomposite = new MyComposite("Hello");
 The rendered component is shown in <<figure.components.customcomponent>>.
 
 [[figure.components.customcomponent]]
-.A Custom Composite Component
-image::img/customcomponent-example1.png[]
+.A custom composite component
+image::img/customcomponent-example1.png[width=25%, scaledwidth=40%]
 
 You can also inherit any other components, such as layouts, to attain similar
-composition. ((("Google Web
-Toolkit")))
+composition.
+((("Google Web Toolkit")))
 Even further, you can create entirely new low-level components, by integrating
 pure client-side components or by extending the client-side functionality of
 built-in components. Development of new components is covered in
 <<dummy/../../../framework/gwt/gwt-overview.asciidoc#gwt.overview,"Integrating
 with the Server-Side">>.
-
-
-

documentation/components/components-customfield.asciidoc

@@ -7,21 +7,13 @@ layout: page
 [[components.customfield]]
 = Composite Fields with [classname]#CustomField#
 
-The [classname]#CustomField# is a way to create composite components like with
-[classname]#CustomComponent#, except that it implements the
-[interfacename]#Field# interface and inherit [classname]#AbstractField#,
-described in
-<<dummy/../../../framework/components/components-fields#components.fields,"Field
-Components">>. A field allows editing a property value in the Vaadin data model,
-and can be bound to data with field groups, as described in
-<<dummy/../../../framework/datamodel/datamodel-itembinding#datamodel.itembinding,"Creating
-Forms by Binding Fields to Items">>. The field values are buffered and can be
-validated with validators.
-
-A composite field class must implement the [methodname]#getType()# and
-[methodname]#initContent()# methods. The latter should return the content
-composite of the field. It is typically a layout component, but can be any
-component.
+The [classname]#CustomField# is a way to create composite components as with [classname]#CustomComponent#, except that it implements the [interfacename]#Field# interface and inherits [classname]#AbstractField#, described in <<dummy/../../../framework/components/components-fields#components.fields,"Field Components">>.
+A field allows editing a property value in the Vaadin data model, and can be bound to data with field groups, as described in <<dummy/../../../framework/datamodel/datamodel-itembinding#datamodel.itembinding, "Creating Forms by Binding Fields to Items">>.
+The field values are buffered and can be validated with validators.
+
+A composite field class must implement the [methodname]#getType()# and [methodname]#initContent()# methods.
+The latter should return the content composite of the field.
+It is typically a layout component, but can be any component.
 
 It is also possible to override [methodname]#validate()#,
 [methodname]#setInternalValue()#, [methodname]#commit()#,
@@ -29,5 +21,70 @@ It is also possible to override [methodname]#validate()#,
 to implement different functionalities in the field. Methods overriding
 [methodname]#setInternalValue()# should call the superclass method.
 
+[[components.customfield.basic]]
+== Basic Use
+
+Let us consider a simple custom switch button component that allows you to click a button to switch it "on" and "off", as illustrated in <<figure.components.customfield.basic>>.
+
+[[figure.components.customfield.basic]]
+.A custom switch button field
+image::img/customfield-basic.png[width=25%, scaledwidth=40%]
+
+The field has [classname]#Boolean# value type, which the [methodname]#getType()# returns.
+In [methodname]#initContent()#, we initialize the button and the layout.
+Notice how we handle user interaction with the button to change the field value.
+We customize the [methodname]#setValue()# method to reflect the state back to the user.
+
+[source, Java]
+----
+public class BooleanField extends CustomField<Boolean> {
+    Button button = new Button();
+
+    public BooleanField() {
+        setValue(true); // On by default
+    }
+
+    @Override
+    protected Component initContent() {
+        // Flip the field value on click
+        button.addClickListener(click ->
+            setValue(! (Boolean) getValue()));
+
+        return new VerticalLayout(
+            new Label("Click the button"), button);
+    }
+
+    @Override
+    public Class<Boolean> getType() {
+        return Boolean.class;
+    }
+
+    @Override
+    public void setValue(Boolean newFieldValue)
+        throws com.vaadin.data.Property.ReadOnlyException,
+        ConversionException {
+        button.setCaption(newFieldValue? "On" : "Off");
+        super.setValue(newFieldValue);
+    }
+}
+----
+
+We can now use the field in all the normal ways for a field:
+
+[source, Java]
+----
+// Create it
+BooleanField field = new BooleanField();
+
+// It's a field so we can set its value
+field.setValue(new Boolean(true));
 
+// ...and read the value
+Label value = new Label(field.getValue()?
+    "Initially on" : "Initially off");
 
+// ...and handle value changes
+field.addValueChangeListener(event ->
+    value.setValue(field.getValue()?
+        "It's now on" : "It's now off"));
+----

documentation/components/components-datefield.asciidoc

@@ -28,7 +28,7 @@ of the date field to current time by using the default constructor of the
 ----
 // Create a DateField with the default style
 DateField date = new DateField();
-	
+
 // Set the date and time to present
 date.setValue(new Date());
 ----
@@ -37,7 +37,7 @@ The result is shown in <<figure.components.datefield.basic>>.
 
 [[figure.components.datefield.basic]]
 .[classname]#DateField# ([classname]#PopupDateField#) for Selecting Date and Time
-image::img/datefield-example1.png[]
+image::img/datefield-example1.png[width=35%, scaledwidth=60%]
 
 [[components.datefield.popupdatefield]]
 == [classname]#PopupDateField#
@@ -75,7 +75,7 @@ The result is shown in <<figure.components.datefield.popupdatefield.format>>.
 
 [[figure.components.datefield.popupdatefield.format]]
 .Custom Date Format for [classname]#PopupDateField#
-image::img/datefield-formatting.png[]
+image::img/datefield-formatting.png[width=35%, scaledwidth=60%]
 
 The same format specification is also used for parsing user-input date and time,
 as described later.
@@ -143,13 +143,13 @@ PopupDateField date = new PopupDateField("My Date") {
                     ConversionException("Not a number");
             }
         }
-        
+
         // Bad date
         throw new Property.
             ConversionException("Your date needs two slashes");
     }
 };
-        
+
 // Display only year, month, and day in slash-delimited format
 date.setDateFormat("yyyy/MM/dd");
 
@@ -185,7 +185,7 @@ PopupDateField date = new PopupDateField("My Date") {
         Notification.show(
                 "Your date needs two slashes",
                 Notification.TYPE_WARNING_MESSAGE);
-        
+
         // A failure must always also throw an exception
         throw new Property.ConversionException("Bad date");
     }
@@ -212,7 +212,7 @@ PopupDateField date = new PopupDateField();
 
 // Set the prompt
 date.setInputPrompt("Select a date");
-        
+
 // Set width explicitly to accommodate the prompt
 date.setWidth("10em");
 ----
@@ -264,19 +264,16 @@ The top-level element of the floating popup calendar has
 [literal]#++.v-datefield-popup++# style. Observe that the popup frame is outside
 the HTML structure of the component, hence it is not enclosed in the
 [literal]#++v-datefield++# element and does not include any custom styles.
-//NOTE: May be changed in
-#5752.
+// NOTE: May be changed in #5752.
 The content in the [literal]#++v-datefield-calendarpanel++# is the same as in
 [classname]#InlineDateField#, as described in <<components.datefield.calendar>>.
 
-
-
 [[components.datefield.calendar]]
 == [classname]#InlineDateField#
 
 The [classname]#InlineDateField# provides a date picker component with a month
 view. The user can navigate months and years by clicking the appropriate arrows.
-Unlike with the popup variant, the month view is always visible in the inline
+Unlike with the pop-up variant, the month view is always visible in the inline
 field.
 
 
@@ -284,7 +281,7 @@ field.
 ----
 // Create a DateField with the default style
 InlineDateField date = new InlineDateField();
-    
+
 // Set the date and time to present
 date.setValue(new java.util.Date());
 ----
@@ -293,7 +290,7 @@ The result is shown in <<figure.components.datefield.inlinedatefield>>.
 
 [[figure.components.datefield.inlinedatefield]]
 .Example of the [classname]#InlineDateField#
-image::img/datefield-inlinedatefield.png[]
+image::img/datefield-inlinedatefield.png[width=35%, scaledwidth=60%]
 
 The user can also navigate the calendar using the cursor keys.
 
@@ -339,8 +336,6 @@ The other style names should be self-explanatory. For weekdays, the
 [literal]#++v-first++# and [literal]#++v-last++# styles allow making rounded
 endings for the weekday bar.
 
-
-
 [[components.datefield.resolution]]
 == Date and Time Resolution
 
@@ -386,6 +381,3 @@ Sunday, nor in some North African and Middle-Eastern countries, where the week
 begins on Saturday. In such locales, the week numbers are not displayed.
 
 endif::web[]
-
-
-

documentation/components/components-embedded.asciidoc

@@ -10,15 +10,12 @@ layout: page
 You can embed images in Vaadin UIs with the [classname]#Image# component, Adobe
 Flash graphics with [classname]#Flash#, and other web content with
 [classname]#BrowserFrame#. There is also a generic [classname]#Embedded#
-component for embedding other object types. The embedded content is referenced
-as __resources__, as described in
-<<dummy/../../../framework/application/application-resources#application.resources,"Images
-and Other Resources">>.
+component for embedding other object types.
+The embedded content is referenced as _resources_, as described in <<dummy/../../../framework/application/application-resources#application.resources,"Images and Other Resources">>.
 
 The following example displays an image as a class resource loaded with the
 class loader:
 
-
 [source, java]
 ----
 Image image = new Image("Yes, logo:",
@@ -30,7 +27,7 @@ The caption can be given as null to disable it. An empty string displays an
 empty caption which takes a bit space. The caption is managed by the containing
 layout.
 
-You can set an altenative text for an embedded resource with
+You can set an alternative text for an embedded resource with
 [methodname]#setAlternateText()#, which can be shown if images are disabled in
 the browser for some reason. The text can be used for accessibility purposes,
 such as for text-to-speech generation.
@@ -77,8 +74,8 @@ resource is not enough. Because of how caching is handled in some browsers, you
 can cause a reload easiest by renaming the filename of the resource with a
 unique name, such as one including a timestamp. You should set cache time to
 zero with [methodname]#setCacheTime()# for the resource object when you create
-it.//BUG
-#2470.
+it.
+// BUG #2470.
 
 
 [source, java]
@@ -137,7 +134,7 @@ for the Flash object element in HTML.
 == [classname]#BrowserFrame#
 
 The [classname]#BrowserFrame# allows embedding web content inside an HTML
-&lt;iframe&gt; element. You can refer to an external URL with
+`&lt;iframe&gt;` element. You can refer to an external URL with
 [classname]#ExternalResource#.
 
 As the [classname]#BrowserFrame# has undefined size by default, it is critical
@@ -199,7 +196,3 @@ example above (where it was actually unnecessary).
 Some embeddable object types may require special support in the browser. You
 should make sure that there is a proper fallback mechanism if the browser does
 not support the embedded type.
-
-
-
-

documentation/components/components-features.asciidoc

@@ -27,7 +27,6 @@ caption.
 The caption text can usually be given as the first parameter of a constructor of
 a component or with [methodname]#setCaption()#.
 
-
 [source, java]
 ----
 // New text field with caption "Name"
@@ -47,7 +46,7 @@ rendered.
 
 [[figure.components.features.caption.layoutmanaged]]
 .Caption Management by [classname]#VerticalLayout# and [classname]#FormLayout#.
-image::img/features-caption-layoutmanaged.png[]
+image::img/features-caption-layoutmanaged.png[width=50%,scaledwidth=65%]
 
 Some components, such as [classname]#Button# and [classname]#Panel#, manage the
 caption themselves and display it inside the component.
@@ -111,15 +110,14 @@ The tooltip is shown in <<figure.components.tooltip.plain>>.
 
 [[figure.components.tooltip.plain]]
 .Component Description as a Tooltip
-image::img/tooltip-plain-withpointer-hi.png[]
+image::img/tooltip-plain-withpointer-hi.png[width=30%, scaledwidth=100%]
 
 A description is rendered as a tooltip in most components.
 
 When a component error has been set with [methodname]#setComponentError()#, the
 error is usually also displayed in the tooltip, below the description.
 Components that are in error state will also display the error indicator. See
-<<dummy/../../../framework/application/application-errors#application.errors.error-indicator,"Error
-Indicator and Message">>.
+<<dummy/../../../framework/application/application-errors#application.errors.error-indicator, "Error Indicator and Message">>.
 
 The description is actually not plain text, but you can use HTML tags to format
 it. Such a rich text description can contain any HTML elements, including
@@ -129,7 +127,8 @@ images.
 [source, java]
 ----
 button.setDescription(
-    "<h2><img src=\"../VAADIN/themes/sampler/icons/comment_yellow.gif\"/>"+
+    "<h2><img src=\"../VAADIN/themes/sampler/"+
+    "icons/comment_yellow.gif\"/>"+
     "A richtext tooltip</h2>"+
     "<ul>"+
     "  <li>Use rich formatting with HTML</li>"+
@@ -143,7 +142,7 @@ The result is shown in <<figure.components.tooltip.richtext>>.
 
 [[figure.components.tooltip.richtext]]
 .A Rich Text Tooltip
-image::img/tooltip-richtext-withpointer-hi.png[]
+image::img/tooltip-richtext-withpointer-hi.png[width=40%, scaledwidth=75%]
 
 Notice that the setter and getter are defined for all fields in the
 [classname]#Field# interface, not for all components in the
@@ -179,7 +178,7 @@ buttons.
 
 [[figure.components.features.enabled.simple]]
 .An Enabled and Disabled [classname]#Button#
-image::img/features-enabled-simple.png[]
+image::img/features-enabled-simple.png[width=30%, scaledwidth=50%]
 
 A disabled component is automatically put in read-only state. No client
 interaction with such a component is sent to the server and, as an important
@@ -206,19 +205,11 @@ have to join the style class names with a dot as done in the example below.
 
 This would make the border of all disabled text fields dotted.
 
-
-//TODO This may change to
-$v-button-disabled-opacity
-In Valo theme, the opacity of disabled components is specified with the
-$v-disabled-opacity parameter
-
-ifdef::web[]
-, as described in
-<<dummy/../../../framework/themes/themes-valo#themes.valo.variables,"Common
-Settings">>
-endif::web[]
-.
-
+// TODO This may change to $v-button-disabled-opacity
+In the Valo theme, the opacity of disabled components is specified with the
+`$v-disabled-opacity`
+ifndef::web[parameter.]
+ifdef::web[parameter, as described in <<dummy/../../../framework/themes/themes-valo#themes.valo.variables,"Common Settings">>]
 
 [[components.features.icon]]
 == Icon
@@ -260,7 +251,7 @@ so if the root component has an icon, it will not be rendered.
 
 [[figure.components.features.icon]]
 .Displaying an Icon from a Theme Resource.
-image::img/features-icon.png[]
+image::img/features-icon.png[width=40%, scaledwidth=60%]
 
 Some components, such as [classname]#Button# and [classname]#Panel#, manage the
 icon themselves and display it inside the component.
@@ -307,12 +298,11 @@ layout.addComponent(date);
 ----
 See the http://demo.vaadin.com/book-examples-vaadin7/book#component.features.locale.simple[on-line example, window="_blank"].
 
-The resulting date field is shown in
-<<figure.components.features.locale.simple>>.
+The resulting date field is shown in <<figure.components.features.locale.simple>>.
 
 [[figure.components.features.locale.simple]]
-.Set Locale for [classname]#InlineDateField#
-image::img/features-locale-simple.png[]
+.Set locale for [classname]#InlineDateField#
+image::img/features-locale-simple.png[width=40%, scaledwidth=60%]
 
 ifdef::web[]
 [[components.features.locale.get]]
@@ -330,7 +320,6 @@ to the UI, which is usually the case in most constructors, so it is a bit
 awkward to use it for internationalization. You can get the locale in
 [methodname]#attach()#, as shown in the following example:
 
-
 [source, java]
 ----
 Button cancel = new Button() {
@@ -349,7 +338,6 @@ See the http://demo.vaadin.com/book-examples-vaadin7/book#component.features.loc
 However, it is normally a better practice to use the locale of the current UI to
 get the localized resource right when the component is created.
 
-
 [source, java]
 ----
 // Captions are stored in MyAppCaptions resource bundle
@@ -364,7 +352,6 @@ Button cancel =
 layout.addComponent(cancel);
 ----
 See the http://demo.vaadin.com/book-examples-vaadin7/book#component.features.locale.get-ui[on-line example, window="_blank"].
-
 endif::web[]
 
 ifdef::web[]
@@ -435,7 +422,7 @@ See the http://demo.vaadin.com/book-examples-vaadin7/book#component.features.loc
 The user interface is shown in <<figure.components.features.locale.selection>>.
 
 [[figure.components.features.locale.selection]]
-.Selecting a Locale
+.Selecting a locale
 image::img/features-locale-selection.png[]
 
 endif::web[]
@@ -450,7 +437,6 @@ The property defines whether the value of a component can be changed. The
 property is mainly applicable to [classname]#Field# components, as they have a
 value that can be edited by the user.
 
-
 [source, java]
 ----
 TextField readwrite = new TextField("Read-Write");
@@ -468,8 +454,8 @@ The resulting read-only text field is shown in
 <<figure.components.features.readonly.simple>>.
 
 [[figure.components.features.readonly.simple]]
-.A Read-Only Component.
-image::img/features-readonly-simple.png[]
+.A read-only component
+image::img/features-readonly-simple.png[width=50%, scaledwidth=80%]
 
 Setting a layout or some other component container as read-only does not usually
 make the contained components read-only recursively. This is different from, for
@@ -559,7 +545,6 @@ a [classname]#Panel# component would conflict with the built-in
 The following CSS rule would apply the style to any component that has the
 [literal]#++mystyle++# style.
 
-
 [source, css]
 ----
 .mystyle {
@@ -571,13 +556,11 @@ The following CSS rule would apply the style to any component that has the
 }
 ----
 
-The resulting styled component is shown in
-<<figure.components.features.stylename>>
+The resulting styled component is shown in <<figure.components.features.stylename>>
 
 [[figure.components.features.stylename]]
-.Component with a Custom Style
-image::img/features-stylename-simple.png[]
-
+.Component with a custom style
+image::img/features-stylename-simple.png[width=50%, scaledwidth=75%]
 
 [[components.features.visible]]
 == Visible
@@ -592,7 +575,6 @@ rules. This feature is important for security if you have components that
 contain security-critical information that must only be shown in specific
 application states.
 
-
 [source, java]
 ----
 TextField invisible = new TextField("No-see-um");
@@ -605,7 +587,7 @@ The resulting invisible component is shown in
 <<figure.components.features.visible.simple>>.
 
 [[figure.components.features.visible.simple]]
-.An Invisible Component.
+.An invisible component
 image::img/features-visible-simple.png[]
 
 Beware that invisible beings can leave footprints. The containing layout cell
@@ -664,7 +646,7 @@ mycomponent.setWidth("100%");
 mycomponent.setHeight("400px");
 ----
 
-The " [literal]#++100%++#" percentage value makes the component take all
+The "[literal]#++100%++#" percentage value makes the component take all
 available size in the particular direction (see the description of
 [parameter]#Sizeable.UNITS_PERCENTAGE# in the table below). You can also use the
 shorthand method [methodname]#setSizeFull()# to set the size to 100% in both
@@ -677,39 +659,29 @@ can set the height or width as undefined with
 [parameter]#Sizeable.SIZE_UNDEFINED# parameter for [methodname]#setWidth()# and
 [methodname]#setHeight()#.
 
-You always need to keep in mind that __a layout with undefined size may not
-contain components with defined relative size__, such as "full size". See
-<<dummy/../../../framework/layout/layout-settings#layout.settings.size,"Layout
-Size">> for details.
+Always keep in mind that _a layout with undefined size may not contain components with defined relative size_, such as "full size", except in some special cases.
+See <<dummy/../../../framework/layout/layout-settings#layout.settings.size,"Layout Size">> for details.
 
-The <<components.features.sizeable.units.table>> lists the available units and
-their codes defined in the [classname]#Sizeable# interface.
+The <<components.features.sizeable.units.table>> table lists the available units and their codes defined in the [interfacename]#Sizeable# interface.
 
 [[components.features.sizeable.units.table]]
-.Size Units
-
+.Size units
+[cols="5,2,10", options="header"]
 |===============
-|[parameter]#Unit.PIXELS#|px|The__pixel__is the basic hardware-specific measure of one physical display pixel.
-|[parameter]#Unit.POINTS#|pt|The__point__is a typographical unit, which is usually defined as 1/72 inches or about 0.35 mm. However, on displays the size can vary significantly depending on display metrics.
-|[parameter]#Unit.PICAS#|pc|The__pica__is a typographical unit, defined as 12 points, or 1/7 inches or about 4.233 mm. On displays, the size can vary depending on display metrics.
+|Constant|Unit|Description
+|[parameter]#Unit.PIXELS#|px|The _pixel_ is the basic hardware-specific measure of one physical display pixel.
+|[parameter]#Unit.POINTS#|pt|The _point_ is a typographical unit, which is usually defined as 1/72 inches or about 0.35 mm. However, on displays the size can vary significantly depending on display metrics.
+|[parameter]#Unit.PICAS#|pc|The _pica_ is a typographical unit, defined as 12 points, or 1/7 inches or about 4.233 mm. On displays, the size can vary depending on display metrics.
 |[parameter]#Unit.EM#|em|A unit relative to the used font, the width of the upper-case "M" letter.
 |[parameter]#Unit.EX#|ex|A unit relative to the used font, the height of the lower-case "x" letter.
 |[parameter]#Unit.MM#|mm|A physical length unit, millimeters on the surface of a display device. However, the actual size depends on the display, its metrics in the operating system, and the browser.
-|[parameter]#Unit.CM#|cm|A physical length unit,__centimeters__on the surface of a display device. However, the actual size depends on the display, its metrics in the operating system, and the browser.
-|[parameter]#Unit.INCH#|in|A physical length unit,__inches__on the surface of a display device. However, the actual size depends on the display, its metrics in the operating system, and the browser.
-|[parameter]#Unit.PERCENTAGE#|%|A relative percentage of the available size. For example, for the top-level layout[parameter]#100%#would be the full width or height of the browser window. The percentage value must be between 0 and 100.
-
+|[parameter]#Unit.CM#|cm|A physical length unit, _centimeters_ on the surface of a display device. However, the actual size depends on the display, its metrics in the operating system, and the browser.
+|[parameter]#Unit.INCH#|in|A physical length unit, _inches_ on the surface of a display device. However, the actual size depends on the display, its metrics in the operating system, and the browser.
+|[parameter]#Unit.PERCENTAGE#|%|A relative percentage of the available size. For example, for the top-level layout [parameter]#100%# would be the full width or height of the browser window. The percentage value must be between 0 and 100.
 |===============
 
-
-
-If a component inside [classname]#HorizontalLayout# or
-[classname]#VerticalLayout# has full size in the namesake direction of the
-layout, the component will expand to take all available space not needed by the
-other components. See
-<<dummy/../../../framework/layout/layout-settings#layout.settings.size,"Layout
-Size">> for details.
-
+If a component inside [classname]#HorizontalLayout# or [classname]#VerticalLayout# has full size in the namesake direction of the layout, the component will expand to take all available space not needed by the other components.
+See <<dummy/../../../framework/layout/layout-settings#layout.settings.size,"Layout Size">> for details.
 
 == Managing Input Focus
 
@@ -719,8 +691,7 @@ component allows inputting text, the focus and insertion point are indicated by
 a cursor. Pressing the Tab key moves the focus to the component next in the
 __focus order__.
 
-Focusing is supported by all [classname]#Field# components and also by
-[classname]#Upload#.
+Focusing is supported by all [classname]#Field# components and also by the [classname]#Upload# component.
 
 The focus order or __tab index__ of a component is defined as a positive integer
 value, which you can set with [methodname]#setTabIndex()# and get with

documentation/components/components-fields.asciidoc

@@ -15,8 +15,8 @@ user interface. <<figure.components.fields>> illustrates the inheritance
 relationships and the important interfaces and base classes.
 
 [[figure.components.fields]]
-.Field Components
-image::img/field-diagram-hi.png[]
+.Field components
+image::img/field-diagram-hi.png[width=60%, scaledwidth=100%]
 
 Field components are built upon the framework defined in the [classname]#Field#
 interface and the [classname]#AbstractField# base class.
@@ -30,7 +30,7 @@ The description of the field interfaces and base classes is broken down in the
 following sections.
 
 [[components.fields.field]]
-== [classname]#Field# Interface
+== The [classname]#Field# Interface
 
 The [classname]#Field# interface inherits the [classname]#Component#
 superinterface and also the [classname]#Property# interface to have a value for
@@ -39,8 +39,8 @@ the field. [classname]#AbstractField# is the only class implementing the
 <<figure.components.fields.field>>.
 
 [[figure.components.fields.field]]
-.[classname]#Field# Interface Inheritance Diagram
-image::img/field-interface-hi.png[]
+.[classname]#Field# interface inheritance
+image::img/field-interface-hi.png[width=60%, scaledwidth=100%]
 
 You can set the field value with the [methodname]#setValue()# and read with the
 [methodname]#getValue()# method defined in the [classname]#Property# interface.
@@ -61,9 +61,6 @@ guide.
 The error message is set as the component error for the field and is usually
 displayed in a tooltip when the mouse pointer hovers over the error indicator.
 
-
-
-
 [[components.fields.databinding]]
 == Data Binding and Conversions
 
@@ -180,28 +177,30 @@ requires that the value type of the property data source is
 Vaadin includes the following built-in validators. The property value type is
 indicated.
 
-[classname]#BeanValidator#:: Validates a bean property according to annotations defined in the Bean
-Validation API 1.0 (JSR-303). This validator is usually not used explicitly, but
-they are created implicitly when binding fields in a
-[classname]#BeanFieldGroup#. Using bean validation requires an implementation
-library of the API. See
-<<dummy/../../../framework/datamodel/datamodel-itembinding#datamodel.itembinding.beanvalidation,"Bean
-Validation">> for details.
-
-[classname]#CompositeValidator#:: Combines validators using logical AND and OR operators.
+[classname]#BeanValidator#::
+Validates a bean property according to annotations defined in the Bean Validation API 1.0 (JSR-303).
+This validator is usually not used explicitly, but they are created implicitly when binding fields in a [classname]#BeanFieldGroup#.
+Using bean validation requires an implementation library of the API.
+See <<dummy/../../../framework/datamodel/datamodel-itembinding#datamodel.itembinding.beanvalidation,"Bean Validation">> for details.
 
-[classname]#DateRangeValidator#:[classname]#Date#:: Checks that the date value is within the range at or between two given
-dates/times.
+[classname]#CompositeValidator#::
+Combines validators using logical AND and OR operators.
 
-[classname]#DoubleRangeValidator#:[classname]#Double#:: Checks that the double value is at or between two given values.
+[classname]#DateRangeValidator#: [classname]#Date#::
+Checks that the date value is within the range at or between two given dates/times.
 
-[classname]#EmailValidator#:[classname]#String#:: Checks that the string value is a syntactically valid email address. The
-validated syntax is close to the RFC 822 standard regarding email addresses.
+[classname]#DoubleRangeValidator#: [classname]#Double#::
+Checks that the double value is at or between two given values.
 
-[classname]#IntegerRangeValidator#:[classname]#Integer#:: Checks that the integer value is at or between two given values.
+[classname]#EmailValidator#: [classname]#String#::
+Checks that the string value is a syntactically valid email address.
+The validated syntax is close to the RFC 822 standard regarding email addresses.
 
-[classname]#NullValidator#:: Checks that the value is or is not a null value.
+[classname]#IntegerRangeValidator#: [classname]#Integer#::
+Checks that the integer value is at or between two given values.
 
+[classname]#NullValidator#::
+Checks whether the value is or is not a null value.
 +
 For the validator to be meaningful, the component must support inputting null
 values. For example, for selection components and [classname]#TextField#,
@@ -216,9 +215,11 @@ Setting field as __required__ can be used for similar effect, and it also
 enables an indicator to indicate that a value is required.
 endif::web[]
 
-[classname]#RegexpValidator#:[classname]#String#:: Checks that the value matches with the given regular expression.
+[classname]#RegexpValidator#: [classname]#String#::
+Checks that the value matches with the given regular expression.
 
-[classname]#StringLengthValidator#:[classname]#String#:: Checks that the length of the input string is at or between two given lengths.
+[classname]#StringLengthValidator#: [classname]#String#::
+Checks that the length of the input string is at or between two given lengths.
 
 ifdef::web[]
 +
@@ -228,16 +229,13 @@ length, so it will be invalid if the minimum length is greater than zero.
 Allowing null value is meaningful only if inputting null values is enabled with
 [methodname]#setNullSettingAllowed(true)#, and typically in such case, you want
 to set the null representation to empty string with
-[methodname]#setNullRepresentation("")#. Note that __this parameter is
-deprecated__ and should normally be [parameter]#true#; then you can use
+[methodname]#setNullRepresentation("")#. Note that _this parameter is
+deprecated_ and should normally be [parameter]#true#; then you can use
 [methodname]#setRequired()# (for the false case) or [classname]#NullValidator#.
 endif::web[]
 
-
-
 Please see the API documentation for more details.
 
-
 [[components.fields.validation.automatic]]
 === Automatic Validation
 
@@ -275,12 +273,12 @@ final TextField field = new TextField("Name");
 field.setNullRepresentation("");
 field.setNullSettingAllowed(true);
 layout.addComponent(field);
-        
+
 // Define validation as usual
 field.addValidator(new StringLengthValidator(
     "The name must be 1-10 letters (was {0})",
     1, 10, true));
-        
+
 // Run validation explicitly
 Button validate = new Button("Validate");
 validate.addClickListener(new ClickListener() {
@@ -321,7 +319,7 @@ class MyValidator implements Validator {
     }
 }
 
-final TextField field = new TextField("Say hello");
+TextField field = new TextField("Say hello");
 field.addValidator(new MyValidator());
 field.setImmediate(true);
 layout.addComponent(field);
@@ -338,8 +336,4 @@ Forms by Binding Fields to Items">>, calling [methodname]#commit()# for the
 group runs the validation for all the fields in the group, and if successful,
 writes the input values to the data source.
 
-
-
 (((range="endofrange", startref="term.components.fields")))
-
-

documentation/components/components-grid.asciidoc

@@ -30,8 +30,8 @@ easily. The grid data can be sorted by clicking on a column header;
 shift-clicking a column header enables secondary sorting criteria.
 
 [[figure.components.grid.features]]
-.A [classname]#Grid# Component
-image::img/grid-features.png[]
+.A [classname]#Grid#
+image::img/grid-features.png[width=70%, scaledwidth=100%]
 
 The data area can be scrolled both vertically and horizontally. The leftmost
 columns can be frozen, so that they are never scrolled out of the view. The data
@@ -263,7 +263,7 @@ Space bar is the default key for toggling the selection, but it can be customize
 
 [[figure.components.grid.selection.multi]]
 .Multiple Selection in  [classname]#Grid#
-image::img/grid-selection-multi.png[]
+image::img/grid-selection-multi.png[width=50%, scaledwidth=75%]
 
 The selection is managed through the [classname]#MultiSelectionMode# class. The
 currently selected rows can be set with [methodname]#setSelected()# by a
@@ -296,7 +296,7 @@ Button delSelected = new Button("Delete Selected", e -> {
     // Delete all selected data items
     for (Object itemId: selection.getSelectedRows())
         grid.getContainerDataSource().removeItem(itemId);
-    
+
     // Otherwise out of sync with container
     grid.getSelectionModel().reset();
 
@@ -498,7 +498,6 @@ Note that, while [classname]#GeneratedPropertyContainer# implements
 sorting on the generated properties requires special handling. In such cases,
 generated properties or the entire container might not actually be sortable.
 
-
 [[components.grid.renderer]]
 == Column Renderers
 
@@ -506,12 +505,11 @@ A __renderer__ is a feature that draws the client-side representation of a data
 value. This allows having images, HTML, and buttons in grid cells.
 
 [[figure.components.grid.renderer]]
-.Column Renderers: Image, Date, HTML, and Button
-image::img/grid-renderers.png[]
-
-Renderers implement the [interfacename]#Renderer# interface. You set the column
-renderer in the [classname]#Grid.Column# object as follows:
+.Column renderers: image, date, HTML, and button
+image::img/grid-renderers.png[width=75%, scaledwidth=100%]
 
+Renderers implement the [interfacename]#Renderer# interface.
+You set the column renderer in the [classname]#Grid.Column# object as follows:
 
 [source, java]
 ----
@@ -531,16 +529,14 @@ client-side to be rendered with the renderer.
 The following renderers are available, as defined in the server-side
 [package]#com.vaadin.ui.renderers# package:
 
-[classname]#ButtonRenderer#:: Renders the data value as the caption of a button. A
-[interfacename]#RendererClickListener# can be given to handle the button clicks.
+[classname]#ButtonRenderer#:: Renders the data value as the caption of a button. A [interfacename]#RendererClickListener# can be given to handle the button clicks.
 
 ifdef::web[]
++
 Typically, a button renderer is used to display buttons for operating on a data
 item, such as edit, view, delete, etc. It is not meaningful to store the button
 captions in the data source, rather you want to generate them, and they are
 usually all identical.
-
-
 +
 [source, java]
 ----
@@ -579,15 +575,15 @@ grid.getColumn("delete")
         .removeItem(e.getItemId())));
 ----
 endif::web[]
-[classname]#ImageRenderer#:: Renders the cell as an image. The column type must be a
-[interfacename]#Resource#, as described in
-<<dummy/../../../framework/application/application-resources#application.resources,"Images
-and Other Resources">>; only [classname]#ThemeResource# and
+
+[classname]#ImageRenderer#:: Renders the cell as an image.
+The column type must be a [interfacename]#Resource#, as described in
+<<dummy/../../../framework/application/application-resources#application.resources,"Images and Other Resources">>; only [classname]#ThemeResource# and
 [classname]#ExternalResource# are currently supported for images in
 [classname]#Grid#.
 
 ifdef::web[]
-
++
 [source, java]
 ----
 grid.addColumn("picture", Resource.class)
@@ -605,7 +601,6 @@ Instead of creating the resource objects explicitly, as was done above, you
 could generate them dynamically from file name strings using a
 [interfacename]#Converter# for the column.
 
-
 +
 [source, java]
 ----
@@ -678,13 +673,14 @@ endif::web[]
 }
 ----
 endif::web[]
+
 [classname]#DateRenderer#:: Formats a column with a [classname]#Date# type using string formatter. The
 format string is same as for [methodname]#String.format()# in Java API. The date
 is passed in the parameter index 1, which can be omitted if there is only one
-format specifier, such as " [literal]#++%tF++#".
+format specifier, such as "[literal]#++%tF++#".
 
 ifdef::web[]
-
++
 [source, java]
 ----
 Grid.Column bornColumn = grid.getColumn("born");
@@ -698,13 +694,13 @@ Optionally, a locale can be given. Otherwise, the default locale (in the
 component tree) is used.
 
 endif::web[]
+
 [classname]#HTMLRenderer#:: Renders the cell as HTML. This allows formatting cell content, as well as using
 HTML features such as hyperlinks.
 
 ifdef::web[]
++
 First, set the renderer in the [classname]#Grid.Column# object:
-
-
 +
 [source, java]
 ----
@@ -716,7 +712,6 @@ ifdef::web[]
 Then, in the grid data, give the cell content:
 endif::web[]
 
-
 +
 [source, java]
 ----
@@ -727,8 +722,8 @@ grid.addRow("Nicolaus Copernicus", 1543,
 +
 You could also use a [interfacename]#PropertyFormatter# or a generated column to
 generate the HTML for the links.
-
 endif::web[]
+
 [classname]#NumberRenderer#:: Formats column values with a numeric type extending [classname]#Number#:
 [classname]#Integer#, [classname]#Double#, etc. The format can be specified
 either by the subclasses of [classname]#java.text.NumberFormat#, namely
@@ -736,9 +731,8 @@ either by the subclasses of [classname]#java.text.NumberFormat#, namely
 [methodname]#String.format()#.
 
 ifdef::web[]
++
 For example:
-
-
 +
 [source, java]
 ----
@@ -770,9 +764,8 @@ endif::web[]
 must be between 0.0 and 1.0.
 
 ifdef::web[]
++
 For example:
-
-
 +
 [source, java]
 ----
@@ -973,7 +966,7 @@ the container must be of type that implements
 
 [[figure.components.grid.filtering]]
 .Filtering Grid
-image::img/grid-filtering.png[]
+image::img/grid-filtering.png[width=50%, scaledwidth=80%]
 
 The filtering illustrated in <<figure.components.grid.filtering>> can be created
 as follows:
@@ -997,16 +990,16 @@ HeaderRow filterRow = grid.appendHeaderRow();
 for (Object pid: grid.getContainerDataSource()
                      .getContainerPropertyIds()) {
     HeaderCell cell = filterRow.getCell(pid);
-    
+
     // Have an input field to use for filter
     TextField filterField = new TextField();
     filterField.setColumns(8);
-    
+
     // Update filter When the filter input is changed
     filterField.addTextChangeListener(change -> {
         // Can't modify filters so need to replace
         container.removeContainerFilters(pid);
-        
+
         // (Re)create the filter if necessary
         if (! change.getText().isEmpty())
             container.addContainerFilter(
@@ -1028,7 +1021,7 @@ secondary or more sort criteria.
 
 [[figure.components.grid.sorting]]
 .Sorting Grid on Multiple Columns
-image::img/grid-sorting.png[]
+image::img/grid-sorting.png[width=50%, scaledwidth=75%]
 
 Defining sort criteria programmatically can be done with the various
 alternatives of the [methodname]#sort()# method. You can sort on a specific
@@ -1052,7 +1045,7 @@ direction can be given with an optional parameter.
 
 [source, java]
 ----
-// Sort first by city and then by name 
+// Sort first by city and then by name
 grid.sort(Sort.by("city", SortDirection.ASCENDING)
               .then("name", SortDirection.DESCENDING));
 ----
@@ -1098,7 +1091,7 @@ A row under editing is illustrated in <<figure.components.grid.editing>>.
 
 [[figure.components.grid.editing]]
 .Editing a Grid Row
-image::img/grid-editor-basic.png[]
+image::img/grid-editor-basic.png[width=50%, scaledwidth=75%]
 
 [[components.grid.editing.unbuffered]]
 === Unbuffered Mode
@@ -1196,9 +1189,9 @@ public class Person implements Serializable {
     @NotNull
     @Size(min=2, max=10)
     private String name;
-    
+
     @Min(1)
-    @Max(130)       
+    @Max(130)
     private int age;
     ...]
 ----
@@ -1241,7 +1234,7 @@ first error in the editor.
 
 [[figure.components.grid.errors]]
 .Editing a Grid Row
-image::img/grid-editor-errors.png[]
+image::img/grid-editor-errors.png[width=50%, scaledwidth=75%]
 
 You can modify the error handling by implementing a custom
 [interfacename]#EditorErrorHandler# or by extending the
@@ -1403,5 +1396,3 @@ element, as well as the buttons.
 
 
 ((()))
-
-

documentation/components/components-label.asciidoc

@@ -21,7 +21,6 @@ You can give the label text most conviniently in the constructor, as is done in
 the following. Label has 100% default width, so the containing layout must also
 have defined width.
 
-
 [source, java]
 ----
 // A container that is 100% wide by default
@@ -36,13 +35,12 @@ See the http://demo.vaadin.com/book-examples-vaadin7/book#component.label.basic[
 accessing the text value, so you can get and set the text with
 [methodname]#getValue()# and [methodname]#setValue()#.
 
-
 [source, java]
 ----
 // Get the label's text to initialize a field
 TextField editor = new TextField(null, // No caption
                                  label.getValue());
-        
+
 // Change the label's text
 editor.addValueChangeListener(event -> // Java 8
     label.setValue(editor.getValue()));
@@ -91,7 +89,7 @@ width of [classname]#Label# is the default 100%, the text in the
 
 [[figure.components.label]]
 .The Label Component
-image::img/label-example1.png[]
+image::img/label-example1.png[width=50%, scaledwidth=75%]
 
 Setting [classname]#Label# to undefined width will cause it to not wrap at the
 end of the line, as the width of the content defines the width. If placed inside
@@ -162,7 +160,7 @@ Label textLabel = new Label(
 Label preLabel = new Label(
     "Preformatted text is shown in an HTML <pre> tag.\n" +
     "Formatting such as\n" +
-    "  * newlines\n" + 
+    "  * newlines\n" +
     "  * whitespace\n" +
     "and such are preserved. HTML tags, \n"+
     "such as <b>bold</b>, are quoted.",
@@ -184,7 +182,7 @@ The rendering will look as shown in <<figure.components.label.content-mode>>.
 
 [[figure.components.label.content-mode]]
 .Label Content Modes
-image::img/label-modes.png[]
+image::img/label-modes.png[width=75%, scaledwidth=100%]
 
 
 ifdef::web[]
@@ -266,7 +264,7 @@ You can specify the data source either in the constructor or by the
 // Some property
 ObjectProperty<String> property =
     new ObjectProperty<String>("some value");
-        
+
 // Label that is bound to the property
 Label label = new Label(property);
 ----
@@ -305,7 +303,3 @@ would be delegated through the label.
 The [classname]#Label# component has a [literal]#++v-label++# overall style. In
 the [parameter]#PREFORMATTED# content mode, the text is wrapped inside a
 [literal]#++<pre>++# element.
-
-
-
-

documentation/components/components-link.asciidoc

@@ -55,7 +55,10 @@ caption below it.
 
 [[figure.components.link.basic]]
 .[classname]#Link# Example
-image::img/link.png[]
+image::img/link.png[width=30%, scaledwidth=70%]
+
+[[components.link.new-window]]
+== Opening a New Window
 
 With the simple constructor used in the above example, the resource is opened in
 the current window. Using the constructor that takes the target window as a
@@ -66,7 +69,6 @@ browser, the target can be any window, including windows not managed by the
 application itself. You can use the special underscored target names, such as
 [literal]#++_blank++# to open the link to a new browser window or tab.
 
-
 [source, java]
 ----
 // Hyperlink to a given URL
@@ -75,35 +77,15 @@ Link link = new Link("Take me a away to a faraway land",
 
 // Open the URL in a new window/tab
 link.setTargetName("_blank");
-        
+
 // Indicate visually that it opens in a new window/tab
 link.setIcon(new ThemeResource("icons/external-link.png"));
 link.addStyleName("icon-after-caption");
 ----
 See the http://demo.vaadin.com/book-examples-vaadin7/book#component.link.target[on-line example, window="_blank"].
 
-Normally, the link icon is before the caption. You can have it right of the
-caption by reversing the text direction in the containing element.
-
-
-[source, css]
-----
-/* Position icon right of the link caption. */
-.icon-after-caption {
-    direction: rtl;
-}
-/* Add some padding around the icon. */
-.icon-after-caption .v-icon {
-    padding: 0 3px;
-}
-----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#component.link.target[on-line example, window="_blank"].
-
-The resulting link is shown in <<figure.components.link.new-window>>.
-
-[[figure.components.link.new-window]]
-.Link That Opens a New Window
-image::img/link-new.png[]
+[[components.link.pop-up]]
+== Opening as a Pop-Up Window
 
 With the [literal]#++_blank++# target, a normal new browser window is opened. If
 you wish to open it in a popup window (or tab), you need to give a size for the
@@ -113,7 +95,6 @@ which takes any of the defined border styles [parameter]#TARGET_BORDER_DEFAULT#,
 [parameter]#TARGET_BORDER_MINIMAL#, and [parameter]#TARGET_BORDER_NONE#. The
 exact result depends on the browser.
 
-
 [source, java]
 ----
 // Open the URL in a popup
@@ -124,15 +105,16 @@ link.setTargetWidth(400);
 ----
 See the http://demo.vaadin.com/book-examples-vaadin7/book#component.link.target[on-line example, window="_blank"].
 
-In addition to the [classname]#Link# component, Vaadin allows alternative ways
-to make hyperlinks. The [classname]#Button# component has a
-[parameter]#Reindeer.BUTTON_LINK# style name that makes it look like a
-hyperlink, while handling clicks in a server-side click listener instead of in
-the browser. Also, you can make hyperlinks (or any other HTML) in a
-[classname]#Label# in HTML content mode.
+== Alternatives
 
-== CSS Style Rules
+In addition to the [classname]#Link# component, Vaadin allows alternative ways to make hyperlinks.
+Also, you can make hyperlinks (or any other HTML) in a [classname]#Label# in HTML content mode.
 
+The [classname]#Button# component has a [parameter]#Reindeer.BUTTON_LINK# style name that makes it look like a hyperlink, while handling clicks in a server-side click listener instead of in the browser.
+However, browsers do not generally allow opening new windows from with browser code, so for such tasks you need to use the [classname]#BrowserWindowOpener# extension described in <<dummy/../../../framework/advanced/advanced-windows#advanced.windows.popup, "Opening Pop-up Windows">>
+
+
+== CSS Style Rules
 
 [source, css]
 ----
@@ -156,6 +138,30 @@ please notice that [literal]#++a:hover++# must come after an
 [literal]#++a:link++# and [literal]#++a:visited++#, and [literal]#++a:active++#
 after the [literal]#++a:hover++#.
 
+ifdef::web[]
+=== Icon Position
 
+Normally, the link icon is before the caption.
+You can have it right of the caption by reversing the text direction in the containing element.
 
+[source, css]
+----
+/* Position icon right of the link caption. */
+.icon-after-caption {
+    direction: rtl;
+}
 
+/* Add some padding around the icon. */
+.icon-after-caption .v-icon {
+    padding: 0 3px;
+}
+----
+See the http://demo.vaadin.com/book-examples-vaadin7/book#component.link.target[on-line example, window="_blank"].
+
+The resulting link is shown in <<figure.components.link.new-window>>.
+
+[[figure.components.link.new-window]]
+.Link That Opens a New Window
+image::img/link-new.png[width=25%, scaledwidth=50%]
+
+endif::web[]

documentation/components/components-listselect.asciidoc

@@ -23,7 +23,7 @@ visually identical in both modes.
 ----
 // Create the selection component
 ListSelect select = new ListSelect("The List");
-        
+
 // Add some items (here by the item ID as the caption)
 select.addItems("Mercury", "Venus", "Earth", ...);
 
@@ -37,11 +37,10 @@ The number of visible items is set with [methodname]#setRows()#.
 
 [[figure.components.listselect.basic]]
 .The [classname]#ListSelect# Component
-image::img/listselect-basic.png[]
+image::img/listselect-basic.png[width=35%, scaledwidth=50%]
 
 Common selection component features are described in
-<<dummy/../../../framework/components/components-selection#components.selection,"Selection
-Components">>.
+<<dummy/../../../framework/components/components-selection#components.selection,"Selection Components">>.
 
 == CSS Style Rules
 
@@ -56,7 +55,3 @@ Components">>.
 The component has an overall [literal]#++v-select++# style. The native
 [literal]#++<select>++# element has [literal]#++v-select-select++# style. The
 items are represented as [literal]#++<option>++# elements.
-
-
-
-

documentation/components/components-menubar.asciidoc

@@ -12,19 +12,22 @@ ifdef::web[]
 image:{live-demo-image}[alt="Live Demo", link="http://demo.vaadin.com/sampler/#ui/interaction/menu-bar"]
 endif::web[]
 
-The [classname]#MenuBar# component allows creating horizontal dropdown menus,
-much like the main menu in desktop applications.
+The [classname]#MenuBar# component allows creating horizontal drop-down menus, much like the main menu in desktop applications.
 
 [[figure.components.menubar]]
 .Menu Bar
-image::img/menubar-example1.png[]
+image::img/menubar-example1.png[width=40%, scaledwidth=60%]
+
+The menu items open as the user navigates them by hovering or clicking with the mouse.
+Menus can have separators to divide items into sub-sections.
+Menu items can have an icon and styling.
+They can also be checkable, so that the user can click on them to toggle between checked and unchecked.
 
 [[components.menubar.creation]]
 == Creating a Menu
 
 The actual menu bar component is first created as follows:
 
-
 [source, java]
 ----
 MenuBar barmenu = new MenuBar();
@@ -63,7 +66,7 @@ MenuItem snacks = barmenu.addItem("Snacks", null, null);
 snacks.addItem("Weisswurst", null, mycommand);
 snacks.addItem("Bratwurst",  null, mycommand);
 snacks.addItem("Currywurst", null, mycommand);
-        
+
 // Yet another top-level item
 MenuItem servs = barmenu.addItem("Services", null, null);
 servs.addItem("Car Service", null, mycommand);
@@ -90,7 +93,7 @@ MenuBar.Command mycommand = new MenuBar.Command() {
         selection.setValue("Ordered a " +
                            selectedItem.getText() +
                            " from menu.");
-    }  
+    }
 };
 ----
 
@@ -173,13 +176,12 @@ the previously selected item. However, beware that the [literal]#++selected++#
 style for menu items, that is, [literal]#++v-menubar-menuitem-selected++#, is
 reserved for mouse-hover indication.
 
-
 [source, java]
 ----
 MenuBar barmenu = new MenuBar();
 barmenu.addStyleName("mybarmenu");
 layout.addComponent(barmenu);
-        
+
 // A feedback component
 final Label selection = new Label("-");
 layout.addComponent(selection);
@@ -197,9 +199,9 @@ MenuBar.Command mycommand = new MenuBar.Command() {
             previous.setStyleName(null);
         selectedItem.setStyleName("highlight");
         previous = selectedItem;
-    }  
+    }
 };
-        
+
 // Put some items in the menu
 barmenu.addItem("Beverages", null, mycommand);
 barmenu.addItem("Snacks", null, mycommand);
@@ -208,7 +210,6 @@ barmenu.addItem("Services", null, mycommand);
 
 You could then style the highlighting in CSS as follows:
 
-
 [source, css]
 ----
 .mybarmenu .v-menubar-menuitem-highlight {
@@ -217,7 +218,3 @@ You could then style the highlighting in CSS as follows:
 ----
 
 endif::web[]
-
-
-
-

documentation/components/components-nativeselect.asciidoc

@@ -21,7 +21,7 @@ the native selection input of web browsers, using the HTML
 ----
 // Create the selection component
 NativeSelect select = new NativeSelect("Native Selection");
-        
+
 // Add some items
 select.addItems("Mercury", "Venus", ...);
 ----
@@ -31,11 +31,10 @@ The [methodname]#setColumns()# allows setting the width of the list as
 
 [[figure.components.nativeselect.basic]]
 .The [classname]#NativeSelect# Component
-image::img/nativeselect-basic.png[]
+image::img/nativeselect-basic.png[width=20%, scaledwidth=40%]
 
 Common selection component features are described in
-<<dummy/../../../framework/components/components-selection#components.selection,"Selection
-Components">>.
+<<dummy/../../../framework/components/components-selection#components.selection,"Selection Components">>.
 
 == CSS Style Rules
 
@@ -48,7 +47,3 @@ Components">>.
 
 The component has a [literal]#++v-select++# overall style. The native
 [literal]#++select++# element has [literal]#++v-select-select++# style.
-
-
-
-

documentation/components/components-optiongroup.asciidoc

@@ -16,12 +16,11 @@ endif::web[]
 group of radio buttons in single selection mode. In multiple selection mode, the
 items show up as check boxes. The common selection component features are
 described in
-<<dummy/../../../framework/components/components-selection#components.selection,"Selection
-Components">>.
+<<dummy/../../../framework/components/components-selection#components.selection,"Selection Components">>.
 
 [[figure.components.optiongroup]]
 .Option Button Group in Single and Multiple Selection Mode
-image::img/optiongroup-basic.png[]
+image::img/optiongroup-basic.png[width=45%, scaledwidth=70%]
 
 Option group is by default in single selection mode. Multiple selection is
 enabled with [methodname]#setMultiSelect()#.
@@ -50,6 +49,7 @@ maintains the individual check box objects, you can get an array of the
 currently selected items easily, and that you can easily change the appearance
 of a single component.
 
+ifdef::web[]
 [[components.optiongroup.disabling]]
 == Disabling Items
 
@@ -63,7 +63,6 @@ find out whether an item is enabled with [methodname]#isItemEnabled()#.
 The [methodname]#setItemEnabled()# identifies the item to be disabled by its
 item ID.
 
-
 [source, java]
 ----
 // Have an option group with some items
@@ -79,10 +78,10 @@ in <<figure.components.optiongroup.disabling>>.
 
 [[figure.components.optiongroup.disabling]]
 .[classname]#OptionGroup# with a Disabled Item
-image::img/optiongroup-disabling.png[]
+image::img/optiongroup-disabling.png[width=25%, scaledwidth=50%]
 
 Setting an item as disabled turns on the [literal]#++v-disabled++# style for it.
-
+endif::web[]
 
 [[components.optiongroup.css]]
 == CSS Style Rules
@@ -103,6 +102,8 @@ also have the [literal]#++v-select-option++# style that allows styling
 regardless of the option type. Disabled items have additionally the
 [literal]#++v-disabled++# style.
 
+ifdef::web[]
+
 [[components.optiongroup.css.horizontal]]
 === Horizontal Layout
 
@@ -138,9 +139,6 @@ name for the component. The result is shown in
 
 [[figure.components.optiongroup.horizontal]]
 .Horizontal [classname]#OptionGroup#
-image::img/optiongroup-horizontal.png[]
-
-
-
-
+image::img/optiongroup-horizontal.png[width=35%, scaledwidth=50%]
 
+endif::web[]

documentation/components/components-passwordfield.asciidoc

@@ -26,7 +26,7 @@ The result is shown in <<figure.components.passwordfield.basic>>.
 
 [[figure.components.passwordfield.basic]]
 .[classname]#PasswordField#
-image::img/passwordfield-basic.png[]
+image::img/passwordfield-basic.png[width=40%, scaledwidth=50%]
 
 You should note that the [classname]#PasswordField# hides the input only from
 "over the shoulder" visual observation. Unless the server connection is
@@ -38,7 +38,6 @@ possible by exploiting JavaScript execution security holes in the browser.
 [[components.passwordfield.css]]
 == CSS Style Rules
 
-
 [source, css]
 ----
 .v-textfield { }
@@ -46,9 +45,4 @@ possible by exploiting JavaScript execution security holes in the browser.
 
 The [classname]#PasswordField# does not have its own CSS style name but uses the
 same [literal]#++v-textfield++# style as the regular [classname]#TextField#. See
-<<dummy/../../../framework/components/components-textfield#components.textfield.css,"CSS
-Style Rules">> for information on styling it.
-
-CSS Styling
-
-
+<<dummy/../../../framework/components/components-textfield#components.textfield.css,"CSS Style Rules">> for information on styling it.

documentation/components/components-progressbar.asciidoc

@@ -12,13 +12,12 @@ ifdef::web[]
 image:{live-demo-image}[alt="Live Demo", link="http://demo.vaadin.com/sampler/#ui/interaction/progress-bar"]
 endif::web[]
 
-The [classname]#ProgressBar# component allows displaying the progress of a task
-graphically. The progress is specified as a floating-point value between 0.0 and
-1.0.
+The [classname]#ProgressBar# component allows visualizing progress of a task.
+The progress is specified as a floating-point value between 0.0 and 1.0.
 
 [[figure.components.progressbar.basic]]
-.The Progress Bar Component
-image::img/progressbar-basic.png[]
+.The [classname]#ProgressBar# component
+image::img/progressbar-basic.png[width=30%, scaledwidth=70%]
 
 To display upload progress with the [classname]#Upload# component, you can
 update the progress bar in a [interfacename]#ProgressListener#.
@@ -32,15 +31,13 @@ for instructions about using server push. Whichever method you use to update the
 UI, it is important to lock the user session by modifying the progress bar value
 inside [methodname]#access()# call, as illustrated in the following example and
 described in
-<<dummy/../../../framework/advanced/advanced-push#advanced.push.running,"Accessing
-UI from Another Thread">>.
-
+<<dummy/../../../framework/advanced/advanced-push#advanced.push.running,"Accessing UI from Another Thread">>.
 
 [source, java]
 ----
 final ProgressBar bar = new ProgressBar(0.0f);
 layout.addComponent(bar);
-        
+
 layout.addComponent(new Button("Increase",
     new ClickListener() {
     @Override
@@ -67,15 +64,14 @@ bar.setIndeterminate(true);
 ----
 
 [[figure.components.progressbar.indeterminate]]
-.Indeterminate Progress Bar
-image::img/progressbar-indeterminate.png[]
-
+.Indeterminate progress bar
+image::img/progressbar-indeterminate.png[width=15%, scaledwidth=40%]
 
 ifdef::web[]
 [[components.progressbar.thread]]
 == Doing Heavy Computation
 
-The progress indicator is often used to display the progress of a heavy
+The progress bar is typically used to display the progress of a heavy
 server-side computation task, often running in a background thread. The UI,
 including the progress bar, can be updated either with polling or by using
 server push. When doing so, you must ensure thread-safety, most easily by
@@ -94,12 +90,12 @@ is displayed automatically when the browser polls the server.
 ----
 HorizontalLayout barbar = new HorizontalLayout();
 layout.addComponent(barbar);
-        
-// Create the indicator, disabled until progress is started
+
+// Create the bar, disabled until progress is started
 final ProgressBar progress = new ProgressBar(new Float(0.0));
 progress.setEnabled(false);
 barbar.addComponent(progress);
-        
+
 final Label status = new Label("not running");
 barbar.addComponent(status);
 
@@ -136,7 +132,7 @@ class WorkThread extends Thread {
                 }
             });
         }
-        
+
         // Show the "all done" for a while
         try {
             sleep(2000); // Sleep for 2 seconds
@@ -149,10 +145,10 @@ class WorkThread extends Thread {
                 // Restore the state to initial
                 progress.setValue(new Float(0.0));
                 progress.setEnabled(false);
-                        
+
                 // Stop polling
                 UI.getCurrent().setPollInterval(-1);
-                
+
                 button.setEnabled(true);
                 status.setValue("not running");
             }
@@ -181,8 +177,8 @@ button.addClickListener(new Button.ClickListener() {
 The example is illustrated in <<figure.components.progressbar.thread>>.
 
 [[figure.components.progressbar.thread]]
-.Doing Heavy Work
-image::img/progressbar-thread.png[]
+.Doing heavy work
+image::img/progressbar-thread.png[width=40%, scaledwidth=70%]
 
 endif::web[]
 
@@ -197,18 +193,13 @@ endif::web[]
     .v-progressbar-indicator {}
 ----
 
-The progress bar has a [literal]#++v-progressbar++# base style. The animation is
-the background of the element with [literal]#++v-progressbar-wrapper++# style,
-by default an animated GIF image. The progress is an element with
-[literal]#++v-progressbar-indicator++# style inside the wrapper, and therefore
-displayed on top of it. When the progress element grows, it covers more and more
-of the animated background.
-
-In the indeterminate mode, the top element also has the
-[literal]#++v-progressbar-indeterminate++# style. The built-in themes simply
-display the animated GIF in the top element and have the inner elements
-disabled.
-
-
+The progress bar has a [literal]#++v-progressbar++# base style.
+The progress is an element with [literal]#++v-progressbar-indicator++# style inside the wrapper, and therefore displayed on top of it.
+When the progress element grows, it covers more and more of the animated background.
 
+The progress bar can be animated (some themes use that).
+Animation is done in the element with the [literal]#v-progressbar-wrapper# style, by having an animated GIF as the background image.
 
+In the indeterminate mode, the top element also has the
+[literal]#++v-progressbar-indeterminate++# style.
+The built-in themes simply display the animated GIF in the top element and have the inner elements disabled.

documentation/components/components-richtextarea.asciidoc

@@ -37,7 +37,7 @@ rtarea.setValue("<h1>Hello</h1>\n" +
 ----
 
 .Rich Text Area Component
-image::img/richtextarea-example1.png[]
+image::img/richtextarea-example1.png[width=60%, scaledwidth=90%]
 
 Above, we used context-specific tags such as [literal]#++<h1>++# in the initial
 HTML content. The rich text area component does not allow creating such tags,
@@ -69,8 +69,6 @@ scripting vulnerabilities and sanitization of user input.
 
 ====
 
-
-
 ifdef::web[]
 [[components.richtextarea.localization]]
 == Localizing RichTextArea Toolbars
@@ -122,7 +120,3 @@ buttons and drop-down list boxes with the following respective style names:
 .gwt-ToggleButton { }
 .gwt-ListBox { }
 ----
-
-
-
-

documentation/components/components-selection.asciidoc

@@ -11,16 +11,27 @@ Vaadin offers many alternative ways for selecting one or more items. The core
 library includes the following selection components, all based on the
 [classname]#AbstractSelect# class:
 
-[classname]#ComboBox# (Section <<dummy/../../../framework/components/components-combobox#components.combobox,"ComboBox">>):: A drop-down list with a text box, where the user can type text to find matching items. The component also provides an input prompt and the user can enter new items.
-[classname]#ListSelect# (Section <<dummy/../../../framework/components/components-listselect#components.listselect,"ListSelect">>):: A vertical list box for selecting items in either single or multiple selection mode.
-[classname]#NativeSelect# (Section<<dummy/../../../framework/components/components-nativeselect#components.nativeselect,"NativeSelect">>):: Provides selection using the native selection component of the browser, typically a drop-down list for single selection and a multi-line list in multiselect mode. This uses the [literal]#++<select>++# element in HTML.
-[classname]#OptionGroup# (Section <<dummy/../../../framework/components/components-optiongroup#components.optiongroup,"OptionGroup">>):: Shows the items as a vertically arranged group of radio buttons in the single selection mode and of check boxes in multiple selection mode.
-[classname]#TwinColSelect# (Section <<dummy/../../../framework/components/components-twincolselect#components.twincolselect,"TwinColSelect">>):: Shows two list boxes side by side where the user can select items from a list of available items and move them to a list of selected items using control buttons.
+// TODO Only use section numbers here, prefixed with "Section", not include section title
 
+[classname]#ComboBox# (<<components-combobox#components.combobox,"ComboBox">>)::
+A drop-down list with a text box, where the user can type text to find matching items.
+The component also provides an input prompt and the user can enter new items.
 
-In addition, the [classname]#Tree#, [classname]#Table#, and
-[classname]#TreeTable# components allow special forms of selection. They also
-inherit the [classname]#AbstractSelect#.
+[classname]#ListSelect# (<<components-listselect#components.listselect,"ListSelect">>)::
+A vertical list box for selecting items in either single or multiple selection mode.
+
+[classname]#NativeSelect# (<<components-nativeselect#components.nativeselect, "NativeSelect">>)::
+Provides selection using the native selection component of the browser, typically a drop-down list for single selection and a multi-line list in multiselect mode.
+This uses the [literal]#++<select>++# element in HTML.
+
+[classname]#OptionGroup# (<<components-optiongroup#components.optiongroup,"OptionGroup">>)::
+Shows the items as a vertically arranged group of radio buttons in the single selection mode and of check boxes in multiple selection mode.
+
+[classname]#TwinColSelect# (<<components-twincolselect#components.twincolselect, "TwinColSelect">>)::
+Shows two list boxes side by side where the user can select items from a list of available items and move them to a list of selected items using control buttons.
+
+In addition, the [classname]#Tree#, [classname]#Table#, and [classname]#TreeTable# components allow special forms of selection.
+They also inherit [classname]#AbstractSelect#.
 
 [[components.selection.databinding]]
 == Binding Selection Components to Data
@@ -153,9 +164,10 @@ identifier.
 ----
 // Create a selection component
 ComboBox select = new ComboBox("Moons of Mars");
-select.setItemCaptionMode(ItemCaptionMode.EXPLICIT_DEFAULTS_ID);
+select.setItemCaptionMode(
+    ItemCaptionMode.EXPLICIT_DEFAULTS_ID);
 
-// Use the item ID also as the caption of this item
+// The given item ID is also used as the caption
 select.addItem(new Integer(1));
 
 // Set item caption for this item explicitly
@@ -173,7 +185,6 @@ ID:: String representation of the item identifier object is used as caption. Thi
 useful when the identifier is a string, and also when the identifier is an
 complex object that has a string representation. For example:
 
-
 +
 [source, java]
 ----
@@ -181,7 +192,8 @@ ComboBox select = new ComboBox("Inner Planets");
 select.setItemCaptionMode(ItemCaptionMode.ID);
 
 // A class that implements toString()
-class PlanetId extends Object implements Serializable {
+class PlanetId extends Object
+               implements Serializable {
     String planetName;
 
     PlanetId (String name) {
@@ -193,16 +205,19 @@ class PlanetId extends Object implements Serializable {
 }
 
 // Use such objects as item identifiers
-String planets[] = {"Mercury", "Venus", "Earth", "Mars"};
+String planets[] = {"Mercury", "Venus",
+                    "Earth", "Mars"};
 for (int i=0; i<planets.length; i++)
     select.addItem(new PlanetId(planets[i]));
 ----
-INDEX:: Index number of item is used as caption. This caption mode is applicable only to
-data sources that implement the [classname]#Container.Indexed# interface. If the
-interface is not available, the component will throw a
-[classname]#ClassCastException#. The [classname]#AbstractSelect# itself does not
-implement this interface, so the mode is not usable without a separate data
-source. An [classname]#IndexedContainer#, for example, would work.
+
+INDEX::
+Index number of item is used as caption.
+This caption mode is applicable only to data sources that implement the [interfacename]#Container.Indexed# interface.
+If the interface is not available, the component will throw a
+[classname]#ClassCastException#.
+The [classname]#AbstractSelect# itself does not implement this interface, so the mode is not usable without a separate data source.
+An [classname]#IndexedContainer#, for example, would work.
 
 ITEM:: [classname]#String# representation of item, acquired with
 [methodname]#toString()#, is used as the caption. This is applicable mainly when
@@ -220,7 +235,6 @@ and you want to use a specific property for caption.
 In the example below, we bind a selection component to a bean container and use
 a property of the bean as the caption.
 
-
 +
 [source, java]
 ----
@@ -237,30 +251,35 @@ public class Planet implements Serializable {
     ... setters and getters ...
 }
 
-public void captionproperty(VerticalLayout layout) {
+public void captionproperty(
+        VerticalLayout layout) {
     // Have a bean container to put the beans in
     BeanItemContainer<Planet> container =
-        new BeanItemContainer<Planet>(Planet.class);
+        new BeanItemContainer<Planet>(
+            Planet.class);
 
     // Put some example data in it
-    container.addItem(new Planet(1, "Mercury"));
+    container.addItem(
+        new Planet(1, "Mercury"));
     container.addItem(new Planet(2, "Venus"));
     container.addItem(new Planet(3, "Earth"));
     container.addItem(new Planet(4, "Mars"));
 
-    // Create a selection component bound to the container
-    ComboBox select = new ComboBox("Planets", container);
+    // Create a selection component bound
+    // to the container
+    ComboBox select = new ComboBox("Planets",
+                                   container);
 
-    // Set the caption mode to read the caption directly
-    // from the 'name' property of the bean
-    select.setItemCaptionMode(ItemCaptionMode.PROPERTY);
+    // Set the caption mode to read the
+    // caption directly from the 'name'
+    // property of the bean
+    select.setItemCaptionMode(
+        ItemCaptionMode.PROPERTY);
     select.setItemCaptionPropertyId("name");
 
     ...
 ----
 
-
-
 [[components.selection.getset]]
 == Getting and Setting Selection
 
@@ -311,7 +330,7 @@ The result of user interaction is shown in
 
 [[figure.components.selection.valuechange]]
 .Selected Item
-image::img/select-selected1.png[]
+image::img/select-selected1.png[width=30%, scaledwidth=40%]
 
 
 [[components.selection.newitems]]

documentation/components/components-slider.asciidoc

@@ -16,15 +16,18 @@ The [classname]#Slider# is a vertical or horizontal bar that allows setting a
 numeric value within a defined range by dragging a bar handle with the mouse.
 The value is shown when dragging the handle.
 
-[classname]#Slider# has a number of different constructors that take a
-combination of the caption, __minimum__ and __maximum__ value, __resolution__,
-and the __orientation__ of the slider.
+[[figure.components.slider.example1]]
+.Vertical and horizontal [classname]#Slider# components
+image::img/slider-example1-hi.png[width=40%, scaledwidth=70%]
 
+[classname]#Slider# has a number of different constructors that take a
+combination of the caption, _minimum_ and _maximum_ value, _resolution_,
+and the _orientation_ of the slider.
 
 [source, java]
 ----
 // Create a vertical slider
-final Slider vertslider = new Slider(1, 100);
+Slider vertslider = new Slider(1, 100);
 vertslider.setOrientation(SliderOrientation.VERTICAL);
 ----
 
@@ -34,17 +37,12 @@ __max__:: Maximum value of the slider range. The default is 100.0.
 
 __resolution__:: The number of digits after the decimal point. The default is 0.
 
-__orientation__:: The orientation can be either horizontal (
-[parameter]#SliderOrientation.HORIZONTAL#) or vertical (
-[parameter]#SliderOrientation.VERTICAL#). The default is horizontal.
-
-
+__orientation__:: The orientation can be either horizontal ([parameter]#SliderOrientation.HORIZONTAL#) or vertical ([parameter]#SliderOrientation.VERTICAL#). The default is horizontal.
 
 As the [classname]#Slider# is a field component, you can handle value changes
 with a [classname]#ValueChangeListener#. The value of the [classname]#Slider#
 field is a [classname]#Double# object.
 
-
 [source, java]
 ----
 // Shows the value of the vertical slider
@@ -72,14 +70,13 @@ You can set the value with the [methodname]#setValue()# method defined in
 [classname]#Slider# that takes the value as a native double value. The setter
 can throw a [classname]#ValueOutOfBoundsException#, which you must handle.
 
-
 [source, java]
 ----
 // Set the initial value. This has to be set after the
 // listener is added if we want the listener to handle
 // also this value change.
 try {
-	vertslider.setValue(50.0);
+    vertslider.setValue(50.0);
 } catch (ValueOutOfBoundsException e) {
 }
 ----
@@ -91,10 +88,6 @@ does not do bounds checking.
 examples) and horizontal sliders that control the size of a box. The slider
 values are displayed also in separate labels.
 
-[[figure.components.slider.example1]]
-.The [classname]#Slider# Component
-image::img/slider-example1-hi.png[]
-
 == CSS Style Rules
 
 
@@ -111,7 +104,3 @@ higher (for horizontal slider) or wider (for vertical slider) than the bar, the
 handle element is nevertheless contained within the slider bar element. The
 appearance of the handle comes from a background image defined in the
 __background__ CSS property.
-
-
-
-

documentation/components/components-table.asciidoc

@@ -21,12 +21,9 @@ versatile components in Vaadin. Table cells can include text or arbitrary UI
 components. You can easily implement editing of the table data, for example
 clicking on a cell could change it to a text field for editing.
 
-The data contained in a [classname]#Table# is managed using the Data Model of
-Vaadin (see
-<<dummy/../../../framework/datamodel/datamodel-overview.asciidoc#datamodel.overview,"Binding
-Components to Data">>), through the [classname]#Container# interface of the
-[classname]#Table#. This makes it possible to bind a table directly to a data
-source, such as a database query. Only the visible part of the table is loaded
+The data contained in a [classname]#Table# is managed using the Vaadin data model (see <<dummy/../../../framework/datamodel/datamodel-overview.asciidoc#datamodel.overview,"Binding Components to Data">>), through the [classname]#Container# interface of the [classname]#Table#.
+This makes it possible to bind a table directly to a data source, such as a database query.
+Only the visible part of the table is loaded
 into the browser and moving the visible window with the scrollbar loads content
 from the server. While the data is being loaded, a tooltip will be displayed
 that shows the current range and total number of items in the table. The rows of
@@ -46,7 +43,6 @@ parameter is used when new properties (columns) are added to the table, to fill
 in the missing values. (This default has no meaning in the usual case, such as
 below, where we add items after defining the properties.)
 
-
 [source, java]
 ----
 Table table = new Table("The Brightest Stars");
@@ -77,7 +73,7 @@ properties were added. The objects must be of the correct class, as defined in
 the [methodname]#addContainerProperty()# calls.
 
 .Basic Table Example
-image::img/table-example1.png[]
+image::img/table-example1.png[width=35%, scaledwidth=50%]
 
 Scalability of the [classname]#Table# is largely dictated by the container. The
 default [classname]#IndexedContainer# is relatively heavy and can cause
@@ -88,8 +84,7 @@ with just a few. With the current implementation of scrolling, there is a limit
 of around 500 000 rows, depending on the browser and the pixel height of rows.
 
 Common selection component features are described in
-<<dummy/../../../framework/components/components-selection#components.selection,"Selection
-Components">>.
+<<dummy/../../../framework/components/components-selection#components.selection,"Selection Components">>.
 
 [[components.table.selecting]]
 == Selecting Items in a Table
@@ -127,8 +122,8 @@ table.addValueChangeListener(new Property.ValueChangeListener() {
 });
 ----
 
-.Table Selection Example
-image::img/table-example2.png[]
+.Table selection example
+image::img/table-example2.png[width=35%, scaledwidth=80%]
 
 If the user clicks on an already selected item, the selection will deselected
 and the table property will have [parameter]#null# value. You can disable this
@@ -221,7 +216,7 @@ table has been resized.
 
 [[figure.component.table.columnresize]]
 .Resizing Columns
-image::img/table-column-resize.png[]
+image::img/table-column-resize.png[width=50%, scaledwidth=80%]
 
 
 [[components.table.features.reordering]]
@@ -267,7 +262,7 @@ See <<figure.component.table.columncollapsing>>.
 
 [[figure.component.table.columncollapsing]]
 .Collapsing Columns
-image::img/table-column-collapsing.png[]
+image::img/table-column-collapsing.png[width=40%, scaledwidth=80%]
 
 If the table has undefined width, it minimizes its width to fit the width of the
 visible columns. If some columns are initially collapsed, the width of the table
@@ -301,8 +296,9 @@ mode, a multiline [classname]#TextField#, a [classname]#CheckBox#, and a
 
 [source, java]
 ----
-// Create a table and add a style to allow setting the row height in theme.
-final Table table = new Table();
+// Create a table and add a style to
+// allow setting the row height in theme.
+Table table = new Table();
 table.addStyleName("components-inside");
 
 /* Define the names and data types of columns.
@@ -372,7 +368,7 @@ The table will look as shown in <<figure.components.table.components-inside>>.
 
 [[figure.components.table.components-inside]]
 .Components in a Table
-image::img/table-components.png[]
+image::img/table-components.png[width=70%, scaledwidth=100%]
 
 
 [[components.table.features.iterating]]
@@ -443,7 +439,7 @@ fields, as shown in <<figure.component.table.editable>>.
 
 [[figure.component.table.editable]]
 .A Table in Normal and Editable Mode
-image::img/table-editable3.png[]
+image::img/table-editable3.png[width=100%, scaledwidth=100%]
 
 [[components.table.editing.fieldfactories]]
 === Field Factories
@@ -454,13 +450,13 @@ table are defined in a field factory that implements the
 [classname]#DefaultFieldFactory#, which offers the following crude mappings:
 
 .Type to Field Mappings in [classname]#DefaultFieldFactory#
-[options="header"]
+[options="header",cols="2,5"]
 |===============
 |Property Type|Mapped to Field Class
-|[classname]#Date#|A[classname]#DateField#.
-|[classname]#Boolean#|A[classname]#CheckBox#.
-|[classname]#Item#|A[classname]#Form#(deprecated in Vaadin 7). The fields of the form are automatically created from the item's properties using a[classname]#FormFieldFactory#. The normal use for this property type is inside a[classname]#Form#and is less useful inside a[classname]#Table#.
-|__other__|A[classname]#TextField#. The text field manages conversions from the basic types, if possible.
+|[classname]#Date#|A [classname]#DateField#.
+|[classname]#Boolean#|A [classname]#CheckBox#.
+|[classname]#Item#|A [classname]#Form# (deprecated in Vaadin 7). The fields of the form are automatically created from the item's properties using a [classname]#FormFieldFactory#. The normal use for this property type is inside a [classname]#Form# and is less useful inside a [classname]#Table#.
+|__other__|A [classname]#TextField#. The text field manages conversions from the basic types, if possible.
 
 |===============
 
@@ -683,7 +679,7 @@ The resulting table is shown in
 
 [[figure.components.table.headersfooters.footer]]
 .A Table with a Footer
-image::img/table-footer.png[]
+image::img/table-footer.png[width=25%, scaledwidth=40%]
 
 
 [[components.table.headersfooters.clicks]]
@@ -940,8 +936,8 @@ normal and editable modes.
 simply formatted (black) with column generators.
 
 [[figure.ui.table.generated]]
-.Table with Generated Columns in Normal and Editable Mode
-image::img/table-generatedcolumns1.png[]
+.Table with generated columns
+image::img/table-generatedcolumns1.png[width=90%, scaledwidth=100%]
 
 endif::web[]
 
@@ -1013,21 +1009,15 @@ A table with the formatted date and decimal value columns is shown in
 <<figure.components.table.columnformatting>>.
 
 [[figure.components.table.columnformatting]]
-.Formatted Table Columns
-image::img/table-columnformatting.png[]
-
-You can use CSS for further styling of table rows, columns, and individual cells
-by using a [classname]#CellStyleGenerator#. It is described in
-<<components.table.css>>.
+.Formatted Table columns
+image::img/table-columnformatting.png[width=40%, scaledwidth=50%]
 
+You can use CSS for further styling of table rows, columns, and individual cells by using a [classname]#CellStyleGenerator#.
+ifdef::web[It is described in <<components.table.css>>.]
 
 [[components.table.css]]
 == CSS Style Rules
 
-Styling the overall style of a [classname]#Table# can be done with the following
-CSS rules.
-
-
 [source, css]
 ----
 .v-table {}
@@ -1157,8 +1147,8 @@ You can then style the cells, for example, as follows:
 The table will look as shown in <<figure.components.table.cell-style>>.
 
 [[figure.components.table.cell-style]]
-.Cell Style Generator for a Table
-image::img/table-cellstylegenerator1.png[]
+.Cell style generator for a Table
+image::img/table-cellstylegenerator1.png[width=50%, scaledwidth=80%]
 
 endif::web[]
 

documentation/components/components-textarea.asciidoc

@@ -23,7 +23,7 @@ The following example creates a simple text area:
 ----
 // Create the area
 TextArea area = new TextArea("Big Area");
-        
+
 // Put some content in it
 area.setValue("A row\n"+
               "Another row\n"+
@@ -35,7 +35,7 @@ The result is shown in <<figure.components.textarea>>.
 
 [[figure.components.textarea]]
 .[classname]#TextArea# Example
-image::img/textarea-basic.png[]
+image::img/textarea-basic.png[width=40%, scaledwidth=50%]
 
 You can set the number of visible rows with [methodname]#setRows()# or use the
 regular [methodname]#setHeight()# to define the height in other units. If the
@@ -76,7 +76,7 @@ The result is shown in <<figure.components.textarea.wordwrap>>.
 
 [[figure.components.textarea.wordwrap]]
 .Word Wrap in [classname]#TextArea#
-image::img/textarea-wordwrap.png[]
+image::img/textarea-wordwrap.png[width=60%, scaledwidth=100%]
 
 
 [[components.textarea.css]]
@@ -90,7 +90,3 @@ image::img/textarea-wordwrap.png[]
 
 The HTML structure of [classname]#TextArea# is extremely simple, consisting only
 of an element with [literal]#++v-textarea++# style.
-
-CSS Styling
-
-

documentation/components/components-textfield.asciidoc

@@ -14,9 +14,8 @@ endif::web[]
 
 ((("[classname]#TextField#", id="term.components.textfield", range="startofrange")))
 
-[classname]#TextField# is one of the most commonly used user interface
-components. It is a [classname]#Field# component that allows entering textual
-values using keyboard.
+[classname]#TextField# is one of the most commonly used user interface components.
+It is a [classname]#Field# component that allows entering textual values with keyboard.
 
 The following example creates a simple text field:
 
@@ -24,7 +23,7 @@ The following example creates a simple text field:
 ----
 // Create a text field
 TextField tf = new TextField("A Field");
-        
+
 // Put some initial content in it
 tf.setValue("Stuff in the field");
 ----
@@ -34,7 +33,7 @@ The result is shown in <<figure.components.textfield.basic>>.
 
 [[figure.components.textfield.basic]]
 .[classname]#TextField# Example
-image::img/textfield-example.png[]
+image::img/textfield-example.png[width=40%, scaledwidth=50%]
 
 Value changes are handled with a [classname]#Property.ValueChangeListener#, as
 in most other fields. The value can be acquired with [methodname]#getValue()#
@@ -69,7 +68,7 @@ single-line text fields.
 
 [[figure.components.textfield.api]]
 .Text Field Class Relationships
-image::img/textfield-diagram-hi.png[width=50%]
+image::img/textfield-diagram-hi.png[width=40%, scaledwidth=70%]
 
 [[components.textfield.databinding]]
 == Data Binding
@@ -85,11 +84,11 @@ Between Property Type and Representation">>.
 // doesn't support assignment from String, the object is
 // reconstructed in the wrapper when the value is changed.
 Double trouble = 42.0;
-        
+
 // Wrap it in a property data source
 final ObjectProperty<Double> property =
     new ObjectProperty<Double>(trouble);
-        
+
 // Create a text field bound to it
 // (StringToDoubleConverter is used automatically)
 TextField tf = new TextField("The Answer", property);
@@ -146,8 +145,7 @@ values. In such case, you might want to show a special value that stands for the
 null value. You can set the null representation with the
 [methodname]#setNullRepresentation()# method. Most typically, you use an empty
 string for the null representation, unless you want to differentiate from a
-string that is explicitly empty. The default null representation is "
-[literal]#++null++#", which essentially warns that you may have forgotten to
+string that is explicitly empty. The default null representation is "[literal]#null#", which essentially warns that you may have forgotten to
 initialize your data objects properly.
 
 ((("[methodname]#setNullSettingAllowed()#")))
@@ -180,7 +178,7 @@ interface is shown in <<figure.components.textfield.nullvalues>>.
 
 [[figure.components.textfield.nullvalues]]
 .Null Value Representation
-image::img/textfield-nullrepresentation.png[]
+image::img/textfield-nullrepresentation.png[width=35%, scaledwidth=50%]
 
 (((range="endofrange", startref="term.components.textfield.nullvalues")))
 
@@ -231,7 +229,7 @@ The result is shown in <<figure.components.textfield.textchangeevents>>.
 
 [[figure.components.textfield.textchangeevents]]
 .Text Change Events
-image::img/textfield-textchangeevents.png[]
+image::img/textfield-textchangeevents.png[width=35%, scaledwidth=50%]
 
 The __text change event mode__ defines how quickly the changes are transmitted
 to the server and cause a server-side event. Lazier change events allow sending

documentation/components/components-tree.asciidoc

@@ -12,87 +12,153 @@ ifdef::web[]
 image:{live-demo-image}[alt="Live Demo", link="http://demo.vaadin.com/sampler/#ui/grids-and-trees/tree"]
 endif::web[]
 
-The [classname]#Tree# component allows a natural way to represent data that has
-hierarchical relationships, such as filesystems or message threads. The
-[classname]#Tree# component in Vaadin works much like the tree components of
-most modern desktop user interface toolkits, for example in directory browsing.
+The [classname]#Tree# component allows a natural way to represent data that has hierarchical relationships.
+The user can drill down in the hierarchy by expanding items by clicking on the expand arrow, and likewise collapse items.
+[classname]#Tree# is a selection component that allows selecting items.
+It also supports drag and drop, so you can drag items to and from a tree, and drop them in the hierarchy.
 
-The typical use of the [classname]#Tree# component is for displaying a
-hierachical menu, like a menu on the left side of the screen, as in
-<<figure.components.tree>>, or for displaying filesystems or other hierarchical
-datasets. The [parameter]#menu# style makes the appearance of the tree more
-suitable for this purpose.
+A typical use of the [classname]#Tree# component is for displaying a hierarchical menu, as illustrated in <<figure.components.tree>>, or for displaying file systems or hierarchical datasets.
 
+[[figure.components.tree]]
+.A [classname]#Tree# component as a menu
+image::img/tree-example1.png[width=25%, scaledwidth=50%]
+
+The data is managed in a container implementing the [interfacename]#Hierarchical# interface, such as [classname]#HierarchicalContainer# or [classname]#FilesystemContainer#.
+You can use [classname]#ContainerHierarchicalWrapper# to add hierarchical capability to any other container. [classname]#Tree# itself implements the interface and delegates operations to the underlying container.
 
 [source, java]
 ----
-final Object[][] planets = new Object[][]{
-        new Object[]{"Mercury"}, 
-        new Object[]{"Venus"},
-        new Object[]{"Earth", "The Moon"},    
-        new Object[]{"Mars", "Phobos", "Deimos"},
-        new Object[]{"Jupiter", "Io", "Europa", "Ganymedes",
-                                "Callisto"},
-        new Object[]{"Saturn",  "Titan", "Tethys", "Dione",
-                                "Rhea", "Iapetus"},
-        new Object[]{"Uranus",  "Miranda", "Ariel", "Umbriel",
-                                "Titania", "Oberon"},
-        new Object[]{"Neptune", "Triton", "Proteus", "Nereid",
-                                "Larissa"}};
-        
-Tree tree = new Tree("The Planets and Major Moons");
-
-/* Add planets as root items in the tree. */
-for (int i=0; i<planets.length; i++) {
-    String planet = (String) (planets[i][0]);
-    tree.addItem(planet);
-    
-    if (planets[i].length == 1) {
-        // The planet has no moons so make it a leaf.
-        tree.setChildrenAllowed(planet, false);
-    } else {
-        // Add children (moons) under the planets.
-        for (int j=1; j<planets[i].length; j++) {
-            String moon = (String) planets[i][j];
-            
-            // Add the item as a regular item.
-            tree.addItem(moon);
-            
-            // Set it to be a child.
-            tree.setParent(moon, planet);
-            
-            // Make the moons look like leaves.
-            tree.setChildrenAllowed(moon, false);
-        }
-
-        // Expand the subtree.
-        tree.expandItemsRecursively(planet);
+// A menu tree
+Tree menu = new Tree();
+
+// Couple of childless root items
+menu.addItem("Mercury");
+menu.setChildrenAllowed("Mercury", false);
+menu.addItem("Venus");
+menu.setChildrenAllowed("Venus", false);
+
+// An item with hierarchy
+menu.addItem("Earth");
+menu.addItem("The Moon");
+menu.setChildrenAllowed("The Moon", false);
+menu.setParent("The Moon", "Earth");
+menu.expandItem("Earth"); // Expand programmatically
+...
+----
+
+The result was shown in <<figure.components.tree>> in a practical situation, with the [classname]`Tree` wrapped inside a [classname]`Panel`.
+[classname]`Tree` itself does not have scrollbar, but [classname]`Panel` can be used for the purpose.
+
+The caption of tree items is by default the item ID.
+You can define how the item captions are determined with [methodname]#setItemCaptionMode()#, as explained <<components-selection#components.selection.captions, "Selection Component Item Captions">>.
+
+[[components.tree.selection]]
+== Handling Selection and Clicks
+
+[classname]#Tree# is a selection component, which are described in  <<components-selection#components.selection, "Selection Components">>.
+You can thereby get or set the currently selected item by the value property of the tree, that is, with [methodname]#getValue()# and [methodname]#setValue()#.
+When the user selects an item, the tree will receive an [classname]#ValueChangeEvent#, which you can catch with a [classname]#ValueChangeListener#.
+
+[source, Java]
+----
+// Handle selection changes
+menu.addValueChangeListener(event -> { // Java 8
+    if (event.getProperty() != null &&
+        event.getProperty().getValue() != null) {
+        location.setValue("The cat is in " +
+            event.getProperty().getValue());
     }
-}
+});
+----
+
+[classname]#Tree# is selectable by default; you can disallow selection with [methodname]#setSelectable(false)#.
 
-main.addComponent(tree);
+[classname]#Tree# also emits [classname]##ItemClickEvent##s when items are clicked.
+This way you can handle item clicks also when selection is not enabled or you want special user interaction specifically on clicks.
+
+[source, Java]
+----
+tree.addItemClickListener(
+  new ItemClickEvent.ItemClickListener() {
+    public void itemClick(ItemClickEvent event) {
+        // Pick only left mouse clicks
+        if (event.getButton() == ItemClickEvent.BUTTON_LEFT)
+            Notification.show("Left click",
+                        Notification.Type.HUMANIZED_MESSAGE);
+    }
+  });
 ----
 
-<<figure.components.tree>> below shows the tree from the code example in a
-practical situation.
+[[components.tree.expand-collapse]]
+== Expanding and Collapsing Items
 
-[[figure.components.tree]]
-.A [classname]#Tree# Component as a Menu
-image::img/tree-example1.png[]
+An item can have children only if the [propertyname]#childrenAllowed# property is set as true.
+The expand indicator is shown when and only when the property is true.
+The property is defined in the container and can be set with [methodname]#setChildrenAllowed()#.
+
+Expanding an item fires an [classname]#Tree.ExpandEvent# and collapsing an [classname]#Tree.CollapseEvent#, which you can handle with respective listeners.
+
+[source, Java]
+----
+tree.addExpandListener(new Tree.ExpandListener() {
+    public void nodeExpand(ExpandEvent event) {
+        Notification.show("Expand!");
+    }
+});
+----
+
+You can expand and collapse items programmatically with [methodname]#expandItem()# or [methodname]#expandItemRecursively()#.
+
+[source, Java]
+----
+// Expand all items that can be
+for (Object itemId: tree.getItemIds())
+    tree.expandItem(itemId);
+----
+
+TIP: [classname]#Tree# itself does not support lazy loading, which makes it impractical for huge hierarchies.
+You can implement one kind of lazy loading by adding items in an expand listener and removing them in a collapse listener.
+For more proper lazy loading, you can use [classname]#TreeTable# or hierarchical support extension for [classname]#Grid#.
+
+[[components.tree.css]]
+== CSS Style Rules
 
-You can read or set the currently selected item by the value property of the
-[classname]#Tree# component, that is, with [methodname]#getValue()# and
-[methodname]#setValue()#. When the user clicks an item on a tree, the tree will
-receive an [classname]#ValueChangeEvent#, which you can catch with a
-[classname]#ValueChangeListener#. To receive the event immediately after the
-click, you need to set the tree as [classname]#setImmediate(true)#.
+[source, css]
+----
+.v-tree {}
+  .v-tree-node {}            /* A node (item)           */
+    .v-tree-node-caption {}  /* Caption of the node     */
+    .v-tree-node-children {} /* Contains child nodes    */
+  .v-tree-node-root {}       /* If node is a root node  */
+  .v-tree-node-leaf {}       /* If node has no children */
+----
 
-The [classname]#Tree# component uses [classname]#Container# data sources much
-like the [classname]#Table# component, with the addition that it also utilizes
-hierarchy information maintained by a [classname]#HierarchicalContainer#. The
-contained items can be of any item type supported by the container. The default
-container and its [methodname]#addItem()# assume that the items are strings and
-the string value is used as the item ID.
+[[components.tree.css.itemstyles]]
+=== Generating Item Styles
 
+You can style each tree item individually by generating a style name for them with a [interfacename]#Tree.ItemStyleGenerator#, which you assign to a tree with [methodname]#setItemStyleGenerator()#.
+The generator should return a style name for each item or `null`.
 
+[source, Java]
+----
+// Show all leaf nodes as disabled
+tree.setItemStyleGenerator(new Tree.ItemStyleGenerator() {
+    @Override
+    public String getStyle(Tree source, Object itemId) {
+        if (! tree.hasChildren(itemId))
+            return "disabled";
+        return null;
+    }
+});
+----
 
+The style names are prefixed with `v-tree-node-caption-`.
+You could thereby define the item styling as follows:
+
+[source, CSS]
+----
+.v-tree-node-caption-disabled {
+    color: graytext;
+    font-style: italic;
+}
+----

documentation/components/components-treetable.asciidoc

@@ -20,20 +20,19 @@ The default container is [classname]#HierarchicalContainer#, but you can bind
 [classname]#TreeTable# to any container implementing the interface.
 
 [[figure.components.treetable.basic]]
-.[classname]#TreeTable# Component
-image::img/treetable-basic.png[]
+.The [classname]#TreeTable# component
+image::img/treetable-basic.png[width=40%, scaledwidth=60%]
 
 As with [classname]#Tree#, you can define the parent-child relationships with
 [methodname]#setParent()#, as is shown in the following example with numeric
 item IDs:
 
-
 [source, java]
 ----
 TreeTable ttable = new TreeTable("My TreeTable");
 ttable.addContainerProperty("Name", String.class, null);
 ttable.addContainerProperty("Number", Integer.class, null);
-        
+
 // Create the tree nodes and set the hierarchy
 ttable.addItem(new Object[]{"Menu", null}, 0);
 ttable.addItem(new Object[]{"Beverages", null}, 1);
@@ -58,10 +57,10 @@ Unlike [classname]#Tree#, a [classname]#TreeTable# can have components in the
 hierarchical column, both when the property type is a component type and when
 the tree table is in editable mode.
 
-For other features, we refer you to documentation for [classname]#Table#, as
-given in
-<<dummy/../../../framework/components/components-table#components.table,"Table">>.
+For other features, we refer you to documentation for [classname]#Table# in
+<<dummy/../../../framework/components/components-table#components.table,"Table">> and [classname]#Tree# in <<dummy/../../../framework/components/components-tree#components.tree,"Tree">>.
 
+ifdef::web[]
 [[components.treetable.collapsed]]
 == Expanding and Collapsing Items
 
@@ -80,7 +79,7 @@ over all the items, but you need to get the IDs from the underlying container.
 for (Object itemId: ttable.getContainerDataSource()
                           .getItemIds()) {
     ttable.setCollapsed(itemId, false);
-    
+
     // As we're at it, also disallow children from
     // the current leaves
     if (! ttable.hasChildren(itemId))
@@ -96,6 +95,4 @@ the container, thereby avoiding the explicit settings and memory overhead. There
 are no built-in collapsible containers in the Vaadin core framework, so you
 either need to use an add-on container or implement it yourself.
 
-
-
-
+endif::web[]

documentation/components/components-twincolselect.asciidoc

@@ -21,7 +21,7 @@ clicking on the "<<" button.
 
 [[figure.components.twincolselect.basic]]
 .Twin Column Selection
-image::img/twincolselect-basic.png[]
+image::img/twincolselect-basic.png[width=50%, scaledwidth=80%]
 
 [classname]#TwinColSelect# is always in multi-select mode, so its property value
 is always a collection of the item IDs of the selected items, that is, the items
@@ -94,7 +94,3 @@ button area, which has overall [literal]#++v-select-twincol-buttons++# style;
 the actual buttons reuse the styles for the [classname]#Button# component.
 Between the buttons is a divider element with
 [literal]#++v-select-twincol-deco++# style.
-
-
-
-

documentation/components/components-upload.asciidoc

@@ -21,15 +21,14 @@ user sends the file by clicking the upload submit button.
 Uploading requires a receiver that implements [interfacename]#Upload.Receiver#
 to provide an output stream to which the upload is written by the server.
 
-
 [source, java]
 ----
 Upload upload = new Upload("Upload it here", receiver);
 ----
 
 [[figure.ui.upload]]
-.Upload Component
-image::img/upload.png[]
+.The [classname]#Upload# component
+image::img/upload.png[width=60%, scaledwidth=80%]
 
 You can set the text of the upload button with [methodname]#setButtonCaption()#.
 Note that it is difficult to change the caption or look of the
@@ -38,7 +37,6 @@ language of the [guibutton]#Browse# button is determined by the browser, so if
 you wish to have the language of the [classname]#Upload# component consistent,
 you will have to use the same language in your application.
 
-
 [source, java]
 ----
 upload.setButtonCaption("Upload Now");
@@ -88,7 +86,6 @@ The following example uploads images to [filename]#/tmp/uploads# directory in
 (UNIX) filesystem (the directory must exist or the upload fails). The component
 displays the uploaded image in an [classname]#Image# component.
 
-
 [source, java]
 ----
 // Show uploaded file in this placeholder
@@ -99,7 +96,7 @@ image.setVisible(false);
 // listener for successful upload
 class ImageUploader implements Receiver, SucceededListener {
     public File file;
-    
+
     public OutputStream receiveUpload(String filename,
                                       String mimeType) {
         // Create upload stream
@@ -124,13 +121,13 @@ class ImageUploader implements Receiver, SucceededListener {
         image.setSource(new FileResource(file));
     }
 };
-ImageUploader receiver = new ImageUploader(); 
+ImageUploader receiver = new ImageUploader();
 
 // Create the upload with a caption and set receiver later
 Upload upload = new Upload("Upload Image Here", receiver);
 upload.setButtonCaption("Start Upload");
 upload.addSucceededListener(receiver);
-        
+
 // Put the components in a panel
 Panel panel = new Panel("Cool Image Storage");
 Layout panelContent = new VerticalLayout();
@@ -147,8 +144,7 @@ shown in <<figure.ui.upload.example>>.
 
 [[figure.ui.upload.example]]
 .Image Upload Example
-image::img/upload-example.png[]
-
+image::img/upload-example.png[width=60%, scaledwidth=80%]
 
 [[components.upload.css]]
 == CSS Style Rules
@@ -166,7 +162,3 @@ image::img/upload-example.png[]
 The [classname]#Upload# component has an overall [literal]#++v-upload++# style.
 The upload button has the same structure and style as a regular
 [classname]#Button# component.
-
-
-
-

documentation/components/original-drawings/slider-example1.svg

@@ -1,127 +1,134 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   id="svg1901"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="slider-example1.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs1903">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective7" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2579"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient7607"
-       y2="471.38"
-       spreadMethod="reflect"
-       gradientUnits="userSpaceOnUse"
-       y1="45.132999"
-       gradientTransform="matrix(0.75592,0,0,1.3229,-36,0)"
-       x2="1370.6"
-       x1="-526.85999"
-       inkscape:collect="always">
-      <stop
-         id="stop7603"
-         style="stop-color:#000000"
-         offset="0" />
-      <stop
-         id="stop7605"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="258.73755"
-     inkscape:cy="889.25792"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     gridtolerance="10000"
-     inkscape:window-width="877"
-     inkscape:window-height="739"
-     inkscape:window-x="1039"
-     inkscape:window-y="153"
-     showgrid="false"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata1906">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Taso 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="opacity:1">
-    <image
-       y="56.505013"
-       x="74.071419"
-       id="image2463"
-       height="236"
-       width="249"
-       sodipodi:absref="/home/magi/itmill/book-7/manual/img/components/slider-orig.png"
-       xlink:href="/home/magi/itmill/book-7/manual/img/components/slider-orig.png" />
-    <g
-       transform="matrix(0.04895833,0,0,0.04895833,85.307423,133.89853)"
-       id="g1317">
-      <path
-         id="path6080"
-         style="fill:url(#linearGradient7607)"
-         inkscape:connector-curvature="0"
-         d="m 70.29,24.826 v 602.34 h 35.44 v -35.44 h 35.44 v -35.4 h 35.4 v -35.44 h 70.88 v 70.84 h 35.43 v 70.88 h 35.44 v 70.87 h 35.44 v 35.44 h 70.84 v -35.44 h 35.44 v -70.87 H 424.6 v -70.88 h -35.4 v -70.84 h -35.44 v -70.88 h 141.72 v -35.43 h -35.44 v -35.44 H 424.6 v -35.44 h -35.4 v -35.41 h -35.44 v -35.43 h -35.44 v -35.44 h -35.44 v -35.44 h -35.43 v -35.44 h -35.44 v -35.43 h -35.44 v -35.44 h -35.4 V 60.256 H 105.73 V 24.818 H 70.29 z" />
-      <path
-         id="rect1430"
-         style="fill:#000000;fill-rule:evenodd"
-         inkscape:connector-curvature="0"
-         d="m 35.438,24.812 v 602.35 h 35.437 v -35.44 h 35.435 v -35.41 H 70.875 V 95.662 L 106.31,95.66 V 60.254 H 70.875 V 24.816 H 35.438 z m 70.872,70.844 v 35.434 h 35.41 V 95.656 h -35.41 z m 35.41,35.434 v 35.44 h 35.44 v -35.44 h -35.44 z m 35.44,35.44 v 35.44 h 35.43 v -35.44 h -35.43 z m 35.43,35.44 v 35.44 h 35.44 v -35.44 h -35.44 z m 35.44,35.44 v 35.43 h 35.44 v -35.43 h -35.44 z m 35.44,35.43 v 35.44 h 35.44 v -35.44 h -35.44 z m 35.44,35.44 v 35.41 h 35.43 v -35.41 h -35.43 z m 35.43,35.41 v 35.43 h 35.41 v -35.43 h -35.41 z m 35.41,35.43 v 35.44 H 283.47 v 106.32 h 35.44 V 450 h 141.71 v -35.44 h -35.43 v -35.44 h -35.44 z m -70.84,141.76 v 70.84 h 35.43 v -70.84 h -35.43 z m 35.43,70.84 v 70.87 h 35.41 v -70.87 h -35.41 z m 35.41,70.87 v 70.88 h 35.44 v -70.88 h -35.44 z m 0,70.88 h -70.84 v 35.44 h 70.84 v -35.44 z m -70.84,0 v -70.88 h -35.44 v 70.88 h 35.44 z m -35.44,-70.88 v -70.87 h -35.44 v 70.87 h 35.44 z m -35.44,-70.87 v -70.84 h -35.44 v 70.84 h 35.44 z M 212.59,520.88 V 450 h -35.43 v 35.44 h -35.44 v 35.44 h 70.87 z m -70.87,0 h -35.41 v 35.43 h 35.41 v -35.43 z" />
-      <path
-         id="rect3779"
-         style="fill:#ffffff"
-         inkscape:connector-curvature="0"
-         d="m 70.875,95.656 v 460.65 h 35.435 v -35.43 h 35.41 v -35.44 h 35.44 v -35.44 h 35.43 v 70.88 h 35.44 v 70.84 h 35.44 v 70.87 h 35.44 v 70.88 h 70.84 v -70.88 h -35.41 v -70.87 h -35.43 v -70.84 h -35.44 v -106.32 h 106.28 v -35.44 h -35.41 v -35.43 h -35.43 v -35.41 h -35.44 v -35.44 h -35.44 v -35.43 h -35.44 v -35.44 h -35.43 v -35.44 h -35.44 v -35.44 H 106.31 V 95.648 H 70.875 z" />
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   id="svg1901"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r"
+   sodipodi:docname="slider-example1.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs1903">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective7" />
+    <inkscape:perspective
+       id="perspective2461"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2579"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient7607"
+       y2="471.38"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       y1="45.132999"
+       gradientTransform="matrix(0.75592,0,0,1.3229,-36,0)"
+       x2="1370.6"
+       x1="-526.85999"
+       inkscape:collect="always">
+      <stop
+         id="stop7603"
+         style="stop-color:#000000"
+         offset="0" />
+      <stop
+         id="stop7605"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="212.24603"
+     inkscape:cy="847.82098"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     gridtolerance="10000"
+     inkscape:window-width="1116"
+     inkscape:window-height="882"
+     inkscape:window-x="800"
+     inkscape:window-y="153"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata1906">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Taso 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="opacity:1">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="rect3344"
+       width="249"
+       height="236"
+       x="67.505424"
+       y="64.081154" />
+    <image
+       sodipodi:absref="/home/magi/itmill/vaadin/documentation/components/original-drawings/../img/slider-orig.png"
+       xlink:href="../img/slider-orig.png"
+       y="64.081154"
+       x="67.505424"
+       id="image2463"
+       height="236"
+       width="249" />
+    <g
+       transform="matrix(0.04895833,0,0,0.04895833,85.307423,133.89853)"
+       id="g1317">
+      <path
+         id="path6080"
+         style="fill:url(#linearGradient7607)"
+         inkscape:connector-curvature="0"
+         d="m 70.29,24.826 v 602.34 h 35.44 v -35.44 h 35.44 v -35.4 h 35.4 v -35.44 h 70.88 v 70.84 h 35.43 v 70.88 h 35.44 v 70.87 h 35.44 v 35.44 h 70.84 v -35.44 h 35.44 v -70.87 H 424.6 v -70.88 h -35.4 v -70.84 h -35.44 v -70.88 h 141.72 v -35.43 h -35.44 v -35.44 H 424.6 v -35.44 h -35.4 v -35.41 h -35.44 v -35.43 h -35.44 v -35.44 h -35.44 v -35.44 h -35.43 v -35.44 h -35.44 v -35.43 h -35.44 v -35.44 h -35.4 V 60.256 H 105.73 V 24.818 H 70.29 z" />
+      <path
+         id="rect1430"
+         style="fill:#000000;fill-rule:evenodd"
+         inkscape:connector-curvature="0"
+         d="m 35.438,24.812 v 602.35 h 35.437 v -35.44 h 35.435 v -35.41 H 70.875 V 95.662 L 106.31,95.66 V 60.254 H 70.875 V 24.816 H 35.438 z m 70.872,70.844 v 35.434 h 35.41 V 95.656 h -35.41 z m 35.41,35.434 v 35.44 h 35.44 v -35.44 h -35.44 z m 35.44,35.44 v 35.44 h 35.43 v -35.44 h -35.43 z m 35.43,35.44 v 35.44 h 35.44 v -35.44 h -35.44 z m 35.44,35.44 v 35.43 h 35.44 v -35.43 h -35.44 z m 35.44,35.43 v 35.44 h 35.44 v -35.44 h -35.44 z m 35.44,35.44 v 35.41 h 35.43 v -35.41 h -35.43 z m 35.43,35.41 v 35.43 h 35.41 v -35.43 h -35.41 z m 35.41,35.43 v 35.44 H 283.47 v 106.32 h 35.44 V 450 h 141.71 v -35.44 h -35.43 v -35.44 h -35.44 z m -70.84,141.76 v 70.84 h 35.43 v -70.84 h -35.43 z m 35.43,70.84 v 70.87 h 35.41 v -70.87 h -35.41 z m 35.41,70.87 v 70.88 h 35.44 v -70.88 h -35.44 z m 0,70.88 h -70.84 v 35.44 h 70.84 v -35.44 z m -70.84,0 v -70.88 h -35.44 v 70.88 h 35.44 z m -35.44,-70.88 v -70.87 h -35.44 v 70.87 h 35.44 z m -35.44,-70.87 v -70.84 h -35.44 v 70.84 h 35.44 z M 212.59,520.88 V 450 h -35.43 v 35.44 h -35.44 v 35.44 h 70.87 z m -70.87,0 h -35.41 v 35.43 h 35.41 v -35.43 z" />
+      <path
+         id="rect3779"
+         style="fill:#ffffff"
+         inkscape:connector-curvature="0"
+         d="m 70.875,95.656 v 460.65 h 35.435 v -35.43 h 35.41 v -35.44 h 35.44 v -35.44 h 35.43 v 70.88 h 35.44 v 70.84 h 35.44 v 70.87 h 35.44 v 70.88 h 70.84 v -70.88 h -35.41 v -70.87 h -35.43 v -70.84 h -35.44 v -106.32 h 106.28 v -35.44 h -35.41 v -35.43 h -35.43 v -35.41 h -35.44 v -35.44 h -35.44 v -35.43 h -35.44 v -35.44 h -35.43 v -35.44 h -35.44 v -35.44 H 106.31 V 95.648 H 70.875 z" />
+    </g>
+  </g>
+</svg>

documentation/getting-started/chapter-getting-started.asciidoc

@@ -5,7 +5,6 @@ This chapter gives practical instructions for creating a Vaadin application proj
 
 The instructions are given separately for the Eclipse IDE, NetBeans, and IntelliJ IDEA.
 
-
 include::getting-started-overview.adoc[leveloffset=+2]
 
 include::getting-started-libraries.asciidoc[leveloffset=+2]
@@ -14,12 +13,12 @@ include::getting-started-archetypes.asciidoc[leveloffset=+2]
 
 include::getting-started-first-project.asciidoc[leveloffset=+2]
 
-include::getting-started-maven.asciidoc[leveloffset=+2]
-
 include::getting-started-netbeans.asciidoc[leveloffset=+2]
 
 include::getting-started-idea.asciidoc[leveloffset=+2]
 
+include::getting-started-maven.asciidoc[leveloffset=+2]
+
 include::getting-started-package.asciidoc[leveloffset=+2]
 
 include::getting-started-scala.asciidoc[leveloffset=+2]

documentation/getting-started/getting-started-first-project.asciidoc

@@ -14,7 +14,7 @@ Vaadin Plugin. The task will include the following steps:
 
 . Write the source code
 
-. Configure and start Tomcat (or some other web server)
+. Configure and start web server
 
 . Open a web browser to use the web application
 
@@ -41,13 +41,13 @@ previous section. First, launch Eclipse and follow the following steps:
 . In the [guilabel]#New Project# window that opens, select "Vaadin > Vaadin 7
 Project" and click [guibutton]#Next#.
 +
-image::img/myproject-ivy-new-vaadin.png[width=70%]
+image::img/myproject-ivy-new-vaadin.png[width=70%, scaledwidth=100%]
 
 . In the [guilabel]#Vaadin Project# step, you need to set the basic web project
 settings. You need to give at least the __project name__ and the runtime; the
 default values should be good for the other settings.
 +
-image::img/myproject-ivy-settings.png[width=70%]
+image::img/myproject-ivy-settings.png[width=70%, scaledwidth=100%]
 
 [guilabel]#Project name#:: Give the project a name. The name should be a valid identifier usable
 cross-platform as a filename and inside a URL, so using only lower-case
@@ -110,7 +110,7 @@ settings, or click [guibutton]#Next#.
 the settings are pre-filled, and you should normally accept them as they are.
 
 +
-image::img/myproject-ivy-web.png[]
+image::img/myproject-ivy-web.png[scaledwidth=100%]
 
 [guilabel]#Context Root#:: The context root (of the application) identifies the application in the URL used
 for accessing it. For example, if the project has a [literal]#++myproject++#
@@ -131,7 +131,7 @@ If you are trying out Vaadin for the first time, you should not need
 to change anything. You can set most of the settings afterwards, except the
 creation of the portlet configuration.
 +
-image::img/myproject-vaadin.png[]
+image::img/myproject-vaadin.png[scaledwidth=100%]
 
 [guilabel]#Create project template#:: Make the wizard create an UI class stub.
 
@@ -236,17 +236,17 @@ First, launch Eclipse and follow the following steps:
 . In the [guilabel]#New Project# window that opens, select "Vaadin > Vaadin 7
 Project (Maven)" and click [guibutton]#Next#.
 +
-image::img/myproject-new-vaadin.png[width=70%]
+image::img/myproject-new-vaadin.png[width=70%, scaledwidth=90%]
 
 . In the [guilabel]#Select a Maven archetype# step, you need to select the project type.
 To create a simple test project, select the [guilabel]#Single-module Application Project#.
 +
-image::img/myproject-archetype-selection.png[width=70%]
+image::img/myproject-archetype-selection.png[width=70%, scaledwidth=90%]
 
 . In the [guilabel]#Specify archetype parameters# step, you need to give at least the [guilabel]#Group Id# and the [guilabel]#Artifact Id#.
 The default values should be good for the other settings.
 +
-image::img/myproject-settings.png[width=70%]
+image::img/myproject-settings.png[width=70%, scaledwidth=90%]
 
 [guilabel]#Group Id#::
 Give the project an organization-level identifier, for example, [packagename]#com.example#.
@@ -277,7 +277,7 @@ The project hierarchy shown in the Project Explorer is shown in <<figure.getting
 
 [[figure.getting-started.first-project.exploring]]
 .A new Vaadin Project
-image::img/myproject-created-annotated-hi.png[width=80%]
+image::img/myproject-created-annotated-hi.png[width=80%, scaledwidth=90%]
 
 The Vaadin libraries and other dependencies are managed by Maven.
 Notice that the libraries are not stored under the project folder, even though they are listed in the "Java Resources > Libraries > Maven Dependencies" virtual folder.
@@ -337,6 +337,8 @@ image::img/myproject-compilewidgetset.png[width=50%]
 [[getting-started.first-project.coding]]
 == Coding Tips for Eclipse
 
+=== Code Completion
+
 One of the most useful features in Eclipse is __code completion__. Pressing
 kbd:[Ctrl+Space] in the editor will display a pop-up list of possible class name and
 method name completions, as shown in
@@ -345,21 +347,20 @@ context of the cursor position.
 
 [[figure.getting-started.first-project.coding.codecompletion]]
 .Java Code Completion in Eclipse
-image::img/codingtips-codecompletion.png[]
-
-To add an [literal]#++import++# statement for a class, such as
-[classname]#Button#, simply press kbd:[Ctrl+Shift+O] or click the red error indicator on
-the left side of the editor window. If the class is available in multiple
-packages, a list of the alternatives is displayed, as shown in
-<<figure.getting-started.first-project.coding.import>>. For server-side
-development, you should normally use the classes under the
-[package]#com.vaadin.ui# or [package]#com.vaadin.server# packages. You can not
-use client-side classes (under [package]#com.vaadin.client#) or GWT classes for
-server-side development.
+image::img/codingtips-codecompletion.png[scaledwidth=100%]
+
+=== Generating Imports
+
+To automatically add an [literal]#++import++# statement for a class, such as
+[classname]#Button#, simply press kbd:[Ctrl+Shift+O] or click the red error indicator on the left side of the editor window.
+If the class is available in multiple packages, a list of the alternatives is displayed, as shown in <<figure.getting-started.first-project.coding.import>>.
 
 [[figure.getting-started.first-project.coding.import]]
-.Importing Classes Automatically
-image::img/codingtips-automaticimports.png[scaledwidth=80%]
+.Importing classes automatically
+image::img/codingtips-automaticimports.png[scaledwidth=70%]
+
+For server-side Vaadin development, you should generally use the classes under the [package]#com.vaadin.ui# or [package]#com.vaadin.server# packages.
+_You can not use client-side classes (under [package]#com.vaadin.client#) or GWT classes for server-side development._
 
 [[getting-started.first-project.server]]
 == Setting Up and Starting the Web Server
@@ -375,29 +376,39 @@ directory.
 
 Follow the following steps:
 
-. Switch to the Servers tab in the lower panel in Eclipse. List of servers should be empty after Eclipse is installed. Right-click on the empty area in the panel and select "New > Server".
+. Switch to the [guilabel]#Servers# tab in the lower panel in Eclipse.
+List of servers should be empty after Eclipse is installed.
+Right-click on the empty area in the panel and select "New > Server".
+ifdef::web[]
 +
-image::img/tomcat-startserver-1.png[]
-
+image::img/tomcat-startserver-1.png[width=60%, scaledwidth=100%]
+endif::web[]
 
 . Select "Apache > Tomcat v7.0 Server" and set [guilabel]#Server's host name# as [literal]#++localhost++#, which should be the default. If you have only one Tomcat installed, [guilabel]#Server runtime# has only one choice. Click [guibutton]#Next#.
+ifdef::web[]
 +
-image::img/tomcat-startserver-2.png[]
-
+image::img/tomcat-startserver-2.png[width=60%, scaledwidth=100%]
+endif::web[]
 
 . Add your project to the server by selecting it on the left and clicking [guibutton]#Add# to add it to the configured projects on the right. Click [guibutton]#Finish#.
+ifdef::web[]
 +
-image::img/tomcat-startserver-3.png[]
+image::img/tomcat-startserver-3.png[width=60%, scaledwidth=100%]
+endif::web[]
 
 . The server and the project are now installed in Eclipse and are shown in the [guilabel]#Servers# tab.
 To start the server, right-click on the server and select [guilabel]#Debug#.
 To start the server in non-debug mode, select [guilabel]#Start#.
+ifdef::web[]
 +
-image::img/tomcat-startserver-4.png[]
+image::img/tomcat-startserver-4.png[width=60%, scaledwidth=100%]
+endif::web[]
 
 . The server starts and the WebContent directory of the project is published to the server on http://localhost:8080/myproject/.
+ifdef::web[]
 +
-image::img/tomcat-startserver-5.png[]
+image::img/tomcat-startserver-5.png[width=60%, scaledwidth=100%]
+endif::web[]
 
 [[getting-started.first-project.run]]
 == Running and Debugging
@@ -406,8 +417,12 @@ Starting your application is as easy as selecting [guilabel]#myproject# from the
 [guilabel]#Project Explorer# and then "Run > Debug As > Debug on Server".
 Eclipse then opens the application in built-in web browser.
 
+////
+// This is rather irrelevant
+//
 .Running a Vaadin Application
-image::img/runningMyProject.png[width=60%]
+image::img/runningMyProject.png[width=60%, scaledwidth=80%]
+////
 
 You can insert break points in the Java code by double-clicking on the left
 margin bar of the source code window. For example, if you insert a breakpoint in
@@ -418,14 +433,20 @@ examine and change the state of the application.
 To continue execution, select [guilabel]#Resume# from [guilabel]#Run# menu.
 
 .Debugging a Vaadin Application
-image::img/debuggingMyProject.png[]
+image::img/debuggingMyProject.png[scaledwidth=100%]
 
 Above, we described how to debug a server-side application.
 Debugging client-side applications and widgets is described in
 <<dummy/../../../framework/clientside/clientside-debugging#clientside.debugging,"Debugging Client-Side Code">>.
 
 [[getting-started.eclipse.mavenlibraryupdate]]
+ifdef::web[]
 == Updating the Vaadin Libraries in Maven Projects
+endif::web[]
+// The book only describes Maven projects
+ifndef::web[]
+== Updating the Vaadin Libraries
+endif::web[]
 
 Updating the Vaadin plugin does not update Vaadin libraries. The libraries are
 project specific, as a different version might be required for different
@@ -449,6 +470,7 @@ right-clicking the server and selecting [guilabel]#Clean# as well as
 If you experience problems after updating the libraries, you can try using
 "Maven > Update Project".
 
+ifdef::web[]
 [[getting-started.eclipse.libraryupdate]]
 == Updating the Vaadin Libraries in Ivy Projects
 
@@ -486,3 +508,5 @@ If you experience problems after updating the libraries, you can try clearing
 the Ivy resolution caches by right-clicking the project and selecting "Ivy >
 Clean all caches".
 Then, do the "Ivy > Resolve" and other tasks again.
+
+endif::web[]

documentation/getting-started/getting-started-idea.asciidoc

@@ -35,7 +35,7 @@ the [guilabel]#Java SDK# to be used for the project.
 Vaadin requires at least Java 6.
 If you have not configured a Java SDK previously, you can configure it here.
 +
-image::img/idea-newproject-1.png[]
+image::img/idea-newproject-1.png[scaledwidth=100%]
 +
 Click [guibutton]#Next#.
 
@@ -45,7 +45,7 @@ Click [guibutton]#Next#.
 path. You probably also want an application stub, so select [guilabel]#Create
 sample application# and give a name for the generated UI class.
 +
-image::img/idea-newproject-2.png[]
+image::img/idea-newproject-2.png[scaledwidth=100%]
 +
 Do __not__ click [guibutton]#Finish# yet.
 
@@ -54,7 +54,7 @@ Set it as an integrated server that you have configured in IntelliJ IDEA, as des
 
 ifdef::web[]
 +
-image::img/idea-newproject-3.png[]
+image::img/idea-newproject-3.png[scaledwidth=100%]
 endif::web[]
 
 . Click [guibutton]#Finish#.
@@ -62,7 +62,7 @@ endif::web[]
 The project is created with the UI class stub and a [filename]#web.xml#
 deployment descriptor.
 
-image::img/idea-newproject-4.png[]
+image::img/idea-newproject-4.png[scaledwidth=100%]
 
 The wizard does not currently create a servlet class automatically, and uses
 Servlet 2.4 compatible deployment with a [filename]#web.xml# deployment
@@ -92,7 +92,7 @@ server using a run/debug configuration.
 . Enter a project name, location, and the Java SDK to be used for the project.
 Vaadin requires at least Java 6.
 +
-image::img/idea-maven-newproject-1.png[]
+image::img/idea-maven-newproject-1.png[scaledwidth=100%]
 +
 Click [guibutton]#Next#.
 //<?dbfo-need height="6cm" ?>
@@ -101,7 +101,7 @@ Click [guibutton]#Next#.
 [guilabel]#Version# for the project, or use the defaults.
 
 +
-image::img/idea-maven-newproject-2.png[]
+image::img/idea-maven-newproject-2.png[scaledwidth=100%]
 
 . Check [guilabel]#Create from archetype#
 //<?dbfo-need height="6cm" ?>

documentation/getting-started/getting-started-netbeans.asciidoc

@@ -24,13 +24,13 @@ theme, and so on.
 
 . In the [guilabel]#New Project# window that opens, select the [guilabel]#Vaadin# category and one of the Vaadin archetypes from the right.
 +
-image::img/netbeans-newproject-1.png[]
+image::img/netbeans-newproject-1.png[width=80%, scaledwidth=100%]
 +
 The archetypes are described in more detail in <<getting-started-archetypes#getting-started.archetypes, "Overview of Maven Archetypes">>.
 
 . In the [guilabel]#Name and Location# step, enter the project parameters.
 +
-image::img/netbeans-newproject-2.png[]
+image::img/netbeans-newproject-2.png[width=80%, scaledwidth=100%]
 
 [guilabel]#Project Name#:: A project name.
 The name must be a valid identifier that may only contains alphanumerics, minus, and underscore.
@@ -66,7 +66,7 @@ The project hierarchy shown in the Project Explorer is shown in <<figure.getting
 
 [[figure.getting-started.netbeans.exploring]]
 .A new Vaadin project in NetBeans
-image::img/netbeans-created-annotated-hi.png[width=80%]
+image::img/netbeans-created-annotated-hi.png[width=80%, scaledwidth=100%]
 
 [filename]#mytheme#::
 The theme of the UI.
@@ -89,12 +89,12 @@ Once created, you can run it in a server as follows.
 . In the [guilabel]#Select deployment server# window, select a server from the [guilabel]#Server# list.
 It should show either GlassFish or Apache Tomcat or both, depending on what you chose in NetBeans installation.
 +
-image::img/netbeans-server.png[width=75%]
+image::img/netbeans-server.png[width=75%, scaledwidth=100%]
 +
 Also, select [guilabel]#Remember Permanently# if you want to use the same server also in future while developing applications.
 +
 Click [guibutton]#OK#.
-+
+
 The widget set will be compiled at this point, which may take a while.
 
 If all goes well, NetBeans starts the server in port 8080 and, depending on your

documentation/getting-started/getting-started-overview.adoc

@@ -15,8 +15,8 @@ The recommended way to create a Vaadin application project is to use a Maven arc
 The archetypes contain all the needed dependencies, which Maven takes care of.
 The Eclipse IDE plugin currently also supports creating a normal Eclipse web project using the Ivy dependency manager.
 
-In this chapter, we give:
+In this chapter, we:
 
-. An overview of the Vaadin libraries
-. List the available Maven archetypes
-. Step-by-step instructions for creating a project in the Eclipse IDE, NetBeans IDE, and IntelliJ IDEA, as well as with command-line.
+* Give an overview of the Vaadin libraries
+* List the available Maven archetypes
+* Give step-by-step instructions for creating a project in the Eclipse IDE, NetBeans IDE, and IntelliJ IDEA, as well as with command-line.

documentation/installing/installing-eclipse.adoc

@@ -133,13 +133,15 @@ in <<figure.getting-started.eclipse.notification-center.overview>>.
 
 [[figure.getting-started.eclipse.notification-center.overview]]
 .Overview of the notification center
-image::img/notification-center-overview.png[]
+image::img/notification-center-overview.png[scaledwidth=60%]
 
 By clicking a notification in the list, you can open it up.
+ifdef::web[]
 
 .Detailed view of a notification
-image::img/webinar-trainings-sneakpeek.png[]
+image::img/webinar-trainings-sneakpeek.png[scaledwidth=75%]
 
+endif::web[]
 Clicking on the [guilabel]#Clear All# icon in the main pop-up clears all notifications and marks them all as read.
 
 [[getting-started.eclipse.notification.signin]]
@@ -155,57 +157,56 @@ When you are not signed in, the top-most notification will be a
 notification that asks you to sign in.
 
 .The sign-in notification
-image::img/signin-icon.png[]
+image::img/signin-icon.png[scaledwidth=75%]
 
 When you click the sign-in item, a dialog opens for signing in.
 
-.The sign-in dialog.
-image::img/sign-in-form.png[]
+.The sign-in dialog
+image::img/sign-in-form.png[scaledwidth=60%]
 
-You can then sign in with your Vaadin
-account. If you do not have one, you can sign in using a Google,
-Facebook, or Twitter account instead. First, click on the sign-in link. It opens a second dialog, as shown
+You can then sign in with your Vaadin account.
+
+If you do not have one, you can sign in using a Google, Facebook, or Twitter account instead.
+
+First, click on the sign-in link. It opens a second dialog, as shown
 in <<figure.getting-started.eclipse.notification-center.complex-signin>>.
 
 [[figure.getting-started.eclipse.notification-center.complex-signin]]
 .Sign-in authentication dialog
-image::img/signin-via-website.png[]
+image::img/signin-via-website.png[scaledwidth=60%]
 
-By following the [url]#vaadin.com# link and logging in to the Vaadin website using your preferred
-account, you can then copy the authentication token from the resulting page.
-After that, you can paste the authorization token into the dialog and
-click [guibutton]#Submit# to log in.
+By following the [url]#vaadin.com# link and logging in to the Vaadin website using your preferred account, you can then copy the authentication token from the resulting page.
+After that, you can paste the authorization token into the dialog and click [guibutton]#Submit# to log in.
 
 [[getting-started.eclipse.notification.settings]]
 === Notification Settings
 
 You can open the settings by selecting "Eclipse... > Preferences".
 
+ifdef::web[]
 .The settings pane
-image::img/preferences.png[]
+image::img/preferences.png[scaledwidth=100%]
+endif::web[]
 
 The options are as follows:
 
-[guilabel]#Enable automatic widgetset compilation# :: Compiles the widgetset
-of Maven-based projects whenever there are changes and the project is rebuilt.
+[guilabel]#Enable automatic widgetset compilation#::
+Compiles the widgetset of Maven-based projects whenever there are changes and the project is rebuilt.
 
-[guilabel]#Enable Vaadin pre-release archetypes# :: Adds pre-release
-(alpha/beta) archetypes to the archetype selection list when creating a new
-Vaadin project.
+[guilabel]#Enable Vaadin pre-release archetypes#::
+Adds pre-release (alpha/beta) archetypes to the archetype selection list when creating a new Vaadin project.
 
 [guilabel]#Enable# :: Disabling this disables all notifications.
 
-[guilabel]#Show popups# :: Disabling this stops
-pop-ups from appearing. The notifications can still be viewed by opening
-the notification center window.
+[guilabel]#Show popups# ::
+Disabling this stops pop-ups from appearing.
+The notifications can still be viewed by opening the notification center window.
 
 [guilabel]#Check for new Vaadin versions# ::
-Polls for new Vaadin versions once every 24h and gives a notification if there
-are new versions available.
-
-[guilabel]#Check for new notifications from vaadin.com# :: Polls the Vaadin site
-for notifications once every 4 hours.
+Polls for new Vaadin versions once every 24h and gives a notification if there are new versions available.
 
+[guilabel]#Check for new notifications from vaadin.com#::
+Polls the Vaadin site for notifications once every 4 hours.
 
 [[installing.eclipse.update]]
 == Updating the Plugins

documentation/installing/installing-idea.asciidoc

@@ -43,12 +43,12 @@ A WebSocket-enabled server, such as Glassfish or TomEE, is required for server p
 
 . In the Tomcat Server dialog, specify the home directory for the server.
 +
-image::img/idea-server-1.png[]
+image::img/idea-server-1.png[scaledwidth=80%]
 +
 Click [guibutton]#OK#.
 
 . Review the application server settings page to check that it is OK.
 +
-image::img/idea-server-2.png[]
+image::img/idea-server-2.png[scaledwidth=100%]
 +
 Then, click [guibutton]#OK#.

documentation/installing/installing-netbeans.asciidoc

@@ -12,7 +12,7 @@ The Vaadin Plug-in for NetBeans supports creating Vaadin projects, updating Vaad
 It also allows directly downloading Vaadin add-ons from the Vaadin Directory.
 
 .Installation of the NetBeans IDE toolchain
-image::img/installation-netbeans-hi.png[width=60%]
+image::img/installation-netbeans-hi.png[width=80%, scaledwidth=80%]
 
 The installation bundle includes a web server, so you do not need that.
 

documentation/installing/installing-other.adoc

@@ -29,7 +29,7 @@ toolbar. <<figure.firebug.calc>> shows Firebug in action.
 
 [[figure.firebug.calc]]
 .Firebug Debugger for Firefox
-image::img/firebug.png[]
+image::img/firebug.png[scaledwidth=100%]
 
 The most important feature in Firebug is inspecting HTML elements. Right-click
 on an element and select [guilabel]#Inspect Element with Firebug# to inspect it.

documentation/installing/installing-overview.adoc

@@ -13,7 +13,7 @@ You can use Vaadin with any Java IDE or no IDE at all.
 Vaadin has special support for the Eclipse and NetBeans IDEs, as well as for IntelliJ IDEA.
 
 .Vaadin installation steps
-image::img/installation-steps-hi.png[]
+image::img/installation-steps.svg[scaledwidth=100%]
 
 Managing Vaadin and other Java libraries can get tedious to do manually, so using a build system that manages dependencies automatically is adviced.
 Vaadin is distributed in the Maven central repository, and can be used with any build or dependency management system that can access Maven repositories, such as Ivy or Gradle, in addition to Maven.

documentation/installing/installing-toolchain.adoc

@@ -28,7 +28,7 @@ your entire toolchain supports it.
 
 [[figure.toolchain]]
 .Development Toolchain and Process
-image::img/toolchain-hi.png[width=70%]
+image::img/toolchain-hi.png[width=70%, scaledwidth=100%]
 
 <<figure.toolchain>> illustrates the development toolchain. You develop your
 application as an Eclipse project. The project must include, in addition to your

documentation/installing/original-drawings/installation-steps-constellation.svg

@@ -14,9 +14,12 @@
    height="744.09448"
    id="svg1901"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="steps-constellation-2.svg"
-   version="1.1">
+   inkscape:version="0.91 r"
+   sodipodi:docname="installation-steps-constellation.svg"
+   version="1.1"
+   inkscape:export-filename="/home/magi/itmill/vaadin/documentation/installing/original-drawings/installation-steps-constellation.png"
+   inkscape:export-xdpi="183"
+   inkscape:export-ydpi="183">
   <defs
      id="defs1903">
     <g
@@ -5877,14 +5880,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.2743067"
-     inkscape:cx="596.69243"
-     inkscape:cy="336.80876"
+     inkscape:zoom="1.1371534"
+     inkscape:cx="438.05434"
+     inkscape:cy="283.40355"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:window-width="1920"
      inkscape:window-height="1060"
-     inkscape:window-x="-3"
+     inkscape:window-x="-2"
      inkscape:window-y="-3"
      showgrid="true"
      inkscape:window-maximized="1"
@@ -5912,7 +5915,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -5921,18 +5924,6 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-308.2677)">
-    <g
-       id="surface0"
-       transform="matrix(2.4204743,0,0,2.4204743,-57.788206,141.01257)"
-       style="opacity:0">
-      <use
-         id="use15470"
-         xlink:href="#surface1"
-         x="0"
-         y="0"
-         width="1"
-         height="1" />
-    </g>
     <path
        style="fill:none;stroke:#acacac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 458.93578,684.66906 -23.94945,18.58377"
@@ -5986,7 +5977,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="14.258381"
        sodipodi:ry="14.258381"
-       d="m 17.085091,430.95432 a 14.258381,14.258381 0 1 1 0.03124,0.0208"
+       d="m 17.085091,430.95432 a 14.258381,14.258381 0 0 1 -3.950129,-19.76694 14.258381,14.258381 0 0 1 19.764334,-3.96314 14.258381,14.258381 0 0 1 3.976137,19.76173 14.258381,14.258381 0 0 1 -19.759102,3.98913"
        transform="matrix(0.54549827,0,0,0.54549827,426.83523,443.91326)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4398399"
@@ -6047,7 +6038,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="14.258381"
        sodipodi:ry="14.258381"
-       d="m 17.085091,430.95432 c -6.550005,-4.37129 -8.3162076,-13.22474 -3.944924,-19.77475 4.371283,-6.55 13.224737,-8.3162 19.774742,-3.94492 6.550005,4.37128 8.316208,13.22474 3.944924,19.77474 -4.370182,6.54836 -13.220603,8.31559 -19.770514,3.94775 L 25,419.09448 z"
+       d="m 17.085091,430.95432 a 14.258381,14.258381 0 0 1 -3.945629,-19.77369 14.258381,14.258381 0 0 1 19.773333,-3.94739 14.258381,14.258381 0 0 1 3.949153,19.77298 14.258381,14.258381 0 0 1 -19.772629,3.95092 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,445.27941,456.04902)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6062,7 +6053,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="9.9760981"
        sodipodi:ry="9.9760981"
-       d="m 19.462211,427.3924 c -4.582813,-3.05844 -5.818564,-9.25289 -2.760128,-13.83571 3.058437,-4.58281 9.252893,-5.81856 13.835706,-2.76012 4.582813,3.05843 5.818564,9.25289 2.760128,13.8357 -3.057666,4.58166 -9.250001,5.81814 -13.832748,2.7621 L 25,419.09448 z"
+       d="m 19.462211,427.3924 a 9.9760981,9.9760981 0 0 1 -2.760621,-13.83497 9.9760981,9.9760981 0 0 1 13.83472,-2.76185 9.9760981,9.9760981 0 0 1 2.763087,13.83447 9.9760981,9.9760981 0 0 1 -13.834228,2.76432 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,521.47235,449.18471)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6086,7 +6077,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="16.573128"
        sodipodi:ry="16.573128"
-       d="M 15.800162,432.87968 C 8.1868101,427.79874 6.1338769,417.508 11.214807,409.89464 c 5.080931,-7.61335 15.371679,-9.66628 22.985031,-4.58535 7.613352,5.08093 9.666285,15.37168 4.585355,22.98503 -5.07965,7.61143 -15.366874,9.66557 -22.980117,4.58863 L 25,419.09448 z"
+       d="m 15.800162,432.87968 a 16.573128,16.573128 0 0 1 -4.586174,-22.98381 16.573128,16.573128 0 0 1 22.983393,-4.58822 16.573128,16.573128 0 0 1 4.59027,22.98299 16.573128,16.573128 0 0 1 -22.982575,4.59231 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,569.95275,535.48029)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6110,7 +6101,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="16.45739"
        sodipodi:ry="16.45739"
-       d="m 15.864409,432.78341 c -7.5601846,-5.04545 -9.5987812,-15.26433 -4.553333,-22.82452 5.045447,-7.56018 15.264331,-9.59878 22.824515,-4.55333 7.560185,5.04545 9.598781,15.26433 4.553333,22.82451 -5.044176,7.55828 -15.25956,9.59807 -22.819636,4.55659 L 25,419.09448 z"
+       d="m 15.864409,432.78341 a 16.45739,16.45739 0 0 1 -4.554147,-22.8233 16.45739,16.45739 0 0 1 22.82289,-4.55618 16.45739,16.45739 0 0 1 4.558214,22.82248 16.45739,16.45739 0 0 1 -22.822078,4.56025 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,650.04587,468.90306)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6125,7 +6116,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="6.6197143"
        sodipodi:ry="6.6197143"
-       d="m 21.325359,424.60063 c -3.04096,-2.02945 -3.860952,-6.13983 -1.831504,-9.18079 2.029449,-3.04096 6.139827,-3.86095 9.180786,-1.8315 3.04096,2.02945 3.860952,6.13982 1.831504,9.18078 -2.028937,3.0402 -6.137907,3.86067 -9.178824,1.83282 L 25,419.09448 z"
+       d="m 21.325359,424.60063 a 6.6197143,6.6197143 0 0 1 -1.831831,-9.1803 6.6197143,6.6197143 0 0 1 9.180132,-1.83265 6.6197143,6.6197143 0 0 1 1.833467,9.17997 6.6197143,6.6197143 0 0 1 -9.179806,1.83429 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,693.69477,532.83762)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6140,7 +6131,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="11.133471"
        sodipodi:ry="11.133471"
-       d="m 18.819747,428.35508 c -5.114486,-3.41326 -6.493602,-10.32636 -3.080343,-15.44085 3.41326,-5.11449 10.326363,-6.4936 15.440849,-3.08034 5.114486,3.41326 6.493602,10.32636 3.080343,15.44085 -3.4124,5.11319 -10.323136,6.49312 -15.437548,3.08254 L 25,419.09448 z"
+       d="m 18.819747,428.35508 a 11.133471,11.133471 0 0 1 -3.080893,-15.44003 11.133471,11.133471 0 0 1 15.439749,-3.08226 11.133471,11.133471 0 0 1 3.083645,15.43947 11.133471,11.133471 0 0 1 -15.4392,3.08502 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,543.84048,509.96824)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6155,7 +6146,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="9.1659365"
        sodipodi:ry="9.1659365"
-       d="m 19.911936,426.71852 c -4.210641,-2.81006 -5.346037,-8.50146 -2.535977,-12.7121 2.81006,-4.21064 8.501463,-5.34604 12.712105,-2.53598 4.210641,2.81006 5.346037,8.50146 2.535977,12.71211 -2.809352,4.20958 -8.498806,5.34564 -12.709387,2.53779 L 25,419.09448 z"
+       d="m 19.911936,426.71852 a 9.1659365,9.1659365 0 0 1 -2.53643,-12.71142 9.1659365,9.1659365 0 0 1 12.711199,-2.53756 9.1659365,9.1659365 0 0 1 2.538696,12.71097 9.1659365,9.1659365 0 0 1 -12.710747,2.53983 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,558.10888,564.13766)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6170,7 +6161,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="10.148001"
        sodipodi:ry="10.148001"
-       d="m 19.366787,427.53538 c -4.661782,-3.11113 -5.918827,-9.41233 -2.807689,-14.07411 3.111138,-4.66178 9.412334,-5.91883 14.074115,-2.80769 4.661782,3.11114 5.918827,9.41233 2.807689,14.07412 -3.110354,4.6606 -9.409392,5.91838 -14.071107,2.80969 L 25,419.09448 z"
+       d="m 19.366787,427.53538 a 10.148001,10.148001 0 0 1 -2.808191,-14.07336 10.148001,10.148001 0 0 1 14.073113,-2.80944 10.148001,10.148001 0 0 1 2.810698,14.07286 10.148001,10.148001 0 0 1 -14.072612,2.81195 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,585.22254,590.25297)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6185,7 +6176,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="7.0381308"
        sodipodi:ry="7.0381308"
-       d="m 21.093093,424.94866 c -3.233171,-2.15773 -4.104993,-6.52791 -1.947268,-9.76108 2.157725,-3.23318 6.52791,-4.105 9.761082,-1.94727 3.233171,2.15772 4.104993,6.52791 1.947268,9.76108 -2.157181,3.23236 -6.52587,4.10469 -9.758995,1.94866 L 25,419.09448 z"
+       d="m 21.093093,424.94866 a 7.0381308,7.0381308 0 0 1 -1.947616,-9.76056 7.0381308,7.0381308 0 0 1 9.760386,-1.94849 7.0381308,7.0381308 0 0 1 1.949356,9.76021 7.0381308,7.0381308 0 0 1 -9.760039,1.95023 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,600.04322,575.49375)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6200,7 +6191,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="7.0545816"
        sodipodi:ry="7.0545816"
-       d="m 21.083961,424.96234 a 7.0545816,7.0545816 0 1 1 0.0021,0.001 L 25,419.09448 z"
+       d="m 21.083961,424.96234 a 7.0545816,7.0545816 0 0 1 -1.952168,-9.78337 7.0545816,7.0545816 0 0 1 9.7832,-1.95304 7.0545816,7.0545816 0 0 1 1.953912,9.78302 7.0545816,7.0545816 0 0 1 -9.782852,1.95479 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,457.00359,499.62701)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6215,7 +6206,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="6.0560665"
        sodipodi:ry="6.0560665"
-       d="m 21.638243,424.1318 a 6.0560665,6.0560665 0 1 1 0.0018,0.001 L 25,419.09448 z"
+       d="m 21.638243,424.1318 a 6.0560665,6.0560665 0 0 1 -1.675856,-8.39863 6.0560665,6.0560665 0 0 1 8.398472,-1.6766 6.0560665,6.0560665 0 0 1 1.677353,8.39832 6.0560665,6.0560665 0 0 1 -8.398174,1.6781 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,534.87537,373.72391)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6230,7 +6221,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="7.0381308"
        sodipodi:ry="7.0381308"
-       d="m 21.093093,424.94866 a 7.0381308,7.0381308 0 1 1 0.0021,0.001 L 25,419.09448 z"
+       d="m 21.093093,424.94866 a 7.0381308,7.0381308 0 0 1 -1.947616,-9.76056 7.0381308,7.0381308 0 0 1 9.760386,-1.94849 7.0381308,7.0381308 0 0 1 1.949356,9.76021 7.0381308,7.0381308 0 0 1 -9.760039,1.95023 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,421.34887,474.63751)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6245,7 +6236,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="7.3141384"
        sodipodi:ry="7.3141384"
-       d="m 20.93988,425.17823 a 7.3141384,7.3141384 0 1 1 0.0022,0.001 L 25,419.09448 z"
+       d="m 20.93988,425.17823 a 7.3141384,7.3141384 0 0 1 -2.023994,-10.14333 7.3141384,7.3141384 0 0 1 10.14315,-2.02489 7.3141384,7.3141384 0 0 1 2.025802,10.14297 7.3141384,7.3141384 0 0 1 -10.14279,2.0267 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,405.3085,269.06738)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6260,7 +6251,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="6.8368459"
        sodipodi:ry="6.8368459"
-       d="m 21.204828,424.78123 a 6.8368459,6.8368459 0 1 1 0.002,0.001 L 25,419.09448 z"
+       d="m 21.204828,424.78123 a 6.8368459,6.8368459 0 0 1 -1.891916,-9.48141 6.8368459,6.8368459 0 0 1 9.481247,-1.89276 6.8368459,6.8368459 0 0 1 1.893606,9.48107 6.8368459,6.8368459 0 0 1 -9.48091,1.89445 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,461.6318,289.90142)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6275,7 +6266,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="9.1659365"
        sodipodi:ry="9.1659365"
-       d="m 19.911936,426.71852 a 9.1659365,9.1659365 0 1 1 0.0027,0.002 L 25,419.09448 z"
+       d="m 19.911936,426.71852 a 9.1659365,9.1659365 0 0 1 -2.53643,-12.71142 9.1659365,9.1659365 0 0 1 12.711199,-2.53756 9.1659365,9.1659365 0 0 1 2.538696,12.71097 9.1659365,9.1659365 0 0 1 -12.710747,2.53983 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,334.64672,276.96229)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6290,7 +6281,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="14.142643"
        sodipodi:ry="14.142643"
-       d="m 17.149338,430.85805 c -6.496838,-4.3358 -8.2487037,-13.11739 -3.912903,-19.61423 4.335801,-6.49684 13.11739,-8.2487 19.614227,-3.9129 6.496838,4.3358 8.248704,13.11739 3.912903,19.61422 -4.216961,6.31877 -12.672539,8.17737 -19.150591,4.20945"
+       d="m 17.149338,430.85805 a 14.142643,14.142643 0 0 1 -3.988727,-19.49941 14.142643,14.142643 0 0 1 19.459676,-4.17825 14.142643,14.142643 0 0 1 4.36738,19.4181 14.142643,14.142643 0 0 1 -19.374693,4.5561"
        transform="matrix(0.54549827,0,0,0.54549827,521.47235,449.18471)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4035543"
@@ -6306,7 +6297,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="7.5456133"
        sodipodi:ry="7.5456133"
-       d="m 20.811387,425.37077 c -3.466299,-2.31331 -4.400983,-6.9986 -2.087676,-10.4649 2.313307,-3.4663 6.998604,-4.40098 10.464902,-2.08768 3.466299,2.31331 4.400983,6.99861 2.087676,10.46491 -2.312725,3.46542 -6.996416,4.40065 -10.462665,2.08916 L 25,419.09448 z"
+       d="m 20.811387,425.37077 a 7.5456133,7.5456133 0 0 1 -2.088049,-10.46434 7.5456133,7.5456133 0 0 1 10.464157,-2.08898 7.5456133,7.5456133 0 0 1 2.089913,10.46397 7.5456133,7.5456133 0 0 1 -10.463784,2.09084 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,530.58222,440.52024)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6660,7 +6651,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="14.258381"
        sodipodi:ry="14.258381"
-       d="m 17.085091,430.95432 a 14.258381,14.258381 0 1 1 0.03124,0.0208"
+       d="m 17.085091,430.95432 a 14.258381,14.258381 0 0 1 -3.950129,-19.76694 14.258381,14.258381 0 0 1 19.764334,-3.96314 14.258381,14.258381 0 0 1 3.976137,19.76173 14.258381,14.258381 0 0 1 -19.759102,3.98913"
        transform="matrix(0.54549827,0,0,0.54549827,748.55255,386.93313)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4398399"
@@ -6706,7 +6697,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="11.457419"
        sodipodi:ry="11.457419"
-       d="M 18.639921,428.62453 C 13.37662,425.11196 11.957375,417.9977 15.46995,412.7344 c 3.512575,-5.2633 10.626828,-6.68254 15.890129,-3.16997 5.263301,3.51258 6.682546,10.62683 3.169971,15.89013 -3.51169,5.26198 -10.623506,6.68205 -15.886732,3.17224 L 25,419.09448 z"
+       d="m 18.639921,428.62453 a 11.457419,11.457419 0 0 1 -3.170538,-15.88928 11.457419,11.457419 0 0 1 15.888998,-3.17195 11.457419,11.457419 0 0 1 3.173369,15.88871 11.457419,11.457419 0 0 1 -15.888432,3.17479 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,386.28035,373.45979)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6721,7 +6712,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="8.0366459"
        sodipodi:ry="8.0366459"
-       d="m 20.538812,425.7792 a 8.0366459,8.0366459 0 1 1 0.0024,0.002 L 25,419.09448 z"
+       d="m 20.538812,425.7792 a 8.0366459,8.0366459 0 0 1 -2.223929,-11.14531 8.0366459,8.0366459 0 0 1 11.145114,-2.22492 8.0366459,8.0366459 0 0 1 2.225915,11.14491 8.0366459,8.0366459 0 0 1 -11.144717,2.22691 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,479.22751,566.24206)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6736,7 +6727,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="6.2361951"
        sodipodi:ry="6.2361951"
-       d="m 21.538252,424.28162 a 6.2361951,6.2361951 0 1 1 0.0018,0.001 L 25,419.09448 z"
+       d="m 21.538252,424.28162 a 6.2361951,6.2361951 0 0 1 -1.725702,-8.64842 6.2361951,6.2361951 0 0 1 8.648273,-1.72648 6.2361951,6.2361951 0 0 1 1.727243,8.64812 6.2361951,6.2361951 0 0 1 -8.647965,1.72802 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,487.83627,571.33356)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6751,7 +6742,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="8.0366459"
        sodipodi:ry="8.0366459"
-       d="m 20.538812,425.7792 a 8.0366459,8.0366459 0 1 1 0.0024,0.002 L 25,419.09448 z"
+       d="m 20.538812,425.7792 a 8.0366459,8.0366459 0 0 1 -2.223929,-11.14531 8.0366459,8.0366459 0 0 1 11.145114,-2.22492 8.0366459,8.0366459 0 0 1 2.225915,11.14491 8.0366459,8.0366459 0 0 1 -11.144717,2.22691 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,577.80511,399.02132)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6766,7 +6757,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="7.4637752"
        sodipodi:ry="7.4637752"
-       d="m 20.856816,425.3027 a 7.4637752,7.4637752 0 1 1 0.0022,0.001 L 25,419.09448 z"
+       d="m 20.856816,425.3027 a 7.4637752,7.4637752 0 0 1 -2.065403,-10.35085 7.4637752,7.4637752 0 0 1 10.350665,-2.06632 7.4637752,7.4637752 0 0 1 2.067247,10.35048 7.4637752,7.4637752 0 0 1 -10.350296,2.06817 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,521.99238,481.6531)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6781,7 +6772,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,486.60346,375.03871)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6796,7 +6787,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,486.95467,357.60974)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6811,7 +6802,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,636.67061,362.9471)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6826,7 +6817,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,649.86144,401.20052)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6841,7 +6832,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,601.05536,420.10738)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6856,7 +6847,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,620.40192,422.30585)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6871,7 +6862,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,650.30114,420.54707)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6886,7 +6877,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,661.73319,422.30585)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6901,7 +6892,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,718.01408,489.5791)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6916,7 +6907,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,661.73319,482.54399)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6931,7 +6922,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,594.89964,567.40501)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6946,7 +6937,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,421.22034,494.41574)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6961,7 +6952,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.4486704"
        sodipodi:ry="5.4486704"
-       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 21.975412,423.62658 a 5.4486704,5.4486704 0 0 1 -1.507775,-7.55628 5.4486704,5.4486704 0 0 1 7.556143,-1.50845 5.4486704,5.4486704 0 0 1 1.509122,7.55601 5.4486704,5.4486704 0 0 1 -7.555875,1.50979 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,406.27073,500.57146)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6976,7 +6967,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7433839"
        sodipodi:ry="4.7433839"
-       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 1 1 0.0014,9.4e-4 L 25,419.09448 z"
+       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 0 1 -1.312605,-6.57818 4.7433839,4.7433839 0 0 1 6.578061,-1.31319 4.7433839,4.7433839 0 0 1 1.313779,6.57795 4.7433839,4.7433839 0 0 1 -6.577828,1.31436 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,516.11611,330.06144)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -6991,7 +6982,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7433839"
        sodipodi:ry="4.7433839"
-       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 1 1 0.0014,9.4e-4 L 25,419.09448 z"
+       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 0 1 -1.312605,-6.57818 4.7433839,4.7433839 0 0 1 6.578061,-1.31319 4.7433839,4.7433839 0 0 1 1.313779,6.57795 4.7433839,4.7433839 0 0 1 -6.577828,1.31436 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,551.42485,333.21276)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7006,7 +6997,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7433839"
        sodipodi:ry="4.7433839"
-       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 1 1 0.0014,9.4e-4 L 25,419.09448 z"
+       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 0 1 -1.312605,-6.57818 4.7433839,4.7433839 0 0 1 6.578061,-1.31319 4.7433839,4.7433839 0 0 1 1.313779,6.57795 4.7433839,4.7433839 0 0 1 -6.577828,1.31436 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,635.38908,321.93665)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7021,7 +7012,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7433839"
        sodipodi:ry="4.7433839"
-       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 1 1 0.0014,9.4e-4 L 25,419.09448 z"
+       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 0 1 -1.312605,-6.57818 4.7433839,4.7433839 0 0 1 6.578061,-1.31319 4.7433839,4.7433839 0 0 1 1.313779,6.57795 4.7433839,4.7433839 0 0 1 -6.577828,1.31436 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,626.06175,300.4838)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7036,7 +7027,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7433839"
        sodipodi:ry="4.7433839"
-       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 1 1 0.0014,9.4e-4 L 25,419.09448 z"
+       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 0 1 -1.312605,-6.57818 4.7433839,4.7433839 0 0 1 6.578061,-1.31319 4.7433839,4.7433839 0 0 1 1.313779,6.57795 4.7433839,4.7433839 0 0 1 -6.577828,1.31436 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,664.3038,299.24015)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7051,7 +7042,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7433839"
        sodipodi:ry="4.7433839"
-       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 1 1 0.0014,9.4e-4 L 25,419.09448 z"
+       d="m 22.36692,423.03993 a 4.7433839,4.7433839 0 0 1 -1.312605,-6.57818 4.7433839,4.7433839 0 0 1 6.578061,-1.31319 4.7433839,4.7433839 0 0 1 1.313779,6.57795 4.7433839,4.7433839 0 0 1 -6.577828,1.31436 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,685.91639,393.50586)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7066,7 +7057,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.3479152"
        sodipodi:ry="5.3479152"
-       d="m 22.031342,423.54277 a 5.3479152,5.3479152 0 1 1 0.0016,0.001 L 25,419.09448 z"
+       d="m 22.031342,423.54277 a 5.3479152,5.3479152 0 0 1 -1.479894,-7.41655 5.3479152,5.3479152 0 0 1 7.416418,-1.48055 5.3479152,5.3479152 0 0 1 1.481215,7.41628 5.3479152,5.3479152 0 0 1 -7.416154,1.48188 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,355.92571,551.57601)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7081,7 +7072,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.8441391"
        sodipodi:ry="4.8441391"
-       d="m 22.310991,423.12374 a 4.8441391,4.8441391 0 1 1 0.0014,9.6e-4 L 25,419.09448 z"
+       d="m 22.310991,423.12374 a 4.8441391,4.8441391 0 0 1 -1.340488,-6.71791 4.8441391,4.8441391 0 0 1 6.717788,-1.34108 4.8441391,4.8441391 0 0 1 1.341685,6.71766 4.8441391,4.8441391 0 0 1 -6.717549,1.34229 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,489.15313,501.01115)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7096,7 +7087,7 @@
        sodipodi:cy="505.69778"
        sodipodi:rx="4.0302472"
        sodipodi:ry="4.2794442"
-       d="m 598.09317,509.25734 a 4.0302472,4.2794442 0 1 1 0.0789,0.0545"
+       d="m 598.09317,509.25734 a 4.0302472,4.2794442 0 0 1 -1.12807,-5.91428 4.0302472,4.2794442 0 0 1 5.56321,-1.23232 4.0302472,4.2794442 0 0 1 1.19301,5.89989 4.0302472,4.2794442 0 0 1 -5.54927,1.3012"
        transform="translate(0.7145034,307.7181)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4191227"
@@ -7112,7 +7103,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.0456495"
        sodipodi:ry="5.0456495"
-       d="m 22.199131,423.29135 a 5.0456495,5.0456495 0 1 1 0.0015,10e-4 L 25,419.09448 z"
+       d="m 22.199131,423.29135 a 5.0456495,5.0456495 0 0 1 -1.39625,-6.99736 5.0456495,5.0456495 0 0 1 6.99724,-1.39688 5.0456495,5.0456495 0 0 1 1.397497,6.99712 5.0456495,5.0456495 0 0 1 -6.996991,1.39812 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,503.60808,441.59744)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7127,7 +7118,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="5.0456495"
        sodipodi:ry="5.0456495"
-       d="m 22.199131,423.29135 a 5.0456495,5.0456495 0 1 1 0.0015,10e-4 L 25,419.09448 z"
+       d="m 22.199131,423.29135 a 5.0456495,5.0456495 0 0 1 -1.39625,-6.99736 5.0456495,5.0456495 0 0 1 6.99724,-1.39688 5.0456495,5.0456495 0 0 1 1.397497,6.99712 5.0456495,5.0456495 0 0 1 -6.996991,1.39812 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,502.07547,430.88932)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7142,7 +7133,7 @@
        sodipodi:cy="505.69778"
        sodipodi:rx="4.0302472"
        sodipodi:ry="4.2794442"
-       d="m 598.09317,509.25734 a 4.0302472,4.2794442 0 1 1 0.0789,0.0545"
+       d="m 598.09317,509.25734 a 4.0302472,4.2794442 0 0 1 -1.12807,-5.91428 4.0302472,4.2794442 0 0 1 5.56321,-1.23232 4.0302472,4.2794442 0 0 1 1.19301,5.89989 4.0302472,4.2794442 0 0 1 -5.54927,1.3012"
        transform="translate(-60.10543,208.90573)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4191227"
@@ -7158,7 +7149,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="6.8735647"
        sodipodi:ry="6.8735647"
-       d="m 21.184445,424.81177 a 6.8735647,6.8735647 0 1 1 0.002,0.001 L 25,419.09448 z"
+       d="m 21.184445,424.81177 a 6.8735647,6.8735647 0 0 1 -1.902077,-9.53233 6.8735647,6.8735647 0 0 1 9.532168,-1.90293 6.8735647,6.8735647 0 0 1 1.903776,9.532 6.8735647,6.8735647 0 0 1 -9.531829,1.90462 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,711.09589,465.11113)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7173,7 +7164,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7362232"
        sodipodi:ry="4.7362232"
-       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 1 1 0.0014,9.3e-4 L 25,419.09448 z"
+       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 0 1 -1.310624,-6.56825 4.7362232,4.7362232 0 0 1 6.568132,-1.31121 4.7362232,4.7362232 0 0 1 1.311794,6.56801 4.7362232,4.7362232 0 0 1 -6.567897,1.31238 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,402.31127,372.70812)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7188,7 +7179,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7362232"
        sodipodi:ry="4.7362232"
-       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 1 1 0.0014,9.3e-4 L 25,419.09448 z"
+       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 0 1 -1.310624,-6.56825 4.7362232,4.7362232 0 0 1 6.568132,-1.31121 4.7362232,4.7362232 0 0 1 1.311794,6.56801 4.7362232,4.7362232 0 0 1 -6.567897,1.31238 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,370.18207,354.27138)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7203,7 +7194,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="6.7310748"
        sodipodi:ry="6.7310748"
-       d="m 21.263542,424.69325 a 6.7310748,6.7310748 0 1 1 0.002,0.001 L 25,419.09448 z"
+       d="m 21.263542,424.69325 a 6.7310748,6.7310748 0 0 1 -1.862647,-9.33473 6.7310748,6.7310748 0 0 1 9.334565,-1.86348 6.7310748,6.7310748 0 0 1 1.864311,9.3344 6.7310748,6.7310748 0 0 1 -9.334234,1.86515 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,379.35394,351.31773)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7218,7 +7209,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7362232"
        sodipodi:ry="4.7362232"
-       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 1 1 0.0014,9.3e-4 L 25,419.09448 z"
+       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 0 1 -1.310624,-6.56825 4.7362232,4.7362232 0 0 1 6.568132,-1.31121 4.7362232,4.7362232 0 0 1 1.311794,6.56801 4.7362232,4.7362232 0 0 1 -6.567897,1.31238 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,373.29118,344.16678)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7233,7 +7224,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7362232"
        sodipodi:ry="4.7362232"
-       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 1 1 0.0014,9.3e-4 L 25,419.09448 z"
+       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 0 1 -1.310624,-6.56825 4.7362232,4.7362232 0 0 1 6.568132,-1.31121 4.7362232,4.7362232 0 0 1 1.311794,6.56801 4.7362232,4.7362232 0 0 1 -6.567897,1.31238 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,429.72151,287.42554)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"
@@ -7248,7 +7239,7 @@
        sodipodi:cy="419.09448"
        sodipodi:rx="4.7362232"
        sodipodi:ry="4.7362232"
-       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 1 1 0.0014,9.3e-4 L 25,419.09448 z"
+       d="m 22.370895,423.03398 a 4.7362232,4.7362232 0 0 1 -1.310624,-6.56825 4.7362232,4.7362232 0 0 1 6.568132,-1.31121 4.7362232,4.7362232 0 0 1 1.311794,6.56801 4.7362232,4.7362232 0 0 1 -6.567897,1.31238 L 25,419.09448 Z"
        transform="matrix(0.54549827,0,0,0.54549827,492.83642,279.03094)"
        sodipodi:start="2.1592864"
        sodipodi:end="8.4421153"

documentation/installing/original-drawings/installation-steps.svg

@@ -9,15 +9,28 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
+   width="561"
+   height="231"
    id="svg1901"
    sodipodi:version="0.32"
    inkscape:version="0.48.4 r9939"
    sodipodi:docname="installation-steps.svg"
    version="1.1">
   <defs
-     id="defs1903" />
+     id="defs1903">
+    <font
+       horiz-adv-x="1024"
+       id="font3118"
+       inkscape:label="fontti 1">
+      <font-face
+         units-per-em="1024"
+         id="font-face3120"
+         font-family="SVGFont 1" />
+      <missing-glyph
+         d="M0,0h1000v1024h-1000z"
+         id="missing-glyph3122" />
+    </font>
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,9 +38,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="402.01814"
-     inkscape:cy="409.01233"
+     inkscape:zoom="1.979899"
+     inkscape:cx="247.15191"
+     inkscape:cy="62.440392"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:window-width="1920"
@@ -43,7 +56,11 @@
      inkscape:object-nodes="true"
      inkscape:snap-object-midpoints="true"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     fit-margin-top="5"
+     fit-margin-left="5"
+     fit-margin-right="5"
+     fit-margin-bottom="5">
     <inkscape:grid
        type="xygrid"
        id="grid2982"
@@ -52,14 +69,16 @@
        enabled="true"
        snapvisiblegridlinesonly="true"
        spacingx="5px"
-       spacingy="5px" />
+       spacingy="5px"
+       originx="-124.5px"
+       originy="-294.50073px" />
     <sodipodi:guide
        orientation="1,0"
-       position="227.32143,468.92857"
+       position="102.82143,174.42784"
        id="guide3116" />
     <sodipodi:guide
        orientation="1,0"
-       position="328.03571,468.03571"
+       position="203.53571,173.53498"
        id="guide3120" />
   </sodipodi:namedview>
   <metadata
@@ -78,7 +97,7 @@
      inkscape:label="Taso 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-308.2677)">
+     transform="translate(-124.5,-526.86145)">
     <rect
        style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.13524589;stroke-dasharray:2, 1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3115"
@@ -111,7 +130,7 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(0.74636894,298.81113)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-7-2"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-6-3"><rect
@@ -246,7 +265,7 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(0.96798326,298.92194)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-7-2-4"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-6-3-2"><rect
@@ -272,7 +291,7 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(5.79546,303.04687)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-7-0"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-6-6"><rect
@@ -298,7 +317,7 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(5.77146,308.61462)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-8"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-3"><rect
@@ -372,7 +391,7 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(1.0223215,288.61775)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-7-2-4-0"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-6-3-2-1"><rect
@@ -398,7 +417,7 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(5.7477504,293.01433)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-7-0-0"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-6-6-0"><rect
@@ -423,11 +442,11 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(6.486036,298.2575)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-7-0-0-9"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-6-6-0-5"><rect
-               style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;writing-mode:lr;text-anchor:start;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+               style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;writing-mode:lr-tb;text-anchor:start;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
                y="363.14072"
                x="16.541248"
                height="25.127552"
@@ -448,7 +467,7 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(5.5983218,303.07893)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-8-5"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-3-9"><rect
@@ -473,11 +492,11 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(5.4917504,307.90036)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-8-5-5"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-3-9-6"><rect
-               style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;writing-mode:lr;text-anchor:start;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+               style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;writing-mode:lr-tb;text-anchor:start;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
                y="363.14072"
                x="16.541248"
                height="25.127552"
@@ -547,7 +566,7 @@
            rx="1.8654728" />
         <flowRoot
            transform="translate(-0.038706,307.54845)"
-           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:90%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:89.99999762%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica Rounded LT Std;-inkscape-font-specification:Helvetica Rounded LT Std Bold"
            id="flowRoot3808-5-9"
            xml:space="preserve"><flowRegion
              id="flowRegion3810-5-65"><rect

documentation/introduction/intro-overview.asciidoc

@@ -24,7 +24,7 @@ deal directly with browser technologies, such as HTML or JavaScript.
 
 [[figure.intro.architecture]]
 .Vaadin Application Architecture
-image::img/architecture-vaadin7-hi.png[]
+image::img/architecture-vaadin7-hi.png[scaledwidth=100%]
 
 <<figure.intro.architecture>> illustrates the basic architectures of web
 applications made with Vaadin. The server-side application architecture consists
@@ -84,6 +84,3 @@ for now. You can read more about it later in
 or jump straight to more practical things in
 <<dummy/../../../framework/application/application-overview.asciidoc#application.overview,"Writing
 a Server-Side Web Application">>.
-
-
-

documentation/layout/layout-gridlayout.asciidoc

@@ -54,12 +54,12 @@ 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.
+The resulting layout is shown in <<figure.layout.gridlayout>>.
+The borders have been made visible to illustrate the layout cells.
 
-[[figure.ui.gridlayout]]
-.The Grid Layout Component
-image::img/gridlayout.png[]
+[[figure.layout.gridlayout]]
+.The [classname]#GridLayout# component
+image::img/gridlayout.png[width=50%, scaledwidth=75%]
 
 A component to be placed on the grid must not overlap with existing components.
 A conflict causes throwing a [classname]#GridLayout.OverlapsException#.
@@ -103,8 +103,6 @@ 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
@@ -116,7 +114,6 @@ 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);
@@ -153,7 +150,7 @@ 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)
@@ -163,8 +160,8 @@ for (int col=0; col<grid.getColumns(); col++) {
 ----
 
 [[figure.ui.gridlayout.sizing.expanding]]
-.Expanding Rows and Columns in [classname]#GridLayout#
-image::img/gridlayout_sizing_expanding.png[]
+.Expanding rows and columns in [classname]#GridLayout#
+image::img/gridlayout_sizing_expanding.png[width=75%, scaledwidth=100%]
 
 If the size of the contained components is undefined or fixed, the expansion
 ratio is of the __excess__ space, as in
@@ -177,68 +174,18 @@ example, if we had a 100 pixels wide grid layout with two columns with 1.0 and
 [methodname]#setWidth("100%")#, the columns would have respective widths of 20
 and 80 pixels, regardless of the minimum size of their contained components.
 
-
+[[layout.gridlayout.css]]
 == 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">>
-
-
-
+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.
+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 wrap a component inside a layout component just for styling the cell.

documentation/layout/layout-orderedlayout.asciidoc

@@ -31,14 +31,13 @@ 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:
+In [classname]#VerticalLayout#, the captions of child components are placed above each component, so the layout would look as follows:
 
-image::img/orderedlayout_vertical.png[]
+image::img/orderedlayout_vertical.png[width=30%, scaledwidth=65%]
 
-Using [classname]#HorizontalLayout# gives the following layout:
+[classname]#HorizontalLayout# gives the following layout:
 
-image::img/orderedlayout_horizontal.png[]
+image::img/orderedlayout_horizontal.png[width=80%, scaledwidth=100%]
 
 [[layout.orderedlayout.properties]]
 == Properties or Attributes
@@ -48,18 +47,16 @@ Ordered layouts have the following properties:
 [[layout.orderedlayout.properties.table]]
 .Properties and Declarative Attributes
 
+[cols="1,2"]
 |===============
 |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]#[=<boolean>]#
-|[parameter]#margin#|[parameter]#margin#[replaceable]#[=<boolean>]#
-|[parameter]#expandRatio#|In child components:[parameter]#:expand#=[replaceable]#<integer>#or[parameter]#:expand#(implies ratio 1)
+|[parameter]#componentAlignment#|Alignment of a child component is specified in the child with: [literal]#++:left++# (default), [literal]#++:center++#, [literal]#++:right++#, [literal]#++:top++# (default), [literal]##++:middle++##, [literal]##++:bottom++##
+|[parameter]#spacing#|[parameter]##spacing##++[=++[replaceable]##<boolean>##++]++
+|[parameter]#margin#|[parameter]##margin##++[=++[replaceable]##<boolean>##++]++
+|[parameter]#expandRatio#|Expand ratio of a child component is specified in the child with: [parameter]#:expand#++[=++[replaceable]##<integer>##++]++ or [parameter]#:expand# (implies ratio 1)
 
 |===============
 
-
-
-
 [[layout.orderedlayout.spacing]]
 == Spacing in Ordered Layouts
 
@@ -76,9 +73,7 @@ element in a CSS selector, such as [literal]#++v-verticallayout++# for a
 [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:
-
+For example, the following sets the amount of spacing for all [classname]##VerticalLayout##s (as well as [classname]##FormLayout##s) in the UI:
 
 [source, css]
 ----
@@ -89,7 +84,6 @@ For example, the following sets the amount of spacing for all
 
 Or for [classname]#HorizontalLayout#:
 
-
 [source, css]
 ----
 .v-horizontal > .v-spacing {
@@ -97,7 +91,6 @@ Or for [classname]#HorizontalLayout#:
 }
 ----
 
-
 [[layout.orderedlayout.sizing]]
 == Sizing Contained Components
 
@@ -106,8 +99,8 @@ 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[]
+.Component widths in [classname]#HorizontalLayout#
+image::img/horizontallayout_sizing.png[width=75%, scaledwidth=100%]
 
 <<figure.layout.orderedlayout.size.summary>> gives a summary of the sizing
 options for a [classname]#HorizontalLayout#. The figure is broken down in the
@@ -154,8 +147,6 @@ 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
@@ -163,6 +154,7 @@ 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.
 
+ifdef::web[]
 The technique can be used to define the width of a [classname]#VerticalLayout#
 or the height of a [classname]#HorizontalLayout#.
 
@@ -171,10 +163,10 @@ or the height of a [classname]#HorizontalLayout#.
 ----
 // 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 =
@@ -182,7 +174,7 @@ Label label =
               "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");
@@ -193,8 +185,9 @@ See the http://demo.vaadin.com/book-examples-vaadin7/book#layout.orderedlayout.s
 
 [[figure.layout.orderedlayout.sizing.undefined.defining]]
 .Defining the Size with a Component
-image::img/orderedlayout-sizing-undefined.png[]
+image::img/orderedlayout-sizing-undefined.png[width=50%, scaledwidth=75%]
 
+endif::web[]
 
 === Layout with Defined Size
 
@@ -310,7 +303,7 @@ excess space that expands, not the components.
 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.
@@ -349,8 +342,3 @@ for (int i = 1; i <= 3; i++) {
 }
 parentLayout.addComponent(layout50);
 ----
-
-
-
-
-

documentation/layout/layout-overview.asciidoc

@@ -9,15 +9,23 @@ layout: page
 
 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.
+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.
+You can use plain Java to accomplish sophisticated component layouts.
+
+[[figure.layout.intro.simple]]
+.Layout example
+image::img/layout-intro-example-1.png[width=75%, scaledwidth=100%]
 
 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.
 
+[[figure.layout.intro.schematic]]
+.Layout schematic
+image::img/layout-schematic-hi.png[width=100%, scaledwidth=100%]
+
+Let us look at building a bit simplified version of the layout in <<figure.layout.intro.simple>>:
 
 [source, java]
 ----
@@ -25,20 +33,22 @@ of the component tree.
 VerticalLayout content = new VerticalLayout();
 setContent(content);
 
-// Add the topmost component.
-content.addComponent(new Label("The Ultimate Cat Finder"));
+HorizontalLayout titleBar = new HorizontalLayout();
+titleBar.setWidth("100%");
+root.addComponent(titleBar);
 
-// Add a horizontal layout for the bottom part.
-HorizontalLayout bottom = new HorizontalLayout();
-content.addComponent(bottom);
+Label title = new Label("The Ultimate Cat Finder");
+titleBar.addComponent(title);
+titleBar.setExpandRatio(title, 1.0f); // Expand
 
-bottom.addComponent(new Tree("Major Planets and Their Moons"));
-bottom.addComponent(new Panel());
-...
-----
+Label titleComment = new Label("for Vaadin");
+titleComment.setSizeUndefined(); // Take minimum space
+titleBar.addComponent(titleComment);
 
-Or in the declarative format:
+... build rest of the layout ...
+----
 
+Or in the declarative format (roughly):
 
 [source, html]
 ----
@@ -46,8 +56,9 @@ Or in the declarative format:
   <vaadin-label>The Ultimate Cat Finder</vaadin-label>
 
   <vaadin-horizontal-layout>
-    <vaadin-tree caption="Major Planets and Their Moons"/>
+    <vaadin-tree caption="Possible Places"/>
     <vaadin-panel/>
+    ...
   </vaadin-horizontal-layout>
 </vaadin-vertical-layout>
 ----
@@ -65,10 +76,3 @@ described in
 
 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[]
-
-
-

documentation/layout/original-drawings/Makefile

@@ -0,0 +1,17 @@
+SVG =
+RASTERIMAGES = layout-schematic
+
+RASTERSRCIMAGES := $(foreach file, $(RASTERIMAGES), $(file).svg)
+RASTERIMAGES_HI := $(foreach file, $(RASTERIMAGES), ../img/$(file)-hi.png)
+SVGTRGIMAGES := $(foreach file, $(SVG), ../img/$(file).svg)
+
+images: $(RASTERIMAGES_HI) $(SVGTRGIMAGES) FORCE
+# Just do low now $(TRGIMAGES_LO)
+
+$(RASTERIMAGES_HI): ../img/%-hi.png: %.svg
+	inkscape --export-png $@ --export-dpi=300 --export-area-drawing $<
+
+$(SVGTRGIMAGES): ../img/%.svg: %.svg FORCE
+	inkscape $< --export-text-to-path -l $@
+
+FORCE:

documentation/layout/original-drawings/layout-schematic.svg

@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="82mm"
+   height="41mm"
+   id="svg1901"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r"
+   sodipodi:docname="layout-schematic.svg"
+   version="1.1">
+  <defs
+     id="defs1903" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="148.02363"
+     inkscape:cy="70.790343"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1920"
+     inkscape:window-height="1060"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     showgrid="true"
+     inkscape:window-maximized="1"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="mm"
+     fit-margin-top="2"
+     fit-margin-left="2"
+     fit-margin-right="2"
+     fit-margin-bottom="2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2982"
+       empspacing="10"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="3.5433071"
+       spacingy="3.5433071"
+       units="mm"
+       originx="18.581643"
+       originy="0.35428181" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1906">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Taso 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(18.581643,-907.44094)">
+    <rect
+       y="910.62994"
+       x="46.062992"
+       height="138.189"
+       width="162.99213"
+       id="rect4347-0-2-5-5-9-59"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#e61e6d;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4349"
+       style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(7.0866142,882.28351)"><flowRegion
+         id="flowRegion4351"><rect
+           id="rect4353"
+           width="67.322838"
+           height="42.519684"
+           x="49.6063"
+           y="56.692909"
+           style="font-size:10px" /></flowRegion><flowPara
+         id="flowPara4355" /></flowRoot>    <g
+       id="g4392-0-4-6-8"
+       transform="translate(216.14174,42.519773)" />
+    <rect
+       y="914.17328"
+       x="49.6063"
+       height="131.10236"
+       width="155.90552"
+       id="rect4347-0-2-5-5-9"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#e61e6d;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="917.71655"
+       x="53.149605"
+       height="21.259869"
+       width="148.81889"
+       id="rect4347-0-2-5-5-9-5"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#e61e6d;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="921.25989"
+       x="56.692913"
+       height="14.17316"
+       width="102.7559"
+       id="rect4347-0-2-5-5-9-5-8"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffc13f;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="921.25983"
+       x="162.99213"
+       height="14.173287"
+       width="35.433075"
+       id="rect4347-0-2-5-5-9-5-8-5"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffc13f;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="942.51971"
+       x="53.149605"
+       height="88.582695"
+       width="148.81889"
+       id="rect4347-0-2-5-5-9-5-84"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#e61e6d;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="1034.6458"
+       x="53.149605"
+       height="7.0865755"
+       width="148.81889"
+       id="rect4347-0-2-5-5-9-5-9"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffc13f;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="946.06305"
+       x="56.692913"
+       height="81.496048"
+       width="46.062984"
+       id="rect4347-0-2-5-5-9-5-8-0"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#e61e6d;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="956.69293"
+       x="60.236221"
+       height="67.322792"
+       width="38.976372"
+       id="rect4347-0-2-5-5-9-5-8-0-5"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffc13f;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="946.06293"
+       x="106.29922"
+       height="81.49617"
+       width="92.125977"
+       id="rect4347-0-2-5-5-9-5-8-0-8"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#e61e6d;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="956.69287"
+       x="109.84253"
+       height="67.322922"
+       width="85.03936"
+       id="rect4347-0-2-5-5-9-5-8-0-5-4"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#e61e6d;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 49.606297,921.25994 -10.629919,-5e-5"
+       id="path3003-6-5-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="921.25989"
+       cx="49.606293"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6"
+       r="2.1259842" />
+    <circle
+       cy="921.25989"
+       cx="38.976379"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 53.149601,1038.1893 -14.17322,0"
+       id="path3003-6-5-1-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="1038.1891"
+       cx="53.149601"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-7"
+       r="2.1259842" />
+    <circle
+       cy="1038.189"
+       cx="38.976379"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-4"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 56.69291,953.14967 -17.716532,-2e-5"
+       id="path3003-6-5-1-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="953.14966"
+       cx="56.692902"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13"
+       r="2.1259842" />
+    <circle
+       cy="953.14966"
+       cx="38.976376"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 53.1496,946.06308 -14.173222,-4e-5"
+       id="path3003-6-5-1-5-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="946.06299"
+       cx="53.149601"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-9"
+       r="2.1259842" />
+    <circle
+       cy="946.06305"
+       cx="38.976379"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-8"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 216.14174,931.8898 -17.71654,0"
+       id="path3003-6-5-1-5-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="931.88983"
+       cx="198.42522"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-3"
+       r="2.1259842" />
+    <circle
+       cy="931.88983"
+       cx="216.14174"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-7"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 56.692911,928.34655 -17.716533,-5e-5"
+       id="path3003-6-5-1-5-78"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="928.3465"
+       cx="56.692902"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-7"
+       r="2.1259842" />
+    <circle
+       cy="928.3465"
+       cx="38.976379"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-0"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 60.236217,960.23629 -21.259839,-3e-5"
+       id="path3003-6-5-1-5-13"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="960.23627"
+       cx="60.236206"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-39"
+       r="2.1259842" />
+    <circle
+       cy="960.23627"
+       cx="38.976376"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-9"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 216.14174,949.60637 -17.71653,0"
+       id="path3003-6-5-1-5-7-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="949.60632"
+       cx="198.42522"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-3-2"
+       r="2.1259842" />
+    <circle
+       cy="949.60638"
+       cx="216.14175"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-7-4"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 216.14174,921.25991 -14.17323,0"
+       id="path3003-6-5-1-5-7-1-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="921.25989"
+       cx="201.96854"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-3-2-6"
+       r="2.1259842" />
+    <circle
+       cy="921.26001"
+       cx="216.14175"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-7-4-2"
+       r="2.1259842" />
+    <rect
+       y="970.86621"
+       x="120.47243"
+       height="38.976353"
+       width="63.77953"
+       id="rect4347-0-2-5-5-9-5-8-0-5-4-1"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#e61e6d;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="974.40948"
+       x="124.01573"
+       height="14.173236"
+       width="56.692928"
+       id="rect4347-0-2-5-5-9-5-8-0-5-4-1-7"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffc13f;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="992.12604"
+       x="124.01573"
+       height="14.173219"
+       width="56.692928"
+       id="rect4347-0-2-5-5-9-5-8-0-5-4-1-7-8"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffc13f;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 216.14173,985.03941 -35.43307,2e-5"
+       id="path3003-6-5-1-5-7-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="985.03943"
+       cx="180.70866"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-3-5"
+       r="2.1259842" />
+    <circle
+       cy="985.03943"
+       cx="216.14174"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-7-0"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 216.14173,1002.7559 -35.43307,0"
+       id="path3003-6-5-1-5-7-7-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="1002.7559"
+       cx="180.70866"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-3-5-3"
+       r="2.1259842" />
+    <circle
+       cy="1002.7559"
+       cx="216.14174"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-7-0-3"
+       r="2.1259842" />
+    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 216.14173,974.40949 -31.88976,2e-5"
+       id="path3003-6-5-1-5-7-1-1-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="974.40948"
+       cx="184.25197"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-3-2-6-9"
+       r="2.1259842" />
+    <circle
+       cy="974.40955"
+       cx="216.14177"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-7-4-2-4"
+       r="2.1259842" />
+    <flowRoot
+       transform="translate(34.181781,923.10248)"
+       id="flowRoot4367-0-7-2-4-4-43-5-2"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-6-6-7" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;writing-mode:lr;text-anchor:end;"
+         id="flowPara4783-7-2-8-1-0-0">VerticalLayout</flowPara></flowRoot>    <flowRoot
+       transform="translate(34.055515,1040.0315)"
+       id="flowRoot4367-0-7-2-4-4-4"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-8" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;writing-mode:lr;text-anchor:end;"
+         id="flowPara4783-7-2-8-5">Label</flowPara></flowRoot>    <flowRoot
+       transform="translate(34.055511,955.26005)"
+       id="flowRoot4367-0-7-2-4-4-43"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-6" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;writing-mode:lr;text-anchor:end;"
+         id="flowPara4783-7-2-8-1">Panel</flowPara></flowRoot>    <flowRoot
+       transform="translate(34.176406,947.90968)"
+       id="flowRoot4367-0-7-2-4-4-43-3"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-6-1" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;letter-spacing:0px;writing-mode:lr;text-anchor:end;"
+         id="flowPara4684">HorizontalLayout</flowPara></flowRoot>    <flowRoot
+       transform="translate(220.06236,933.6273)"
+       id="flowRoot4367-0-7-2-4-4-8"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-7" /><flowPara
+         style="font-size:6.25px;text-align:start;text-anchor:start;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;-inkscape-font-specification:'Montserrat, Normal';font-family:Montserrat;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;writing-mode:lr;line-height:58%;"
+         id="flowPara4783-7-2-8-7">Label</flowPara></flowRoot>    <flowRoot
+       transform="translate(34.055512,930.18906)"
+       id="flowRoot4367-0-7-2-4-4-43-5"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-6-6" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;writing-mode:lr;text-anchor:end;"
+         id="flowPara4783-7-2-8-1-0">Label</flowPara></flowRoot>    <flowRoot
+       transform="translate(33.772237,962.0788)"
+       id="flowRoot4367-0-7-2-4-4-43-8"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-6-7" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;writing-mode:lr;text-anchor:end;"
+         id="flowPara4783-7-2-8-1-1">Tree</flowPara></flowRoot>    <flowRoot
+       transform="translate(220.06237,951.34394)"
+       id="flowRoot4367-0-7-2-4-4-8-4"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-7-7" /><flowPara
+         style="font-size:6.25px;text-align:start;text-anchor:start;-inkscape-font-specification:'Montserrat, Normal';font-family:Montserrat;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;writing-mode:lr;line-height:58%;"
+         id="flowPara4783-7-2-8-7-1">Panel</flowPara></flowRoot>    <flowRoot
+       transform="translate(219.88965,923.13155)"
+       id="flowRoot4367-0-7-2-4-4-8-4-8"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-7-7-1" /><flowPara
+         style="font-size:6.25px;line-height:58%;text-align:start;text-anchor:start;-inkscape-font-specification:'Montserrat, Normal';font-family:Montserrat;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;writing-mode:lr;"
+         id="flowPara4865">HorizontalLayout</flowPara></flowRoot>    <flowRoot
+       transform="translate(220.25102,986.77706)"
+       id="flowRoot4367-0-7-2-4-4-8-9"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-7-6" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;writing-mode:lr;text-anchor:start;"
+         id="flowPara4783-7-2-8-7-4">Label</flowPara></flowRoot>    <flowRoot
+       transform="translate(220.25102,1004.4936)"
+       id="flowRoot4367-0-7-2-4-4-8-9-7"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-7-6-6" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;writing-mode:lr;text-anchor:start;"
+         id="flowPara4783-7-2-8-7-4-8">Label</flowPara></flowRoot>    <flowRoot
+       transform="translate(219.88712,976.25205)"
+       id="flowRoot4367-0-7-2-4-4-8-4-8-2"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-7-7-1-6" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:58%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;writing-mode:lr;text-anchor:start;"
+         id="flowPara4865-9">VerticalLayout</flowPara></flowRoot>    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 46.06299,914.17332 -7.086612,-5e-5"
+       id="path3003-6-5-1-86"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="914.17328"
+       cx="46.062992"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-8"
+       r="2.1259842" />
+    <circle
+       cy="914.17328"
+       cx="38.976379"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-6"
+       r="2.1259842" />
+    <flowRoot
+       transform="translate(34.181782,916.01583)"
+       id="flowRoot4367-0-7-2-4-4-43-5-2-5"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-6-6-7-3" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:121%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:end;writing-mode:lr;text-anchor:end;"
+         id="flowPara4783-7-2-8-1-0-0-9">UI</flowPara></flowRoot>    <path
+       style="fill:none;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 216.1417,960.23626 -21.25981,0"
+       id="path3003-6-5-1-5-7-1-1-7-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       cy="960.23627"
+       cx="194.8819"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-13-3-2-6-9-1"
+       r="2.1259842" />
+    <circle
+       cy="960.23627"
+       cx="216.14174"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#33383a;stroke-width:0.70866144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path2997-7-6-1-7-7-4-2-4-9"
+       r="2.1259842" />
+    <flowRoot
+       transform="translate(219.88709,962.07882)"
+       id="flowRoot4367-0-7-2-4-4-8-4-8-2-0"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:57.99999833%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><flowRegion
+         id="flowRegion4369-0-6-7-7-5-7-7-1-6-7" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.25px;line-height:57.99999833%;font-family:Montserrat;-inkscape-font-specification:'Montserrat, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start"
+         id="flowPara4865-9-0">VerticalLayout</flowPara></flowRoot>  </g>
+</svg>