Added version information to welcome page.

Added TODO texts.

Removed obsolete code.

svn changeset:594/svn branch:toolkit

diff --git a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java
index b8c2b7e28eb20bbbfd0cf893d30a9b6ffb278c75..41e8979ce7d62b108dafbaa05609136d2bfcb69b 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java
@@ -81,20 +81,6 @@ public class FeatureBrowser extends CustomComponent implements
                left.addComponent(features);
                layout.addComponent(left);
 
-               // Welcome temporarily disabled
-               // Label greeting = new Label(WELCOME_TEXT, Label.CONTENT_XHTML);
-               // OrderedLayout welcomePanel = new OrderedLayout();
-               // welcome =
-               // new Embedded(
-               // "",
-               // new ClassResource(
-               // getClass(),
-               // "itmill.gif",
-               // getApplication()));
-               // welcomePanel.addComponent(welcome);
-               // welcomePanel.addComponent(greeting);
-               // layout.addComponent(welcomePanel);
-
                // Theme selector
                left.addComponent(themeSelector);
                themeSelector.addItem("demo");

diff --git a/src/com/itmill/toolkit/demo/features/IntroBasic.java b/src/com/itmill/toolkit/demo/features/IntroBasic.java
index 21bcb2a5f7d25cb4aba9dc4a1804ec895e7ddea5..4c76a16445288ca0f5a8b6a415281f4ca1b4c63e 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroBasic.java
+++ b/src/com/itmill/toolkit/demo/features/IntroBasic.java
@@ -68,7 +68,7 @@ public class IntroBasic extends Feature {
        }
 
        protected String getTitle() {
-               return "Introduction of basic UI components";
+               return "Introduction of basic UI components (TODO)";
        }
 
 }

diff --git a/src/com/itmill/toolkit/demo/features/IntroComponents.java b/src/com/itmill/toolkit/demo/features/IntroComponents.java
index f161a9898c0f3ea28029bef03d0cffe609993d81..b7cf2412d4157005476ab43aa79a32ed76a2aa05 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroComponents.java
+++ b/src/com/itmill/toolkit/demo/features/IntroComponents.java
@@ -68,7 +68,7 @@ public class IntroComponents extends Feature {
        }
 
        protected String getTitle() {
-               return "";
+               return "Introduction of basic components (TODO)";
        }
 
 }

diff --git a/src/com/itmill/toolkit/demo/features/IntroDataHandling.java b/src/com/itmill/toolkit/demo/features/IntroDataHandling.java
index efc2e8e25aef07860a1a034f015cdd781607577f..1079505becb9a3092d6f08a931b65998792bcff2 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroDataHandling.java
+++ b/src/com/itmill/toolkit/demo/features/IntroDataHandling.java
@@ -68,7 +68,7 @@ public class IntroDataHandling extends Feature {
        }
 
        protected String getTitle() {
-               return "Introduction for data handling";
+               return "Introduction for data handling (TODO)";
        }
 
 }

diff --git a/src/com/itmill/toolkit/demo/features/IntroDataModel.java b/src/com/itmill/toolkit/demo/features/IntroDataModel.java
index 6ba6d2ee687801082fe1544e695a376a964666b7..35c640da3052837af102ad7058e539fea7bddcb9 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroDataModel.java
+++ b/src/com/itmill/toolkit/demo/features/IntroDataModel.java
@@ -68,7 +68,7 @@ public class IntroDataModel extends Feature {
        }
 
        protected String getTitle() {
-               return "Introduction for data model";
+               return "Introduction for data model (TODO)";
        }
 
 }

diff --git a/src/com/itmill/toolkit/demo/features/IntroItemContainers.java b/src/com/itmill/toolkit/demo/features/IntroItemContainers.java
index ab6f5d764702603fc84544dbea641d0874473eba..d7d811f0bb2e9c29cb856c679f9d8d3dc1ee50c0 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroItemContainers.java
+++ b/src/com/itmill/toolkit/demo/features/IntroItemContainers.java
@@ -68,7 +68,7 @@ public class IntroItemContainers extends Feature {
        }
 
        protected String getTitle() {
-               return "Introduction for item containers";
+               return "Introduction for item containers (TODO)";
        }
 
 }

diff --git a/src/com/itmill/toolkit/demo/features/IntroLayouts.java b/src/com/itmill/toolkit/demo/features/IntroLayouts.java
index 9065b9d75802a7a9b8285d9aeb90b05aa118b7fd..724916f3ee2e2a0e72064b883241015c0a9efb92 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroLayouts.java
+++ b/src/com/itmill/toolkit/demo/features/IntroLayouts.java
@@ -68,7 +68,7 @@ public class IntroLayouts extends Feature {
        }
 
        protected String getTitle() {
-               return "Introduction for layouts";
+               return "Introduction for layouts (TODO)";
        }
 
 }

diff --git a/src/com/itmill/toolkit/demo/features/IntroTerminal.java b/src/com/itmill/toolkit/demo/features/IntroTerminal.java
index 3853ae713e7190c205e6b1dd74d0440c79ba6690..be5603d284faa16073db8d4b75a2f24273b91435 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroTerminal.java
+++ b/src/com/itmill/toolkit/demo/features/IntroTerminal.java
@@ -68,7 +68,7 @@ public class IntroTerminal extends Feature {
        }
 
        protected String getTitle() {
-               return "Introduction for terminals";
+               return "Introduction for terminals (TODO)";
        }
 
 }

diff --git a/src/com/itmill/toolkit/demo/features/IntroWelcome.java b/src/com/itmill/toolkit/demo/features/IntroWelcome.java
index a48f1115f9e4c2b9eb8b333697c814af741346e0..3346f97269bb26ac20084d829a67f5a77e7735e1 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroWelcome.java
+++ b/src/com/itmill/toolkit/demo/features/IntroWelcome.java
@@ -54,7 +54,8 @@ public class IntroWelcome extends Feature {
                Label lab = new Label();
                lab.setStyle("featurebrowser-none");
                Label version = new Label();
-               version.setValue("IT Mill Toolkit Version: "+ApplicationServlet.VERSION);
+               version.setValue("IT Mill Toolkit version: "+ApplicationServlet.VERSION);
+               l.addComponent(version);
                l.addComponent(lab);
 
                // Properties
@@ -79,7 +80,7 @@ public class IntroWelcome extends Feature {
        }
 
        protected String getTitle() {
-               return "Welcome to the IT Mill Toolkit feature tour!";
+               return "Welcome to the IT Mill Toolkit feature tour! (TODO)";
        }
 
 }