diff --git a/draft/application/cms/cms-safe.ecf b/draft/application/cms/cms-safe.ecf index d225d9dd..51accbb1 100644 --- a/draft/application/cms/cms-safe.ecf +++ b/draft/application/cms/cms-safe.ecf @@ -14,7 +14,7 @@ - + diff --git a/draft/application/cms/cms.ecf b/draft/application/cms/cms.ecf index 7d3f886d..0eb505c1 100644 --- a/draft/application/cms/cms.ecf +++ b/draft/application/cms/cms.ecf @@ -15,7 +15,7 @@ - + diff --git a/draft/application/cms/example/src/module/demo/demo_widget_cms_execution.e b/draft/application/cms/example/src/module/demo/demo_widget_cms_execution.e index f68d136c..58083ee5 100644 --- a/draft/application/cms/example/src/module/demo/demo_widget_cms_execution.e +++ b/draft/application/cms/example/src/module/demo/demo_widget_cms_execution.e @@ -35,9 +35,9 @@ feature -- Execution set_main_content (s) end - new_table: CMS_WIDGET_AGENT_TABLE [READABLE_STRING_8] + new_table: WSF_WIDGET_AGENT_TABLE [READABLE_STRING_8] local - l_table: CMS_WIDGET_AGENT_TABLE [READABLE_STRING_8] + l_table: WSF_WIDGET_AGENT_TABLE [READABLE_STRING_8] do create l_table.make l_table.add_css_style ("width: 85%%; border: solid 1px #999; padding: 2px;") @@ -53,10 +53,10 @@ feature -- Execution l_table.set_data (<<"foo", "bar", "foobar">>) l_table.set_foot_data (<<"abc", "def">>) - l_table.set_compute_item_function (agent (d: READABLE_STRING_8): CMS_WIDGET_TABLE_ROW + l_table.set_compute_item_function (agent (d: READABLE_STRING_8): WSF_WIDGET_TABLE_ROW local i: INTEGER - w: CMS_WIDGET_TABLE_ITEM + w: WSF_WIDGET_TABLE_ITEM do create Result.make (d.count) if d.is_case_insensitive_equal ("bar") then diff --git a/draft/application/cms/src/cms_execution.e b/draft/application/cms/src/cms_execution.e index 8cbcdd42..06e1f8db 100644 --- a/draft/application/cms/src/cms_execution.e +++ b/draft/application/cms/src/cms_execution.e @@ -264,7 +264,7 @@ feature -- Message add_message (a_msg, "success") end - report_form_errors (fd: CMS_FORM_DATA) + report_form_errors (fd: WSF_FORM_DATA) require has_error: not fd.is_valid do diff --git a/draft/application/cms/src/cms_service.e b/draft/application/cms/src/cms_service.e index 00003f80..62890042 100644 --- a/draft/application/cms/src/cms_service.e +++ b/draft/application/cms/src/cms_service.e @@ -203,7 +203,7 @@ feature -- Hook: form_alter form_alter_hooks: detachable ARRAYED_LIST [CMS_HOOK_FORM_ALTER] - call_form_alter_hooks (f: CMS_FORM; a_form_data: detachable CMS_FORM_DATA; a_execution: CMS_EXECUTION) + call_form_alter_hooks (f: CMS_FORM; a_form_data: detachable WSF_FORM_DATA; a_execution: CMS_EXECUTION) do if attached form_alter_hooks as lst then across diff --git a/draft/application/cms/src/form/cms_form.e b/draft/application/cms/src/form/cms_form.e new file mode 100644 index 00000000..b0746d51 --- /dev/null +++ b/draft/application/cms/src/form/cms_form.e @@ -0,0 +1,43 @@ +note + description: "Summary description for {CMS_FORM}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + CMS_FORM + +inherit + WSF_FORM + rename + process as process_form + end + +create + make + +feature -- Basic operation + + prepare (a_execution: CMS_EXECUTION) + do + a_execution.service.call_form_alter_hooks (Current, Void, a_execution) + end + + process (a_execution: CMS_EXECUTION) + do + process_form (a_execution.request, agent on_prepared (a_execution, ?), agent on_processed (a_execution, ?)) + end + + on_prepared (a_execution: CMS_EXECUTION; fd: WSF_FORM_DATA) + do + a_execution.service.call_form_alter_hooks (Current, fd, a_execution) + end + + on_processed (a_execution: CMS_EXECUTION; fd: WSF_FORM_DATA) + do + if not fd.is_valid or fd.has_error then + a_execution.report_form_errors (fd) + end + end + +end diff --git a/draft/application/cms/src/hooks/cms_hook_form_alter.e b/draft/application/cms/src/hooks/cms_hook_form_alter.e index 83499bd1..afc45305 100644 --- a/draft/application/cms/src/hooks/cms_hook_form_alter.e +++ b/draft/application/cms/src/hooks/cms_hook_form_alter.e @@ -12,7 +12,7 @@ inherit feature -- Hook - 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) deferred end diff --git a/draft/application/cms/src/kernel/content/cms_content_type.e b/draft/application/cms/src/kernel/content/cms_content_type.e index 64438267..ebddfea9 100644 --- a/draft/application/cms/src/kernel/content/cms_content_type.e +++ b/draft/application/cms/src/kernel/content/cms_content_type.e @@ -34,14 +34,14 @@ feature -- Factory deferred end - change_node (a_execution: CMS_EXECUTION; a_form_data: CMS_FORM_DATA; a_node: like new_node) + change_node (a_execution: CMS_EXECUTION; a_form_data: WSF_FORM_DATA; a_node: like new_node) -- Apply data from `a_form_data' to a_node require a_node.has_id deferred end - new_node (a_execution: CMS_EXECUTION; a_form_data: CMS_FORM_DATA; a_node: detachable like new_node): CMS_NODE + new_node (a_execution: CMS_EXECUTION; a_form_data: WSF_FORM_DATA; a_node: detachable like new_node): CMS_NODE -- New content created with `a_form_data' deferred ensure diff --git a/draft/application/cms/src/kernel/form/cms_form_item.e b/draft/application/cms/src/kernel/form/cms_form_item.e deleted file mode 100644 index 344fef10..00000000 --- a/draft/application/cms/src/kernel/form/cms_form_item.e +++ /dev/null @@ -1,17 +0,0 @@ -note - description: "Summary description for {CMS_FORM_ITEM}." - author: "" - date: "$Date$" - revision: "$Revision$" - -deferred class - CMS_FORM_ITEM - -inherit - CMS_WIDGET - - WITH_CSS_CLASS - - WITH_CSS_STYLE - -end diff --git a/draft/application/cms/src/modules/admin/admin_user_roles_cms_execution.e b/draft/application/cms/src/modules/admin/admin_user_roles_cms_execution.e index 84ea97c0..5fe6fb6b 100644 --- a/draft/application/cms/src/modules/admin/admin_user_roles_cms_execution.e +++ b/draft/application/cms/src/modules/admin/admin_user_roles_cms_execution.e @@ -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")) diff --git a/draft/application/cms/src/modules/node/cms_page_content_type.e b/draft/application/cms/src/modules/node/cms_page_content_type.e index 74e4f787..948d8e4d 100644 --- a/draft/application/cms/src/modules/node/cms_page_content_type.e +++ b/draft/application/cms/src/modules/node/cms_page_content_type.e @@ -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 -- local b: detachable READABLE_STRING_8 diff --git a/draft/application/cms/src/modules/node/node_add_cms_execution.e b/draft/application/cms/src/modules/node/node_add_cms_execution.e index e79252b9..6b3357e3 100644 --- a/draft/application/cms/src/modules/node/node_add_cms_execution.e +++ b/draft/application/cms/src/modules/node/node_add_cms_execution.e @@ -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 diff --git a/draft/application/cms/src/modules/node/node_cms_execution.e b/draft/application/cms/src/modules/node/node_cms_execution.e index 339b7fa4..075649b9 100644 --- a/draft/application/cms/src/modules/node/node_cms_execution.e +++ b/draft/application/cms/src/modules/node/node_cms_execution.e @@ -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) diff --git a/draft/application/cms/src/modules/node/node_edit_cms_execution.e b/draft/application/cms/src/modules/node/node_edit_cms_execution.e index 0ab65038..ebe46173 100644 --- a/draft/application/cms/src/modules/node/node_edit_cms_execution.e +++ b/draft/application/cms/src/modules/node/node_edit_cms_execution.e @@ -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 diff --git a/draft/application/cms/src/modules/openid/openid_cms_execution.e b/draft/application/cms/src/modules/openid/openid_cms_execution.e index e1b805cb..53bbdbf9 100644 --- a/draft/application/cms/src/modules/openid/openid_cms_execution.e +++ b/draft/application/cms/src/modules/openid/openid_cms_execution.e @@ -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] diff --git a/draft/application/cms/src/modules/openid/openid_module.e b/draft/application/cms/src/modules/openid/openid_module.e index 302b1b78..2f3a073f 100644 --- a/draft/application/cms/src/modules/openid/openid_module.e +++ b/draft/application/cms/src/modules/openid/openid_module.e @@ -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 diff --git a/draft/application/cms/src/modules/user/user_cms_execution.e b/draft/application/cms/src/modules/user/user_cms_execution.e index 76a2a39b..89e0762f 100644 --- a/draft/application/cms/src/modules/user/user_cms_execution.e +++ b/draft/application/cms/src/modules/user/user_cms_execution.e @@ -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) diff --git a/draft/application/cms/src/modules/user/user_edit_cms_execution.e b/draft/application/cms/src/modules/user/user_edit_cms_execution.e index 37afd19a..bc076fb6 100644 --- a/draft/application/cms/src/modules/user/user_edit_cms_execution.e +++ b/draft/application/cms/src/modules/user/user_edit_cms_execution.e @@ -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) diff --git a/draft/application/cms/src/modules/user/user_new_password_cms_execution.e b/draft/application/cms/src/modules/user/user_new_password_cms_execution.e index 25438ecf..70b60710 100644 --- a/draft/application/cms/src/modules/user/user_new_password_cms_execution.e +++ b/draft/application/cms/src/modules/user/user_new_password_cms_execution.e @@ -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) diff --git a/draft/application/cms/src/modules/user/user_register_cms_execution.e b/draft/application/cms/src/modules/user/user_register_cms_execution.e index b82f64ca..95369dc9 100644 --- a/draft/application/cms/src/modules/user/user_register_cms_execution.e +++ b/draft/application/cms/src/modules/user/user_register_cms_execution.e @@ -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 diff --git a/draft/application/cms/src/theme/cms_theme.e b/draft/application/cms/src/theme/cms_theme.e index 5942c413..bec379ae 100644 --- a/draft/application/cms/src/theme/cms_theme.e +++ b/draft/application/cms/src/theme/cms_theme.e @@ -8,6 +8,12 @@ deferred class CMS_THEME inherit + WSF_THEME + undefine + url_encoded, + html_encoded + end + CMS_COMMON_API feature {NONE} -- Access diff --git a/draft/library/text/css/src/css_selector.e b/library/server/wsf_html/css/css_selector.e similarity index 100% rename from draft/library/text/css/src/css_selector.e rename to library/server/wsf_html/css/css_selector.e diff --git a/draft/library/text/css/src/css_style.e b/library/server/wsf_html/css/css_style.e similarity index 100% rename from draft/library/text/css/src/css_style.e rename to library/server/wsf_html/css/css_style.e diff --git a/draft/library/text/css/src/css_text.e b/library/server/wsf_html/css/css_text.e similarity index 100% rename from draft/library/text/css/src/css_text.e rename to library/server/wsf_html/css/css_text.e diff --git a/draft/application/cms/src/kernel/form/cms_form.e b/library/server/wsf_html/form/wsf_form.e similarity index 59% rename from draft/application/cms/src/kernel/form/cms_form.e rename to library/server/wsf_html/form/wsf_form.e index 2e5e5195..091e6720 100644 --- a/draft/application/cms/src/kernel/form/cms_form.e +++ b/library/server/wsf_html/form/wsf_form.e @@ -1,14 +1,16 @@ note - description: "Summary description for {CMS_FORM}." + description: "Summary description for {WSF_FORM}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM + WSF_FORM inherit - CMS_FORM_COMPOSITE + WSF_FORM_COMPOSITE + + WSF_WITH_HTML_ATTRIBUTE create make @@ -48,41 +50,42 @@ feature -- Access -- Form's method --| GET or POST + encoding_type: detachable READABLE_STRING_8 + -- Encoding type + feature -- Basic operation - prepare (a_execution: CMS_EXECUTION) - do - a_execution.service.call_form_alter_hooks (Current, Void, a_execution) - end - - process (a_execution: CMS_EXECUTION) + process (req: WSF_REQUEST; a_before_callback, a_after_callback: detachable PROCEDURE [ANY, TUPLE [WSF_FORM_DATA]]) + -- Process Current form with request `req' + -- agent `a_before_callback' is called before the validation + -- agent `a_after_callback' is called after the validation local - fd: CMS_FORM_DATA + fd: WSF_FORM_DATA do - create fd.make (a_execution.request, Current) + create fd.make (req, Current) last_data := fd - a_execution.service.call_form_alter_hooks (Current, fd, a_execution) + if a_before_callback /= Void then + a_before_callback.call ([fd]) + end fd.validate fd.apply_to_associated_form -- Maybe only when has error? if fd.is_valid then fd.submit - if fd.has_error then - a_execution.report_form_errors (fd) - end - else - a_execution.report_form_errors (fd) + end + if a_after_callback /= Void then + a_after_callback.call ([fd]) end end - last_data: detachable CMS_FORM_DATA + last_data: detachable WSF_FORM_DATA feature -- Validation - validation_actions: ACTION_SEQUENCE [TUPLE [CMS_FORM_DATA]] + validation_actions: ACTION_SEQUENCE [TUPLE [WSF_FORM_DATA]] -- Procedure to validate the data -- report error if not valid - submit_actions: ACTION_SEQUENCE [TUPLE [CMS_FORM_DATA]] + submit_actions: ACTION_SEQUENCE [TUPLE [WSF_FORM_DATA]] -- Submit actions feature -- Element change @@ -97,17 +100,30 @@ feature -- Element change method := "POST" end + set_encoding_type (s: like encoding_type) + do + encoding_type := s + end + + set_multipart_form_data_encoding_type + do + encoding_type := "multipart/form-data" + end + feature -- Optional html_classes: ARRAYED_LIST [STRING_8] feature -- Conversion - append_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_to_html (a_theme: WSF_THEME; a_html: STRING_8) local s: STRING_8 do - a_html.append ("
%N") end - to_html (a_theme: CMS_THEME): STRING_8 + to_html (a_theme: WSF_THEME): STRING_8 do create Result.make_empty append_to_html (a_theme, Result) diff --git a/draft/application/cms/src/kernel/form/cms_form_button_input.e b/library/server/wsf_html/form/wsf_form_button_input.e similarity index 58% rename from draft/application/cms/src/kernel/form/cms_form_button_input.e rename to library/server/wsf_html/form/wsf_form_button_input.e index e7937122..b0d3e5e4 100644 --- a/draft/application/cms/src/kernel/form/cms_form_button_input.e +++ b/library/server/wsf_html/form/wsf_form_button_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_BUTTON_INPUT}." + description: "Summary description for {WSF_FORM_BUTTON_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_BUTTON_INPUT + WSF_FORM_BUTTON_INPUT inherit - CMS_FORM_INPUT + WSF_FORM_INPUT create make diff --git a/draft/application/cms/src/kernel/form/cms_form_checkbox_input.e b/library/server/wsf_html/form/wsf_form_checkbox_input.e similarity index 60% rename from draft/application/cms/src/kernel/form/cms_form_checkbox_input.e rename to library/server/wsf_html/form/wsf_form_checkbox_input.e index d0860bf1..aefc92fd 100644 --- a/draft/application/cms/src/kernel/form/cms_form_checkbox_input.e +++ b/library/server/wsf_html/form/wsf_form_checkbox_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_CHECKBOX_INPUT}." + description: "Summary description for {WSF_FORM_CHECKBOX_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_CHECKBOX_INPUT + WSF_FORM_CHECKBOX_INPUT inherit - CMS_FORM_SELECTABLE_INPUT + WSF_FORM_SELECTABLE_INPUT create make, diff --git a/draft/application/cms/src/kernel/form/cms_form_composite.e b/library/server/wsf_html/form/wsf_form_composite.e similarity index 67% rename from draft/application/cms/src/kernel/form/cms_form_composite.e rename to library/server/wsf_html/form/wsf_form_composite.e index 55971d07..b3b9ca4b 100644 --- a/draft/application/cms/src/kernel/form/cms_form_composite.e +++ b/library/server/wsf_html/form/wsf_form_composite.e @@ -5,10 +5,10 @@ note revision : "$Revision$" deferred class - CMS_FORM_COMPOSITE + WSF_FORM_COMPOSITE inherit - CMS_WIDGET_COMPOSITE + WSF_WIDGET_COMPOSITE redefine extend end @@ -22,18 +22,18 @@ feature -- Status feature -- Access - fields_by_name (a_name: READABLE_STRING_GENERAL): detachable LIST [CMS_FORM_FIELD] + fields_by_name (a_name: READABLE_STRING_GENERAL): detachable LIST [WSF_FORM_FIELD] do Result := fields_by_name_from (Current, a_name) end feature -- Change - extend (i: CMS_WIDGET) + extend (i: WSF_WIDGET) local n: READABLE_STRING_8 do - if attached {CMS_FORM_FIELD} i as l_field then + if attached {WSF_FORM_FIELD} i as l_field then n := l_field.name if n.is_empty then n := (items.count + 1).out @@ -45,34 +45,34 @@ feature -- Change feature {NONE} -- Implementation: Items - container_has_field (a_container: ITERABLE [CMS_WIDGET]; a_name: READABLE_STRING_GENERAL): BOOLEAN + container_has_field (a_container: ITERABLE [WSF_WIDGET]; a_name: READABLE_STRING_GENERAL): BOOLEAN do across a_container as i until Result loop - if attached {CMS_FORM_FIELD} i.item as l_field and then l_field.name.same_string_general (a_name) then + if attached {WSF_FORM_FIELD} i.item as l_field and then l_field.name.same_string_general (a_name) then Result := True - elseif attached {ITERABLE [CMS_WIDGET]} i.item as l_cont then + elseif attached {ITERABLE [WSF_WIDGET]} i.item as l_cont then Result := container_has_field (l_cont, a_name) end end end - fields_by_name_from (a_container: ITERABLE [CMS_WIDGET]; a_name: READABLE_STRING_GENERAL): detachable ARRAYED_LIST [CMS_FORM_FIELD] + fields_by_name_from (a_container: ITERABLE [WSF_WIDGET]; a_name: READABLE_STRING_GENERAL): detachable ARRAYED_LIST [WSF_FORM_FIELD] local - res: detachable ARRAYED_LIST [CMS_FORM_FIELD] + res: detachable ARRAYED_LIST [WSF_FORM_FIELD] do across a_container as i loop - if attached {CMS_FORM_FIELD} i.item as l_field and then l_field.name.same_string_general (a_name) then + if attached {WSF_FORM_FIELD} i.item as l_field and then l_field.name.same_string_general (a_name) then if res = Void then create res.make (1) end res.force (l_field) - elseif attached {ITERABLE [CMS_WIDGET]} i.item as l_cont then + elseif attached {ITERABLE [WSF_WIDGET]} i.item as l_cont then if attached fields_by_name_from (l_cont, a_name) as lst then if res = Void then res := lst diff --git a/draft/application/cms/src/kernel/form/cms_form_data.e b/library/server/wsf_html/form/wsf_form_data.e similarity index 88% rename from draft/application/cms/src/kernel/form/cms_form_data.e rename to library/server/wsf_html/form/wsf_form_data.e index e02a368a..1e9e5630 100644 --- a/draft/application/cms/src/kernel/form/cms_form_data.e +++ b/library/server/wsf_html/form/wsf_form_data.e @@ -5,17 +5,17 @@ note revision : "$Revision$" class - CMS_FORM_DATA + WSF_FORM_DATA inherit TABLE_ITERABLE [detachable WSF_VALUE, READABLE_STRING_8] -create {CMS_FORM} +create {WSF_FORM} make feature {NONE} -- Initialization - make (req: WSF_REQUEST; a_form: CMS_FORM) + make (req: WSF_REQUEST; a_form: WSF_FORM) -- Initialize `Current'. do form := a_form @@ -25,7 +25,7 @@ feature {NONE} -- Initialization feature -- Access - form: CMS_FORM + form: WSF_FORM feature -- Status @@ -132,11 +132,11 @@ feature -- Basic operation form.validation_actions.call ([Current]) end - validate_item (w: CMS_WIDGET) + validate_item (w: WSF_WIDGET) do - if attached {CMS_FORM_FIELD} w as l_field then + if attached {WSF_FORM_FIELD} w as l_field then l_field.validate (Current) - elseif attached {ITERABLE [CMS_WIDGET]} w as lst then + elseif attached {ITERABLE [WSF_WIDGET]} w as lst then across lst as c loop @@ -182,16 +182,16 @@ feature -- Basic operation feature {NONE} -- Implementation: apply - apply_to_associated_form_item (a_name: READABLE_STRING_8; a_value: detachable WSF_VALUE; i: CMS_WIDGET) + apply_to_associated_form_item (a_name: READABLE_STRING_8; a_value: detachable WSF_VALUE; i: WSF_WIDGET) local do - if attached {CMS_FORM_FIELD} i as l_field then - if not attached {CMS_FORM_SUBMIT_INPUT} l_field then + if attached {WSF_FORM_FIELD} i as l_field then + if not attached {WSF_FORM_SUBMIT_INPUT} l_field then if l_field.name.same_string (a_name) then l_field.set_value (a_value) end end - elseif attached {ITERABLE [CMS_WIDGET]} i as l_set then + elseif attached {ITERABLE [WSF_WIDGET]} i as l_set then across l_set as c loop @@ -231,20 +231,20 @@ feature {NONE} -- Implementation get_form_items (req, form) end - get_form_items (req: WSF_REQUEST; lst: ITERABLE [CMS_WIDGET]) + get_form_items (req: WSF_REQUEST; lst: ITERABLE [WSF_WIDGET]) do across lst as c loop - if attached {CMS_FORM_FIELD} c.item as l_field then + if attached {WSF_FORM_FIELD} c.item as l_field then get_form_field_item (req, l_field, l_field.name) - elseif attached {ITERABLE [CMS_WIDGET]} c.item as l_set then + elseif attached {ITERABLE [WSF_WIDGET]} c.item as l_set then get_form_items (req, l_set) end end end - get_form_field_item (req: WSF_REQUEST; i: CMS_FORM_FIELD; n: READABLE_STRING_8) + get_form_field_item (req: WSF_REQUEST; i: WSF_FORM_FIELD; n: READABLE_STRING_8) local v: detachable WSF_VALUE do @@ -269,7 +269,7 @@ feature {NONE} -- Implementation end end - add_error (a_field: detachable CMS_FORM_FIELD; a_msg: detachable READABLE_STRING_8) + add_error (a_field: detachable WSF_FORM_FIELD; a_msg: detachable READABLE_STRING_8) local err: like errors do @@ -322,7 +322,7 @@ feature -- Reports Result := attached errors as err and then not err.is_empty end - errors: detachable ARRAYED_LIST [TUPLE [field: detachable CMS_FORM_FIELD; message: detachable READABLE_STRING_8]] + errors: detachable ARRAYED_LIST [TUPLE [field: detachable WSF_FORM_FIELD; message: detachable READABLE_STRING_8]] invariant diff --git a/draft/application/cms/src/kernel/form/cms_form_div.e b/library/server/wsf_html/form/wsf_form_div.e similarity index 77% rename from draft/application/cms/src/kernel/form/cms_form_div.e rename to library/server/wsf_html/form/wsf_form_div.e index 7b2c6dd6..e3205162 100644 --- a/draft/application/cms/src/kernel/form/cms_form_div.e +++ b/library/server/wsf_html/form/wsf_form_div.e @@ -5,14 +5,14 @@ note revision : "$Revision$" class - CMS_FORM_DIV + WSF_FORM_DIV inherit - CMS_FORM_ITEM + WSF_FORM_ITEM - CMS_FORM_COMPOSITE + WSF_FORM_COMPOSITE - WITH_CSS_ID + WSF_WITH_CSS_ID create make, @@ -32,16 +32,16 @@ feature {NONE} -- Initialization make_with_text (s: READABLE_STRING_8) do - make_with_item (create {CMS_FORM_RAW_TEXT}.make (s)) + make_with_item (create {WSF_FORM_RAW_TEXT}.make (s)) end - make_with_item (i: CMS_WIDGET) + make_with_item (i: WSF_WIDGET) do initialize_with_count (1) extend (i) end - make_with_items (it: ITERABLE [CMS_WIDGET]) + make_with_items (it: ITERABLE [WSF_WIDGET]) do initialize_with_count (2) across @@ -51,7 +51,7 @@ feature {NONE} -- Initialization end end - make_with_item_and_css_id (i: CMS_WIDGET; a_css_id: READABLE_STRING_8) + make_with_item_and_css_id (i: WSF_WIDGET; a_css_id: READABLE_STRING_8) do make_with_item (i) set_css_id (a_css_id) @@ -65,7 +65,7 @@ feature {NONE} -- Initialization feature -- Conversion - append_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_to_html (a_theme: WSF_THEME; a_html: STRING_8) do a_html.append ("") end - append_item_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_item_to_html (a_theme: WSF_THEME; a_html: STRING_8) deferred end diff --git a/draft/application/cms/src/kernel/form/cms_form_field_set.e b/library/server/wsf_html/form/wsf_form_field_set.e similarity index 89% rename from draft/application/cms/src/kernel/form/cms_form_field_set.e rename to library/server/wsf_html/form/wsf_form_field_set.e index 893f39fa..da3de611 100644 --- a/draft/application/cms/src/kernel/form/cms_form_field_set.e +++ b/library/server/wsf_html/form/wsf_form_field_set.e @@ -5,14 +5,14 @@ note revision : "$Revision$" class - CMS_FORM_FIELD_SET + WSF_FORM_FIELD_SET inherit - CMS_FORM_ITEM + WSF_FORM_ITEM - CMS_FORM_COMPOSITE + WSF_FORM_COMPOSITE - WITH_CSS_ID + WSF_WITH_CSS_ID create make @@ -59,7 +59,7 @@ feature -- Change feature -- Conversion - append_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_to_html (a_theme: WSF_THEME; a_html: STRING_8) do a_html.append ("") Precursor (a_theme, a_html) diff --git a/draft/application/cms/src/kernel/form/cms_form_image_input.e b/library/server/wsf_html/form/wsf_form_image_input.e similarity index 89% rename from draft/application/cms/src/kernel/form/cms_form_image_input.e rename to library/server/wsf_html/form/wsf_form_image_input.e index f3d1860d..60022600 100644 --- a/draft/application/cms/src/kernel/form/cms_form_image_input.e +++ b/library/server/wsf_html/form/wsf_form_image_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_IMAGE_INPUT}." + description: "Summary description for {WSF_FORM_IMAGE_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_IMAGE_INPUT + WSF_FORM_IMAGE_INPUT inherit - CMS_FORM_INPUT + WSF_FORM_INPUT redefine specific_input_attributes_string end diff --git a/draft/application/cms/src/kernel/form/cms_form_input.e b/library/server/wsf_html/form/wsf_form_input.e similarity index 92% rename from draft/application/cms/src/kernel/form/cms_form_input.e rename to library/server/wsf_html/form/wsf_form_input.e index ae74f5c1..494e8f9d 100644 --- a/draft/application/cms/src/kernel/form/cms_form_input.e +++ b/library/server/wsf_html/form/wsf_form_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_INPUT}." + description: "Summary description for {WSF_FORM_INPUT}." author: "" date: "$Date$" revision: "$Revision$" deferred class - CMS_FORM_INPUT + WSF_FORM_INPUT inherit - CMS_FORM_FIELD + WSF_FORM_FIELD feature {NONE} -- Initialization @@ -78,7 +78,7 @@ feature -- Element change feature -- Conversion - append_item_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_item_to_html (a_theme: WSF_THEME; a_html: STRING_8) local old_count: INTEGER do @@ -121,7 +121,7 @@ feature -- Conversion feature {NONE} -- Implementation - append_child_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_child_to_html (a_theme: WSF_THEME; a_html: STRING_8) -- Specific child element if any. --| To redefine if needed do diff --git a/library/server/wsf_html/form/wsf_form_item.e b/library/server/wsf_html/form/wsf_form_item.e new file mode 100644 index 00000000..d8573ddf --- /dev/null +++ b/library/server/wsf_html/form/wsf_form_item.e @@ -0,0 +1,17 @@ +note + description: "Summary description for {WSF_FORM_ITEM}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + WSF_FORM_ITEM + +inherit + WSF_WIDGET + + WSF_WITH_CSS_CLASS + + WSF_WITH_CSS_STYLE + +end diff --git a/draft/application/cms/src/kernel/form/cms_form_password_input.e b/library/server/wsf_html/form/wsf_form_password_input.e similarity index 67% rename from draft/application/cms/src/kernel/form/cms_form_password_input.e rename to library/server/wsf_html/form/wsf_form_password_input.e index 118b4788..004c45be 100644 --- a/draft/application/cms/src/kernel/form/cms_form_password_input.e +++ b/library/server/wsf_html/form/wsf_form_password_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_PASSWORD_INPUT}." + description: "Summary description for {WSF_FORM_PASSWORD_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_PASSWORD_INPUT + WSF_FORM_PASSWORD_INPUT inherit - CMS_FORM_INPUT + WSF_FORM_INPUT redefine input_type end diff --git a/draft/application/cms/src/kernel/form/cms_form_radio_input.e b/library/server/wsf_html/form/wsf_form_radio_input.e similarity index 60% rename from draft/application/cms/src/kernel/form/cms_form_radio_input.e rename to library/server/wsf_html/form/wsf_form_radio_input.e index 78288dca..fb321435 100644 --- a/draft/application/cms/src/kernel/form/cms_form_radio_input.e +++ b/library/server/wsf_html/form/wsf_form_radio_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_RADIO_INPUT}." + description: "Summary description for {WSF_FORM_RADIO_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_RADIO_INPUT + WSF_FORM_RADIO_INPUT inherit - CMS_FORM_SELECTABLE_INPUT + WSF_FORM_SELECTABLE_INPUT create make, diff --git a/draft/application/cms/src/kernel/form/cms_form_raw_text.e b/library/server/wsf_html/form/wsf_form_raw_text.e similarity index 58% rename from draft/application/cms/src/kernel/form/cms_form_raw_text.e rename to library/server/wsf_html/form/wsf_form_raw_text.e index 90fa8fdc..cdca2d24 100644 --- a/draft/application/cms/src/kernel/form/cms_form_raw_text.e +++ b/library/server/wsf_html/form/wsf_form_raw_text.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_RAW_TEXT}." + description: "Summary description for {WSF_FORM_RAW_TEXT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_RAW_TEXT + WSF_FORM_RAW_TEXT inherit - CMS_WIDGET_TEXT + WSF_WIDGET_TEXT rename set_text as set_value, make_with_text as make @@ -21,12 +21,12 @@ create feature -- Conversion - append_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_to_html (a_theme: WSF_THEME; a_html: STRING_8) do append_item_html_to (a_theme, a_html) end - append_item_html_to (a_theme: CMS_THEME; a_html: STRING_8) + append_item_html_to (a_theme: WSF_THEME; a_html: STRING_8) do a_html.append (text) end diff --git a/draft/application/cms/src/kernel/form/cms_form_reset_input.e b/library/server/wsf_html/form/wsf_form_reset_input.e similarity index 58% rename from draft/application/cms/src/kernel/form/cms_form_reset_input.e rename to library/server/wsf_html/form/wsf_form_reset_input.e index d652d66b..ffe80d62 100644 --- a/draft/application/cms/src/kernel/form/cms_form_reset_input.e +++ b/library/server/wsf_html/form/wsf_form_reset_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_RESET_INPUT}." + description: "Summary description for {WSF_FORM_RESET_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_RESET_INPUT + WSF_FORM_RESET_INPUT inherit - CMS_FORM_INPUT + WSF_FORM_INPUT create make diff --git a/draft/application/cms/src/kernel/form/cms_form_select.e b/library/server/wsf_html/form/wsf_form_select.e similarity index 90% rename from draft/application/cms/src/kernel/form/cms_form_select.e rename to library/server/wsf_html/form/wsf_form_select.e index acdd6db6..8802daa0 100644 --- a/draft/application/cms/src/kernel/form/cms_form_select.e +++ b/library/server/wsf_html/form/wsf_form_select.e @@ -1,16 +1,16 @@ note - description: "Summary description for {CMS_FORM_SELECT}." + description: "Summary description for {WSF_FORM_SELECT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_SELECT + WSF_FORM_SELECT inherit - CMS_FORM_FIELD + WSF_FORM_FIELD - CMS_FORM_UTILITY + WSF_FORM_UTILITY create make @@ -25,13 +25,13 @@ feature {NONE} -- Initialization feature -- Access - options: ARRAYED_LIST [CMS_FORM_SELECT_OPTION] + options: ARRAYED_LIST [WSF_FORM_SELECT_OPTION] feature -- Element change set_text_by_value (a_text: detachable READABLE_STRING_GENERAL) local - opt: CMS_FORM_SELECT_OPTION + opt: WSF_FORM_SELECT_OPTION l_found: BOOLEAN v: READABLE_STRING_8 do @@ -96,14 +96,14 @@ feature -- Element change end end - add_option (opt: CMS_FORM_SELECT_OPTION) + add_option (opt: WSF_FORM_SELECT_OPTION) do options.force (opt) end feature -- Conversion - append_item_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_item_to_html (a_theme: WSF_THEME; a_html: STRING_8) local l_is_already_selected: BOOLEAN h: detachable STRING_8 diff --git a/draft/application/cms/src/kernel/form/cms_form_select_option.e b/library/server/wsf_html/form/wsf_form_select_option.e similarity index 94% rename from draft/application/cms/src/kernel/form/cms_form_select_option.e rename to library/server/wsf_html/form/wsf_form_select_option.e index 3a18067d..7da513bd 100644 --- a/draft/application/cms/src/kernel/form/cms_form_select_option.e +++ b/library/server/wsf_html/form/wsf_form_select_option.e @@ -5,10 +5,10 @@ note revision : "$Revision$" class - CMS_FORM_SELECT_OPTION + WSF_FORM_SELECT_OPTION inherit - CMS_FORM_SELECTABLE_ITEM + WSF_FORM_SELECTABLE_ITEM create make diff --git a/draft/application/cms/src/kernel/form/cms_form_selectable_input.e b/library/server/wsf_html/form/wsf_form_selectable_input.e similarity index 91% rename from draft/application/cms/src/kernel/form/cms_form_selectable_input.e rename to library/server/wsf_html/form/wsf_form_selectable_input.e index 07a711ca..37c58366 100644 --- a/draft/application/cms/src/kernel/form/cms_form_selectable_input.e +++ b/library/server/wsf_html/form/wsf_form_selectable_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_SELECTABLE_INPUT}." + description: "Summary description for {WSF_FORM_SELECTABLE_INPUT}." author: "" date: "$Date$" revision: "$Revision$" deferred class - CMS_FORM_SELECTABLE_INPUT + WSF_FORM_SELECTABLE_INPUT inherit - CMS_FORM_INPUT + WSF_FORM_INPUT rename default_value as value, make_with_text as make_with_value @@ -18,7 +18,7 @@ inherit append_child_to_html end - CMS_FORM_SELECTABLE_ITEM + WSF_FORM_SELECTABLE_ITEM rename is_selected as checked, set_is_selected as set_checked @@ -87,7 +87,7 @@ feature -- Change feature {NONE} -- Implementation - append_child_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_child_to_html (a_theme: WSF_THEME; a_html: STRING_8) -- Specific child element if any. --| To redefine if needed do diff --git a/draft/application/cms/src/kernel/form/cms_form_selectable_item.e b/library/server/wsf_html/form/wsf_form_selectable_item.e similarity index 75% rename from draft/application/cms/src/kernel/form/cms_form_selectable_item.e rename to library/server/wsf_html/form/wsf_form_selectable_item.e index 216cee0d..6788125a 100644 --- a/draft/application/cms/src/kernel/form/cms_form_selectable_item.e +++ b/library/server/wsf_html/form/wsf_form_selectable_item.e @@ -1,10 +1,10 @@ note - description: "Summary description for {CMS_FORM_SELECTABLE_ITEM}." + description: "Summary description for {WSF_FORM_SELECTABLE_ITEM}." date: "$Date$" revision: "$Revision$" deferred class - CMS_FORM_SELECTABLE_ITEM + WSF_FORM_SELECTABLE_ITEM feature -- Status report diff --git a/draft/application/cms/src/kernel/form/cms_form_submit_input.e b/library/server/wsf_html/form/wsf_form_submit_input.e similarity index 62% rename from draft/application/cms/src/kernel/form/cms_form_submit_input.e rename to library/server/wsf_html/form/wsf_form_submit_input.e index 6ead4705..32f0fab3 100644 --- a/draft/application/cms/src/kernel/form/cms_form_submit_input.e +++ b/library/server/wsf_html/form/wsf_form_submit_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_INPUT}." + description: "Summary description for {WSF_FORM_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_SUBMIT_INPUT + WSF_FORM_SUBMIT_INPUT inherit - CMS_FORM_INPUT + WSF_FORM_INPUT create make, diff --git a/draft/application/cms/src/kernel/form/cms_form_text_input.e b/library/server/wsf_html/form/wsf_form_text_input.e similarity index 61% rename from draft/application/cms/src/kernel/form/cms_form_text_input.e rename to library/server/wsf_html/form/wsf_form_text_input.e index a1bc7b81..4ddbdf38 100644 --- a/draft/application/cms/src/kernel/form/cms_form_text_input.e +++ b/library/server/wsf_html/form/wsf_form_text_input.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_TEXT_INPUT}." + description: "Summary description for {WSF_FORM_TEXT_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_TEXT_INPUT + WSF_FORM_TEXT_INPUT inherit - CMS_FORM_INPUT + WSF_FORM_INPUT create make, diff --git a/draft/application/cms/src/kernel/form/cms_form_textarea.e b/library/server/wsf_html/form/wsf_form_textarea.e similarity index 89% rename from draft/application/cms/src/kernel/form/cms_form_textarea.e rename to library/server/wsf_html/form/wsf_form_textarea.e index b71bb5ba..78073a11 100644 --- a/draft/application/cms/src/kernel/form/cms_form_textarea.e +++ b/library/server/wsf_html/form/wsf_form_textarea.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_FORM_INPUT}." + description: "Summary description for {WSF_FORM_INPUT}." author: "" date: "$Date$" revision: "$Revision$" class - CMS_FORM_TEXTAREA + WSF_FORM_TEXTAREA inherit - CMS_FORM_FIELD + WSF_FORM_FIELD create make @@ -61,7 +61,7 @@ feature -- Element change feature -- Conversion - append_item_to_html (a_theme: CMS_THEME; a_html: STRING_8) + append_item_to_html (a_theme: WSF_THEME; a_html: STRING_8) do a_html.append ("