From 3fb1d75e2bf4772bcd4edeb5f9b36a6747fd776b Mon Sep 17 00:00:00 2001 From: Ilia Motornyi Date: Thu, 5 Jan 2017 13:47:42 +0200 Subject: Documentation/application screenshots update (#8137) * Documentation/application screenshots update * Avoid redundant autoboxing in BackEndDataProvider's size callback (#8127) * Update general Component documentation Part of vaadin/framework8-issues#538 * Documentation/application screenshots update * Notification types fixed * Merge branch 'documentation-screenshots-part1' of https://github.com/vaadin/framework into documentation-screenshots-part1 --- .../application/application-notifications.asciidoc | 16 ++++++++-------- .../application/img/notification-error.png | Bin 5007 -> 6317 bytes .../application/img/notification-example2.png | Bin 27709 -> 14366 bytes .../application/img/notification-example3.png | Bin 5269 -> 5802 bytes .../application/img/notification-humanized.png | Bin 5162 -> 5857 bytes documentation/application/img/notification-tray.png | Bin 3604 -> 5998 bytes .../application/img/notification-warning.png | Bin 6124 -> 7509 bytes documentation/architecture/img/datamodel-sml.png | Bin 67576 -> 0 bytes documentation/components/img/calendar-monthly.png | Bin 17802 -> 0 bytes documentation/components/img/calendar-weekly.png | Bin 16872 -> 0 bytes documentation/components/img/tooltip-richtext.png | Bin 12240 -> 12820 bytes documentation/components/img/tree-example1.png | Bin 15383 -> 0 bytes 12 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 documentation/architecture/img/datamodel-sml.png delete mode 100644 documentation/components/img/calendar-monthly.png delete mode 100644 documentation/components/img/calendar-weekly.png delete mode 100644 documentation/components/img/tree-example1.png diff --git a/documentation/application/application-notifications.asciidoc b/documentation/application/application-notifications.asciidoc index d19751d73f..a53fb7d7b4 100644 --- a/documentation/application/application-notifications.asciidoc +++ b/documentation/application/application-notifications.asciidoc @@ -23,7 +23,7 @@ type, and displays it in the current page. ---- Notification.show("This is the caption", "This is the description", - Notification.Type.WARNING_MESSAGE); + Notification.Type.HUMANIZED_MESSAGE); ---- [[figure.notification.example1]] @@ -39,8 +39,8 @@ in a [classname]#Page#, typically the current page. [source, java] ---- new Notification("This is a warning", - "
This is the last warning", - Notification.TYPE_WARNING_MESSAGE, true) + "This is the last warning", + Notification.Type.WARNING_MESSAGE, true) .show(Page.getCurrent()); ---- @@ -67,14 +67,14 @@ notification. If no notification type is given, the "humanized" type is used as the default. The notification types, listed below, are defined in the [classname]#Notification.Type# class. -[parameter]#TYPE_HUMANIZED_MESSAGE#:: +[parameter]#HUMANIZED_MESSAGE#:: image:img/notification-humanized.png[width=30%, scaledwidth=50%] + A user-friendly message that does not annoy too much: it does not require confirmation by clicking and disappears quickly. It is centered and has a neutral gray color. -[parameter]#TYPE_WARNING_MESSAGE#:: +[parameter]#WARNING_MESSAGE#:: image:img/notification-warning.png[width=30%, scaledwidth=50%] + Warnings are messages of medium importance. They are displayed with colors that @@ -82,7 +82,7 @@ are neither neutral nor too distractive. A warning is displayed for 1.5 seconds, but the user can click the message box to dismiss it. The user can continue to interact with the application while the warning is displayed. -[parameter]#TYPE_ERROR_MESSAGE#:: +[parameter]#ERROR_MESSAGE#:: image:img/notification-error.png[width=30%, scaledwidth=50%] + Error messages are notifications that require the highest user attention, with @@ -92,7 +92,7 @@ although the close box in the upper right corner indicates it visually. Unlike with other notifications, the user can not interact with the application while the error message is displayed. -[parameter]#TYPE_TRAY_NOTIFICATION#:: +[parameter]#TRAY_NOTIFICATION#:: image:img/notification-tray.png[width=30%, scaledwidth=50%] + Tray notifications are displayed in the "system tray" area, that is, in the @@ -115,7 +115,7 @@ the current page. // Notification with default settings for a warning Notification notif = new Notification( "Warning", - "
Area of reindeer husbandry", + "Area of reindeer husbandry", Notification.TYPE_WARNING_MESSAGE); // Customize it diff --git a/documentation/application/img/notification-error.png b/documentation/application/img/notification-error.png index 8759712672..28793c72a3 100644 Binary files a/documentation/application/img/notification-error.png and b/documentation/application/img/notification-error.png differ diff --git a/documentation/application/img/notification-example2.png b/documentation/application/img/notification-example2.png index 25adf1be78..e48b24c869 100644 Binary files a/documentation/application/img/notification-example2.png and b/documentation/application/img/notification-example2.png differ diff --git a/documentation/application/img/notification-example3.png b/documentation/application/img/notification-example3.png index 84d17b4387..3479a8a2e4 100644 Binary files a/documentation/application/img/notification-example3.png and b/documentation/application/img/notification-example3.png differ diff --git a/documentation/application/img/notification-humanized.png b/documentation/application/img/notification-humanized.png index 602a46aa48..05db485b10 100644 Binary files a/documentation/application/img/notification-humanized.png and b/documentation/application/img/notification-humanized.png differ diff --git a/documentation/application/img/notification-tray.png b/documentation/application/img/notification-tray.png index f970f04adb..ce5c79ab4e 100644 Binary files a/documentation/application/img/notification-tray.png and b/documentation/application/img/notification-tray.png differ diff --git a/documentation/application/img/notification-warning.png b/documentation/application/img/notification-warning.png index 69a4d43dc1..bdc7c77759 100644 Binary files a/documentation/application/img/notification-warning.png and b/documentation/application/img/notification-warning.png differ diff --git a/documentation/architecture/img/datamodel-sml.png b/documentation/architecture/img/datamodel-sml.png deleted file mode 100644 index 8087ffa7d8..0000000000 Binary files a/documentation/architecture/img/datamodel-sml.png and /dev/null differ diff --git a/documentation/components/img/calendar-monthly.png b/documentation/components/img/calendar-monthly.png deleted file mode 100644 index 1b9b1c5a33..0000000000 Binary files a/documentation/components/img/calendar-monthly.png and /dev/null differ diff --git a/documentation/components/img/calendar-weekly.png b/documentation/components/img/calendar-weekly.png deleted file mode 100644 index d3b60aa08a..0000000000 Binary files a/documentation/components/img/calendar-weekly.png and /dev/null differ diff --git a/documentation/components/img/tooltip-richtext.png b/documentation/components/img/tooltip-richtext.png index de184fa20e..9185013822 100644 Binary files a/documentation/components/img/tooltip-richtext.png and b/documentation/components/img/tooltip-richtext.png differ diff --git a/documentation/components/img/tree-example1.png b/documentation/components/img/tree-example1.png deleted file mode 100644 index 509d9a5074..0000000000 Binary files a/documentation/components/img/tree-example1.png and /dev/null differ -- cgit v1.2.3