Added version information to welcome page.

Added TODO texts.

Removed obsolete code.

svn changeset:594/svn branch:toolkit

9 files changed, 10 insertions, 23 deletions

diff --git a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java
index b8c2b7e28e..41e8979ce7 100644
--- 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 21bcb2a5f7..4c76a16445 100644
--- 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 f161a9898c..b7cf2412d4 100644
--- 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 efc2e8e25a..1079505bec 100644
--- 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 6ba6d2ee68..35c640da30 100644
--- 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 ab6f5d7647..d7d811f0bb 100644
--- 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 9065b9d758..724916f3ee 100644
--- 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 3853ae713e..be5603d284 100644
--- 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 a48f1115f9..3346f97269 100644
--- 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)";
 	}
 
 }