From 8bbe02b1eaa91618a2661a248fb1a70ea5ad4200 Mon Sep 17 00:00:00 2001 From: Marko Gronroos Date: Wed, 1 Jun 2016 18:21:58 +0300 Subject: Revised diagrams in intro, installation, architecture, and application chapters. #19897 Change-Id: I42673cabcd171dd560dfe84fd84eb86e7ba11733 --- .../introduction/img/architecture-vaadin7-hi.png | Bin 105306 -> 0 bytes .../introduction/img/architecture-vaadin7-lo.png | Bin 23570 -> 0 bytes documentation/introduction/img/architecture.png | Bin 0 -> 89782 bytes .../introduction/img/intro-themes-faded-hi.png | Bin 175732 -> 0 bytes .../introduction/img/intro-themes-faded-lo.png | Bin 51462 -> 0 bytes documentation/introduction/intro-overview.asciidoc | 4 +- .../introduction/original-drawings/Makefile | 16 + .../original-drawings/architecture-vaadin7.svg | 826 ----------- .../original-drawings/architecture.svg | 1494 ++++++++++++++------ .../original-drawings/intro-layout-capture-1.png | Bin 22465 -> 0 bytes .../original-drawings/intro-themes-faded.svg | 143 -- 11 files changed, 1063 insertions(+), 1420 deletions(-) delete mode 100644 documentation/introduction/img/architecture-vaadin7-hi.png delete mode 100644 documentation/introduction/img/architecture-vaadin7-lo.png create mode 100644 documentation/introduction/img/architecture.png delete mode 100644 documentation/introduction/img/intro-themes-faded-hi.png delete mode 100644 documentation/introduction/img/intro-themes-faded-lo.png create mode 100644 documentation/introduction/original-drawings/Makefile delete mode 100644 documentation/introduction/original-drawings/architecture-vaadin7.svg delete mode 100644 documentation/introduction/original-drawings/intro-layout-capture-1.png delete mode 100644 documentation/introduction/original-drawings/intro-themes-faded.svg (limited to 'documentation/introduction') diff --git a/documentation/introduction/img/architecture-vaadin7-hi.png b/documentation/introduction/img/architecture-vaadin7-hi.png deleted file mode 100644 index a28e5be7c6..0000000000 Binary files a/documentation/introduction/img/architecture-vaadin7-hi.png and /dev/null differ diff --git a/documentation/introduction/img/architecture-vaadin7-lo.png b/documentation/introduction/img/architecture-vaadin7-lo.png deleted file mode 100644 index 5ef0c0bea0..0000000000 Binary files a/documentation/introduction/img/architecture-vaadin7-lo.png and /dev/null differ diff --git a/documentation/introduction/img/architecture.png b/documentation/introduction/img/architecture.png new file mode 100644 index 0000000000..c624f27942 Binary files /dev/null and b/documentation/introduction/img/architecture.png differ diff --git a/documentation/introduction/img/intro-themes-faded-hi.png b/documentation/introduction/img/intro-themes-faded-hi.png deleted file mode 100644 index e7f4653232..0000000000 Binary files a/documentation/introduction/img/intro-themes-faded-hi.png and /dev/null differ diff --git a/documentation/introduction/img/intro-themes-faded-lo.png b/documentation/introduction/img/intro-themes-faded-lo.png deleted file mode 100644 index b9c4b5724f..0000000000 Binary files a/documentation/introduction/img/intro-themes-faded-lo.png and /dev/null differ diff --git a/documentation/introduction/intro-overview.asciidoc b/documentation/introduction/intro-overview.asciidoc index 22ccc06c10..beed28ac6f 100644 --- a/documentation/introduction/intro-overview.asciidoc +++ b/documentation/introduction/intro-overview.asciidoc @@ -23,8 +23,8 @@ browser and the server. With the Vaadin approach, you do not need to learn and deal directly with browser technologies, such as HTML or JavaScript. [[figure.intro.architecture]] -.Vaadin Application Architecture -image::img/architecture-vaadin7-hi.png[scaledwidth=100%] +.Vaadin application architecture +image::img/architecture.png[width=100%, scaledwidth=100%] <> illustrates the basic architectures of web applications made with Vaadin. The server-side application architecture consists diff --git a/documentation/introduction/original-drawings/Makefile b/documentation/introduction/original-drawings/Makefile new file mode 100644 index 0000000000..8d49864253 --- /dev/null +++ b/documentation/introduction/original-drawings/Makefile @@ -0,0 +1,16 @@ +SVG = +RASTERIMAGES = architecture + +RASTERSRCIMAGES := $(foreach file, $(RASTERIMAGES), $(file).svg) +RASTERIMAGES := $(foreach file, $(RASTERIMAGES), ../img/$(file).png) +SVGTRGIMAGES := $(foreach file, $(SVG), ../img/$(file).svg) + +images: $(RASTERIMAGES) $(SVGTRGIMAGES) FORCE + +$(RASTERIMAGES): ../img/%.png: %.svg + inkscape --export-png $@ --export-dpi=300 --export-area-page $< + +$(SVGTRGIMAGES): ../img/%.svg: %.svg FORCE + inkscape $< --export-text-to-path -l $@ + +FORCE: diff --git a/documentation/introduction/original-drawings/architecture-vaadin7.svg b/documentation/introduction/original-drawings/architecture-vaadin7.svg deleted file mode 100644 index 581fb7aa04..0000000000 --- a/documentation/introduction/original-drawings/architecture-vaadin7.svg +++ /dev/null @@ -1,826 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - UI Logic - - - - - - - - - - - - - - - - - Components - - - - Built-inComponents - - - Add-onComponents - - - CustomComponents - - - - - - - - - - - - - - - - - - - Back-End BusinessLogicPersistence - - - - - - - - - - - - - - - - - - - Browser - - - - Built-inWidgets - - - Add-onWidgets - - - CustomWidgets - - - - - - - - - - - - Client-SideUI - - - - - - - - - Client-Side Engine - - - Service - - - - - - - - - - - - - Web Server / Portal - diff --git a/documentation/introduction/original-drawings/architecture.svg b/documentation/introduction/original-drawings/architecture.svg index 674cd0b959..d3b421b670 100644 --- a/documentation/introduction/original-drawings/architecture.svg +++ b/documentation/introduction/original-drawings/architecture.svg @@ -1,449 +1,1045 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - Client-SideEngine WebBrowser - - - - - - - - - - - JavaWebServer - - - - - - - - - - - YourUI - - - - - - - - - - - VaadinServer-SideFramework - - - - - - - - - - - Back-End Business LogicPersistenceDatabase - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + Client-SideWidgets Server-SideComponents USERINTERFACE BROWSER Built-in + + Application Theme THEME BACK-ENDSERVICE + + + BusinessLogic Database EJB Add-on Custom + Base Theme + + + + + + + + + diff --git a/documentation/introduction/original-drawings/intro-layout-capture-1.png b/documentation/introduction/original-drawings/intro-layout-capture-1.png deleted file mode 100644 index 0823787f00..0000000000 Binary files a/documentation/introduction/original-drawings/intro-layout-capture-1.png and /dev/null differ diff --git a/documentation/introduction/original-drawings/intro-themes-faded.svg b/documentation/introduction/original-drawings/intro-themes-faded.svg deleted file mode 100644 index fdeb1e9ef1..0000000000 --- a/documentation/introduction/original-drawings/intro-themes-faded.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - -- cgit v1.2.3