diff options
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 57 | ||||
| -rw-r--r-- | WebContent/index.html | 7 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/demo/features/FeatureBrowser.java | 7 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/demo/package.html | 8 |
4 files changed, 71 insertions, 8 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 0eaa8e0314..f0276d5dfa 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -34,6 +34,63 @@ <url-pattern>/demo/features/ajax/*</url-pattern> </servlet-mapping> +<!-- APPLICATION: ...demo.calc --> + <servlet> + <servlet-name>calc-ajax</servlet-name> + <servlet-class>com.itmill.toolkit.terminal.ajax.AjaxAdapterServlet</servlet-class> + <init-param> + <param-name>application</param-name> + <param-value>com.itmill.toolkit.demo.Calc</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>calc-ajax</servlet-name> + <url-pattern>/demo/calc/ajax/*</url-pattern> + </servlet-mapping> + +<!-- APPLICATION: ...demo.chat --> + <servlet> + <servlet-name>chat-ajax</servlet-name> + <servlet-class>com.itmill.toolkit.terminal.ajax.AjaxAdapterServlet</servlet-class> + <init-param> + <param-name>application</param-name> + <param-value>com.itmill.toolkit.demo.Chat</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>chat-ajax</servlet-name> + <url-pattern>/demo/chat/ajax/*</url-pattern> + </servlet-mapping> + +<!-- APPLICATION: ...demo.Hello --> + <servlet> + <servlet-name>hello-ajax</servlet-name> + <servlet-class>com.itmill.toolkit.terminal.ajax.AjaxAdapterServlet</servlet-class> + <init-param> + <param-name>application</param-name> + <param-value>com.itmill.toolkit.demo.HelloWorld</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>hello-ajax</servlet-name> + <url-pattern>/demo/hello/ajax/*</url-pattern> + </servlet-mapping> + +<!-- APPLICATION: ...demo.Login --> + <servlet> + <servlet-name>login-ajax</servlet-name> + <servlet-class>com.itmill.toolkit.terminal.ajax.AjaxAdapterServlet</servlet-class> + <init-param> + <param-name>application</param-name> + <param-value>com.itmill.toolkit.demo.Login</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>login-ajax</servlet-name> + <url-pattern>/demo/login/ajax/*</url-pattern> + </servlet-mapping> + + <welcome-file-list> <welcome-file>index.html</welcome-file> <welcome-file>index.htm</welcome-file> diff --git a/WebContent/index.html b/WebContent/index.html index ab1dfde464..81aa7b9fad 100644 --- a/WebContent/index.html +++ b/WebContent/index.html @@ -6,7 +6,12 @@ <h1>IT Mill Toolkit Demos</h1> +<p> Feature Browser <a href="demo/features/web/">[web]</a> <a href="demo/features-ajax.html">[ajax]</a> - +</p> +<p>Demo application (ajax) : <a href="demo/demoapp.html?app=calc">Calculator</a></p> +<p>Demo application (ajax) : <a href="demo/demoapp.html?app=chat">Chat</a> (broken)</p> +<p>Demo application (ajax) : <a href="demo/demoapp.html?app=hello">HelloWorld</a></p> +<p>Demo application (ajax) : <a href="demo/demoapp.html?app=login">Login</a></p> </body> </html>
\ No newline at end of file diff --git a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java index 42420041f5..31dcbba193 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java +++ b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java @@ -80,7 +80,7 @@ public class FeatureBrowser close.setStyle("link"); layout.addComponent(left, 0, 0, 0, 0); Label greeting = new Label(WELCOME_TEXT, Label.CONTENT_XHTML); - //welcomePanel = new Panel((String) null); + OrderedLayout welcomePanel = new OrderedLayout(); welcome = new Embedded( "", @@ -88,8 +88,9 @@ public class FeatureBrowser getClass(), "millstone-logo.gif", getApplication())); - // welcomePanel.addComponent(greeting); - layout.addComponent(welcome, 1, 0, 1, 0); + welcomePanel.addComponent(welcome); + welcomePanel.addComponent(greeting); + layout.addComponent(welcomePanel, 1, 0, 1, 0); // Test component registerFeature( diff --git a/src/com/itmill/toolkit/demo/package.html b/src/com/itmill/toolkit/demo/package.html index ebff0df337..e9e7735a73 100644 --- a/src/com/itmill/toolkit/demo/package.html +++ b/src/com/itmill/toolkit/demo/package.html @@ -14,14 +14,14 @@ applications.</p> <p><ul> <li><strong>HelloWorld</strong> is the classic example which only prints the -text "Hello, World!" on the screen. +text "Hello, World!" on the screen.</li> <li><strong>LoginExample</strong> is almost as simple as HelloWorld. It demonstrates how to use the optional login procedure available to MillStone -applications. +applications.</li> <li><strong>Calc</strong> implements a calculator application which demonstrates how to build a bit more complicated user interface and how the -application can interact with the usern through that interface. -</u></p> +application can interact with the usern through that interface.</li> +</ul></p> <!-- <h2>Package Specification</h2> --> |