1 files changed, 30 insertions, 7 deletions

diff --git a/src/com/itmill/toolkit/demo/features/IntroDataHandling.java b/src/com/itmill/toolkit/demo/features/IntroDataHandling.java
index 1079505bec..c2c954381f 100644
--- a/src/com/itmill/toolkit/demo/features/IntroDataHandling.java
+++ b/src/com/itmill/toolkit/demo/features/IntroDataHandling.java
@@ -29,11 +29,19 @@
 package com.itmill.toolkit.demo.features;
 
 import com.itmill.toolkit.ui.Component;
+import com.itmill.toolkit.ui.Form;
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.Panel;
+import com.itmill.toolkit.ui.Select;
 
 public class IntroDataHandling extends Feature {
 
+	private static final String INTRO_TEXT = ""
+			+ "Embedded Objects and Upload components are provided as samples"
+			+ " for data handling section."
+			+ "<br /><br />See the API documentation of respective components for more information.";
+
 	public IntroDataHandling() {
 		super();
 	}
@@ -42,25 +50,40 @@ public class IntroDataHandling extends Feature {
 
 		OrderedLayout l = new OrderedLayout();
 
-		Label lab = new Label();
-		lab.setStyle("featurebrowser-none");
-		l.addComponent(lab);
+		Panel panel = new Panel();
+		panel.setCaption("Data Handling");
+		l.addComponent(panel);
+
+		Label label = new Label();
+		panel.addComponent(label);
+
+		label.setContentMode(Label.CONTENT_XHTML);
+		label.setValue(INTRO_TEXT);
 
 		// Properties
-		propertyPanel = null;
+		propertyPanel = new PropertyPanel(panel);
+		Form ap = propertyPanel.createBeanPropertySet(new String[] { "width",
+				"height" });
+		Select themes = (Select) propertyPanel.getField("style");
+		themes.addItem("light").getItemProperty(
+				themes.getItemCaptionPropertyId()).setValue("light");
+		themes.addItem("strong").getItemProperty(
+				themes.getItemCaptionPropertyId()).setValue("strong");
+		propertyPanel.addProperties("Panel Properties", ap);
 
 		return l;
 	}
 
 	protected String getExampleSrc() {
-		return "";
+		return null;
 	}
 
 	/**
 	 * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML()
 	 */
 	protected String getDescriptionXHTML() {
-		return "";
+		return "Please select <em>Embedded Objects</em> or <em>Upload</em>"
+				+ " from the menu for more information.";
 	}
 
 	protected String getImage() {
@@ -68,7 +91,7 @@ public class IntroDataHandling extends Feature {
 	}
 
 	protected String getTitle() {
-		return "Introduction for data handling (TODO)";
+		return null;
 	}
 
 }