Some small changes

This commit is contained in:
Severin Münger
2013-09-06 20:36:04 +02:00
parent 9f40c6355c
commit d45405f261
2 changed files with 12 additions and 16 deletions

View File

@@ -10,10 +10,6 @@ class
inherit inherit
WSF_PAGE_CONTROL WSF_PAGE_CONTROL
redefine
initialize_controls,
process
end
create create
make make
@@ -31,26 +27,26 @@ feature
button1.set_click_event (agent handle_click) button1.set_click_event (agent handle_click)
create form.make_form_control ("panel") create form.make_form_control ("panel")
form.add_class ("form-horizontal") form.add_class ("form-horizontal")
create cklist.make_checkbox_list_control("categories") create cklist.make_checkbox_list_control ("categories")
cklist.add_control (create {WSF_CHECKBOX_CONTROL}.make_checkbox("net","Network","net")) cklist.add_control (create {WSF_CHECKBOX_CONTROL}.make_checkbox ("net", "Network", "net"))
cklist.add_control (create {WSF_CHECKBOX_CONTROL}.make_checkbox("os","Operating Systems","os")) cklist.add_control (create {WSF_CHECKBOX_CONTROL}.make_checkbox ("os", "Operating Systems", "os"))
form.add_control (create {WSF_FORM_ELEMENT_CONTROL[STRING]}.make_form_element("Number1",textbox1)) form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING]}.make_form_element ("Number1", textbox1))
form.add_control (create {WSF_FORM_ELEMENT_CONTROL[STRING]}.make_form_element("Number2",textbox2)) form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING]}.make_form_element ("Number2", textbox2))
form.add_control (create {WSF_FORM_ELEMENT_CONTROL[LIST[STRING]]}.make_form_element("Categories",cklist)) form.add_control (create {WSF_FORM_ELEMENT_CONTROL [LIST [STRING]]}.make_form_element ("Categories", cklist))
form.add_control (button1) form.add_control (button1)
form.add_control (create {WSF_FORM_ELEMENT_CONTROL[STRING]}.make_form_element("Result",textbox_result)) form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING]}.make_form_element ("Result", textbox_result))
control := form control := form
end end
handle_click handle_click
local local
text:STRING text: STRING
do do
text := textbox1.text + " + " + textbox2.text + " = " + (textbox1.text.to_integer_16 + textbox2.text.to_integer_16).out text := textbox1.text + " + " + textbox2.text + " = " + (textbox1.text.to_integer_16 + textbox2.text.to_integer_16).out
across across
cklist.value as s cklist.value as s
loop loop
text.append ("%N-"+s.item) text.append ("%N-" + s.item)
end end
textbox_result.set_text (text) textbox_result.set_text (text)
end end

View File

@@ -88,14 +88,14 @@ feature
loop loop
css_classes_string := css_classes_string + " " + c.item css_classes_string := css_classes_string + " " + c.item
end end
Result:=render_tag_with_tagname(tag_name,body,attributes,css_classes_string) Result := render_tag_with_tagname (tag_name, body, attributes, css_classes_string)
end end
render_tag_with_tagname (tag, body, attributes,css_classes_string: STRING): STRING render_tag_with_tagname (tag, body, attributes, css_classes_string: STRING): STRING
local local
l_attributes: STRING l_attributes: STRING
do do
l_attributes:=attributes l_attributes := attributes
if not css_classes_string.is_empty then if not css_classes_string.is_empty then
l_attributes := " class=%"" + css_classes_string + "%"" l_attributes := " class=%"" + css_classes_string + "%""
end end