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

Extracted the WIDGET and FORM classes out of "cms" component

Browse Source 
and build the wsf_html library which also include the previous css lib.
This commit is contained in:
Jocelyn Fiat
2013-03-22 20:11:44 +01:00
parent de57e814c0
commit 52cc356f8e
65 changed files with 468 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
draft/application/cms/src/modules/admin/admin_user_roles_cms_execution.e
View File

@@ -81,7 +81,7 @@ feature -- Execution
feature -- Forms
edit_form_submit (fd: CMS_FORM_DATA; a_roles: LIST [CMS_USER_ROLE])
edit_form_submit (fd: WSF_FORM_DATA; a_roles: LIST [CMS_USER_ROLE])
local
l_role: CMS_USER_ROLE
do
@@ -120,9 +120,9 @@ feature -- Forms
new_edit_form (a_action: READABLE_STRING_8; a_roles: LIST [CMS_USER_ROLE]; a_use_data: BOOLEAN): CMS_FORM
local
perms: ARRAYED_SET [READABLE_STRING_8]
tb: CMS_WIDGET_AGENT_TABLE [READABLE_STRING_8]
tb: WSF_WIDGET_AGENT_TABLE [READABLE_STRING_8]
i: INTEGER
tf: CMS_FORM_TEXT_INPUT
tf: WSF_FORM_TEXT_INPUT
do
create perms.make (10)
perms.compare_objects
@@ -158,10 +158,10 @@ feature -- Forms
tb.add_css_style ("border: solid 1px #999;")
tb.set_data (perms)
tb.set_compute_item_function (agent (p: READABLE_STRING_8; ia_roles: LIST [CMS_USER_ROLE]; ia_use_data: BOOLEAN): CMS_WIDGET_TABLE_ROW
tb.set_compute_item_function (agent (p: READABLE_STRING_8; ia_roles: LIST [CMS_USER_ROLE]; ia_use_data: BOOLEAN): WSF_WIDGET_TABLE_ROW
local
it: CMS_WIDGET_TABLE_ITEM
cb: CMS_FORM_CHECKBOX_INPUT
it: WSF_WIDGET_TABLE_ITEM
cb: WSF_FORM_CHECKBOX_INPUT
do
create Result.make (1 + ia_roles.count)
create it.make_with_text (p)
@@ -188,21 +188,21 @@ feature -- Forms
create Result.make (a_action, "edit-user-roles")
Result.set_method_post
Result.extend (tb.to_computed_table)
Result.extend (create {CMS_FORM_SUBMIT_INPUT}.make_with_text ("op", "Apply"))
Result.extend (create {WSF_FORM_SUBMIT_INPUT}.make_with_text ("op", "Apply"))
create tf.make ("new-role")
tf.add_css_class ("horizontal")
tf.set_size (24)
tf.set_label ("New user role")
Result.extend (tf)
Result.extend (create {CMS_FORM_SUBMIT_INPUT}.make_with_text ("op", "Add role"))
Result.extend (create {WSF_FORM_SUBMIT_INPUT}.make_with_text ("op", "Add role"))
create tf.make ("new-permission")
tf.add_css_class ("horizontal")
tf.set_size (24)
tf.set_label ("New permission")
Result.extend (tf)
Result.extend (create {CMS_FORM_SUBMIT_INPUT}.make_with_text ("op", "Add permission"))
Result.extend (create {WSF_FORM_SUBMIT_INPUT}.make_with_text ("op", "Add permission"))

14
draft/application/cms/src/modules/node/cms_page_content_type.e
View File

@@ -41,11 +41,11 @@ feature -- Factory
fill_edit_form (f: CMS_FORM; a_node: detachable CMS_NODE)
local
ti: CMS_FORM_TEXT_INPUT
fset: CMS_FORM_FIELD_SET
ta: CMS_FORM_TEXTAREA
tselect: CMS_FORM_SELECT
opt: CMS_FORM_SELECT_OPTION
ti: WSF_FORM_TEXT_INPUT
fset: WSF_FORM_FIELD_SET
ta: WSF_FORM_TEXTAREA
tselect: WSF_FORM_SELECT
opt: WSF_FORM_SELECT_OPTION
do
create ti.make ("title")
ti.set_label ("Title")
@@ -96,7 +96,7 @@ feature -- Factory
end
change_node (a_execution: CMS_EXECUTION; fd: CMS_FORM_DATA; a_node: like new_node)
change_node (a_execution: CMS_EXECUTION; fd: WSF_FORM_DATA; a_node: like new_node)
local
b: detachable READABLE_STRING_8
f: detachable CMS_FORMAT
@@ -123,7 +123,7 @@ feature -- Factory
end
end
new_node (a_execution: CMS_EXECUTION; fd: CMS_FORM_DATA; a_node: detachable like new_node): CMS_PAGE
new_node (a_execution: CMS_EXECUTION; fd: WSF_FORM_DATA; a_node: detachable like new_node): CMS_PAGE
-- <Precursor>
local
b: detachable READABLE_STRING_8

2
draft/application/cms/src/modules/node/node_add_cms_execution.e
View File

@@ -18,7 +18,7 @@ feature -- Execution
local
b: STRING_8
f: like edit_form
fd: detachable CMS_FORM_DATA
fd: detachable WSF_FORM_DATA
do
create b.make_empty
if attached non_empty_string_path_parameter ("type") as s_type then

10
draft/application/cms/src/modules/node/node_cms_execution.e
View File

@@ -12,7 +12,7 @@ inherit
feature -- Form
edit_form_validate (fd: CMS_FORM_DATA; b: STRING)
edit_form_validate (fd: WSF_FORM_DATA; b: STRING)
local
l_preview: BOOLEAN
l_format: detachable CMS_FORMAT
@@ -39,7 +39,7 @@ feature -- Form
end
end
edit_form_submit (fd: CMS_FORM_DATA; a_node: detachable CMS_NODE; a_type: CMS_CONTENT_TYPE; b: STRING)
edit_form_submit (fd: WSF_FORM_DATA; a_node: detachable CMS_NODE; a_type: CMS_CONTENT_TYPE; b: STRING)
local
l_preview: BOOLEAN
l_node: detachable CMS_NODE
@@ -77,7 +77,7 @@ feature -- Form
end
end
-- edit_form_submit (fd: CMS_FORM_DATA; a_type: CMS_CONTENT_TYPE; b: STRING)
-- edit_form_submit (fd: WSF_FORM_DATA; a_type: CMS_CONTENT_TYPE; b: STRING)
-- local
-- l_preview: BOOLEAN
-- do
@@ -110,8 +110,8 @@ feature -- Form
edit_form (a_node: detachable CMS_NODE; a_url: READABLE_STRING_8; a_name: STRING; a_type: CMS_CONTENT_TYPE): CMS_FORM
local
f: CMS_FORM
ts: CMS_FORM_SUBMIT_INPUT
th: CMS_FORM_HIDDEN_INPUT
ts: WSF_FORM_SUBMIT_INPUT
th: WSF_FORM_HIDDEN_INPUT
do
create f.make (a_url, a_name)

2
draft/application/cms/src/modules/node/node_edit_cms_execution.e
View File

@@ -18,7 +18,7 @@ feature -- Execution
local
b: STRING_8
f: like edit_form
fd: detachable CMS_FORM_DATA
fd: detachable WSF_FORM_DATA
do
create b.make_empty
if

4
draft/application/cms/src/modules/openid/openid_cms_execution.e
View File

@@ -18,8 +18,8 @@ feature -- Execution
local
b: STRING
f: CMS_FORM
tf: CMS_FORM_TEXT_INPUT
ts: CMS_FORM_SUBMIT_INPUT
tf: WSF_FORM_TEXT_INPUT
ts: WSF_FORM_SUBMIT_INPUT
o: OPENID_CONSUMER
v: OPENID_CONSUMER_VALIDATION
tb: HASH_TABLE [READABLE_STRING_8, STRING_8]

14
draft/application/cms/src/modules/openid/openid_module.e
View File

@@ -60,10 +60,10 @@ feature -- Hooks
end
end
form_alter (a_form: CMS_FORM; a_form_data: detachable CMS_FORM_DATA; a_execution: CMS_EXECUTION)
form_alter (a_form: CMS_FORM; a_form_data: detachable WSF_FORM_DATA; a_execution: CMS_EXECUTION)
local
i: CMS_FORM_DIV
fh: CMS_FORM_HIDDEN_INPUT
i: WSF_FORM_DIV
fh: WSF_FORM_HIDDEN_INPUT
do
if a_form.id.same_string ("openid-login") then
create i.make_with_text_and_css_id (
@@ -82,7 +82,7 @@ feature -- Hooks
,
"openid"
)
if attached a_form.items_by_type ({CMS_WIDGET_TEXT}) as lst and then not lst.is_empty then
if attached a_form.items_by_type ({WSF_WIDGET_TEXT}) as lst and then not lst.is_empty then
a_form.insert_before (i, lst.last)
else
a_form.extend (i)
@@ -98,7 +98,7 @@ feature -- Hooks
across
f_lst as c
loop
if attached {CMS_FORM_TEXT_INPUT} c.item as txt then
if attached {WSF_FORM_TEXT_INPUT} c.item as txt then
txt.set_text_value (l_openid_nickname.to_string_32)
end
end
@@ -110,7 +110,7 @@ feature -- Hooks
across
f_lst as c
loop
if attached {CMS_FORM_TEXT_INPUT} c.item as txt then
if attached {WSF_FORM_TEXT_INPUT} c.item as txt then
txt.set_text_value (l_openid_email.to_string_32)
end
end
@@ -122,7 +122,7 @@ feature -- Hooks
end
end
openid_user_register_submitted (a_form_data: CMS_FORM_DATA)
openid_user_register_submitted (a_form_data: WSF_FORM_DATA)
do
end

16
draft/application/cms/src/modules/user/user_cms_execution.e
View File

@@ -94,7 +94,7 @@ feature -- Execution
l_url: detachable READABLE_STRING_8
b: STRING_8
f: CMS_FORM
fd: detachable CMS_FORM_DATA
fd: detachable WSF_FORM_DATA
do
if
attached {WSF_STRING} request.item ("destination") as s_dest
@@ -134,7 +134,7 @@ feature -- Execution
end
end
on_form_submitted (fd: CMS_FORM_DATA)
on_form_submitted (fd: WSF_FORM_DATA)
local
u: detachable CMS_USER
do
@@ -159,12 +159,12 @@ feature -- Execution
login_form (a_action: READABLE_STRING_8; a_form_name: READABLE_STRING_8; a_destination: READABLE_STRING_8): CMS_FORM
local
th: CMS_FORM_HIDDEN_INPUT
ti: CMS_FORM_TEXT_INPUT
tp: CMS_FORM_PASSWORD_INPUT
ts: CMS_FORM_SUBMIT_INPUT
l_logo: CMS_FORM_RAW_TEXT
d: CMS_FORM_DIV
th: WSF_FORM_HIDDEN_INPUT
ti: WSF_FORM_TEXT_INPUT
tp: WSF_FORM_PASSWORD_INPUT
ts: WSF_FORM_SUBMIT_INPUT
l_logo: WSF_FORM_RAW_TEXT
d: WSF_FORM_DIV
do
create Result.make (a_action, a_form_name)

18
draft/application/cms/src/modules/user/user_edit_cms_execution.e
View File

@@ -20,7 +20,7 @@ feature -- Execution
local
b: STRING_8
f: CMS_FORM
fd: detachable CMS_FORM_DATA
fd: detachable WSF_FORM_DATA
u: detachable CMS_USER
l_is_editing_current_user: BOOLEAN
do
@@ -63,7 +63,7 @@ feature -- Execution
set_main_content (b)
end
edit_form_validate (fd: CMS_FORM_DATA; u: CMS_USER)
edit_form_validate (fd: WSF_FORM_DATA; u: CMS_USER)
local
fu: detachable CMS_USER
do
@@ -81,7 +81,7 @@ feature -- Execution
end
end
edit_form_submit (fd: CMS_FORM_DATA; u: CMS_USER; a_is_editing_current_user: BOOLEAN; b: STRING)
edit_form_submit (fd: WSF_FORM_DATA; u: CMS_USER; a_is_editing_current_user: BOOLEAN; b: STRING)
local
up: detachable CMS_USER_PROFILE
l_roles: like {CMS_USER}.roles
@@ -138,12 +138,12 @@ feature -- Execution
edit_form (u: CMS_USER; a_url: READABLE_STRING_8; a_name: STRING): CMS_FORM
local
f: CMS_FORM
ti: CMS_FORM_TEXT_INPUT
tp: CMS_FORM_PASSWORD_INPUT
ta: CMS_FORM_TEXTAREA
ts: CMS_FORM_SUBMIT_INPUT
tset: CMS_FORM_FIELD_SET
cb: CMS_FORM_CHECKBOX_INPUT
ti: WSF_FORM_TEXT_INPUT
tp: WSF_FORM_PASSWORD_INPUT
ta: WSF_FORM_TEXTAREA
ts: WSF_FORM_SUBMIT_INPUT
tset: WSF_FORM_FIELD_SET
cb: WSF_FORM_CHECKBOX_INPUT
do
create f.make (a_url, a_name)

12
draft/application/cms/src/modules/user/user_new_password_cms_execution.e
View File

@@ -21,7 +21,7 @@ feature -- Execution
b: STRING_8
f: CMS_FORM
u: detachable CMS_USER
fd: detachable CMS_FORM_DATA
fd: detachable WSF_FORM_DATA
do
set_title ("Request new password")
create b.make_empty
@@ -56,7 +56,7 @@ feature -- Execution
set_main_content (b)
end
password_form_validate (fd: CMS_FORM_DATA)
password_form_validate (fd: WSF_FORM_DATA)
local
u: detachable CMS_USER
do
@@ -73,7 +73,7 @@ feature -- Execution
initialize_primary_tabs (u)
end
password_form_submit (fd: CMS_FORM_DATA; b: STRING)
password_form_submit (fd: WSF_FORM_DATA; b: STRING)
local
e: detachable CMS_EMAIL
l_uuid: UUID
@@ -113,9 +113,9 @@ feature -- Execution
local
u: like user
f: CMS_FORM
ti: CMS_FORM_TEXT_INPUT
th: CMS_FORM_HIDDEN_INPUT
ts: CMS_FORM_SUBMIT_INPUT
ti: WSF_FORM_TEXT_INPUT
th: WSF_FORM_HIDDEN_INPUT
ts: WSF_FORM_SUBMIT_INPUT
err: BOOLEAN
do
create f.make (a_url, a_name)

16
draft/application/cms/src/modules/user/user_register_cms_execution.e
View File

@@ -20,7 +20,7 @@ feature -- Execution
local
b: STRING_8
f: CMS_FORM
fd: detachable CMS_FORM_DATA
fd: detachable WSF_FORM_DATA
do
set_title ("Create new account")
create b.make_empty
@@ -50,7 +50,7 @@ feature -- Execution
set_main_content (b)
end
registration_form_validate (fd: CMS_FORM_DATA)
registration_form_validate (fd: WSF_FORM_DATA)
local
u: detachable CMS_USER
do
@@ -68,7 +68,7 @@ feature -- Execution
end
end
registration_form_submitted (fd: CMS_FORM_DATA; buf: STRING)
registration_form_submitted (fd: WSF_FORM_DATA; buf: STRING)
local
b: STRING
u: detachable CMS_USER
@@ -124,17 +124,17 @@ feature -- Execution
registration_form (a_url: READABLE_STRING_8; a_name: STRING): CMS_FORM
local
f: CMS_FORM
ti: CMS_FORM_TEXT_INPUT
tp: CMS_FORM_PASSWORD_INPUT
ta: CMS_FORM_TEXTAREA
ts: CMS_FORM_SUBMIT_INPUT
ti: WSF_FORM_TEXT_INPUT
tp: WSF_FORM_PASSWORD_INPUT
ta: WSF_FORM_TEXTAREA
ts: WSF_FORM_SUBMIT_INPUT
do
create f.make (a_url, a_name)
create ti.make ("username")
ti.set_label ("Username")
ti.set_is_required (True)
ti.set_validation_action (agent (fd: CMS_FORM_DATA)
ti.set_validation_action (agent (fd: WSF_FORM_DATA)
do
if attached {WSF_STRING} fd.item ("username") as f_username and then f_username.value.count >= 5 then
else