From 93767cf76b2fb14c65b758066c67fc8b48cc2eeb Mon Sep 17 00:00:00 2001 From: Marko Gronroos Date: Fri, 20 May 2016 14:44:42 +0300 Subject: 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 --- .../installing/img/installation-steps.svg | 1019 ++++++++++++++++++++ documentation/installing/img/sign-in-form.png | Bin 23263 -> 13875 bytes .../installing/img/signin-via-website.png | Bin 36736 -> 26780 bytes documentation/installing/installing-eclipse.adoc | 55 +- documentation/installing/installing-idea.asciidoc | 4 +- .../installing/installing-netbeans.asciidoc | 2 +- documentation/installing/installing-other.adoc | 2 +- documentation/installing/installing-overview.adoc | 2 +- documentation/installing/installing-toolchain.adoc | 2 +- .../installation-steps-constellation.svg | 143 ++- .../original-drawings/installation-steps.svg | 65 +- 11 files changed, 1162 insertions(+), 132 deletions(-) create mode 100644 documentation/installing/img/installation-steps.svg (limited to 'documentation/installing') diff --git a/documentation/installing/img/installation-steps.svg b/documentation/installing/img/installation-steps.svg new file mode 100644 index 0000000000..a4dfaf49b5 --- /dev/null +++ b/documentation/installing/img/installation-steps.svg @@ -0,0 +1,1019 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/documentation/installing/img/sign-in-form.png b/documentation/installing/img/sign-in-form.png index 3efd40dc2e..b22e040077 100644 Binary files a/documentation/installing/img/sign-in-form.png and b/documentation/installing/img/sign-in-form.png differ diff --git a/documentation/installing/img/signin-via-website.png b/documentation/installing/img/signin-via-website.png index e6ac32ba89..38a798c976 100644 Binary files a/documentation/installing/img/signin-via-website.png and b/documentation/installing/img/signin-via-website.png differ diff --git a/documentation/installing/installing-eclipse.adoc b/documentation/installing/installing-eclipse.adoc index 9a11fbc672..b68644a35d 100644 --- a/documentation/installing/installing-eclipse.adoc +++ b/documentation/installing/installing-eclipse.adoc @@ -133,13 +133,15 @@ in <>. [[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]] .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 diff --git a/documentation/installing/installing-idea.asciidoc b/documentation/installing/installing-idea.asciidoc index 95779dab55..3533a3feb1 100644 --- a/documentation/installing/installing-idea.asciidoc +++ b/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#. diff --git a/documentation/installing/installing-netbeans.asciidoc b/documentation/installing/installing-netbeans.asciidoc index 35d7b96c16..bee2d02979 100644 --- a/documentation/installing/installing-netbeans.asciidoc +++ b/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. diff --git a/documentation/installing/installing-other.adoc b/documentation/installing/installing-other.adoc index b7ff51dfea..4101509673 100644 --- a/documentation/installing/installing-other.adoc +++ b/documentation/installing/installing-other.adoc @@ -29,7 +29,7 @@ toolbar. <> 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. diff --git a/documentation/installing/installing-overview.adoc b/documentation/installing/installing-overview.adoc index 7075c10172..3b2a60f767 100644 --- a/documentation/installing/installing-overview.adoc +++ b/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. diff --git a/documentation/installing/installing-toolchain.adoc b/documentation/installing/installing-toolchain.adoc index 08ad190a8d..414bc8033f 100644 --- a/documentation/installing/installing-toolchain.adoc +++ b/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%] <> illustrates the development toolchain. You develop your application as an Eclipse project. The project must include, in addition to your diff --git a/documentation/installing/original-drawings/installation-steps-constellation.svg b/documentation/installing/original-drawings/installation-steps-constellation.svg index 7716b64f6c..a59a3edb80 100644 --- a/documentation/installing/original-drawings/installation-steps-constellation.svg +++ b/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"> image/svg+xml - + @@ -5921,18 +5924,6 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-308.2677)"> - - - + id="defs1903"> + + + + + + inkscape:guide-bbox="true" + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5"> + spacingy="5px" + originx="-124.5px" + originy="-294.50073px" /> + transform="translate(-124.5,-526.86145)">