summaryrefslogtreecommitdiffstats
path: root/WebContent/multiapp.html
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2010-12-21 14:11:16 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2010-12-21 14:11:16 +0000
commitcdb97891280b81a4611813f33203b8311c676e34 (patch)
treed7f5799fe8166707a847b59e1e8305f46aaf567e /WebContent/multiapp.html
parent4bab8436f277d1d28f0de7bc9655062e3dfaa87a (diff)
downloadvaadin-framework-cdb97891280b81a4611813f33203b8311c676e34.tar.gz
vaadin-framework-cdb97891280b81a4611813f33203b8311c676e34.zip
undoing last accidental commit
svn changeset:16613/svn branch:6.5
Diffstat (limited to 'WebContent/multiapp.html')
-rw-r--r--WebContent/multiapp.html9
1 files changed, 6 insertions, 3 deletions
diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html
index acc925a941..ddde191d28 100644
--- a/WebContent/multiapp.html
+++ b/WebContent/multiapp.html
@@ -5,6 +5,12 @@
<script type="text/javascript">
var vaadin = {
vaadinConfigurations: {
+ 'fb' :{
+ appUri:'/FeatureBrowser',
+ pathInfo: '/',
+ themeUri: '/VAADIN/themes/example',
+ versionInfo : {vaadinVersion:"6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
+ },
'calc' :{
appUri:'/Calc',
pathInfo: '/',
@@ -32,8 +38,5 @@
<div id="fb" style="height:400px;border:2px solid red;margin:0"></div>
<div id="calc" style="border:2px solid green;margin:0"></div>
<div id="hello" style="border:2px solid blue;margin:0"></div>
-
-
- <iframe src="/FeatureBrowser?debug" style="width:300px; height:200px;"></iframe>
</body>
</html> \ No newline at end of file