diff options
Diffstat (limited to 'WebContent/multiwidgetset.html')
| -rw-r--r-- | WebContent/multiwidgetset.html | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/WebContent/multiwidgetset.html b/WebContent/multiwidgetset.html index 1fee38fb22..4049b25be2 100644 --- a/WebContent/multiwidgetset.html +++ b/WebContent/multiwidgetset.html @@ -7,21 +7,11 @@ var vaadin = { debug: true, vaadinConfigurations : { - 'fb' : { - appUri : '/sampler', - // sampler only works with sampler widgetset - widgetset : 'com.vaadin.demo.sampler.gwt.SamplerWidgetSet', - themeUri : '/VAADIN/themes/sampler-reindeer', - versionInfo : { - vaadinVersion : "6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD", - applicationVersion : "NONVERSIONED" - } - }, '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/sampler-reindeer', + themeUri : '/VAADIN/themes/reindeer', versionInfo : { vaadinVersion : "6-INTERNAL-NONVERSIONED-DEBUG-BUILD", applicationVersion : "NONVERSIONED" @@ -30,7 +20,7 @@ 'colorpicker' : { appUri : '/colorpicker', widgetset : 'com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet', - themeUri : '/VAADIN/themes/sampler-reindeer', + themeUri : '/VAADIN/themes/reindeer', versionInfo : { vaadinVersion : "6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD", applicationVersion : "NONVERSIONED" @@ -44,10 +34,8 @@ 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> -<script language='javascript' - src='/VAADIN/widgetsets/com.vaadin.demo.sampler.gwt.SamplerWidgetSet/com.vaadin.demo.sampler.gwt.SamplerWidgetSet.nocache.js'></script> <link rel="stylesheet" type="text/css" - href="/VAADIN/themes/sampler-reindeer/styles.css" /> + href="/VAADIN/themes/reindeer/styles.css" /> </head> <body> <iframe id="__gwt_historyFrame" @@ -55,13 +43,12 @@ src="javascript:false"></iframe> <p>Experimental test page for multiple apps and multiple widgetsets - on the same page. Try with ?debug to see three VConsoles! Test well + 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="fb" style="height: 400px; border: 2px solid red; margin: 0"></div> <div id="calc" style="border: 2px solid green; margin: 0"></div> <div id="colorpicker" style="border: 2px solid blue; margin: 0"></div> </body> |