backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fix removed DOCTYPE

Browse Source
This commit is contained in:
Severin Münger
2013-09-13 00:41:31 +02:00
parent b1cf630443
commit 9c65194d91
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/server/wsf_html/webcontrol/wsf_control.e
View File

@@ -10,6 +10,9 @@ deferred class
inherit inherit
WSF_STATELESS_CONTROL WSF_STATELESS_CONTROL
redefine
render_tag_with_tagname
end
feature feature
@@ -62,6 +65,24 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
state_changes: JSON_OBJECT state_changes: JSON_OBJECT
feature -- Rendering
render_tag_with_tagname (tag, body, attributes, css_classes_string: STRING): STRING
local
l_attributes: STRING
do
l_attributes := attributes
if not css_classes_string.is_empty then
l_attributes := l_attributes + " class=%"" + css_classes_string + "%""
end
Result := "<" + tag + " id=%"" + control_name + "%" data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + l_attributes
if body.is_empty and not tag.is_equal ("textarea") then
Result := Result + " />"
else
Result := Result + " >" + body + "</" + tag + ">"
end
end
feature --EVENT HANDLING feature --EVENT HANDLING
handle_callback (cname: STRING; event: STRING) handle_callback (cname: STRING; event: STRING)

2
library/server/wsf_html/webcontrol/wsf_page_control.e
View File

@@ -76,7 +76,7 @@ feature
do do
create states.make create states.make
control.read_state (states) control.read_state (states)
data := "<!DOCTYPE html><html><head>" data := "<html><head>"
data.append ("<link href=%"/bootstrap.min.css%" rel=%"stylesheet%">") data.append ("<link href=%"/bootstrap.min.css%" rel=%"stylesheet%">")
data.append ("<link href=%"/widget.css%" rel=%"stylesheet%">") data.append ("<link href=%"/widget.css%" rel=%"stylesheet%">")
data.append ("</head><body>") data.append ("</head><body>")

2
library/server/wsf_html/webcontrol/wsf_stateless_control.e
View File

@@ -51,7 +51,7 @@ feature
if not css_classes_string.is_empty then if not css_classes_string.is_empty then
l_attributes := l_attributes + " class=%"" + css_classes_string + "%"" l_attributes := l_attributes + " class=%"" + css_classes_string + "%""
end end
Result := "<" + tag + l_attributes Result := "<" + tag + " " + l_attributes
if body.is_empty and not tag.is_equal ("textarea") then if body.is_empty and not tag.is_equal ("textarea") then
Result := Result + " />" Result := Result + " />"
else else