aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/itmill/toolkit/demo
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2006-11-15 12:46:29 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2006-11-15 12:46:29 +0000
commitfc7bba8f33ae15704cdb2e6367bb770ca46ac22c (patch)
tree8e94e3e5dcc8621627ecac78c9e8f883d3db2317 /src/com/itmill/toolkit/demo
parent999fa806ac093279ff370132ede34ebed0b9258b (diff)
downloadvaadin-framework-fc7bba8f33ae15704cdb2e6367bb770ca46ac22c.tar.gz
vaadin-framework-fc7bba8f33ae15704cdb2e6367bb770ca46ac22c.zip
Enabled sample applications (ajax versions) and welcome text in feature browser
svn changeset:97/svn branch:toolkit
Diffstat (limited to 'src/com/itmill/toolkit/demo')
-rw-r--r--src/com/itmill/toolkit/demo/features/FeatureBrowser.java7
-rw-r--r--src/com/itmill/toolkit/demo/package.html8
2 files changed, 8 insertions, 7 deletions
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> -->