diff options
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/base.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif | bin | 0 -> 3223 bytes | |||
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/reconnect-dialog.scss | 32 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_global.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss | 31 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 18 |
6 files changed, 85 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss index d40ac1a7bf..56b2e311c6 100644 --- a/WebContent/VAADIN/themes/base/base.scss +++ b/WebContent/VAADIN/themes/base/base.scss @@ -17,6 +17,7 @@ $v-line-height: $line-height !default; @import "caption/caption.scss"; @import "colorpicker/colorpicker.scss"; @import "common/common.scss"; +@import "common/reconnect-dialog.scss"; @import "csslayout/csslayout.scss"; @import "customcomponent/customcomponent.scss"; @import "customlayout/customlayout.scss"; @@ -89,6 +90,7 @@ $v-line-height: $line-height !default; // here for now to preserve old semantics @include base-common; + @include base-reconnect-dialog; @include base-layout; @include base-csslayout; diff --git a/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif b/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif Binary files differnew file mode 100644 index 0000000000..bc1a496d11 --- /dev/null +++ b/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif diff --git a/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss b/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss new file mode 100644 index 0000000000..cde587cfe9 --- /dev/null +++ b/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss @@ -0,0 +1,32 @@ +@mixin base-reconnect-dialog { + .v-reconnect-dialog { + color: white; + top: 12px; + right: 12px; + max-width: 100%; + border-radius: 0; + @include box-shadow(0 0 20px 0 rgba(0,0,0,0.25)); + padding: 10px; + + background-color: #444; + text-align: center; + + .text { + display: inline-block; + padding-left: 10px; + } + + .spinner { + background-image: url(img/reconnect-spinner.gif); + width: 31px; + height: 31px; + display: inline-block; + visibility: hidden; + vertical-align: middle; + } + + &.active .spinner { + visibility: visible; + } + } +}
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/valo/shared/_global.scss b/WebContent/VAADIN/themes/valo/shared/_global.scss index b4e8564119..39b5a4e7d9 100644 --- a/WebContent/VAADIN/themes/valo/shared/_global.scss +++ b/WebContent/VAADIN/themes/valo/shared/_global.scss @@ -2,6 +2,7 @@ @import "contextmenu"; @import "overlay"; @import "tooltip"; +@import "reconnect-dialog"; /* @@ -374,6 +375,7 @@ $valo-shared-pathPrefix: null; @include valo-contextmenu; + @include valo-reconnect-dialog; } diff --git a/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss b/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss new file mode 100644 index 0000000000..e648795b5a --- /dev/null +++ b/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss @@ -0,0 +1,31 @@ +@mixin valo-reconnect-dialog { + .v-reconnect-dialog { + color: white; + top: $v-layout-spacing-vertical; + right: $v-layout-spacing-horizontal; + max-width: 100%; + border-radius: 0; + @include box-shadow(0 0 20px 0 rgba(0,0,0,0.25)); + padding: round($v-unit-size/3) round($v-unit-size/2.5); + + background-color: #444; + background-color: rgba(#444, .9); + line-height: round($v-font-size * 1.4); + + text-align: center; + .text { + display: inline-block; + padding-left: 10px; + } + + .spinner { + @include valo-spinner; + display: none; + vertical-align: middle; + } + + &.active .spinner { + display: inline-block; + } + } +}
\ No newline at end of file diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index a9d3db30b3..1879175109 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -96,6 +96,19 @@ </init-param> <async-supported>true</async-supported> </servlet> + <servlet> + <servlet-name>CommErrorEmulator</servlet-name> + <servlet-class>com.vaadin.tests.application.CommErrorEmulatorServlet</servlet-class> + <init-param> + <param-name>heartbeatInterval</param-name> + <param-value>10</param-value> + </init-param> + <init-param> + <param-name>ui</param-name> + <param-value>com.vaadin.tests.application.CommErrorEmulatorUI</param-value> + </init-param> + <async-supported>true</async-supported> + </servlet> <servlet> <!-- This servlet is a separate instance for the sole purpose of @@ -185,6 +198,11 @@ </servlet-mapping> <servlet-mapping> + <servlet-name>CommErrorEmulator</servlet-name> + <url-pattern>/commerror/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> <servlet-name>VaadinStaticFiles</servlet-name> <url-pattern>/VAADIN/*</url-pattern> </servlet-mapping> |
