]> source.dussan.org Git - vaadin-framework.git/commitdiff
#7178 multiapp and multiwidgetset examples moved to demo site project
authorHenri Sara <henri.sara@itmill.com>
Tue, 16 Aug 2011 06:20:43 +0000 (06:20 +0000)
committerHenri Sara <henri.sara@itmill.com>
Tue, 16 Aug 2011 06:20:43 +0000 (06:20 +0000)
svn changeset:20394/svn branch:6.7

WebContent/multiapp.html [deleted file]
WebContent/multiwidgetset.html [deleted file]

diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html
deleted file mode 100644 (file)
index ddde191..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="width:100%;height:100%;border:0;margin:0;">
-<head>
-<title>Multiple embedded applications</title>
-<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: '/', 
-                               themeUri: '/VAADIN/themes/example', 
-                               versionInfo : {vaadinVersion:"6-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
-                       },
-                       'hello' :{
-                               appUri:'/HelloWorld', 
-                               pathInfo: '/', 
-                               themeUri: '/VAADIN/themes/example', 
-                               versionInfo : {vaadinVersion:"6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
-                       }
-
-                       
-               }};
-</script>
-<script language='javascript' src='/VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js'></script>
-<link rel="stylesheet" type="text/css" href="/VAADIN/themes/example/styles.css"/>
-</head>
-<body>
-       <iframe id="__gwt_historyFrame" style="width:0;height:0;border:0;overflow:hidden" src="javascript:false"></iframe>
-       
-       <p>Multiple Vaadin applications per html file test page</p>
-       
-       <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>
-       </body>
-</html>
\ No newline at end of file
diff --git a/WebContent/multiwidgetset.html b/WebContent/multiwidgetset.html
deleted file mode 100644 (file)
index 4049b25..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-       style="width:100%;height:100%;border:0;margin:0;">
-<head>
-<title>Multiple embedded applications</title>
-<script type="text/javascript">
-       var vaadin = {
-               debug: true,
-               vaadinConfigurations : {
-                       'calc' : {
-                               appUri : '/Calc',
-                               // no widgetset defined means don't care. Most widgetset have button and gridlayout. 
-                               // First injected widgetset will start this app.
-                               themeUri : '/VAADIN/themes/reindeer',
-                               versionInfo : {
-                                       vaadinVersion : "6-INTERNAL-NONVERSIONED-DEBUG-BUILD",
-                                       applicationVersion : "NONVERSIONED"
-                               }
-                       },
-                       'colorpicker' : {
-                               appUri : '/colorpicker',
-                               widgetset : 'com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet',
-                               themeUri : '/VAADIN/themes/reindeer',
-                               versionInfo : {
-                                       vaadinVersion : "6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD",
-                                       applicationVersion : "NONVERSIONED"
-                               }
-                       }
-               }
-       };
-</script>
-
-<script language='javascript'
-       src='/VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js'></script>
-<script language='javascript'
-       src='/VAADIN/widgetsets/com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet/com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet.nocache.js'></script>
-<link rel="stylesheet" type="text/css"
-       href="/VAADIN/themes/reindeer/styles.css" />
-</head>
-<body>
-       <iframe id="__gwt_historyFrame"
-               style="width: 0; height: 0; border: 0; overflow: hidden"
-               src="javascript:false"></iframe>
-
-       <p>Experimental test page for multiple apps and multiple widgetsets
-               on the same page. Try with ?debug to see two VConsoles! Test well
-               before using this kind of setup in production. E.g. theme conflicts
-               and other unknown issues may arise. E.g. Glass can get broken in your
-               screen, even in LCD:s. Seriously, to save bandwidth and client side load,
-               it is highly recommended to use the classic shared widgetset approach.</p>
-
-       <div id="calc" style="border: 2px solid green; margin: 0"></div>
-       <div id="colorpicker" style="border: 2px solid blue; margin: 0"></div>
-</body>
-</html>