]> source.dussan.org Git - vaadin-framework.git/commitdiff
changes to conform with web-ajax merge
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>
Fri, 1 Dec 2006 17:35:33 +0000 (17:35 +0000)
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>
Fri, 1 Dec 2006 17:35:33 +0000 (17:35 +0000)
svn changeset:133/svn branch:toolkit

WebContent/demoapp.html [new file with mode: 0644]
WebContent/index.html

diff --git a/WebContent/demoapp.html b/WebContent/demoapp.html
new file mode 100644 (file)
index 0000000..c7f4db6
--- /dev/null
@@ -0,0 +1,71 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+       
+<html>
+       <head>
+               <title>IT Mill Toolkit Demo</title>
+               
+               <!-- This the default Client application -->
+               <script src="client/client.js" type="text/javascript"></script>
+
+               <!-- These are the "DefaultTheme" related CSS and JS files -->
+        <script type="text/javascript" src="themes/default/theme.js"></script>
+        <script type="text/javascript" src="themes/default/jscalendar/calendar.js"></script> 
+        <script type="text/javascript" src="themes/default/jscalendar/lang/calendar-en.js"></script> 
+        <script type="text/javascript" src="themes/default/jscalendar/calendar-setup.js"></script>    
+        <link rel="stylesheet" media="screen, projection" href="themes/default/calendar-default.css" type="text/css" /> 
+        <link rel="stylesheet" media="screen, projection" href="themes/default/theme.css" type="text/css" />
+
+               <!-- These are the "ExampleTheme" related CSS and JS files -->
+        <script type="text/javascript" src="themes/example/example_theme.js"></script>
+        <link rel="stylesheet" media="screen, projection" href="themes/example/example_styles.css" type="text/css" />
+        
+    </head>
+    
+       <body>  
+       
+               <!-- Loading indicator -->
+               <div id="ajax-wait" class="outset" 
+                       style="top:4px;right:4px;cursor:wait;z-index:10000;background:white;display:none;position:absolute;">
+                       <div class="border pad">Loading...</div>
+               </div>
+               
+               <!-- Div where the client puts the IT Mill Toolkit Application main window -->
+               <div class="window" id="ajax-window" style=""></div>                            
+               
+               <!-- Start the application  -->
+               <script language="JavaScript">
+                       var baseUrl = document.location.href.split("demoapp.html")[0];
+                       
+                       // Determine the demo application
+                       var app = document.location.href.split("app=")[1].split("&")[0];
+                       document.title = document.title + " - " + app;
+                       
+                       // Create ajax-client for the application
+                       var client = new ITMillToolkitClient(
+                               document.getElementById('ajax-window'),         // Element where to put main window
+                               baseUrl + app + "/UIDL/",                                       // Adapter servlet URL (see WEB-INF/web.xml)
+                               baseUrl + "client/",                                            // Base directory for the client
+                               document.getElementById('ajax-wait'));          // Element to show while loading
+                               
+                       // Should we also show debug information?
+                       var debug = document.location.href.split("debug=")[1];
+                       if (debug && debug.split("&")[0] == "1") 
+                               client.debugEnabled = true;
+                            
+                       // Create the default theme and register the theme to the ajax-client
+                       var defaultTheme = new DefaultTheme(baseUrl + "themes/default/");                
+                       defaultTheme.registerTo(client);
+
+                       // Create the example theme and register the theme to the ajax-client
+                       var exampleTheme = new ExampleTheme(baseUrl + "themes/example/",defaultTheme);           
+                       exampleTheme.registerTo(client);
+                                
+                       // Start the client                                      
+                       client.start();
+                                
+               </script>
+               
+       </body>
+ </html>
+               
\ No newline at end of file
index a7547233841a9928c88a3337abf21d10342cbf86..2444cfd44abc8f168f85494325ce8c1e24d8a182 100644 (file)
 <tr><td>
        <h2>Hello World</h2>
        <ul>
-               <li><a href="demo/demoapp.html?app=hello">AJAX</a></li>
-               <li><a href="demo/demoapp.html?debug=1&app=hello">AJAX + debug</a></li>
-               <li><a href="demo/hello/web/">Traditional web</a></li>
+               <li><a href="demoapp.html?app=hello">AJAX</a></li>
+               <li><a href="demoapp.html?debug=1&app=hello">AJAX + debug</a></li>
+               <li><a href="hello/">Traditional web</a></li>
                <li><a href="src/com/itmill/toolkit/demo/Hello.java">Source</li>
        </ul>
 </td><td>
        <h2>Feature Browser</h2>
        <ul>
