From 7bdafbd21ee1e26064448da3098880817782880a Mon Sep 17 00:00:00 2001
From: YNH Webdev <ynhwebdev@gmail.com>
Date: Thu, 5 Sep 2013 16:51:37 +0200
Subject: [PATCH] Fix render function

---
 examples/widgetapp/sample_page.e                | 14 +++++++-------
 .../server/wsf_html/webcontrol/wsf_control.e    |  2 +-
 .../webcontrol/wsf_form_element_control.e       | 17 +++++++++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e
index 7b83e559..dc8ea289 100644
--- a/examples/widgetapp/sample_page.e
+++ b/examples/widgetapp/sample_page.e
@@ -22,19 +22,19 @@ feature
 
 	initialize_controls
 		local
-			panel: WSF_MULTI_CONTROL
+			form: WSF_FORM_CONTROL
 		do
 			create textbox1.make_text ("txtBox1", "1")
 			create textbox2.make_text ("txtBox2", "2")
 			create button1.make_button ("sample_button1", "SUM")
 			create textbox_result.make_text ("txtBox3", "")
 			button1.set_click_event (agent handle_click)
-			create panel.make ("panel")
-			panel.add_control (textbox1)
-			panel.add_control (textbox2)
-			panel.add_control (button1)
-			panel.add_control (textbox_result)
-			control := panel
+			create form.make_form_control ("panel")
+			form.add_control (create {WSF_FORM_ELEMENT_CONTROL[STRING]}.make_form_element("Number1",textbox1))
+			form.add_control (textbox2)
+			form.add_control (button1)
+			form.add_control (textbox_result)
+			control := form
 		end
 
 	handle_click
diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e
index 16efe48d..d9afa4cb 100644
--- a/library/server/wsf_html/webcontrol/wsf_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_control.e
@@ -92,7 +92,7 @@ feature
 				css_classes_string := " class=%"" + css_classes_string + "%""
 			end
 			Result := "<" + tag_name + "  data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attributes + css_classes_string
-			if not body.is_empty then
+			if body.is_empty then
 				Result := Result + " />"
 			else
 				Result := Result + " >" + body + "</" + tag_name + ">"
diff --git a/library/server/wsf_html/webcontrol/wsf_form_element_control.e b/library/server/wsf_html/webcontrol/wsf_form_element_control.e
index 7f0d376a..e4b957a7 100644
--- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e
@@ -12,17 +12,26 @@ inherit
 	WSF_CONTROL
 
 create
-	make_form_element
+	make_form_element,
+	make_form_element_with_validators
 
 feature {NONE}
 
-	make_form_element (n: STRING; c: WSF_VALUE_CONTROL [G]; v: LINKED_LIST [WSF_VALIDATOR [G]])
+	make_form_element (a_label:STRING; c: WSF_VALUE_CONTROL [G])
+		local
+			a_validators: LINKED_LIST [WSF_VALIDATOR [G]]
 		do
-			make (n, "div")
+			create a_validators.make
+			make_form_element_with_validators(a_label,c,a_validators)
+		end
+
+	make_form_element_with_validators (a_label: STRING; c: WSF_VALUE_CONTROL [G]; v: LINKED_LIST [WSF_VALIDATOR [G]])
+		do
+			make (c.control_name+"_container", "div")
 			add_class ("form-group")
 			value_control := c
 			validators := v
-			label := ""
+			label := a_label
 			error := ""
 		end