diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-12 09:39:16 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-12 09:39:21 +0300 |
| commit | da0a11208888f7883bf40fe31019d3a80940e19f (patch) | |
| tree | 10e3470c04a15315300b9d74f60ce8fbeff59d52 /WebContent | |
| parent | ecc2de3ff1b9998c8a7ca496e71a13c53acd5c84 (diff) | |
| parent | 02da730068fc3f828a162b272a532f33a46d4c1e (diff) | |
| download | vaadin-framework-da0a11208888f7883bf40fe31019d3a80940e19f.tar.gz vaadin-framework-da0a11208888f7883bf40fe31019d3a80940e19f.zip | |
Merge changes from origin/7.0
02da730 Merged testbench test for #7110 from 6.8 (fix not needed for 7.0)
Change-Id: I4a53d5a1fed3018c8cdda5b1aa88715e911ed112
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/statictestfiles/PopupViewInEmbeddedApplication.html | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html b/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html new file mode 100644 index 0000000000..613bb2cd41 --- /dev/null +++ b/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <meta http-equiv="X-UA-Compatible" content="IE=9;chrome=1" /> + + <title>This is my Embedding Page</title> + + <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="/VAADIN/themes/reindeer/favicon.ico" /> + <link rel="icon" type="image/vnd.microsoft.icon" href="/VAADIN/themes/reindeer/favicon.ico" /> +</head> + +<body> + <script type="text/javascript" src="/VAADIN/vaadinBootstrap.js"></script> + + + <p>This is a static web page that contains an embedded Vaadin + application. The embedded application div has been taken out of the normal element flow by applying 'float:left' causing the application + to float to the left.</p> + + <div id="helloworld" style="border: 2px solid green; float:left; width:400px; height:400px"></div> + + <div style="clear:both"></div> + + <hr/> + + <script type="text/javascript">//<![CDATA[ + if (!window.vaadin) alert("Failed to load the bootstrap JavaScript: "+ "VAADIN/vaadinBootstrap.js"); + + /* The UI Configuration */ + vaadin.initApplication("helloworld", { + "browserDetailsUrl": "/run/com.vaadin.tests.components.popupview.PopupViewInEmbeddedApplication", + "serviceUrl": "/run", + "widgetset": "com.vaadin.DefaultWidgetSet", + "theme": "reindeer", + "versionInfo": {"vaadinVersion": "7.0.0"}, + "vaadinDir": "./../VAADIN/", + "heartbeatInterval": 300, + "debug": true, + "standalone": false, + "authErrMsg": { + "message": "Take note of any unsaved data, "+ + "and <u>click here<\/u> to continue.", + "caption": "Authentication problem" + }, + "comErrMsg": { + "message": "Take note of any unsaved data, "+ + "and <u>click here<\/u> to continue.", + "caption": "Communication problem" + }, + "sessExpMsg": { + "message": "Take note of any unsaved data, "+ + "and <u>click here<\/u> to continue.", + "caption": "Session Expired" + } + }); + </script> +</body> + +</html>
\ No newline at end of file |