-               <li><a href="demo/demoapp.html?app=features">AJAX</a></li>
-               <li><a href="demo/demoapp.html?debug=1&app=features">AJAX + debug</a></li>
-               <li><a href="demo/features/web/">Traditional web</a></li>
+               <li><a href="demoapp.html?app=features">AJAX</a></li>
+               <li><a href="demoapp.html?debug=1&app=features">AJAX + debug</a></li>
+               <li><a href="features/">Traditional web</a></li>
                <li><a href="src/com/itmill/toolkit/demo/features/">Sources folder</li>
        </ul>
 </td></tr>
 <tr><td>
        <h2>Calculator</h2>
        <ul>
-               <li><a href="demo/demoapp.html?app=calc">AJAX</a></li>
-               <li><a href="demo/demoapp.html?debug=1&app=calc">AJAX + debug</a></li>
-               <li><a href="demo/calc/web/">Traditional web</a></li>
+               <li><a href="demoapp.html?app=calc">AJAX</a></li>
+               <li><a href="demoapp.html?debug=1&app=calc">AJAX + debug</a></li>
+               <li><a href="calc/">Traditional web</a></li>
                <li><a href="src/com/itmill/toolkit/demo/Calc.java">Source</li>
        </ul>
 </td><td>
        <h2>Large Table</h2>
        <ul>
-               <li><a href="demo/demoapp.html?app=table">AJAX</a></li>
-               <li><a href="demo/demoapp.html?debug=1&app=table">AJAX + debug</a></li>
-               <li><a href="demo/tableweb/">Traditional web</a></li>
+               <li><a href="demoapp.html?app=table">AJAX</a></li>
+               <li><a href="demoapp.html?debug=1&app=table">AJAX + debug</a></li>
+               <li><a href="table">Traditional web</a></li>
                <li><a href="src/com/itmill/toolkit/demo/table/TableDemoApplication.java">Source</li>
        </ul>
 </td></tr>
 <tr><td>
        <h2>Chat</h2>
        <ul>
-               <li><a href="demo/demoapp.html?app=chat">AJAX</a></li>
-               <li><a href="demo/demoapp.html?debug=1&app=chat">AJAX + debug</a></li>
-               <li><a href="demo/chat/web/">Traditional web</a></li>
+               <li><a href="demoapp.html?app=chat">AJAX</a></li>
+               <li><a href="demoapp.html?debug=1&app=chat">AJAX + debug</a></li>
+               <li><a href="chat/">Traditional web</a></li>
                <li><a href="src/com/itmill/toolkit/demo/Chat.java">Source</li>
        </ul>
 </td><td>
        <h2>Login</h2>
        <ul>
-               <li><a href="demo/demoapp.html?app=login">AJAX</a></li>
-               <li><a href="demo/demoapp.html?debug=1&app=login">AJAX + debug</a></li>
-               <li><a href="demo/login/web/">Traditional web</a></li>
+               <li><a href="demoapp.html?app=login">AJAX</a></li>
+               <li><a href="demoapp.html?debug=1&app=login">AJAX + debug</a></li>
+               <li><a href="login/">Traditional web</a></li>
                <li><a href="src/com/itmill/toolkit/demo/Login.java">Source</li>
        </ul>
 </td></tr>
@@ -67,9 +67,9 @@
 <tr><td>
        <h2>GO-game</h2>
        <ul>
-               <li><a href="demo/demoapp.html?app=gogame">AJAX</a></li>
-               <li><a href="demo/demoapp.html?debug=1&app=gogame">AJAX + debug</a></li>
-               <li><a href="demo/gogame/web/">Traditional web</a></li>
+               <li><a href="demoapp.html?app=gogame">AJAX</a></li>
+               <li><a href="demoapp.html?debug=1&app=gogame">AJAX + debug</a></li>
+               <li><a href="gogame/">Traditional web</a></li>
                <li><a href="src/com/itmill/toolkit/demo/gogame/Board.java">Board component source</li>
                <li><a href="src/com/itmill/toolkit/demo/gogame/Game.java">Game state model source</li>
                <li><a href="src/com/itmill/toolkit/demo/gogame/Go.java">Application source</li>