From b5b71a3db0078b260d6e0670b559f64b46ae25fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Tue, 27 Aug 2013 13:48:44 +0200 Subject: [PATCH 001/191] Created widget-project testapp project. --- examples/widgetapp/application.e | 38 +++++++++++++++++++++++++++++ examples/widgetapp/widgetapp.ecf | 42 ++++++++++++++++++++++++++++++++ examples/widgetapp/widgetapp.rc | 1 + 3 files changed, 81 insertions(+) create mode 100644 examples/widgetapp/application.e create mode 100644 examples/widgetapp/widgetapp.ecf create mode 100644 examples/widgetapp/widgetapp.rc diff --git a/examples/widgetapp/application.e b/examples/widgetapp/application.e new file mode 100644 index 00000000..e898b73b --- /dev/null +++ b/examples/widgetapp/application.e @@ -0,0 +1,38 @@ +note + description: "simple application root class" + date: "$Date$" + revision: "$Revision$" + +class + APPLICATION + +inherit + + WSF_DEFAULT_SERVICE + redefine + initialize + end + +create + make_and_launch + +feature {NONE} -- Initialization + + initialize + -- Initialize current service. + do + set_service_option ("port", 9090) + end + +feature -- Basic operations + + execute (req: WSF_REQUEST; res: WSF_RESPONSE) + do + -- To send a response we need to setup, the status code and + -- the response headers. + res.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/plain"], ["Content-Length", "11"]>>) + res.put_string ("Hello World 99 just another mod") + res.put_string ("Hello World reloaded") + end + +end diff --git a/examples/widgetapp/widgetapp.ecf b/examples/widgetapp/widgetapp.ecf new file mode 100644 index 00000000..52254872 --- /dev/null +++ b/examples/widgetapp/widgetapp.ecf @@ -0,0 +1,42 @@ + + + + + /EIFGENs$ + /CVS$ + /.svn$ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/widgetapp/widgetapp.rc b/examples/widgetapp/widgetapp.rc new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/examples/widgetapp/widgetapp.rc @@ -0,0 +1 @@ + From c224bf1bb196c474286ac79153123e617b55146f Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 13:53:34 +0200 Subject: [PATCH 002/191] Test --- examples/widgetapp/application.e | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/widgetapp/application.e b/examples/widgetapp/application.e index e898b73b..14677cd6 100644 --- a/examples/widgetapp/application.e +++ b/examples/widgetapp/application.e @@ -32,7 +32,6 @@ feature -- Basic operations -- the response headers. res.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/plain"], ["Content-Length", "11"]>>) res.put_string ("Hello World 99 just another mod") - res.put_string ("Hello World reloaded") end end From 9f7e72f0a48c0095dce04a4b08c896437578acc2 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 14:47:43 +0200 Subject: [PATCH 003/191] Page structure --- .../server/wsf_html/webcontrol/wsf_control.e | 21 +++++ .../wsf_html/webcontrol/wsf_page_control.e | 78 +++++++++++++++++++ library/server/wsf_html/wsf_html-safe.ecf | 4 +- 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 library/server/wsf_html/webcontrol/wsf_control.e create mode 100644 library/server/wsf_html/webcontrol/wsf_page_control.e diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e new file mode 100644 index 00000000..6e7a01ea --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -0,0 +1,21 @@ +note + description: "Summary description for {WSF_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + WSF_CONTROL +feature + name: STRING + +feature {WSF_PAGE_CONTROL} + + handle_callback(event: STRING ; control_name: STRING ; page: WSF_PAGE_CONTROL) + deferred + end + + render:STRING + deferred + end +end diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e new file mode 100644 index 00000000..f4ed32f3 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -0,0 +1,78 @@ +note + description: "Summary description for {WSF_PAGE_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + WSF_PAGE_CONTROL + +feature {NONE} -- Initialization + + make (req: WSF_REQUEST; res: WSF_RESPONSE) + do + request := req + response := res + end + +feature -- Access + + request: WSF_REQUEST + + response: WSF_RESPONSE + +feature + + initialize_controls + deferred + end + + process + deferred + end + +feature + + + execute + local + event: detachable STRING + control_name: detachable STRING + do + initialize_controls + control_name := get_parameter("control_name") + event := get_parameter("event") + if attached event and attached control_name and attached control then + control.handle_callback (control_name,event, Current) + else + process + render + end + end + + render + local + data: STRING + do + data := control.render + response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/plain"], ["Content-Length", data.count.out]>>) + response.put_string (data) + end + + get_parameter(key: STRING) : detachable STRING + local + value: detachable WSF_VALUE + do + Result := VOID + value := request.query_parameter (key) + if attached value then + Result := value.as_string.value + end + + end + +feature {NONE} + + control: WSF_CONTROL + +end diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf index e1b2baca..7c26d2e7 100644 --- a/library/server/wsf_html/wsf_html-safe.ecf +++ b/library/server/wsf_html/wsf_html-safe.ecf @@ -1,5 +1,5 @@ - + @@ -11,11 +11,13 @@ + + From fa5d13e19d9b58529ac35d024b801aa9ee5b2b19 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 15:01:57 +0200 Subject: [PATCH 004/191] Fix path --- library/server/wsf_html/wsf_html-safe.ecf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf index 7c26d2e7..ee951503 100644 --- a/library/server/wsf_html/wsf_html-safe.ecf +++ b/library/server/wsf_html/wsf_html-safe.ecf @@ -17,7 +17,7 @@ - + From 74995101d19c2800479a2836418d86cbc88df573 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 15:58:56 +0200 Subject: [PATCH 005/191] Add a json state to each control --- .../wsf_html/webcontrol/wsf_button_control.e | 51 +++++++++++++++++++ .../server/wsf_html/webcontrol/wsf_control.e | 22 ++++++-- .../wsf_html/webcontrol/wsf_page_control.e | 5 ++ library/server/wsf_html/wsf_html-safe.ecf | 1 + 4 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/wsf_button_control.e diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e new file mode 100644 index 00000000..b286bc17 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -0,0 +1,51 @@ +note + description: "Summary description for {WSF_BUTTON_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_BUTTON_CONTROL + +inherit + WSF_CONTROL +create + make +feature {NONE} + make (n:STRING; v:STRING) + do + make_control + control_name:=n + text:=v + click_event:= agent donothing + end +feature + + --UGLY HACK MUST BE REMOVED + donothing(p:WSF_PAGE_CONTROL) + do + + end + handle_callback(event: STRING ; cname: STRING ; page: WSF_PAGE_CONTROL) + do + if Current.control_name = cname and attached click_event then + click_event.call([page]) + end + end + + render:STRING + do + Result:="" + end + + state:JSON_OBJECT + do + create Result.make + Result.put (create {JSON_STRING}.make_json(text), create {JSON_STRING}.make_json("text")) + end + + +feature + text: STRING + click_event: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] +end diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 6e7a01ea..5d027501 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -6,16 +6,32 @@ note deferred class WSF_CONTROL +feature {NONE} + make_control + do + control_name:="" + end + feature - name: STRING + control_name: STRING feature {WSF_PAGE_CONTROL} - handle_callback(event: STRING ; control_name: STRING ; page: WSF_PAGE_CONTROL) + handle_callback(event: STRING ; cname: STRING ; page: WSF_PAGE_CONTROL) deferred end - render:STRING + render: STRING deferred end + + state: JSON_OBJECT + deferred + end + + read_state(states:JSON_OBJECT) + do + states.put (state, create {JSON_STRING}.make_json(control_name)) + end + end diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index f4ed32f3..2d8fd33b 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -38,12 +38,17 @@ feature local event: detachable STRING control_name: detachable STRING + states:JSON_OBJECT do initialize_controls control_name := get_parameter("control_name") event := get_parameter("event") if attached event and attached control_name and attached control then control.handle_callback (control_name,event, Current) + create states.make + control.read_state(states) + response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>) + response.put_string (states.representation) else process render diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf index ee951503..e5aaeeb4 100644 --- a/library/server/wsf_html/wsf_html-safe.ecf +++ b/library/server/wsf_html/wsf_html-safe.ecf @@ -12,6 +12,7 @@ + From 850a05d6bb5102ac2be015c7cd80693d7f32a719 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 16:00:24 +0200 Subject: [PATCH 006/191] Pretty Print --- .../wsf_html/webcontrol/wsf_button_control.e | 68 ++++++++++-------- .../server/wsf_html/webcontrol/wsf_control.e | 31 ++++---- .../wsf_html/webcontrol/wsf_page_control.e | 72 +++++++++---------- 3 files changed, 90 insertions(+), 81 deletions(-) diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index b286bc17..a2551e93 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -8,44 +8,52 @@ class WSF_BUTTON_CONTROL inherit + WSF_CONTROL + create make + feature {NONE} - make (n:STRING; v:STRING) - do - make_control - control_name:=n - text:=v - click_event:= agent donothing - end -feature - --UGLY HACK MUST BE REMOVED - donothing(p:WSF_PAGE_CONTROL) - do - - end - handle_callback(event: STRING ; cname: STRING ; page: WSF_PAGE_CONTROL) - do - if Current.control_name = cname and attached click_event then - click_event.call([page]) + make (n: STRING; v: STRING) + do + make_control + control_name := n + text := v + click_event := agent donothing end - end - - render:STRING - do - Result:="" - end - - state:JSON_OBJECT - do - create Result.make - Result.put (create {JSON_STRING}.make_json(text), create {JSON_STRING}.make_json("text")) - end - feature + + --UGLY HACK MUST BE REMOVED + + donothing (p: WSF_PAGE_CONTROL) + do + end + + handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) + do + if Current.control_name = cname and attached click_event then + click_event.call ([page]) + end + end + + render: STRING + do + Result := "" + end + + state: JSON_OBJECT + do + create Result.make + Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + end + +feature + text: STRING + click_event: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] + end diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 5d027501..04f9c830 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -6,32 +6,35 @@ note deferred class WSF_CONTROL + feature {NONE} + make_control - do - control_name:="" - end + do + control_name := "" + end feature + control_name: STRING feature {WSF_PAGE_CONTROL} - handle_callback(event: STRING ; cname: STRING ; page: WSF_PAGE_CONTROL) - deferred - end + handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) + deferred + end render: STRING - deferred - end + deferred + end state: JSON_OBJECT - deferred - end + deferred + end - read_state(states:JSON_OBJECT) - do - states.put (state, create {JSON_STRING}.make_json(control_name)) - end + read_state (states: JSON_OBJECT) + do + states.put (state, create {JSON_STRING}.make_json (control_name)) + end end diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 2d8fd33b..46bbfe9d 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -24,57 +24,55 @@ feature -- Access feature initialize_controls - deferred - end + deferred + end process - deferred - end + deferred + end feature - execute - local - event: detachable STRING - control_name: detachable STRING - states:JSON_OBJECT - do - initialize_controls - control_name := get_parameter("control_name") - event := get_parameter("event") - if attached event and attached control_name and attached control then - control.handle_callback (control_name,event, Current) + local + event: detachable STRING + control_name: detachable STRING + states: JSON_OBJECT + do + initialize_controls + control_name := get_parameter ("control_name") + event := get_parameter ("event") + if attached event and attached control_name and attached control then + control.handle_callback (control_name, event, Current) create states.make - control.read_state(states) + control.read_state (states) response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>) response.put_string (states.representation) - else - process - render + else + process + render + end end - end render - local - data: STRING - do - data := control.render - response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/plain"], ["Content-Length", data.count.out]>>) - response.put_string (data) - end - - get_parameter(key: STRING) : detachable STRING - local - value: detachable WSF_VALUE - do - Result := VOID - value := request.query_parameter (key) - if attached value then - Result := value.as_string.value + local + data: STRING + do + data := control.render + response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/plain"], ["Content-Length", data.count.out]>>) + response.put_string (data) end - end + get_parameter (key: STRING): detachable STRING + local + value: detachable WSF_VALUE + do + Result := VOID + value := request.query_parameter (key) + if attached value then + Result := value.as_string.value + end + end feature {NONE} From 8db642cf3bc5c456aa77a0f2fe20ed17274a26e0 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 16:07:06 +0200 Subject: [PATCH 007/191] Move initalize controls --- library/server/wsf_html/webcontrol/wsf_page_control.e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 46bbfe9d..72dbdf6d 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -13,6 +13,7 @@ feature {NONE} -- Initialization do request := req response := res + initialize_controls end feature -- Access @@ -39,7 +40,6 @@ feature control_name: detachable STRING states: JSON_OBJECT do - initialize_controls control_name := get_parameter ("control_name") event := get_parameter ("event") if attached event and attached control_name and attached control then From 6fdffb7418430fa54ce8a274eaba8177e6b2a0a9 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 16:18:51 +0200 Subject: [PATCH 008/191] Add post condition --- library/server/wsf_html/webcontrol/wsf_page_control.e | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 72dbdf6d..d6891ccc 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -26,6 +26,8 @@ feature initialize_controls deferred + ensure + attached control end process From c29a6ad195ebc456307fe9b8701592fe96d072d3 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 16:33:54 +0200 Subject: [PATCH 009/191] Add assigner --- library/server/wsf_html/webcontrol/wsf_button_control.e | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index a2551e93..8f7aea10 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -50,6 +50,11 @@ feature Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) end + set_text (t: STRING) + do + text := t + end + feature text: STRING From 0c0fb5c9c823400babffb9397eff902d66f58d6f Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 16:44:58 +0200 Subject: [PATCH 010/191] Add html body --- library/server/wsf_html/webcontrol/wsf_page_control.e | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index d6891ccc..374241ca 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -61,8 +61,10 @@ feature data: STRING do data := control.render - response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/plain"], ["Content-Length", data.count.out]>>) + response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"], ["Content-Length", data.count.out]>>) + response.put_string ("") response.put_string (data) + response.put_string ("") end get_parameter (key: STRING): detachable STRING From 1a1df35ff163de98bc8684d6a88fcaf0014be3f0 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Tue, 27 Aug 2013 16:45:50 +0200 Subject: [PATCH 011/191] Remove content length --- library/server/wsf_html/webcontrol/wsf_page_control.e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 374241ca..f9020ea1 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -61,7 +61,7 @@ feature data: STRING do data := control.render - response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"], ["Content-Length", data.count.out]>>) + response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>) response.put_string ("") response.put_string (data) response.put_string ("") From ab7ee8e4c361ebdf37ea1d734cbcdeb65555e409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Tue, 27 Aug 2013 16:48:20 +0200 Subject: [PATCH 012/191] Created first working sample page application. --- examples/widgetapp/application.e | 17 ++++++------- examples/widgetapp/sample_page.e | 41 ++++++++++++++++++++++++++++++++ examples/widgetapp/widgetapp.ecf | 1 + 3 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 examples/widgetapp/sample_page.e diff --git a/examples/widgetapp/application.e b/examples/widgetapp/application.e index 14677cd6..86eab8c4 100644 --- a/examples/widgetapp/application.e +++ b/examples/widgetapp/application.e @@ -1,13 +1,12 @@ note - description: "simple application root class" - date: "$Date$" - revision: "$Revision$" + description : "simple application root class" + date : "$Date$" + revision : "$Revision$" class APPLICATION inherit - WSF_DEFAULT_SERVICE redefine initialize @@ -27,11 +26,13 @@ feature {NONE} -- Initialization feature -- Basic operations execute (req: WSF_REQUEST; res: WSF_RESPONSE) + local + page: SAMPLE_PAGE do - -- To send a response we need to setup, the status code and - -- the response headers. - res.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/plain"], ["Content-Length", "11"]>>) - res.put_string ("Hello World 99 just another mod") + -- To send a response we need to setup, the status code and + -- the response headers. + create page.make(req, res) + page.execute end end diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e new file mode 100644 index 00000000..dcfe8f29 --- /dev/null +++ b/examples/widgetapp/sample_page.e @@ -0,0 +1,41 @@ +note + description: "Summary description for {SAMPLE_PAGE}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + SAMPLE_PAGE + +inherit + + WSF_PAGE_CONTROL + redefine + initialize_controls, + process + end + +create + make + +feature + + initialize_controls + do + button := create {WSF_BUTTON_CONTROL}.make ("sample_button", "I'm a button") + control := button + end + + handle_click(context: WSF_PAGE_CONTROL) + do + if attached {SAMPLE_PAGE} context as sp then + sp.button.set_text("Hello World! (Ueeee)") + end + end + + process + do + end + + button: WSF_BUTTON_CONTROL +end diff --git a/examples/widgetapp/widgetapp.ecf b/examples/widgetapp/widgetapp.ecf index 52254872..4e603bf6 100644 --- a/examples/widgetapp/widgetapp.ecf +++ b/examples/widgetapp/widgetapp.ecf @@ -12,6 +12,7 @@ + From ef34217a6d8b8abdb6f162a8ddc85cbf194665f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Tue, 27 Aug 2013 22:06:08 +0200 Subject: [PATCH 013/191] Added WSF_MULTI_CONTROL to support controls that consist of multiple separate controls. --- .../wsf_html/webcontrol/wsf_button_control.e | 1 - .../server/wsf_html/webcontrol/wsf_control.e | 9 +-- .../wsf_html/webcontrol/wsf_multi_control.e | 62 +++++++++++++++++++ 3 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/wsf_multi_control.e diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 8f7aea10..808be0af 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -18,7 +18,6 @@ feature {NONE} make (n: STRING; v: STRING) do - make_control control_name := n text := v click_event := agent donothing diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 04f9c830..40e61b3a 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -7,18 +7,11 @@ note deferred class WSF_CONTROL -feature {NONE} - - make_control - do - control_name := "" - end - feature control_name: STRING -feature {WSF_PAGE_CONTROL} +feature {WSF_PAGE_CONTROL, WSF_CONTROL} handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) deferred diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e new file mode 100644 index 00000000..00a14fa9 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -0,0 +1,62 @@ +note + description: "Summary description for {WSF_MULTI_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_MULTI_CONTROL + +inherit + + WSF_CONTROL + +create + make + +feature {NONE} + + controls: LIST [WSF_CONTROL] + + make (n: STRING) + do + control_name := n + controls := create {LINKED_LIST [WSF_CONTROL]}.make; + end + + handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) + do + if equal (cname, control_name) then + + else + across + controls as c + loop + c.item.handle_callback(event, cname, page) + end + end + end + + render: STRING + do + Result := "" + across + controls as c + loop + Result := Result + c.item.render + end + end + + state: JSON_OBJECT + local + temp: JSON_OBJECT + do + create Result.make + across + controls as c + loop + temp := c.item.state + end + end + +end From cb7f1f0ee397ddb1105cdb28e46b1d0d37608176 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Wed, 28 Aug 2013 00:04:42 +0200 Subject: [PATCH 014/191] First working callback --- examples/widgetapp/application.e | 44 ++++++++-- examples/widgetapp/sample_page.e | 1 + examples/widgetapp/widget.coffee | 45 ++++++++++ examples/widgetapp/widget.js | 82 +++++++++++++++++++ .../wsf_html/webcontrol/wsf_button_control.e | 11 ++- .../server/wsf_html/webcontrol/wsf_control.e | 2 +- .../wsf_html/webcontrol/wsf_page_control.e | 23 ++++-- 7 files changed, 191 insertions(+), 17 deletions(-) create mode 100644 examples/widgetapp/widget.coffee create mode 100644 examples/widgetapp/widget.js diff --git a/examples/widgetapp/application.e b/examples/widgetapp/application.e index 86eab8c4..9163a630 100644 --- a/examples/widgetapp/application.e +++ b/examples/widgetapp/application.e @@ -1,12 +1,15 @@ note - description : "simple application root class" - date : "$Date$" - revision : "$Revision$" + description: "simple application root class" + date: "$Date$" + revision: "$Revision$" class APPLICATION inherit + + WSF_ROUTED_SERVICE + WSF_DEFAULT_SERVICE redefine initialize @@ -20,19 +23,44 @@ feature {NONE} -- Initialization initialize -- Initialize current service. do + initialize_router set_service_option ("port", 9090) end -feature -- Basic operations +feature {NONE} -- Initialization - execute (req: WSF_REQUEST; res: WSF_RESPONSE) + setup_router + do + -- router.map (create {WSF_URI_MAPPING}.make ("/hello", create {WSF_AGENT_URI_HANDLER}.make (agent execute_hello))) + map_agent_uri ("/", agent execute_hello, Void) + map_agent_uri ("/widget.js", agent load_js, Void) + end + +feature -- Helper: mapping + + map_agent_uri (a_uri: READABLE_STRING_8; a_action: like {WSF_URI_AGENT_HANDLER}.action; rqst_methods: detachable WSF_REQUEST_METHODS) + do + router.map_with_request_methods (create {WSF_URI_MAPPING}.make (a_uri, create {WSF_URI_AGENT_HANDLER}.make (a_action)), rqst_methods) + end + +feature -- Execution + + execute_hello (req: WSF_REQUEST; res: WSF_RESPONSE) local page: SAMPLE_PAGE do - -- To send a response we need to setup, the status code and - -- the response headers. - create page.make(req, res) + -- To send a response we need to setup, the status code and + -- the response headers. + create page.make (req, res) page.execute end + load_js (req: WSF_REQUEST; res: WSF_RESPONSE) + local + f: WSF_FILE_RESPONSE + do + create f.make_html ("widget.js") + res.send (f) + end + end diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index dcfe8f29..9a289db1 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -23,6 +23,7 @@ feature initialize_controls do button := create {WSF_BUTTON_CONTROL}.make ("sample_button", "I'm a button") + button.set_click_event(agent handle_click) control := button end diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee new file mode 100644 index 00000000..e6a6c93f --- /dev/null +++ b/examples/widgetapp/widget.coffee @@ -0,0 +1,45 @@ +trigger_callback = (control_name,event)-> + $.ajax + data: + control_name: control_name + event: event + cache: no + .done (new_states)-> + states = new_states + for name,state of states + controls[name].update(state) + return + +class WSF_CONTROL + constructor: (@control_name, @$el)-> + @attach_events() + return + + attach_events: ()-> + return + + update: (state)-> + return + +controls = {} + +class WSF_BUTTON_CONTROL extends WSF_CONTROL + attach_events: ()-> + self = @ + @$el.click ()-> + self.click() + click: ()-> + trigger_callback(@control_name, 'click') + + update: (state) -> + @$el.text(state.text) + +typemap = + "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL + +for name,state of states + $el = $('[data-name='+name+']') + type = $el.data('type') + #bind widget + controls[name]=new typemap[type](name,$el) + diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js new file mode 100644 index 00000000..55f30910 --- /dev/null +++ b/examples/widgetapp/widget.js @@ -0,0 +1,82 @@ +// Generated by CoffeeScript 1.6.1 +(function() { + var $el, WSF_BUTTON_CONTROL, WSF_CONTROL, controls, name, state, trigger_callback, type, typemap, + __hasProp = {}.hasOwnProperty, + __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; + + trigger_callback = function(control_name, event) { + return $.ajax({ + data: { + control_name: control_name, + event: event + }, + cache: false + }).done(function(new_states) { + var name, state, states; + states = new_states; + for (name in states) { + state = states[name]; + controls[name].update(state); + } + }); + }; + + WSF_CONTROL = (function() { + + function WSF_CONTROL(control_name, $el) { + this.control_name = control_name; + this.$el = $el; + this.attach_events(); + return; + } + + WSF_CONTROL.prototype.attach_events = function() {}; + + WSF_CONTROL.prototype.update = function(state) {}; + + return WSF_CONTROL; + + })(); + + controls = {}; + + WSF_BUTTON_CONTROL = (function(_super) { + + __extends(WSF_BUTTON_CONTROL, _super); + + function WSF_BUTTON_CONTROL() { + return WSF_BUTTON_CONTROL.__super__.constructor.apply(this, arguments); + } + + WSF_BUTTON_CONTROL.prototype.attach_events = function() { + var self; + self = this; + return this.$el.click(function() { + return self.click(); + }); + }; + + WSF_BUTTON_CONTROL.prototype.click = function() { + return trigger_callback(this.control_name, 'click'); + }; + + WSF_BUTTON_CONTROL.prototype.update = function(state) { + return this.$el.text(state.text); + }; + + return WSF_BUTTON_CONTROL; + + })(WSF_CONTROL); + + typemap = { + "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL + }; + + for (name in states) { + state = states[name]; + $el = $('[data-name=' + name + ']'); + type = $el.data('type'); + controls[name] = new typemap[type](name, $el); + } + +}).call(this); diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 808be0af..10fe38d1 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -31,16 +31,21 @@ feature do end - handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) + set_click_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]) do - if Current.control_name = cname and attached click_event then + click_event := e + end + + handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) + do + if Current.control_name.is_equal (cname) and attached click_event then click_event.call ([page]) end end render: STRING do - Result := "" + Result := "" end state: JSON_OBJECT diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 40e61b3a..9c039e77 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -13,7 +13,7 @@ feature feature {WSF_PAGE_CONTROL, WSF_CONTROL} - handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) + handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) deferred end diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index f9020ea1..b9545440 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -59,12 +59,25 @@ feature render local data: STRING + page: WSF_PAGE_RESPONSE + states: JSON_OBJECT do - data := control.render - response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>) - response.put_string ("") - response.put_string (data) - response.put_string ("") + create states.make + control.read_state (states) + + data := "" + data.append ("") + data.append (control.render) + data.append ("") + data.append ("") + data.append ("") + data.append ("") + create page.make + page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>) + page.set_body (data) + response.send (page) end get_parameter (key: STRING): detachable STRING From f14ea2963634f74888a842f3748eb3d71c9d7f82 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Wed, 28 Aug 2013 00:34:25 +0200 Subject: [PATCH 015/191] Comment and reformat coffee script file --- examples/widgetapp/widget.coffee | 67 +++++++++++++++++--------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index e6a6c93f..cee6c3cc 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -1,45 +1,50 @@ trigger_callback = (control_name,event)-> - $.ajax - data: - control_name: control_name - event: event - cache: no - .done (new_states)-> - states = new_states - for name,state of states - controls[name].update(state) - return + $.ajax + data: + control_name: control_name + event: event + cache: no + .done (new_states)-> + states = new_states + #Update all classes + for name,state of states + controls[name].update(state) + return class WSF_CONTROL - constructor: (@control_name, @$el)-> - @attach_events() - return - - attach_events: ()-> - return + constructor: (@control_name, @$el)-> + @attach_events() + return - update: (state)-> - return + attach_events: ()-> + return + + update: (state)-> + return controls = {} class WSF_BUTTON_CONTROL extends WSF_CONTROL - attach_events: ()-> - self = @ - @$el.click ()-> - self.click() - click: ()-> - trigger_callback(@control_name, 'click') + attach_events: ()-> + self = @ + @$el.click ()-> + self.click() + click: ()-> + trigger_callback(@control_name, 'click') - update: (state) -> - @$el.text(state.text) + update: (state) -> + @$el.text(state.text) +#map class name to effectiv class typemap = - "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL + "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL +#create a js class for each control for name,state of states - $el = $('[data-name='+name+']') - type = $el.data('type') - #bind widget - controls[name]=new typemap[type](name,$el) + #find control DOM element + $el = $('[data-name='+name+']') + #get control type + type = $el.data('type') + #create class + controls[name]=new typemap[type](name,$el) From b72e6871e8627885f1cac8aeb585909324d48ece Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Wed, 28 Aug 2013 11:04:54 +0200 Subject: [PATCH 016/191] Fix multi control Use multi control in example --- examples/widgetapp/sample_page.e | 29 +++++++++++++------ examples/widgetapp/widget.coffee | 9 +++--- examples/widgetapp/widget.js | 16 ++++++---- .../wsf_html/webcontrol/wsf_multi_control.e | 24 +++++++++++++-- 4 files changed, 56 insertions(+), 22 deletions(-) diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index 9a289db1..bfa702bc 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -21,22 +21,33 @@ create feature initialize_controls + local + panel: WSF_MULTI_CONTROL do - button := create {WSF_BUTTON_CONTROL}.make ("sample_button", "I'm a button") - button.set_click_event(agent handle_click) - control := button + button1 := create {WSF_BUTTON_CONTROL}.make ("sample_button1", "I'm a button") + button1.set_click_event (agent handle_click) + button2 := create {WSF_BUTTON_CONTROL}.make ("sample_button2", "I'm a button2") + button2.set_click_event (agent handle_click) + create panel.make ("panel") + panel.add_control (button1) + panel.add_control (button2) + control := panel end - handle_click(context: WSF_PAGE_CONTROL) - do - if attached {SAMPLE_PAGE} context as sp then - sp.button.set_text("Hello World! (Ueeee)") + handle_click (context: WSF_PAGE_CONTROL) + do + if attached {SAMPLE_PAGE} context as sp then + sp.button1.set_text ("Hello World! (Ueeee)") + sp.button2.set_text ("Hi btn2") + end end - end process do end - button: WSF_BUTTON_CONTROL + button1: WSF_BUTTON_CONTROL + + button2: WSF_BUTTON_CONTROL + end diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index cee6c3cc..49800aa5 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -5,10 +5,10 @@ trigger_callback = (control_name,event)-> event: event cache: no .done (new_states)-> - states = new_states #Update all classes - for name,state of states - controls[name].update(state) + for name,state of new_states + controls[name]?.update(state) + states = new_states return class WSF_CONTROL @@ -46,5 +46,6 @@ for name,state of states #get control type type = $el.data('type') #create class - controls[name]=new typemap[type](name,$el) + if type? and typemap[type]? + controls[name]=new typemap[type](name,$el) diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index 55f30910..0f025652 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -12,12 +12,14 @@ }, cache: false }).done(function(new_states) { - var name, state, states; - states = new_states; - for (name in states) { - state = states[name]; - controls[name].update(state); + var name, state, states, _ref; + for (name in new_states) { + state = new_states[name]; + if ((_ref = controls[name]) != null) { + _ref.update(state); + } } + states = new_states; }); }; @@ -76,7 +78,9 @@ state = states[name]; $el = $('[data-name=' + name + ']'); type = $el.data('type'); - controls[name] = new typemap[type](name, $el); + if ((type != null) && (typemap[type] != null)) { + controls[name] = new typemap[type](name, $el); + } } }).call(this); diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index 00a14fa9..8ff1889c 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -10,13 +10,16 @@ class inherit WSF_CONTROL + redefine + read_state + end create make feature {NONE} - controls: LIST [WSF_CONTROL] + controls: LINKED_LIST [WSF_CONTROL] make (n: STRING) do @@ -24,15 +27,21 @@ feature {NONE} controls := create {LINKED_LIST [WSF_CONTROL]}.make; end +feature + + add_control (c: WSF_CONTROL) + do + controls.put_front (c) + end + handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) do if equal (cname, control_name) then - else across controls as c loop - c.item.handle_callback(event, cname, page) + c.item.handle_callback (event, cname, page) end end end @@ -59,4 +68,13 @@ feature {NONE} end end + read_state (states: JSON_OBJECT) + do + states.put (state, create {JSON_STRING}.make_json (control_name)) + across + controls as c + loop + c.item.read_state(states) + end + end end From b7ab840d710339a2921e15215507ae277dd2b1d5 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Wed, 28 Aug 2013 12:52:09 +0200 Subject: [PATCH 017/191] Communication in both directions (Text control) Code regrouping --- examples/widgetapp/sample_page.e | 21 +++-- examples/widgetapp/widget.coffee | 21 ++++- examples/widgetapp/widget.js | 46 +++++++++-- .../wsf_html/webcontrol/wsf_button_control.e | 27 ++++--- .../server/wsf_html/webcontrol/wsf_control.e | 40 +++++++--- .../wsf_html/webcontrol/wsf_multi_control.e | 69 ++++++++++------ .../wsf_html/webcontrol/wsf_page_control.e | 22 ++++-- .../wsf_html/webcontrol/wsf_text_control.e | 79 +++++++++++++++++++ 8 files changed, 255 insertions(+), 70 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/wsf_text_control.e diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index bfa702bc..ef6882d9 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -24,21 +24,24 @@ feature local panel: WSF_MULTI_CONTROL do - button1 := create {WSF_BUTTON_CONTROL}.make ("sample_button1", "I'm a button") + create textbox1.make ("txtBox1", "1") + create textbox2.make ("txtBox2", "2") + button1 := create {WSF_BUTTON_CONTROL}.make ("sample_button1", "SUM") + create textbox_result.make ("txtBox3", "") button1.set_click_event (agent handle_click) - button2 := create {WSF_BUTTON_CONTROL}.make ("sample_button2", "I'm a button2") - button2.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 (button2) + panel.add_control (textbox_result) control := panel end handle_click (context: WSF_PAGE_CONTROL) do if attached {SAMPLE_PAGE} context as sp then - sp.button1.set_text ("Hello World! (Ueeee)") - sp.button2.set_text ("Hi btn2") + + sp.textbox_result.set_text (textbox1.text + " + " + textbox2.text+" = "+ (textbox1.text.to_integer_16+textbox2.text.to_integer_16).out) end end @@ -48,6 +51,10 @@ feature button1: WSF_BUTTON_CONTROL - button2: WSF_BUTTON_CONTROL + textbox1: WSF_TEXT_CONTROL + + textbox2: WSF_TEXT_CONTROL + + textbox_result: WSF_TEXT_CONTROL end diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 49800aa5..9b6e4988 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -2,13 +2,14 @@ trigger_callback = (control_name,event)-> $.ajax data: control_name: control_name - event: event + event: event + states: JSON.stringify(states) cache: no .done (new_states)-> #Update all classes + window.states = new_states for name,state of new_states controls[name]?.update(state) - states = new_states return class WSF_CONTROL @@ -35,12 +36,26 @@ class WSF_BUTTON_CONTROL extends WSF_CONTROL update: (state) -> @$el.text(state.text) +class WSF_TEXT_CONTROL extends WSF_CONTROL + attach_events: ()-> + self = @ + @$el.change ()-> + self.change() + change: ()-> + #update local state + window.states[@control_name]['text'] = @$el.val() + trigger_callback(@control_name, 'change') + + update: (state) -> + @$el.val(state.text) + #map class name to effectiv class typemap = "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL + "WSF_TEXT_CONTROL":WSF_TEXT_CONTROL #create a js class for each control -for name,state of states +for name,state of window.states #find control DOM element $el = $('[data-name='+name+']') #get control type diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index 0f025652..c04e6b3b 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.6.1 (function() { - var $el, WSF_BUTTON_CONTROL, WSF_CONTROL, controls, name, state, trigger_callback, type, typemap, + var $el, WSF_BUTTON_CONTROL, WSF_CONTROL, WSF_TEXT_CONTROL, controls, name, state, trigger_callback, type, typemap, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -8,18 +8,19 @@ return $.ajax({ data: { control_name: control_name, - event: event + event: event, + states: JSON.stringify(states) }, cache: false }).done(function(new_states) { - var name, state, states, _ref; + var name, state, _ref; + window.states = new_states; for (name in new_states) { state = new_states[name]; if ((_ref = controls[name]) != null) { _ref.update(state); } } - states = new_states; }); }; @@ -70,12 +71,43 @@ })(WSF_CONTROL); + WSF_TEXT_CONTROL = (function(_super) { + + __extends(WSF_TEXT_CONTROL, _super); + + function WSF_TEXT_CONTROL() { + return WSF_TEXT_CONTROL.__super__.constructor.apply(this, arguments); + } + + WSF_TEXT_CONTROL.prototype.attach_events = function() { + var self; + self = this; + return this.$el.change(function() { + return self.change(); + }); + }; + + WSF_TEXT_CONTROL.prototype.change = function() { + window.states[this.control_name]['text'] = this.$el.val(); + return trigger_callback(this.control_name, 'change'); + }; + + WSF_TEXT_CONTROL.prototype.update = function(state) { + return this.$el.val(state.text); + }; + + return WSF_TEXT_CONTROL; + + })(WSF_CONTROL); + typemap = { - "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL + "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL, + "WSF_TEXT_CONTROL": WSF_TEXT_CONTROL }; - for (name in states) { - state = states[name]; + _ref = window.states; + for (name in _ref) { + state = _ref[name]; $el = $('[data-name=' + name + ']'); type = $el.data('type'); if ((type != null) && (typemap[type] != null)) { diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 10fe38d1..5f2b7a6b 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -23,11 +23,24 @@ feature {NONE} click_event := agent donothing end -feature +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT - --UGLY HACK MUST BE REMOVED + set_state (new_state: JSON_OBJECT) + do + if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("text")) as new_text then + text := new_text.unescaped_string_32 + end + end - donothing (p: WSF_PAGE_CONTROL) + state: JSON_OBJECT + do + create Result.make + Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + end + +feature --EVENT HANDLING + + donothing (p: WSF_PAGE_CONTROL) --UGLY HACK MUST BE REMOVED do end @@ -43,17 +56,13 @@ feature end end +feature + render: STRING do Result := "" end - state: JSON_OBJECT - do - create Result.make - Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) - end - set_text (t: STRING) do text := t diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 9c039e77..9ad4dbef 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -11,18 +11,16 @@ feature control_name: STRING -feature {WSF_PAGE_CONTROL, WSF_CONTROL} +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT - handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) - deferred - end - - render: STRING - deferred - end - - state: JSON_OBJECT - deferred + load_state (new_states: JSON_OBJECT) + local + new_state: detachable JSON_VALUE + do + new_state := new_states.item (create {JSON_STRING}.make_json (control_name)) + if attached {JSON_OBJECT} new_state as new_state_obj then + set_state (new_state_obj) + end end read_state (states: JSON_OBJECT) @@ -30,4 +28,24 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} states.put (state, create {JSON_STRING}.make_json (control_name)) end + set_state (new_state: JSON_OBJECT) + deferred + end + + state: JSON_OBJECT + deferred + end + +feature --EVENT HANDLING + + handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) + deferred + end + +feature + + render: STRING + deferred + end + end diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index 8ff1889c..edde597d 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -11,7 +11,8 @@ inherit WSF_CONTROL redefine - read_state + read_state, + load_state end create @@ -27,32 +28,28 @@ feature {NONE} controls := create {LINKED_LIST [WSF_CONTROL]}.make; end -feature +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT - add_control (c: WSF_CONTROL) + load_state (new_states: JSON_OBJECT) do - controls.put_front (c) - end - - handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) - do - if equal (cname, control_name) then - else - across - controls as c - loop - c.item.handle_callback (event, cname, page) - end - end - end - - render: STRING - do - Result := "" across controls as c loop - Result := Result + c.item.render + c.item.load_state (new_states) + end + end + + set_state (new_state: JSON_OBJECT) + do + end + + read_state (states: JSON_OBJECT) + do + states.put (state, create {JSON_STRING}.make_json (control_name)) + across + controls as c + loop + c.item.read_state (states) end end @@ -68,13 +65,35 @@ feature end end - read_state (states: JSON_OBJECT) +feature --EVENT HANDLING + + handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) do - states.put (state, create {JSON_STRING}.make_json (control_name)) + if equal (cname, control_name) then + else + across + controls as c + loop + c.item.handle_callback (event, cname, page) + end + end + end + +feature + + render: STRING + do + Result := "" across controls as c loop - c.item.read_state(states) + Result := c.item.render + Result end end + + add_control (c: WSF_CONTROL) + do + controls.put_front (c) + end + end diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index b9545440..acbc2e54 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -40,16 +40,23 @@ feature local event: detachable STRING control_name: detachable STRING - states: JSON_OBJECT + states: detachable STRING + new_states: JSON_OBJECT + json_parser: JSON_PARSER do control_name := get_parameter ("control_name") event := get_parameter ("event") - if attached event and attached control_name and attached control then + states := get_parameter ("states") + if attached event and attached control_name and attached control and attached states then + create json_parser.make_parser (states) + if attached {JSON_OBJECT} json_parser.parse_json as sp then + control.load_state (sp) + end control.handle_callback (control_name, event, Current) - create states.make - control.read_state (states) + create new_states.make + control.read_state (new_states) response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>) - response.put_string (states.representation) + response.put_string (new_states.representation) else process render @@ -64,18 +71,17 @@ feature do create states.make control.read_state (states) - data := "" data.append ("") data.append (control.render) - data.append ("") data.append ("") data.append ("") data.append ("") create page.make - page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>) + page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>) page.set_body (data) response.send (page) end diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e new file mode 100644 index 00000000..5658bf8f --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -0,0 +1,79 @@ +note + description: "Summary description for {WSF_TEXT_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_TEXT_CONTROL + +inherit + + WSF_CONTROL + +create + make + +feature {NONE} + + make (n: STRING; v: STRING) + do + control_name := n + text := v + change_event := agent donothing + end + +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT + + set_state (new_state: JSON_OBJECT) + do + if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("text")) as new_text then + text := new_text.unescaped_string_32 + end + end + + state: JSON_OBJECT + do + create Result.make + Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + end + +feature --EVENT HANDLING + + donothing (p: WSF_PAGE_CONTROL) --UGLY HACK MUST BE REMOVED + do + end + + set_change_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]) + do + change_event := e + end + + handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) + do + if Current.control_name.is_equal (cname) and attached change_event then + if event.is_equal ("change") then + change_event.call ([page]) + end + end + end + +feature + + render: STRING + do + Result := "" + end + + set_text (t: STRING) + do + text := t + end + +feature + + text: STRING + + change_event: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] + +end From 4e09a15454c8126444e693f3214c5e68277237bc Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Wed, 28 Aug 2013 15:30:13 +0200 Subject: [PATCH 018/191] Remove ugly do nothing hack --- .../server/wsf_html/webcontrol/wsf_button_control.e | 11 +++-------- library/server/wsf_html/webcontrol/wsf_text_control.e | 10 +++------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 5f2b7a6b..dbb47484 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -20,7 +20,6 @@ feature {NONE} do control_name := n text := v - click_event := agent donothing end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT @@ -40,10 +39,6 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING - donothing (p: WSF_PAGE_CONTROL) --UGLY HACK MUST BE REMOVED - do - end - set_click_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]) do click_event := e @@ -51,8 +46,8 @@ feature --EVENT HANDLING handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) do - if Current.control_name.is_equal (cname) and attached click_event then - click_event.call ([page]) + if Current.control_name.is_equal (cname) and attached click_event as cevent then + cevent.call ([page]) end end @@ -72,6 +67,6 @@ feature text: STRING - click_event: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] + click_event: detachable PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] end diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 5658bf8f..114c90d7 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -20,7 +20,6 @@ feature {NONE} do control_name := n text := v - change_event := agent donothing end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT @@ -40,9 +39,6 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING - donothing (p: WSF_PAGE_CONTROL) --UGLY HACK MUST BE REMOVED - do - end set_change_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]) do @@ -51,9 +47,9 @@ feature --EVENT HANDLING handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) do - if Current.control_name.is_equal (cname) and attached change_event then + if Current.control_name.is_equal (cname) and attached change_event as cevent then if event.is_equal ("change") then - change_event.call ([page]) + cevent.call ([page]) end end end @@ -74,6 +70,6 @@ feature text: STRING - change_event: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] + change_event: detachable PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] end From 595d0c501abfd6dde230dd0a487081aa8a26921d Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Wed, 28 Aug 2013 15:57:16 +0200 Subject: [PATCH 019/191] Only callback if there is an event attached --- examples/widgetapp/widget.coffee | 6 ++++-- examples/widgetapp/widget.js | 8 ++++++-- library/server/wsf_html/webcontrol/wsf_button_control.e | 1 + library/server/wsf_html/webcontrol/wsf_text_control.e | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 9b6e4988..14cd922e 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -31,7 +31,8 @@ class WSF_BUTTON_CONTROL extends WSF_CONTROL @$el.click ()-> self.click() click: ()-> - trigger_callback(@control_name, 'click') + if window.states[@control_name]['callback_click'] + trigger_callback(@control_name, 'click') update: (state) -> @$el.text(state.text) @@ -44,7 +45,8 @@ class WSF_TEXT_CONTROL extends WSF_CONTROL change: ()-> #update local state window.states[@control_name]['text'] = @$el.val() - trigger_callback(@control_name, 'change') + if window.states[@control_name]['callback_change'] + trigger_callback(@control_name, 'change') update: (state) -> @$el.val(state.text) diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index c04e6b3b..bdd91905 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -60,7 +60,9 @@ }; WSF_BUTTON_CONTROL.prototype.click = function() { - return trigger_callback(this.control_name, 'click'); + if (window.states[this.control_name]['callback_click']) { + return trigger_callback(this.control_name, 'click'); + } }; WSF_BUTTON_CONTROL.prototype.update = function(state) { @@ -89,7 +91,9 @@ WSF_TEXT_CONTROL.prototype.change = function() { window.states[this.control_name]['text'] = this.$el.val(); - return trigger_callback(this.control_name, 'change'); + if (window.states[this.control_name]['callback_change']) { + return trigger_callback(this.control_name, 'change'); + } }; WSF_TEXT_CONTROL.prototype.update = function(state) { diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index dbb47484..ebb1b97b 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -35,6 +35,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT do create Result.make Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + Result.put (create {JSON_BOOLEAN}.make_boolean (attached click_event), create {JSON_STRING}.make_json ("callback_click")) end feature --EVENT HANDLING diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 114c90d7..9af033fa 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -35,6 +35,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT do create Result.make Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + Result.put (create {JSON_BOOLEAN}.make_boolean (attached change_event), create {JSON_STRING}.make_json ("callback_change")) end feature --EVENT HANDLING From e186475a8111b4b82e907a4dc47907f59a2f1991 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Wed, 28 Aug 2013 19:43:44 +0200 Subject: [PATCH 020/191] Clean up code Simplify event --- examples/widgetapp/sample_page.e | 9 +++------ library/server/wsf_html/webcontrol/wsf_button_control.e | 8 ++++---- library/server/wsf_html/webcontrol/wsf_control.e | 2 +- library/server/wsf_html/webcontrol/wsf_multi_control.e | 4 ++-- library/server/wsf_html/webcontrol/wsf_page_control.e | 2 +- library/server/wsf_html/webcontrol/wsf_text_control.e | 8 ++++---- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index ef6882d9..2b653222 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -26,7 +26,7 @@ feature do create textbox1.make ("txtBox1", "1") create textbox2.make ("txtBox2", "2") - button1 := create {WSF_BUTTON_CONTROL}.make ("sample_button1", "SUM") + create button1.make ("sample_button1", "SUM") create textbox_result.make ("txtBox3", "") button1.set_click_event (agent handle_click) create panel.make ("panel") @@ -37,12 +37,9 @@ feature control := panel end - handle_click (context: WSF_PAGE_CONTROL) + handle_click do - if attached {SAMPLE_PAGE} context as sp then - - sp.textbox_result.set_text (textbox1.text + " + " + textbox2.text+" = "+ (textbox1.text.to_integer_16+textbox2.text.to_integer_16).out) - end + textbox_result.set_text (textbox1.text + " + " + textbox2.text + " = " + (textbox1.text.to_integer_16 + textbox2.text.to_integer_16).out) end process diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index ebb1b97b..ffab2c78 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -40,15 +40,15 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING - set_click_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]) + set_click_event (e: attached like click_event) do click_event := e end - handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) + handle_callback (cname: STRING; event: STRING) do if Current.control_name.is_equal (cname) and attached click_event as cevent then - cevent.call ([page]) + cevent.call ([]) end end @@ -68,6 +68,6 @@ feature text: STRING - click_event: detachable PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] + click_event: detachable PROCEDURE [ANY, TUPLE []] end diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 9ad4dbef..380ce181 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -38,7 +38,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING - handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) + handle_callback (cname: STRING; event: STRING) deferred end diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index edde597d..71bc87d0 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -67,14 +67,14 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING - handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL) + handle_callback (event: STRING; cname: STRING) do if equal (cname, control_name) then else across controls as c loop - c.item.handle_callback (event, cname, page) + c.item.handle_callback (event, cname) end end end diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index acbc2e54..dd454754 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -52,7 +52,7 @@ feature if attached {JSON_OBJECT} json_parser.parse_json as sp then control.load_state (sp) end - control.handle_callback (control_name, event, Current) + control.handle_callback (control_name, event) create new_states.make control.read_state (new_states) response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>) diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 9af033fa..15e0b8a5 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -41,16 +41,16 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING - set_change_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]) + set_change_event (e: attached like change_event) do change_event := e end - handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL) + handle_callback (cname: STRING; event: STRING) do if Current.control_name.is_equal (cname) and attached change_event as cevent then if event.is_equal ("change") then - cevent.call ([page]) + cevent.call ([]) end end end @@ -71,6 +71,6 @@ feature text: STRING - change_event: detachable PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]] + change_event: detachable PROCEDURE [ANY, TUPLE []] end From 275cc7aa215f201d190b502fe41a438c915af36f Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Wed, 28 Aug 2013 22:59:24 +0200 Subject: [PATCH 021/191] Add comments Use Precursor --- .../wsf_html/webcontrol/wsf_button_control.e | 3 +++ .../server/wsf_html/webcontrol/wsf_control.e | 19 +++++++++++-------- .../wsf_html/webcontrol/wsf_multi_control.e | 14 ++++++-------- .../wsf_html/webcontrol/wsf_page_control.e | 8 +++++++- .../wsf_html/webcontrol/wsf_text_control.e | 3 +++ 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index ffab2c78..98de6a2b 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -25,6 +25,7 @@ feature {NONE} feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT set_state (new_state: JSON_OBJECT) + -- Restore text from json do if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("text")) as new_text then text := new_text.unescaped_string_32 @@ -32,6 +33,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end state: JSON_OBJECT + -- Return state which contains the current text and if there is an event handle attached do create Result.make Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) @@ -41,6 +43,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING set_click_event (e: attached like click_event) + -- Set button click event handle do click_event := e end diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 380ce181..ab77f0ca 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -14,37 +14,40 @@ feature feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT load_state (new_states: JSON_OBJECT) - local - new_state: detachable JSON_VALUE + -- Select state stored with `control_name` as key do - new_state := new_states.item (create {JSON_STRING}.make_json (control_name)) - if attached {JSON_OBJECT} new_state as new_state_obj then + if attached {JSON_OBJECT} new_states.item (create {JSON_STRING}.make_json (control_name)) as new_state_obj then set_state (new_state_obj) end end + set_state (new_state: JSON_OBJECT) + -- Before we process the callback. We restore the state of control. + deferred + end + read_state (states: JSON_OBJECT) + -- Add a new entry in the `states` JSON object with the `control_name` as key and the `state` as value do states.put (state, create {JSON_STRING}.make_json (control_name)) end - set_state (new_state: JSON_OBJECT) - deferred - end - state: JSON_OBJECT + -- Returns the current state of the Control as JSON. This state will be transfered to the client. deferred end feature --EVENT HANDLING handle_callback (cname: STRING; event: STRING) + -- Method called if any callback recived. In this method you can route the callback to the event handler deferred end feature render: STRING + -- Return html representaion of control deferred end diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index 71bc87d0..2a508fbb 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -31,7 +31,9 @@ feature {NONE} feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT load_state (new_states: JSON_OBJECT) + -- Pass new_states to subcontrols do + Precursor(new_states) across controls as c loop @@ -44,8 +46,9 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end read_state (states: JSON_OBJECT) + -- Read states in subcontrols do - states.put (state, create {JSON_STRING}.make_json (control_name)) + Precursor(states) across controls as c loop @@ -54,20 +57,15 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end state: JSON_OBJECT - local - temp: JSON_OBJECT + --Read state do create Result.make - across - controls as c - loop - temp := c.item.state - end end feature --EVENT HANDLING handle_callback (event: STRING; cname: STRING) + -- Pass callback to subcontrols do if equal (cname, control_name) then else diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index dd454754..42fa3e5c 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -25,18 +25,22 @@ feature -- Access feature initialize_controls + -- Initalize all the controls, all the event handles must be set in this function. deferred ensure attached control end process + -- Function called on page load (not on callback) deferred end feature execute + -- Entry Point: If request is a callback, restore control states and execute handle then return new state json. + -- If request is not a callback. Run process and render the html page local event: detachable STRING control_name: detachable STRING @@ -64,6 +68,7 @@ feature end render + -- Render and send the HTML Page local data: STRING page: WSF_PAGE_RESPONSE @@ -87,12 +92,13 @@ feature end get_parameter (key: STRING): detachable STRING + -- Read query parameter as string local value: detachable WSF_VALUE do Result := VOID value := request.query_parameter (key) - if attached value then + if attached value and then value.is_string then Result := value.as_string.value end end diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 15e0b8a5..2a79b150 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -25,6 +25,7 @@ feature {NONE} feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT set_state (new_state: JSON_OBJECT) + -- Restore text from json do if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("text")) as new_text then text := new_text.unescaped_string_32 @@ -32,6 +33,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end state: JSON_OBJECT + -- Return state which contains the current text and if there is an event handle attached do create Result.make Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) @@ -42,6 +44,7 @@ feature --EVENT HANDLING set_change_event (e: attached like change_event) + -- Set text change event handle do change_event := e end From bc6b4f90c37f712f119de8d15d41d24a27f28da1 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 29 Aug 2013 18:31:57 +0200 Subject: [PATCH 022/191] Only send changes back to client --- examples/widgetapp/sample_page.e | 8 ++--- examples/widgetapp/widget.coffee | 9 ++++-- examples/widgetapp/widget.js | 11 +++++-- .../wsf_html/webcontrol/wsf_button_control.e | 17 ++++++---- .../server/wsf_html/webcontrol/wsf_control.e | 32 +++++++++++++++---- .../wsf_html/webcontrol/wsf_multi_control.e | 27 ++++++++++++---- .../wsf_html/webcontrol/wsf_page_control.e | 22 ++++++------- .../wsf_html/webcontrol/wsf_text_control.e | 20 ++++++------ 8 files changed, 96 insertions(+), 50 deletions(-) diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index 2b653222..7b83e559 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -24,10 +24,10 @@ feature local panel: WSF_MULTI_CONTROL do - create textbox1.make ("txtBox1", "1") - create textbox2.make ("txtBox2", "2") - create button1.make ("sample_button1", "SUM") - create textbox_result.make ("txtBox3", "") + 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) diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 14cd922e..1332d862 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -7,7 +7,6 @@ trigger_callback = (control_name,event)-> cache: no .done (new_states)-> #Update all classes - window.states = new_states for name,state of new_states controls[name]?.update(state) return @@ -35,7 +34,9 @@ class WSF_BUTTON_CONTROL extends WSF_CONTROL trigger_callback(@control_name, 'click') update: (state) -> - @$el.text(state.text) + if state.text? + window.states[@control_name]['text'] = state.text + @$el.text(state.text) class WSF_TEXT_CONTROL extends WSF_CONTROL attach_events: ()-> @@ -49,7 +50,9 @@ class WSF_TEXT_CONTROL extends WSF_CONTROL trigger_callback(@control_name, 'change') update: (state) -> - @$el.val(state.text) + if state.text? + window.states[@control_name]['text'] = state.text + @$el.val(state.text) #map class name to effectiv class typemap = diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index bdd91905..2ea34ceb 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -14,7 +14,6 @@ cache: false }).done(function(new_states) { var name, state, _ref; - window.states = new_states; for (name in new_states) { state = new_states[name]; if ((_ref = controls[name]) != null) { @@ -66,7 +65,10 @@ }; WSF_BUTTON_CONTROL.prototype.update = function(state) { - return this.$el.text(state.text); + if (state.text != null) { + window.states[this.control_name]['text'] = state.text; + return this.$el.text(state.text); + } }; return WSF_BUTTON_CONTROL; @@ -97,7 +99,10 @@ }; WSF_TEXT_CONTROL.prototype.update = function(state) { - return this.$el.val(state.text); + if (state.text != null) { + window.states[this.control_name]['text'] = state.text; + return this.$el.val(state.text); + } }; return WSF_TEXT_CONTROL; diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 98de6a2b..a5ef003e 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -12,20 +12,20 @@ inherit WSF_CONTROL create - make + make_button feature {NONE} - make (n: STRING; v: STRING) + make_button (n: STRING; v: STRING) do - control_name := n + make (n) text := v end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT set_state (new_state: JSON_OBJECT) - -- Restore text from json + -- Restore text from json do if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("text")) as new_text then text := new_text.unescaped_string_32 @@ -33,7 +33,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end state: JSON_OBJECT - -- Return state which contains the current text and if there is an event handle attached + -- Return state which contains the current text and if there is an event handle attached do create Result.make Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) @@ -43,7 +43,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING set_click_event (e: attached like click_event) - -- Set button click event handle + -- Set button click event handle do click_event := e end @@ -64,7 +64,10 @@ feature set_text (t: STRING) do - text := t + if not t.is_equal (text) then + text := t + state_changes.replace (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + end end feature diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index ab77f0ca..a8796679 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -11,10 +11,20 @@ feature control_name: STRING +feature {NONE} + + make (n: STRING) + do + control_name := n + create state_changes.make + ensure + attached state_changes + end + feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT load_state (new_states: JSON_OBJECT) - -- Select state stored with `control_name` as key + -- Select state stored with `control_name` as key do if attached {JSON_OBJECT} new_states.item (create {JSON_STRING}.make_json (control_name)) as new_state_obj then set_state (new_state_obj) @@ -22,32 +32,42 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end set_state (new_state: JSON_OBJECT) - -- Before we process the callback. We restore the state of control. + -- Before we process the callback. We restore the state of control. deferred end read_state (states: JSON_OBJECT) - -- Add a new entry in the `states` JSON object with the `control_name` as key and the `state` as value + -- Add a new entry in the `states` JSON object with the `control_name` as key and the `state` as value do states.put (state, create {JSON_STRING}.make_json (control_name)) end + read_state_changes (states: JSON_OBJECT) + -- Add a new entry in the `states_changes` JSON object with the `control_name` as key and the `state` as value + do + if state_changes.count > 0 then + states.put (state_changes, create {JSON_STRING}.make_json (control_name)) + end + end + state: JSON_OBJECT - -- Returns the current state of the Control as JSON. This state will be transfered to the client. + -- Returns the current state of the Control as JSON. This state will be transfered to the client. deferred end + state_changes: JSON_OBJECT + feature --EVENT HANDLING handle_callback (cname: STRING; event: STRING) - -- Method called if any callback recived. In this method you can route the callback to the event handler + -- Method called if any callback recived. In this method you can route the callback to the event handler deferred end feature render: STRING - -- Return html representaion of control + -- Return html representaion of control deferred end diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index 2a508fbb..6a44db0f 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -11,7 +11,9 @@ inherit WSF_CONTROL redefine + make, read_state, + read_state_changes, load_state end @@ -24,16 +26,16 @@ feature {NONE} make (n: STRING) do - control_name := n + Precursor (n) controls := create {LINKED_LIST [WSF_CONTROL]}.make; end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT load_state (new_states: JSON_OBJECT) - -- Pass new_states to subcontrols + -- Pass new_states to subcontrols do - Precursor(new_states) + Precursor (new_states) across controls as c loop @@ -46,9 +48,9 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end read_state (states: JSON_OBJECT) - -- Read states in subcontrols + -- Read states in subcontrols do - Precursor(states) + Precursor (states) across controls as c loop @@ -56,8 +58,19 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end end + read_state_changes (states: JSON_OBJECT) + -- Read states_changes in subcontrols + do + Precursor (states) + across + controls as c + loop + c.item.read_state_changes (states) + end + end + state: JSON_OBJECT - --Read state + --Read state do create Result.make end @@ -65,7 +78,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING handle_callback (event: STRING; cname: STRING) - -- Pass callback to subcontrols + -- Pass callback to subcontrols do if equal (cname, control_name) then else diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 42fa3e5c..a0d9ca51 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -25,27 +25,27 @@ feature -- Access feature initialize_controls - -- Initalize all the controls, all the event handles must be set in this function. + -- Initalize all the controls, all the event handles must be set in this function. deferred ensure attached control end process - -- Function called on page load (not on callback) + -- Function called on page load (not on callback) deferred end feature execute - -- Entry Point: If request is a callback, restore control states and execute handle then return new state json. - -- If request is not a callback. Run process and render the html page + -- Entry Point: If request is a callback, restore control states and execute handle then return new state json. + -- If request is not a callback. Run process and render the html page local event: detachable STRING control_name: detachable STRING states: detachable STRING - new_states: JSON_OBJECT + states_changes: JSON_OBJECT json_parser: JSON_PARSER do control_name := get_parameter ("control_name") @@ -57,10 +57,10 @@ feature control.load_state (sp) end control.handle_callback (control_name, event) - create new_states.make - control.read_state (new_states) + create states_changes.make + control.read_state_changes (states_changes) response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>) - response.put_string (new_states.representation) + response.put_string (states_changes.representation) else process render @@ -68,7 +68,7 @@ feature end render - -- Render and send the HTML Page + -- Render and send the HTML Page local data: STRING page: WSF_PAGE_RESPONSE @@ -92,13 +92,13 @@ feature end get_parameter (key: STRING): detachable STRING - -- Read query parameter as string + -- Read query parameter as string local value: detachable WSF_VALUE do Result := VOID value := request.query_parameter (key) - if attached value and then value.is_string then + if attached value and then value.is_string then Result := value.as_string.value end end diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 2a79b150..1f9029ab 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -12,20 +12,20 @@ inherit WSF_CONTROL create - make + make_text feature {NONE} - make (n: STRING; v: STRING) + make_text (n: STRING; v: STRING) do - control_name := n + make (n) text := v end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT set_state (new_state: JSON_OBJECT) - -- Restore text from json + -- Restore text from json do if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("text")) as new_text then text := new_text.unescaped_string_32 @@ -33,7 +33,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT end state: JSON_OBJECT - -- Return state which contains the current text and if there is an event handle attached + -- Return state which contains the current text and if there is an event handle attached do create Result.make Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) @@ -42,9 +42,8 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING - - set_change_event (e: attached like change_event) - -- Set text change event handle + set_change_event (e: attached like change_event) + -- Set text change event handle do change_event := e end @@ -67,7 +66,10 @@ feature set_text (t: STRING) do - text := t + if not t.is_equal (text) then + text := t + state_changes.replace (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + end end feature From 16c89180d26fc01156bc994464034450e68e2787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Mon, 2 Sep 2013 03:44:30 +0200 Subject: [PATCH 023/191] Added generalized input control similiar to text --- examples/widgetapp/widget.coffee | 2 +- .../server/wsf_html/webcontrol/wsf_button_control.e | 4 ++-- .../server/wsf_html/webcontrol/wsf_multi_control.e | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 1332d862..5b288b79 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -54,7 +54,7 @@ class WSF_TEXT_CONTROL extends WSF_CONTROL window.states[@control_name]['text'] = state.text @$el.val(state.text) -#map class name to effectiv class +#map class name to effective class typemap = "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL "WSF_TEXT_CONTROL":WSF_TEXT_CONTROL diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index a5ef003e..7ef5bd1a 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -16,10 +16,10 @@ create feature {NONE} - make_button (n: STRING; v: STRING) + make_button (n: STRING; t: STRING) do make (n) - text := v + text := t end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index 6a44db0f..a7c7029b 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -30,6 +30,13 @@ feature {NONE} controls := create {LINKED_LIST [WSF_CONTROL]}.make; end + make_with_controls (n: STRING; c: LINKED_LIST [WSF_CONTROL]) + do + control_name := n + controls := c + create state_changes.make + end + feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT load_state (new_states: JSON_OBJECT) @@ -45,6 +52,11 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT set_state (new_state: JSON_OBJECT) do + across + controls as c + loop + c.item.set_state (new_state) + end end read_state (states: JSON_OBJECT) From 1c08439c1aa7190b8bff5c9b722c6bb456ca9dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Mon, 2 Sep 2013 20:25:59 +0200 Subject: [PATCH 024/191] forgot to add new files --- .../wsf_html/webcontrol/wsf_form_control.e | 20 +++++ .../webcontrol/wsf_form_element_control.e | 21 +++++ .../wsf_html/webcontrol/wsf_input_control.e | 84 +++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 library/server/wsf_html/webcontrol/wsf_form_control.e create mode 100644 library/server/wsf_html/webcontrol/wsf_form_element_control.e create mode 100644 library/server/wsf_html/webcontrol/wsf_input_control.e diff --git a/library/server/wsf_html/webcontrol/wsf_form_control.e b/library/server/wsf_html/webcontrol/wsf_form_control.e new file mode 100644 index 00000000..04d87df4 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_form_control.e @@ -0,0 +1,20 @@ +note + description: "Summary description for {WSF_FORM_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_FORM_CONTROL + +inherit + + WSF_MULTI_CONTROL + +create + make, make_with_controls + +feature {NONE} + + +end diff --git a/library/server/wsf_html/webcontrol/wsf_form_element_control.e b/library/server/wsf_html/webcontrol/wsf_form_element_control.e new file mode 100644 index 00000000..2c741216 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -0,0 +1,21 @@ +note + description: "Summary description for {WSF_FORM_ELEMENT_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + WSF_FORM_ELEMENT_CONTROL +inherit + WSF_CONTROL + +feature + + is_valid(value: STRING):BOOLEAN + do + + end + + validate: detachable FUNCTION[ANY, TUPLE[STRING], BOOLEAN] + +end diff --git a/library/server/wsf_html/webcontrol/wsf_input_control.e b/library/server/wsf_html/webcontrol/wsf_input_control.e new file mode 100644 index 00000000..9eccdb10 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_input_control.e @@ -0,0 +1,84 @@ +note + description: "Summary description for {WSF_INPUT_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_INPUT_CONTROL + +inherit + + WSF_CONTROL + +create + make_input + +feature {NONE} + + make_input (n, t, v: STRING) + do + make (n) + type := t + value := v + end + +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT + + set_state (new_state: JSON_OBJECT) + -- Restore value from json + do + if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("value")) as new_value then + value := new_value.unescaped_string_32 + end + end + + state: JSON_OBJECT + -- Return state which contains the current value and if there is an event handle attached + do + create Result.make + Result.put (create {JSON_STRING}.make_json (value), create {JSON_STRING}.make_json ("value")) + Result.put (create {JSON_BOOLEAN}.make_boolean (attached change_event), create {JSON_STRING}.make_json ("callback_change")) + end + +feature --EVENT HANDLING + + set_change_event (e: attached like change_event) + -- Set input change event handle + do + change_event := e + end + + handle_callback (cname: STRING; event: STRING) + do + if Current.control_name.is_equal (cname) and attached change_event as cevent then + if event.is_equal ("change") then + cevent.call ([]) + end + end + end + +feature + + render: STRING + do + Result := "" + end + + set_value (v: STRING) + do + if not v.is_equal (value) then + value := v + state_changes.replace (create {JSON_STRING}.make_json (value), create {JSON_STRING}.make_json ("value")) + end + end + +feature + + type: STRING + + value: STRING + + change_event: detachable PROCEDURE [ANY, TUPLE []] + +end From 3b2ad80dc35b55beffa3d7397fc09a1b89e58a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Tue, 3 Sep 2013 03:53:01 +0200 Subject: [PATCH 025/191] Added TextArea --- examples/widgetapp/widget.coffee | 17 ++++++++++++++ examples/widgetapp/widget.js | 39 ++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 5b288b79..fc334f39 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -54,10 +54,27 @@ class WSF_TEXT_CONTROL extends WSF_CONTROL window.states[@control_name]['text'] = state.text @$el.val(state.text) +class WSF_TEXTAREA_CONTROL extends WSF_CONTROL + attach_events: () -> + self = @ + @$el.change () -> + self.change() + + change: () -> + window.states[@control_name]['text'] = @$el.val() + if window.states[@control_name]['callback_change'] + trigger_callback(@control_name, 'change') + + update: (state) -> + if state.text? + window.states[@control_name]['text'] = state.text + $el.val(state.text) + #map class name to effective class typemap = "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL "WSF_TEXT_CONTROL":WSF_TEXT_CONTROL + "WSF_TEXTAREA_CONTROL":WSF_TEXTAREA_CONTROL #create a js class for each control for name,state of window.states diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index 2ea34ceb..b27e13ef 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.6.1 (function() { - var $el, WSF_BUTTON_CONTROL, WSF_CONTROL, WSF_TEXT_CONTROL, controls, name, state, trigger_callback, type, typemap, _ref, + var $el, WSF_BUTTON_CONTROL, WSF_CONTROL, WSF_TEXTAREA_CONTROL, WSF_TEXT_CONTROL, controls, name, state, trigger_callback, type, typemap, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -109,9 +109,44 @@ })(WSF_CONTROL); + WSF_TEXTAREA_CONTROL = (function(_super) { + + __extends(WSF_TEXTAREA_CONTROL, _super); + + function WSF_TEXTAREA_CONTROL() { + return WSF_TEXTAREA_CONTROL.__super__.constructor.apply(this, arguments); + } + + WSF_TEXTAREA_CONTROL.prototype.attach_events = function() { + var self; + self = this; + return this.$el.change(function() { + return self.change(); + }); + }; + + WSF_TEXTAREA_CONTROL.prototype.change = function() { + window.states[this.control_name]['text'] = this.$el.val(); + if (window.states[this.control_name]['callback_change']) { + return trigger_callback(this.control_name, 'change'); + } + }; + + WSF_TEXTAREA_CONTROL.prototype.update = function(state) { + if (state.text != null) { + window.states[this.control_name]['text'] = state.text; + return $el.val(state.text); + } + }; + + return WSF_TEXTAREA_CONTROL; + + })(WSF_CONTROL); + typemap = { "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL, - "WSF_TEXT_CONTROL": WSF_TEXT_CONTROL + "WSF_TEXT_CONTROL": WSF_TEXT_CONTROL, + "WSF_TEXTAREA_CONTROL": WSF_TEXTAREA_CONTROL }; _ref = window.states; From ae9952a941c5828e7dcfc6995f9fd277ee038b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Tue, 3 Sep 2013 03:54:33 +0200 Subject: [PATCH 026/191] Added class for TextArea --- .../webcontrol/wsf_textarea_control.e | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 library/server/wsf_html/webcontrol/wsf_textarea_control.e diff --git a/library/server/wsf_html/webcontrol/wsf_textarea_control.e b/library/server/wsf_html/webcontrol/wsf_textarea_control.e new file mode 100644 index 00000000..f859fff9 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_textarea_control.e @@ -0,0 +1,81 @@ +note + description: "Summary description for {WSF_TEXT_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_TEXTAREA_CONTROL + +inherit + + WSF_CONTROL + +create + make_textarea + +feature {NONE} + + make_textarea (n, t: STRING) + do + make (n) + text := t + end + +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT + + set_state (new_state: JSON_OBJECT) + -- Restore text from json + do + if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("text")) as new_text then + text := new_text.unescaped_string_32 + end + end + + state: JSON_OBJECT + -- Return state which contains the current text and if there is an event handle attached + do + create Result.make + Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + Result.put (create {JSON_BOOLEAN}.make_boolean (attached change_event), create {JSON_STRING}.make_json ("callback_change")) + end + +feature --EVENT HANDLING + + set_change_event (e: attached like change_event) + -- Set text change event handle + do + change_event := e + end + + handle_callback (cname: STRING; event: STRING) + do + if Current.control_name.is_equal (cname) and attached change_event as cevent then + if event.is_equal ("change") then + cevent.call ([]) + end + end + end + +feature + + render: STRING + do + Result := "" + end + + set_text (t: STRING) + do + if not t.is_equal (text) then + text := t + state_changes.replace (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) + end + end + +feature + + text: STRING + + change_event: detachable PROCEDURE [ANY, TUPLE []] + +end From 633243311dd745aeb1cbc44b513a91250ae90672 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 5 Sep 2013 14:48:19 +0200 Subject: [PATCH 027/191] Change wsf control --- library/server/wsf_html/webcontrol/wsf_button_control.e | 2 +- library/server/wsf_html/webcontrol/wsf_control.e | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 7ef5bd1a..1dcb968a 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -59,7 +59,7 @@ feature render: STRING do - Result := "" + Result := "" end set_text (t: STRING) diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index a8796679..0ae82d73 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -11,11 +11,17 @@ feature control_name: STRING + tag_name: STRING + + css_class: LINKED_LIST[STRING] + feature {NONE} - make (n: STRING) + make (n,a_tag_name: STRING) do control_name := n + tag_name := a_tag_name + create css_class.make create state_changes.make ensure attached state_changes From 811d087d7482e739ac26bbd5119ec8a7a67c3b18 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 5 Sep 2013 14:55:52 +0200 Subject: [PATCH 028/191] Generate tag --- library/server/wsf_html/webcontrol/wsf_control.e | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 0ae82d73..4411407d 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -71,7 +71,16 @@ feature --EVENT HANDLING end feature - + render_tag(body,attributes:STRING):STRING + do + Result:="<"+tag_name+" data-name=%"" + control_name + "%" data-type=%""+generator+"%" "+attributes + if not body.is_empty then + Result:= Result + " />" + else + Result:= Result + " >" + body + "" + end + end + render: STRING -- Return html representaion of control deferred From f866c067cb73631db4346935352f1010de1239e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 5 Sep 2013 15:08:02 +0200 Subject: [PATCH 029/191] Changed creation procedures --- .../wsf_html/webcontrol/wsf_button_control.e | 2 +- .../server/wsf_html/webcontrol/wsf_control.e | 1 + .../wsf_html/webcontrol/wsf_form_control.e | 7 +- .../wsf_html/webcontrol/wsf_input_control.e | 84 ------------------- .../wsf_html/webcontrol/wsf_multi_control.e | 15 +--- .../wsf_html/webcontrol/wsf_text_control.e | 2 +- .../webcontrol/wsf_textarea_control.e | 63 +------------- 7 files changed, 15 insertions(+), 159 deletions(-) delete mode 100644 library/server/wsf_html/webcontrol/wsf_input_control.e diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 1dcb968a..9da1feb1 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -18,7 +18,7 @@ feature {NONE} make_button (n: STRING; t: STRING) do - make (n) + make (n, "button") text := t end diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 0ae82d73..aaf3570a 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -25,6 +25,7 @@ feature {NONE} create state_changes.make ensure attached state_changes + attached css_class end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT diff --git a/library/server/wsf_html/webcontrol/wsf_form_control.e b/library/server/wsf_html/webcontrol/wsf_form_control.e index 04d87df4..8dbd3e8d 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_control.e @@ -12,9 +12,14 @@ inherit WSF_MULTI_CONTROL create - make, make_with_controls + make_form_control feature {NONE} + make_form_control (n: STRING) + do + make_multi_control (n) + tag_name := "form" + end end diff --git a/library/server/wsf_html/webcontrol/wsf_input_control.e b/library/server/wsf_html/webcontrol/wsf_input_control.e deleted file mode 100644 index 9eccdb10..00000000 --- a/library/server/wsf_html/webcontrol/wsf_input_control.e +++ /dev/null @@ -1,84 +0,0 @@ -note - description: "Summary description for {WSF_INPUT_CONTROL}." - author: "" - date: "$Date$" - revision: "$Revision$" - -class - WSF_INPUT_CONTROL - -inherit - - WSF_CONTROL - -create - make_input - -feature {NONE} - - make_input (n, t, v: STRING) - do - make (n) - type := t - value := v - end - -feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT - - set_state (new_state: JSON_OBJECT) - -- Restore value from json - do - if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("value")) as new_value then - value := new_value.unescaped_string_32 - end - end - - state: JSON_OBJECT - -- Return state which contains the current value and if there is an event handle attached - do - create Result.make - Result.put (create {JSON_STRING}.make_json (value), create {JSON_STRING}.make_json ("value")) - Result.put (create {JSON_BOOLEAN}.make_boolean (attached change_event), create {JSON_STRING}.make_json ("callback_change")) - end - -feature --EVENT HANDLING - - set_change_event (e: attached like change_event) - -- Set input change event handle - do - change_event := e - end - - handle_callback (cname: STRING; event: STRING) - do - if Current.control_name.is_equal (cname) and attached change_event as cevent then - if event.is_equal ("change") then - cevent.call ([]) - end - end - end - -feature - - render: STRING - do - Result := "" - end - - set_value (v: STRING) - do - if not v.is_equal (value) then - value := v - state_changes.replace (create {JSON_STRING}.make_json (value), create {JSON_STRING}.make_json ("value")) - end - end - -feature - - type: STRING - - value: STRING - - change_event: detachable PROCEDURE [ANY, TUPLE []] - -end diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index a7c7029b..ae3bbae2 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -11,32 +11,23 @@ inherit WSF_CONTROL redefine - make, read_state, read_state_changes, load_state end create - make - + make_multi_control feature {NONE} controls: LINKED_LIST [WSF_CONTROL] - make (n: STRING) + make_multi_control (n: STRING) do - Precursor (n) + make (n, "div") controls := create {LINKED_LIST [WSF_CONTROL]}.make; end - make_with_controls (n: STRING; c: LINKED_LIST [WSF_CONTROL]) - do - control_name := n - controls := c - create state_changes.make - end - feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT load_state (new_states: JSON_OBJECT) diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 1f9029ab..73f2b3f4 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -18,7 +18,7 @@ feature {NONE} make_text (n: STRING; v: STRING) do - make (n) + make (n, "input") text := v end diff --git a/library/server/wsf_html/webcontrol/wsf_textarea_control.e b/library/server/wsf_html/webcontrol/wsf_textarea_control.e index f859fff9..d552bd41 100644 --- a/library/server/wsf_html/webcontrol/wsf_textarea_control.e +++ b/library/server/wsf_html/webcontrol/wsf_textarea_control.e @@ -9,7 +9,7 @@ class inherit - WSF_CONTROL + WSF_TEXT_CONTROL create make_textarea @@ -18,64 +18,7 @@ feature {NONE} make_textarea (n, t: STRING) do - make (n) - text := t + make_text (n, t) + tag_name := "textarea" end - -feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT - - set_state (new_state: JSON_OBJECT) - -- Restore text from json - do - if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("text")) as new_text then - text := new_text.unescaped_string_32 - end - end - - state: JSON_OBJECT - -- Return state which contains the current text and if there is an event handle attached - do - create Result.make - Result.put (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) - Result.put (create {JSON_BOOLEAN}.make_boolean (attached change_event), create {JSON_STRING}.make_json ("callback_change")) - end - -feature --EVENT HANDLING - - set_change_event (e: attached like change_event) - -- Set text change event handle - do - change_event := e - end - - handle_callback (cname: STRING; event: STRING) - do - if Current.control_name.is_equal (cname) and attached change_event as cevent then - if event.is_equal ("change") then - cevent.call ([]) - end - end - end - -feature - - render: STRING - do - Result := "" - end - - set_text (t: STRING) - do - if not t.is_equal (text) then - text := t - state_changes.replace (create {JSON_STRING}.make_json (text), create {JSON_STRING}.make_json ("text")) - end - end - -feature - - text: STRING - - change_event: detachable PROCEDURE [ANY, TUPLE []] - end From 422b73058c27114a9d6424b6fdbe16a1fcb22fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 5 Sep 2013 15:12:22 +0200 Subject: [PATCH 030/191] Adapted rendering of multi control --- library/server/wsf_html/webcontrol/wsf_control.e | 15 ++++++++------- .../wsf_html/webcontrol/wsf_multi_control.e | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 92b3ca62..b4b2c791 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -13,11 +13,11 @@ feature tag_name: STRING - css_class: LINKED_LIST[STRING] + css_class: LINKED_LIST [STRING] feature {NONE} - make (n,a_tag_name: STRING) + make (n, a_tag_name: STRING) do control_name := n tag_name := a_tag_name @@ -72,16 +72,17 @@ feature --EVENT HANDLING end feature - render_tag(body,attributes:STRING):STRING + + render_tag (body, attributes: STRING): STRING do - Result:="<"+tag_name+" data-name=%"" + control_name + "%" data-type=%""+generator+"%" "+attributes + Result := "<" + tag_name + " data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attributes if not body.is_empty then - Result:= Result + " />" + Result := Result + " />" else - Result:= Result + " >" + body + "" + Result := Result + " >" + body + "" end end - + render: STRING -- Return html representaion of control deferred diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index ae3bbae2..d82611cc 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -103,6 +103,7 @@ feature loop Result := c.item.render + Result end + Result := render_tag (Result, "") end add_control (c: WSF_CONTROL) From fa35c22d2d75a1460217a846c9b2eaf7346e6ec3 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 5 Sep 2013 15:33:56 +0200 Subject: [PATCH 031/191] Use render tag --- .../wsf_html/webcontrol/wsf_button_control.e | 2 +- library/server/wsf_html/webcontrol/wsf_control.e | 15 +++++++++++++-- .../server/wsf_html/webcontrol/wsf_text_control.e | 2 +- .../wsf_html/webcontrol/wsf_textarea_control.e | 10 ++++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 9da1feb1..a1f4958a 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -59,7 +59,7 @@ feature render: STRING do - Result := "" + Result := render_tag ( text, "") end set_text (t: STRING) diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 92b3ca62..5099764e 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -73,15 +73,26 @@ feature --EVENT HANDLING feature render_tag(body,attributes:STRING):STRING + local + css_class_string: STRING do - Result:="<"+tag_name+" data-name=%"" + control_name + "%" data-type=%""+generator+"%" "+attributes + css_class_string := "" + across + css_class as c + loop + css_class_string := css_class_string + " " + c.item + end + if not css_class_string.is_empty then + css_class_string := " class=%"" + css_class_string + "%"" + end + Result:="<"+tag_name+" data-name=%"" + control_name + "%" data-type=%""+generator+"%" "+attributes+css_class_string if not body.is_empty then Result:= Result + " />" else Result:= Result + " >" + body + "" end end - + render: STRING -- Return html representaion of control deferred diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 73f2b3f4..12bd1668 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -61,7 +61,7 @@ feature render: STRING do - Result := "" + Result :=render_tag("","value=%"" + text + "%"") end set_text (t: STRING) diff --git a/library/server/wsf_html/webcontrol/wsf_textarea_control.e b/library/server/wsf_html/webcontrol/wsf_textarea_control.e index d552bd41..1ee25a96 100644 --- a/library/server/wsf_html/webcontrol/wsf_textarea_control.e +++ b/library/server/wsf_html/webcontrol/wsf_textarea_control.e @@ -10,6 +10,9 @@ class inherit WSF_TEXT_CONTROL + redefine + render + end create make_textarea @@ -21,4 +24,11 @@ feature {NONE} make_text (n, t) tag_name := "textarea" end +feature + + render: STRING + do + Result :=render_tag(text,"") + end + end From ee0400463f2b9d7526040be7753cdf01a1d26c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 5 Sep 2013 15:37:59 +0200 Subject: [PATCH 032/191] Began with implementation of form handling --- .../wsf_html/webcontrol/wsf_form_control.e | 4 +++ .../webcontrol/wsf_form_element_control.e | 27 ++++++++++++++----- .../wsf_html/webcontrol/wsf_text_control.e | 11 ++++++-- .../wsf_html/webcontrol/wsf_validator.e | 16 +++++++++++ .../wsf_html/webcontrol/wsf_value_control.e | 16 +++++++++++ 5 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/wsf_validator.e create mode 100644 library/server/wsf_html/webcontrol/wsf_value_control.e diff --git a/library/server/wsf_html/webcontrol/wsf_form_control.e b/library/server/wsf_html/webcontrol/wsf_form_control.e index 8dbd3e8d..7008b2ff 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_control.e @@ -22,4 +22,8 @@ feature {NONE} tag_name := "form" end +feature + + + end 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 2c741216..45fb8380 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -4,18 +4,31 @@ note date: "$Date$" revision: "$Revision$" -deferred class - WSF_FORM_ELEMENT_CONTROL +class + WSF_FORM_ELEMENT_CONTROL [G] + inherit + WSF_CONTROL feature - is_valid(value: STRING):BOOLEAN - do - - end + is_valid (value: G): BOOLEAN + do + if attached validate as v then + Result := v.item ([value]) + else + Result := True + end + end - validate: detachable FUNCTION[ANY, TUPLE[STRING], BOOLEAN] + +feature + + value_control: WSF_VALUE_CONTROL[G] + + validate: detachable FUNCTION [ANY, TUPLE [G], BOOLEAN] + + end diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 73f2b3f4..63dc34a3 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -11,6 +11,8 @@ inherit WSF_CONTROL + WSF_VALUE_CONTROL [STRING] + create make_text @@ -57,11 +59,11 @@ feature --EVENT HANDLING end end -feature +feature -- Implementation render: STRING do - Result := "" + Result := render_tag ("", "value=%"" + text + "%"") end set_text (t: STRING) @@ -72,6 +74,11 @@ feature end end + value: STRING + do + Result := text + end + feature text: STRING diff --git a/library/server/wsf_html/webcontrol/wsf_validator.e b/library/server/wsf_html/webcontrol/wsf_validator.e new file mode 100644 index 00000000..f7988814 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_validator.e @@ -0,0 +1,16 @@ +note + description: "Summary description for {WSF_VALIDATOR}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_VALIDATOR + +create + make + +feature {NONE} + + +end diff --git a/library/server/wsf_html/webcontrol/wsf_value_control.e b/library/server/wsf_html/webcontrol/wsf_value_control.e new file mode 100644 index 00000000..31e6cb99 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_value_control.e @@ -0,0 +1,16 @@ +note + description: "Summary description for {WSF_VALUE_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + WSF_VALUE_CONTROL [G] + +feature + + value: G + deferred + end + +end From deaeaa434ded472f791846038232eb8a746c6189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 5 Sep 2013 16:25:44 +0200 Subject: [PATCH 033/191] Implemented WSF_FORM_ELEMENT_CONTROL --- .../server/wsf_html/webcontrol/wsf_control.e | 29 +++++---- .../webcontrol/wsf_form_element_control.e | 61 ++++++++++++++++--- .../wsf_html/webcontrol/wsf_multi_control.e | 4 +- .../wsf_html/webcontrol/wsf_validator.e | 14 +++-- .../wsf_html/webcontrol/wsf_value_control.e | 4 ++ 5 files changed, 85 insertions(+), 27 deletions(-) diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 47af1c05..16efe48d 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -13,7 +13,7 @@ feature tag_name: STRING - css_class: LINKED_LIST [STRING] + css_classes: LINKED_LIST [STRING] feature {NONE} @@ -21,11 +21,11 @@ feature {NONE} do control_name := n tag_name := a_tag_name - create css_class.make + create css_classes.make create state_changes.make ensure attached state_changes - attached css_class + attached css_classes end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT @@ -73,20 +73,25 @@ feature --EVENT HANDLING feature - render_tag(body,attributes:STRING):STRING - local - css_class_string: STRING + add_class (c: STRING) do - css_class_string := "" + css_classes.extend (c) + end + + render_tag (body, attributes: STRING): STRING + local + css_classes_string: STRING + do + css_classes_string := "" across - css_class as c + css_classes as c loop - css_class_string := css_class_string + " " + c.item + css_classes_string := css_classes_string + " " + c.item end - if not css_class_string.is_empty then - css_class_string := " class=%"" + css_class_string + "%"" + if not css_classes_string.is_empty then + css_classes_string := " class=%"" + css_classes_string + "%"" end - Result:="<"+tag_name+" data-name=%"" + control_name + "%" data-type=%""+generator+"%" "+attributes+css_class_string + Result := "<" + tag_name + " data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attributes + css_classes_string if not body.is_empty then Result := Result + " />" else 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 45fb8380..7f0d376a 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -11,24 +11,71 @@ inherit WSF_CONTROL +create + make_form_element + +feature {NONE} + + make_form_element (n: STRING; c: WSF_VALUE_CONTROL [G]; v: LINKED_LIST [WSF_VALIDATOR [G]]) + do + make (n, "div") + add_class ("form-group") + value_control := c + validators := v + label := "" + error := "" + end + feature is_valid (value: G): BOOLEAN do - if attached validate as v then - Result := v.item ([value]) - else - Result := True + Result := True + across + validators as c + loop end end +feature --Implementation + + set_state (new_state: JSON_OBJECT) + do + value_control.set_state (new_state) + end + + state: JSON_OBJECT + do + Result := value_control.state + end + + handle_callback (cname, event: STRING_8) + do + value_control.handle_callback (cname, event) + end + + render: STRING + local + body:STRING + do + body := "" + if not label.is_empty then + body := "" + end + body := body + "
" + body := body + value_control.render + body := body + "
" + Result := render_tag (body, "") + end feature - value_control: WSF_VALUE_CONTROL[G] + value_control: WSF_VALUE_CONTROL [G] - validate: detachable FUNCTION [ANY, TUPLE [G], BOOLEAN] + validators: LINKED_LIST [WSF_VALIDATOR [G]] - + label: STRING + + error: STRING end diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index d82611cc..9bdd5c24 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -80,7 +80,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature --EVENT HANDLING - handle_callback (event: STRING; cname: STRING) + handle_callback (cname: STRING; event: STRING) -- Pass callback to subcontrols do if equal (cname, control_name) then @@ -88,7 +88,7 @@ feature --EVENT HANDLING across controls as c loop - c.item.handle_callback (event, cname) + c.item.handle_callback (cname, event) end end end diff --git a/library/server/wsf_html/webcontrol/wsf_validator.e b/library/server/wsf_html/webcontrol/wsf_validator.e index f7988814..dd29be01 100644 --- a/library/server/wsf_html/webcontrol/wsf_validator.e +++ b/library/server/wsf_html/webcontrol/wsf_validator.e @@ -4,13 +4,15 @@ note date: "$Date$" revision: "$Revision$" -class - WSF_VALIDATOR +deferred class + WSF_VALIDATOR [G] -create - make +feature -feature {NONE} - + validate (input: G): BOOLEAN + deferred + end + + error: STRING end diff --git a/library/server/wsf_html/webcontrol/wsf_value_control.e b/library/server/wsf_html/webcontrol/wsf_value_control.e index 31e6cb99..12f664f0 100644 --- a/library/server/wsf_html/webcontrol/wsf_value_control.e +++ b/library/server/wsf_html/webcontrol/wsf_value_control.e @@ -7,6 +7,10 @@ note deferred class WSF_VALUE_CONTROL [G] +inherit + + WSF_CONTROL + feature value: G From fb345c5f0c52f1618333c5f5cea0b63d2fa27d05 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 5 Sep 2013 16:27:55 +0200 Subject: [PATCH 034/191] Add bootstrap --- library/server/wsf_html/webcontrol/wsf_page_control.e | 1 + 1 file changed, 1 insertion(+) diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index a0d9ca51..1c21c4f3 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -84,6 +84,7 @@ feature data.append (";") data.append ("") data.append ("") + data.append ("") data.append ("") create page.make page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>) From 7bdafbd21ee1e26064448da3098880817782880a Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 5 Sep 2013 16:51:37 +0200 Subject: [PATCH 035/191] 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 + "" 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 From f52f6512a0f871c363306d09efbf29ea5b647d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 5 Sep 2013 16:51:51 +0200 Subject: [PATCH 036/191] Restructured validators, fixed form element rendering --- .../validators/wsf_phone_number_validator.e | 21 +++++++++++++++++++ .../webcontrol/wsf_form_element_control.e | 5 +++-- .../wsf_html/webcontrol/wsf_validator.e | 7 +++++++ library/server/wsf_html/wsf_html-safe.ecf | 7 ++++++- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e diff --git a/library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e new file mode 100644 index 00000000..5b7374e8 --- /dev/null +++ b/library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e @@ -0,0 +1,21 @@ +note + description: "Summary description for {WSF_PHONE_NUMBER_VALIDATOR}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_PHONE_NUMBER_VALIDATOR +inherit + WSF_VALIDATOR[STRING] +create + make + +feature -- Implementation + + validate(input:STRING):BOOLEAN + do + + end + +end 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..593a735a 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -20,6 +20,7 @@ feature {NONE} do make (n, "div") add_class ("form-group") + c.add_class ("form-control") value_control := c validators := v label := "" @@ -56,11 +57,11 @@ feature --Implementation render: STRING local - body:STRING + body: STRING do body := "" if not label.is_empty then - body := "" + body := "" end body := body + "
" body := body + value_control.render diff --git a/library/server/wsf_html/webcontrol/wsf_validator.e b/library/server/wsf_html/webcontrol/wsf_validator.e index dd29be01..58415781 100644 --- a/library/server/wsf_html/webcontrol/wsf_validator.e +++ b/library/server/wsf_html/webcontrol/wsf_validator.e @@ -7,6 +7,13 @@ note deferred class WSF_VALIDATOR [G] +feature {NONE} + + make (e: STRING) + do + error := e + end + feature validate (input: G): BOOLEAN diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf index e5aaeeb4..bb8c3577 100644 --- a/library/server/wsf_html/wsf_html-safe.ecf +++ b/library/server/wsf_html/wsf_html-safe.ecf @@ -11,6 +11,9 @@ + + + @@ -18,7 +21,9 @@ - + + + From ad15ab13c545d4ef14b9e4c1c8d0f017ced235f8 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 5 Sep 2013 16:51:37 +0200 Subject: [PATCH 037/191] 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 + "" 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 593a735a..f18f4678 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -12,18 +12,27 @@ 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") c.add_class ("form-control") value_control := c validators := v - label := "" + label := a_label error := "" end From f506d9e92559663551db645425a6430f7a63d76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 5 Sep 2013 17:16:56 +0200 Subject: [PATCH 038/191] Implemented WSF_CHECKBOX_CONTROL, added id attribute to rendering of WSF_CONTROL --- .../wsf_html/webcontrol/wsf_button_control.e | 2 +- .../webcontrol/wsf_checkbox_control.e | 83 +++++++++++++++++++ .../server/wsf_html/webcontrol/wsf_control.e | 2 +- .../webcontrol/wsf_form_element_control.e | 9 +- .../wsf_html/webcontrol/wsf_text_control.e | 4 +- .../webcontrol/wsf_textarea_control.e | 5 +- 6 files changed, 93 insertions(+), 12 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/wsf_checkbox_control.e diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index a1f4958a..2e9a901d 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -59,7 +59,7 @@ feature render: STRING do - Result := render_tag ( text, "") + Result := render_tag (text, "") end set_text (t: STRING) diff --git a/library/server/wsf_html/webcontrol/wsf_checkbox_control.e b/library/server/wsf_html/webcontrol/wsf_checkbox_control.e new file mode 100644 index 00000000..91c67778 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_checkbox_control.e @@ -0,0 +1,83 @@ +note + description: "Summary description for {WSF_CHECKBOX_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_CHECKBOX_CONTROL +inherit + WSF_VALUE_CONTROL[BOOLEAN] +create + make_checkbox + +feature {NONE} + + make_checkbox (n: STRING; l: STRING) + do + make (n, "input") + label := l + end + +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT + + set_state (new_state: JSON_OBJECT) + -- Restore text from json + do + if attached {JSON_BOOLEAN} new_state.item (create {JSON_STRING}.make_json ("checked")) as new_checked then + checked := new_checked.item + end + end + + state: JSON_OBJECT + -- Return state which contains the current text and if there is an event handle attached + do + create Result.make + Result.put (create {JSON_BOOLEAN}.make_boolean (checked), create {JSON_STRING}.make_json ("checked")) + Result.put (create {JSON_BOOLEAN}.make_boolean (attached change_event), create {JSON_STRING}.make_json ("callback_change")) + end + +feature --EVENT HANDLING + + set_change_event (e: attached like change_event) + -- Set text change event handle + do + change_event := e + end + + handle_callback (cname: STRING; event: STRING) + do + if Current.control_name.is_equal (cname) and attached change_event as cevent then + if event.is_equal ("change") then + cevent.call ([]) + end + end + end + +feature -- Implementation + + render: STRING + local + attributes: STRING + do + attributes := "type=%"checkbox%"" + if checked then + attributes := attributes + " checked" + end + Result := render_tag ("", attributes) + end + + value: BOOLEAN + do + Result := checked + end + +feature + + label: STRING + + checked: BOOLEAN + + change_event: detachable PROCEDURE [ANY, TUPLE []] + +end diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index d9afa4cb..253fc87c 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -91,7 +91,7 @@ feature if not css_classes_string.is_empty then css_classes_string := " class=%"" + css_classes_string + "%"" end - Result := "<" + tag_name + " data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attributes + css_classes_string + Result := "<" + tag_name + " id=%"" + control_name + "%" data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attributes + css_classes_string if body.is_empty then Result := Result + " />" else 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 f18f4678..ea1bc5a9 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -12,22 +12,21 @@ inherit WSF_CONTROL create - make_form_element, - make_form_element_with_validators + make_form_element, make_form_element_with_validators feature {NONE} - make_form_element (a_label:STRING; c: WSF_VALUE_CONTROL [G]) + make_form_element (a_label: STRING; c: WSF_VALUE_CONTROL [G]) local a_validators: LINKED_LIST [WSF_VALIDATOR [G]] do create a_validators.make - make_form_element_with_validators(a_label,c,a_validators) + 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") + make (c.control_name + "_container", "div") add_class ("form-group") c.add_class ("form-control") value_control := c diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e index 63dc34a3..3a03340f 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_text_control.e @@ -9,8 +9,6 @@ class inherit - WSF_CONTROL - WSF_VALUE_CONTROL [STRING] create @@ -63,7 +61,7 @@ feature -- Implementation render: STRING do - Result := render_tag ("", "value=%"" + text + "%"") + Result := render_tag ("", "type=%"text%" value=%"" + text + "%"") end set_text (t: STRING) diff --git a/library/server/wsf_html/webcontrol/wsf_textarea_control.e b/library/server/wsf_html/webcontrol/wsf_textarea_control.e index 1ee25a96..c447e73b 100644 --- a/library/server/wsf_html/webcontrol/wsf_textarea_control.e +++ b/library/server/wsf_html/webcontrol/wsf_textarea_control.e @@ -22,13 +22,14 @@ feature {NONE} make_textarea (n, t: STRING) do make_text (n, t) - tag_name := "textarea" + tag_name := "textarea" end + feature render: STRING do - Result :=render_tag(text,"") + Result := render_tag (text, "") end end From 225f82120645d8dd5343b07a6be3a55bd54bf9b7 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 5 Sep 2013 17:18:46 +0200 Subject: [PATCH 039/191] Test the new controls --- examples/widgetapp/sample_page.e | 8 ++++---- examples/widgetapp/widget.coffee | 3 ++- examples/widgetapp/widget.js | 3 ++- .../server/wsf_html/webcontrol/wsf_control.e | 2 +- .../webcontrol/wsf_form_element_control.e | 18 +++++++++++++----- .../wsf_html/webcontrol/wsf_page_control.e | 3 ++- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index dc8ea289..513cbe84 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -27,13 +27,13 @@ feature 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", "") + create textbox_result.make_textarea ("txtBox3", "") button1.set_click_event (agent handle_click) 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 (create {WSF_FORM_ELEMENT_CONTROL[STRING]}.make_form_element("Number2",textbox2)) form.add_control (button1) - form.add_control (textbox_result) + form.add_control (create {WSF_FORM_ELEMENT_CONTROL[STRING]}.make_form_element("Result",textbox_result)) control := form end @@ -52,6 +52,6 @@ feature textbox2: WSF_TEXT_CONTROL - textbox_result: WSF_TEXT_CONTROL + textbox_result: WSF_TEXTAREA_CONTROL end diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index fc334f39..cfa7045a 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -27,7 +27,8 @@ controls = {} class WSF_BUTTON_CONTROL extends WSF_CONTROL attach_events: ()-> self = @ - @$el.click ()-> + @$el.click (e)-> + e.preventDefault() self.click() click: ()-> if window.states[@control_name]['callback_click'] diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index b27e13ef..ffea70e7 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -53,7 +53,8 @@ WSF_BUTTON_CONTROL.prototype.attach_events = function() { var self; self = this; - return this.$el.click(function() { + return this.$el.click(function(e) { + e.preventDefault(); return self.click(); }); }; diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index d9afa4cb..d6fd106f 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 body.is_empty then + if body.is_empty and not tag_name.is_equal("textarea") then Result := Result + " />" else Result := Result + " >" + body + "" 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 f18f4678..edf35709 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -12,22 +12,21 @@ inherit WSF_CONTROL create - make_form_element, - make_form_element_with_validators + make_form_element, make_form_element_with_validators feature {NONE} - make_form_element (a_label:STRING; c: WSF_VALUE_CONTROL [G]) + make_form_element (a_label: STRING; c: WSF_VALUE_CONTROL [G]) local a_validators: LINKED_LIST [WSF_VALIDATOR [G]] do create a_validators.make - make_form_element_with_validators(a_label,c,a_validators) + 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") + make (c.control_name + "_container", "div") add_class ("form-group") c.add_class ("form-control") value_control := c @@ -64,6 +63,15 @@ feature --Implementation value_control.handle_callback (cname, event) end + read_state_changes (states: JSON_OBJECT) + -- Add a new entry in the `states_changes` JSON object with the `control_name` as key and the `state` as value + do + if state_changes.count > 0 then + states.put (state_changes, create {JSON_STRING}.make_json (control_name)) + end + value_control.read_state_changes (states) + end + render: STRING local body: STRING diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 1c21c4f3..615118b9 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -77,6 +77,8 @@ feature create states.make control.read_state (states) data := "" + data.append ("") + data.append ("") data.append (control.render) data.append ("") data.append ("") data.append ("") - data.append ("") data.append ("") create page.make page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>) From 0c265f4f78190498dcd3cc38459eadbef6bffc17 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Thu, 5 Sep 2013 17:43:46 +0200 Subject: [PATCH 040/191] Fix form and textarea bug --- examples/widgetapp/widget.coffee | 2 +- examples/widgetapp/widget.js | 2 +- .../webcontrol/wsf_form_element_control.e | 50 +++++++++++++------ 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index cfa7045a..50323004 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -69,7 +69,7 @@ class WSF_TEXTAREA_CONTROL extends WSF_CONTROL update: (state) -> if state.text? window.states[@control_name]['text'] = state.text - $el.val(state.text) + @$el.val(state.text) #map class name to effective class typemap = diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index ffea70e7..45a9abca 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -136,7 +136,7 @@ WSF_TEXTAREA_CONTROL.prototype.update = function(state) { if (state.text != null) { window.states[this.control_name]['text'] = state.text; - return $el.val(state.text); + return this.$el.val(state.text); } }; 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 d350aaa0..d057cc56 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -11,7 +11,7 @@ inherit WSF_CONTROL redefine - read_state_changes + read_state_changes,load_state,read_state end create @@ -48,33 +48,53 @@ feature loop end end +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT -feature --Implementation + load_state (new_states: JSON_OBJECT) + -- Pass new_states to subcontrols + do + Precursor (new_states) + value_control.load_state (new_states) + end set_state (new_state: JSON_OBJECT) do - value_control.set_state (new_state) + value_control.set_state(new_state) end - state: JSON_OBJECT + read_state (states: JSON_OBJECT) + -- Read states in subcontrols do - Result := value_control.state - end - - handle_callback (cname, event: STRING_8) - do - value_control.handle_callback (cname, event) + Precursor (states) + value_control.read_state(states) end read_state_changes (states: JSON_OBJECT) - -- Add a new entry in the `states_changes` JSON object with the `control_name` as key and the `state` as value + -- Read states_changes in subcontrols do - if state_changes.count > 0 then - states.put (state_changes, create {JSON_STRING}.make_json (control_name)) - end - value_control.read_state_changes (states) + Precursor (states) + value_control.read_state_changes(states) end + state: JSON_OBJECT + --Read state + do + create Result.make + end + +feature --EVENT HANDLING + + handle_callback (cname: STRING; event: STRING) + -- Pass callback to subcontrols + do + if equal (cname, control_name) then + else + value_control.handle_callback (cname, event) + end + end +feature --Implementation + + render: STRING local body: STRING From aba394502c1bac61f9e188fab36506c46ae0baa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 5 Sep 2013 22:09:08 +0200 Subject: [PATCH 041/191] Added Regexp validation (later used for mail, numbers...) --- .../validators/wsf_phone_number_validator.e | 17 ++++---- .../validators/wsf_regexp_validator.e | 40 +++++++++++++++++++ .../{ => validators}/wsf_validator.e | 0 library/server/wsf_html/wsf_html-safe.ecf | 4 +- 4 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e rename library/server/wsf_html/webcontrol/{ => validators}/wsf_validator.e (100%) diff --git a/library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e index 5b7374e8..d9020b00 100644 --- a/library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e +++ b/library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e @@ -6,16 +6,19 @@ note class WSF_PHONE_NUMBER_VALIDATOR + inherit - WSF_VALIDATOR[STRING] + + WSF_REGEXP_VALIDATOR + create - make + make_with_message -feature -- Implementation +feature {NONE} - validate(input:STRING):BOOLEAN - do - - end + make_with_message (e: STRING) + do + make_regexp_validator ("", e) + end end diff --git a/library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e new file mode 100644 index 00000000..8e20b710 --- /dev/null +++ b/library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e @@ -0,0 +1,40 @@ +note + description: "Summary description for {WSF_REGEXP_VALIDATOR}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_REGEXP_VALIDATOR + +inherit + + WSF_VALIDATOR [STRING] + +create + make_regexp_validator + +feature {NONE} + + make_regexp_validator (r, e: STRING) + do + make(e) + regexp_string := r + create regexp + regexp.compile (r) + end + +feature -- Implementation + + validate (input: STRING): BOOLEAN + do + Result := regexp.matches (input) + end + +feature + + regexp_string: STRING + + regexp: REGULAR_EXPRESSION + +end diff --git a/library/server/wsf_html/webcontrol/wsf_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_validator.e similarity index 100% rename from library/server/wsf_html/webcontrol/wsf_validator.e rename to library/server/wsf_html/webcontrol/validators/wsf_validator.e diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf index bb8c3577..f3ae7f4e 100644 --- a/library/server/wsf_html/wsf_html-safe.ecf +++ b/library/server/wsf_html/wsf_html-safe.ecf @@ -11,11 +11,9 @@ - - - + From c67a7f4982909a874fa3a8918b732a949273fd6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 5 Sep 2013 22:57:56 +0200 Subject: [PATCH 042/191] Added validators for decimals and mails --- .../validators/wsf_decimal_validator.e | 24 +++++++++++++++++++ .../validators/wsf_email_validator.e | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e create mode 100644 library/server/wsf_html/webcontrol/validators/wsf_email_validator.e diff --git a/library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e new file mode 100644 index 00000000..f7fd7f6d --- /dev/null +++ b/library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e @@ -0,0 +1,24 @@ +note + description: "Summary description for {WSF_DECIMAL_VALIDATOR}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_DECIMAL_VALIDATOR + +inherit + + WSF_REGEXP_VALIDATOR + +create + make_decimal_validator + +feature {NONE} + + make_decimal_validator (e: STRING) + do + make_regexp_validator ("[0-9]+(\\.[0-9]*)?|\\.[0-9]+", e) + end + +end diff --git a/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e new file mode 100644 index 00000000..a9578e12 --- /dev/null +++ b/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e @@ -0,0 +1,24 @@ +note + description: "Summary description for {WSF_EMAIL_VALIDATOR}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_EMAIL_VALIDATOR + +inherit + + WSF_REGEXP_VALIDATOR + +create + make_email_validator + +feature + + make_email_validator (e: STRING) + do + make_regexp_validator ("^[a-zA-Z0-9._%%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,6}$", e) + end + +end From 59a12dcac1bc404782f5a6d23d249720192d2666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Fri, 6 Sep 2013 01:20:41 +0200 Subject: [PATCH 043/191] Added checkbox list, modified form validation --- examples/widgetapp/widget.coffee | 1 + .../validators/wsf_email_validator.e | 2 +- .../webcontrol/wsf_checkbox_control.e | 5 +++- .../webcontrol/wsf_checkbox_list_control.e | 24 +++++++++++++++++++ .../wsf_html/webcontrol/wsf_form_control.e | 22 ++++++++++++++--- .../webcontrol/wsf_form_element_control.e | 7 +++++- .../wsf_html/webcontrol/wsf_multi_control.e | 9 +++---- 7 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index fc334f39..af353f20 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -75,6 +75,7 @@ typemap = "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL "WSF_TEXT_CONTROL":WSF_TEXT_CONTROL "WSF_TEXTAREA_CONTROL":WSF_TEXTAREA_CONTROL + "WSF_FORM_CONTROL":WSF_FORM_CONTROL #create a js class for each control for name,state of window.states diff --git a/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e index a9578e12..68ff9360 100644 --- a/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e +++ b/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e @@ -14,7 +14,7 @@ inherit create make_email_validator -feature +feature{NONE} make_email_validator (e: STRING) do diff --git a/library/server/wsf_html/webcontrol/wsf_checkbox_control.e b/library/server/wsf_html/webcontrol/wsf_checkbox_control.e index 91c67778..bf40d944 100644 --- a/library/server/wsf_html/webcontrol/wsf_checkbox_control.e +++ b/library/server/wsf_html/webcontrol/wsf_checkbox_control.e @@ -6,8 +6,11 @@ note class WSF_CHECKBOX_CONTROL + inherit - WSF_VALUE_CONTROL[BOOLEAN] + + WSF_VALUE_CONTROL [BOOLEAN] + create make_checkbox diff --git a/library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e b/library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e new file mode 100644 index 00000000..9f9bd8e8 --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e @@ -0,0 +1,24 @@ +note + description: "Summary description for {WSF_CHECKBOX_LIST_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_CHECKBOX_LIST_CONTROL + +inherit + + WSF_MULTI_CONTROL[WSF_CHECKBOX_CONTROL] + +create + make_checkbox_list_control + +feature {NONE} + + make_checkbox_list_control (n: STRING) + do + make_multi_control (n) + end + +end diff --git a/library/server/wsf_html/webcontrol/wsf_form_control.e b/library/server/wsf_html/webcontrol/wsf_form_control.e index 7008b2ff..dec7fa21 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_control.e @@ -9,7 +9,7 @@ class inherit - WSF_MULTI_CONTROL + WSF_MULTI_CONTROL [WSF_CONTROL] create make_form_control @@ -22,8 +22,24 @@ feature {NONE} tag_name := "form" end -feature +feature -- Validation - + validate: BOOLEAN + do + Result := True + across + controls as c + until + Result = False + loop + -- TODO: Change generic parameter of elm from ANY to if something like that is available in Eiffel. + -- Otherwise, check separately for STRING, LIST... + if attached {WSF_FORM_ELEMENT_CONTROL[ANY]} c.item as elem then + if not elem.is_valid then + Result := False + end + end + end + end end 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 ea1bc5a9..52184072 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -37,12 +37,17 @@ feature {NONE} feature - is_valid (value: G): BOOLEAN + is_valid (): BOOLEAN do Result := True across validators as c + until + not Result loop + if not c.item.validate (value_control.value) then + Result := False + end end end diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index 9bdd5c24..20521e12 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -5,7 +5,7 @@ note revision: "$Revision$" class - WSF_MULTI_CONTROL + WSF_MULTI_CONTROL[G -> WSF_CONTROL] inherit @@ -18,14 +18,15 @@ inherit create make_multi_control + feature {NONE} - controls: LINKED_LIST [WSF_CONTROL] + controls: LINKED_LIST [G] make_multi_control (n: STRING) do make (n, "div") - controls := create {LINKED_LIST [WSF_CONTROL]}.make; + controls := create {LINKED_LIST [G]}.make; end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT @@ -106,7 +107,7 @@ feature Result := render_tag (Result, "") end - add_control (c: WSF_CONTROL) + add_control (c: G) do controls.put_front (c) end From 9f40c6355c4aa399038ea865c0411110f78c6acb Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Fri, 6 Sep 2013 14:22:23 +0200 Subject: [PATCH 044/191] First working checkbox list --- examples/widgetapp/sample_page.e | 17 +++++++- examples/widgetapp/widget.coffee | 18 ++++++++- examples/widgetapp/widget.js | 39 ++++++++++++++++++- .../webcontrol/wsf_checkbox_control.e | 7 +++- .../webcontrol/wsf_checkbox_list_control.e | 26 ++++++++++++- .../server/wsf_html/webcontrol/wsf_control.e | 19 ++++++--- .../webcontrol/wsf_form_element_control.e | 5 ++- 7 files changed, 117 insertions(+), 14 deletions(-) diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index 513cbe84..a4040ada 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -30,16 +30,29 @@ feature create textbox_result.make_textarea ("txtBox3", "") button1.set_click_event (agent handle_click) create form.make_form_control ("panel") + form.add_class ("form-horizontal") + 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("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("Number2",textbox2)) + form.add_control (create {WSF_FORM_ELEMENT_CONTROL[LIST[STRING]]}.make_form_element("Categories",cklist)) form.add_control (button1) form.add_control (create {WSF_FORM_ELEMENT_CONTROL[STRING]}.make_form_element("Result",textbox_result)) control := form end handle_click + local + text:STRING do - textbox_result.set_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 + cklist.value as s + loop + text.append ("%N-"+s.item) + end + textbox_result.set_text (text) end process @@ -52,6 +65,8 @@ feature textbox2: WSF_TEXT_CONTROL + cklist: WSF_CHECKBOX_LIST_CONTROL + textbox_result: WSF_TEXTAREA_CONTROL end diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 06d0b65c..9ca48ee9 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -71,12 +71,28 @@ class WSF_TEXTAREA_CONTROL extends WSF_CONTROL window.states[@control_name]['text'] = state.text @$el.val(state.text) +class WSF_CHECKBOX_CONTROL extends WSF_CONTROL + attach_events: ()-> + self = @ + @$el.change ()-> + self.change() + change: ()-> + #update local state + window.states[@control_name]['checked'] = @$el.is(':checked') + if window.states[@control_name]['callback_change'] + trigger_callback(@control_name, 'change') + + update: (state) -> + if state.text? + window.states[@control_name]['checked'] = state.checked + @$el.prop('checked',state.checked) + #map class name to effective class typemap = "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL "WSF_TEXT_CONTROL":WSF_TEXT_CONTROL "WSF_TEXTAREA_CONTROL":WSF_TEXTAREA_CONTROL - "WSF_FORM_CONTROL":WSF_FORM_CONTROL + "WSF_CHECKBOX_CONTROL":WSF_CHECKBOX_CONTROL #create a js class for each control for name,state of window.states diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index 45a9abca..9cda85af 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.6.1 (function() { - var $el, WSF_BUTTON_CONTROL, WSF_CONTROL, WSF_TEXTAREA_CONTROL, WSF_TEXT_CONTROL, controls, name, state, trigger_callback, type, typemap, _ref, + var $el, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CONTROL, WSF_TEXTAREA_CONTROL, WSF_TEXT_CONTROL, controls, name, state, trigger_callback, type, typemap, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -144,10 +144,45 @@ })(WSF_CONTROL); + WSF_CHECKBOX_CONTROL = (function(_super) { + + __extends(WSF_CHECKBOX_CONTROL, _super); + + function WSF_CHECKBOX_CONTROL() { + return WSF_CHECKBOX_CONTROL.__super__.constructor.apply(this, arguments); + } + + WSF_CHECKBOX_CONTROL.prototype.attach_events = function() { + var self; + self = this; + return this.$el.change(function() { + return self.change(); + }); + }; + + WSF_CHECKBOX_CONTROL.prototype.change = function() { + window.states[this.control_name]['checked'] = this.$el.is(':checked'); + if (window.states[this.control_name]['callback_change']) { + return trigger_callback(this.control_name, 'change'); + } + }; + + WSF_CHECKBOX_CONTROL.prototype.update = function(state) { + if (state.text != null) { + window.states[this.control_name]['checked'] = state.checked; + return this.$el.prop('checked', state.checked); + } + }; + + return WSF_CHECKBOX_CONTROL; + + })(WSF_CONTROL); + typemap = { "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL, "WSF_TEXT_CONTROL": WSF_TEXT_CONTROL, - "WSF_TEXTAREA_CONTROL": WSF_TEXTAREA_CONTROL + "WSF_TEXTAREA_CONTROL": WSF_TEXTAREA_CONTROL, + "WSF_CHECKBOX_CONTROL": WSF_CHECKBOX_CONTROL }; _ref = window.states; diff --git a/library/server/wsf_html/webcontrol/wsf_checkbox_control.e b/library/server/wsf_html/webcontrol/wsf_checkbox_control.e index bf40d944..b1281ac2 100644 --- a/library/server/wsf_html/webcontrol/wsf_checkbox_control.e +++ b/library/server/wsf_html/webcontrol/wsf_checkbox_control.e @@ -16,10 +16,11 @@ create feature {NONE} - make_checkbox (n: STRING; l: STRING) + make_checkbox (n: STRING; l: STRING; c: STRING) do make (n, "input") label := l + checked_value := c end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT @@ -67,7 +68,7 @@ feature -- Implementation if checked then attributes := attributes + " checked" end - Result := render_tag ("", attributes) + Result := render_tag_with_tagname ("div",render_tag_with_tagname ("label", render_tag ("", attributes) + " " + label, "",""), "","checkbox") end value: BOOLEAN @@ -81,6 +82,8 @@ feature checked: BOOLEAN + checked_value: STRING + change_event: detachable PROCEDURE [ANY, TUPLE []] end diff --git a/library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e b/library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e index 9f9bd8e8..2c6cadd2 100644 --- a/library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e +++ b/library/server/wsf_html/webcontrol/wsf_checkbox_list_control.e @@ -9,7 +9,14 @@ class inherit - WSF_MULTI_CONTROL[WSF_CHECKBOX_CONTROL] + WSF_VALUE_CONTROL [LIST [STRING]] + undefine + load_state, + read_state, + read_state_changes + end + + WSF_MULTI_CONTROL [WSF_CHECKBOX_CONTROL] create make_checkbox_list_control @@ -21,4 +28,21 @@ feature {NONE} make_multi_control (n) end +feature + + value: LIST [STRING] + local + l: LINKED_LIST [STRING] + do + create l.make + across + controls as c + loop + if c.item.value then + l.extend (c.item.checked_value) + end + end + Result := l + end + end diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index daa55405..8a092305 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -88,15 +88,22 @@ feature loop css_classes_string := css_classes_string + " " + c.item end - if not css_classes_string.is_empty then - css_classes_string := " class=%"" + css_classes_string + "%"" - end + Result:=render_tag_with_tagname(tag_name,body,attributes,css_classes_string) + end - Result := "<" + tag_name + " id=%"" + control_name + "%" data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attributes + css_classes_string - if body.is_empty and not tag_name.is_equal("textarea") then + 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 := " 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 + "" + Result := Result + " >" + body + "" end end 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 90c15995..2550e79d 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -31,7 +31,10 @@ feature {NONE} do make (c.control_name + "_container", "div") add_class ("form-group") - c.add_class ("form-control") + if attached {WSF_TEXT_CONTROL}c or attached {WSF_TEXTAREA_CONTROL}c then + c.add_class ("form-control") + + end value_control := c validators := v label := a_label From bbd48d24e4a901db77f09fe2f39f044c687567fa Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Fri, 6 Sep 2013 18:06:43 +0200 Subject: [PATCH 045/191] Implement serverside and client side validatation --- examples/widgetapp/own_validator.e | 31 +++ examples/widgetapp/sample_page.e | 49 +++-- examples/widgetapp/widget.coffee | 102 +++++++++- examples/widgetapp/widget.js | 190 ++++++++++++++++-- .../validators/wsf_decimal_validator.e | 2 +- .../validators/wsf_email_validator.e | 2 +- .../validators/wsf_regexp_validator.e | 20 +- .../webcontrol/validators/wsf_validatable.e | 20 ++ .../webcontrol/validators/wsf_validator.e | 9 +- .../wsf_html/webcontrol/wsf_button_control.e | 2 + .../webcontrol/wsf_checkbox_control.e | 2 +- .../server/wsf_html/webcontrol/wsf_control.e | 6 +- .../wsf_html/webcontrol/wsf_form_control.e | 17 +- .../webcontrol/wsf_form_element_control.e | 81 ++++++-- ...wsf_text_control.e => wsf_input_control.e} | 11 +- .../wsf_html/webcontrol/wsf_multi_control.e | 2 +- .../wsf_html/webcontrol/wsf_page_control.e | 1 - .../webcontrol/wsf_password_control.e | 25 +++ .../webcontrol/wsf_textarea_control.e | 4 +- 19 files changed, 492 insertions(+), 84 deletions(-) create mode 100644 examples/widgetapp/own_validator.e create mode 100644 library/server/wsf_html/webcontrol/validators/wsf_validatable.e rename library/server/wsf_html/webcontrol/{wsf_text_control.e => wsf_input_control.e} (90%) create mode 100644 library/server/wsf_html/webcontrol/wsf_password_control.e diff --git a/examples/widgetapp/own_validator.e b/examples/widgetapp/own_validator.e new file mode 100644 index 00000000..1ba0395a --- /dev/null +++ b/examples/widgetapp/own_validator.e @@ -0,0 +1,31 @@ +note + description: "Summary description for {OWN_VALIDATOR}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + OWN_VALIDATOR + +inherit + + WSF_VALIDATOR [STRING] + +create + make_own + +feature {NONE} + + make_own + do + error := "Input to long" + end + +feature + + is_valid (input: STRING): BOOLEAN + do + Result := input.count < 5 + end + +end diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index a4040ada..f3452c73 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -23,36 +23,49 @@ feature initialize_controls local form: WSF_FORM_CONTROL + n1_container: WSF_FORM_ELEMENT_CONTROL [STRING] + n2_container: WSF_FORM_ELEMENT_CONTROL [STRING] do - create textbox1.make_text ("txtBox1", "1") - create textbox2.make_text ("txtBox2", "2") + create textbox1.make_input ("txtBox1", "1") + create textbox2.make_input ("txtBox2", "2") create button1.make_button ("sample_button1", "SUM") create textbox_result.make_textarea ("txtBox3", "") button1.set_click_event (agent handle_click) + button1.add_class ("col-lg-offset-2") create form.make_form_control ("panel") form.add_class ("form-horizontal") - 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("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("Number2",textbox2)) - form.add_control (create {WSF_FORM_ELEMENT_CONTROL[LIST[STRING]]}.make_form_element("Categories",cklist)) + 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 ("os", "Operating Systems", "os")) + create n1_container.make_form_element ("Number1", textbox1) + n1_container.add_validator (create {WSF_DECIMAL_VALIDATOR}.make_decimal_validator ("Invalid Number")) + n1_container.add_validator (create {OWN_VALIDATOR}.make_own) + create n2_container.make_form_element ("Number2", textbox2) + n2_container.add_validator (create {WSF_DECIMAL_VALIDATOR}.make_decimal_validator ("Invalid Number")) + form.add_control (n1_container) + form.add_control (n2_container) + form.add_control (create {WSF_FORM_ELEMENT_CONTROL [LIST [STRING]]}.make_form_element ("Categories", cklist)) 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 end handle_click local - text:STRING + text: STRING do - text := textbox1.text + " + " + textbox2.text + " = " + (textbox1.text.to_integer_16 + textbox2.text.to_integer_16).out - across - cklist.value as s - loop - text.append ("%N-"+s.item) + if attached {WSF_FORM_CONTROL} control as form then + form.validate + if form.is_valid then + text := textbox1.text + " + " + textbox2.text + " = " + (textbox1.text.to_integer_64 + textbox2.text.to_integer_64).out + across + cklist.value as s + loop + text.append ("%N-" + s.item) + end + textbox_result.set_text (text) + end end - textbox_result.set_text (text) end process @@ -61,9 +74,9 @@ feature button1: WSF_BUTTON_CONTROL - textbox1: WSF_TEXT_CONTROL + textbox1: WSF_INPUT_CONTROL - textbox2: WSF_TEXT_CONTROL + textbox2: WSF_INPUT_CONTROL cklist: WSF_CHECKBOX_LIST_CONTROL diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 9ca48ee9..814ace72 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -10,17 +10,53 @@ trigger_callback = (control_name,event)-> for name,state of new_states controls[name]?.update(state) return +class WSF_VALIDATOR + constructor: (@parent_control, @settings)-> + @error = @settings.error + return + + validate: ()-> + return true + +class WSF_REGEXP_VALIDATOR extends WSF_VALIDATOR + constructor: ()-> + super + @pattern = new RegExp(@settings.expression,'g') + + validate: ()-> + val = @parent_control.value() + res = val.match(@pattern) + return (res!=null) + +validatormap = + "WSF_REGEXP_VALIDATOR":WSF_REGEXP_VALIDATOR class WSF_CONTROL constructor: (@control_name, @$el)-> - @attach_events() return attach_events: ()-> return update: (state)-> - return + return + + #Simple event listener + on: (name, callback, context)-> + if not @_events? + @_events = {} + if not @_events[name]? + @_events[name] = [] + @_events[name].push({callback:callback,context:context}) + return @ + + trigger: (name)-> + if not @_events?[name]? + return @ + for ev in @_events[name] + ev.callback.call(ev.context) + return @ + controls = {} @@ -39,16 +75,21 @@ class WSF_BUTTON_CONTROL extends WSF_CONTROL window.states[@control_name]['text'] = state.text @$el.text(state.text) -class WSF_TEXT_CONTROL extends WSF_CONTROL +class WSF_INPUT_CONTROL extends WSF_CONTROL attach_events: ()-> self = @ @$el.change ()-> self.change() + change: ()-> #update local state window.states[@control_name]['text'] = @$el.val() if window.states[@control_name]['callback_change'] trigger_callback(@control_name, 'change') + @trigger('change') + + value:()-> + return @$el.val() update: (state) -> if state.text? @@ -65,6 +106,10 @@ class WSF_TEXTAREA_CONTROL extends WSF_CONTROL window.states[@control_name]['text'] = @$el.val() if window.states[@control_name]['callback_change'] trigger_callback(@control_name, 'change') + @trigger('change') + + value:()-> + return @$el.val() update: (state) -> if state.text? @@ -76,23 +121,70 @@ class WSF_CHECKBOX_CONTROL extends WSF_CONTROL self = @ @$el.change ()-> self.change() + change: ()-> #update local state window.states[@control_name]['checked'] = @$el.is(':checked') if window.states[@control_name]['callback_change'] trigger_callback(@control_name, 'change') + @trigger('change') + + value:()-> + return @$el.is(':checked') update: (state) -> if state.text? window.states[@control_name]['checked'] = state.checked @$el.prop('checked',state.checked) +class WSF_FORM_ELEMENT_CONTROL extends WSF_CONTROL + attach_events: ()-> + self = @ + @value_control = controls[window.states[@control_name]['value_control']] + if @value_control? + @value_control.on('change',@change,@) + @serverside_validator = false + @validators = [] + for validator in window.states[@control_name]['validators'] + if validatormap[validator.name]? + @validators.push new validatormap[validator.name](@,validator) + else + #Use serverside validator if no js implementation + @serverside_validator = true + return + + change: ()-> + for validator in @validators + if not validator.validate() + @showerror(validator.error) + return + @showerror("") + if @serverside_validator + trigger_callback(@control_name, 'validate') + return + + showerror: (message)-> + @$el.removeClass("has-error") + @$el.find(".validation").remove() + if message.length>0 + @$el.addClass("has-error") + errordiv = $("
").addClass('help-block').addClass('validation').text(message) + @$el.find(".col-lg-10").append(errordiv) + + update: (state) -> + if state.error? + @showerror(state.error) + + value: ()-> + @value_control.value() + #map class name to effective class typemap = "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL - "WSF_TEXT_CONTROL":WSF_TEXT_CONTROL + "WSF_INPUT_CONTROL":WSF_INPUT_CONTROL "WSF_TEXTAREA_CONTROL":WSF_TEXTAREA_CONTROL "WSF_CHECKBOX_CONTROL":WSF_CHECKBOX_CONTROL + "WSF_FORM_ELEMENT_CONTROL": WSF_FORM_ELEMENT_CONTROL #create a js class for each control for name,state of window.states @@ -103,4 +195,6 @@ for name,state of window.states #create class if type? and typemap[type]? controls[name]=new typemap[type](name,$el) +for name,state of window.states + controls[name]?.attach_events() diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index 9cda85af..4fca7c78 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.6.1 (function() { - var $el, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CONTROL, WSF_TEXTAREA_CONTROL, WSF_TEXT_CONTROL, controls, name, state, trigger_callback, type, typemap, _ref, + var $el, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CONTROL, WSF_FORM_ELEMENT_CONTROL, WSF_INPUT_CONTROL, WSF_REGEXP_VALIDATOR, WSF_TEXTAREA_CONTROL, WSF_VALIDATOR, controls, name, state, trigger_callback, type, typemap, validatormap, _ref, _ref1, _ref2, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -23,12 +23,52 @@ }); }; + WSF_VALIDATOR = (function() { + + function WSF_VALIDATOR(parent_control, settings) { + this.parent_control = parent_control; + this.settings = settings; + this.error = this.settings.error; + return; + } + + WSF_VALIDATOR.prototype.validate = function() { + return true; + }; + + return WSF_VALIDATOR; + + })(); + + WSF_REGEXP_VALIDATOR = (function(_super) { + + __extends(WSF_REGEXP_VALIDATOR, _super); + + function WSF_REGEXP_VALIDATOR() { + WSF_REGEXP_VALIDATOR.__super__.constructor.apply(this, arguments); + this.pattern = new RegExp(this.settings.expression, 'g'); + } + + WSF_REGEXP_VALIDATOR.prototype.validate = function() { + var res, val; + val = this.parent_control.value(); + res = val.match(this.pattern); + return res !== null; + }; + + return WSF_REGEXP_VALIDATOR; + + })(WSF_VALIDATOR); + + validatormap = { + "WSF_REGEXP_VALIDATOR": WSF_REGEXP_VALIDATOR + }; + WSF_CONTROL = (function() { function WSF_CONTROL(control_name, $el) { this.control_name = control_name; this.$el = $el; - this.attach_events(); return; } @@ -36,6 +76,33 @@ WSF_CONTROL.prototype.update = function(state) {}; + WSF_CONTROL.prototype.on = function(name, callback, context) { + if (this._events == null) { + this._events = {}; + } + if (this._events[name] == null) { + this._events[name] = []; + } + this._events[name].push({ + callback: callback, + context: context + }); + return this; + }; + + WSF_CONTROL.prototype.trigger = function(name) { + var ev, _i, _len, _ref, _ref1; + if (((_ref = this._events) != null ? _ref[name] : void 0) == null) { + return this; + } + _ref1 = this._events[name]; + for (_i = 0, _len = _ref1.length; _i < _len; _i++) { + ev = _ref1[_i]; + ev.callback.call(ev.context); + } + return this; + }; + return WSF_CONTROL; })(); @@ -76,15 +143,15 @@ })(WSF_CONTROL); - WSF_TEXT_CONTROL = (function(_super) { + WSF_INPUT_CONTROL = (function(_super) { - __extends(WSF_TEXT_CONTROL, _super); + __extends(WSF_INPUT_CONTROL, _super); - function WSF_TEXT_CONTROL() { - return WSF_TEXT_CONTROL.__super__.constructor.apply(this, arguments); + function WSF_INPUT_CONTROL() { + return WSF_INPUT_CONTROL.__super__.constructor.apply(this, arguments); } - WSF_TEXT_CONTROL.prototype.attach_events = function() { + WSF_INPUT_CONTROL.prototype.attach_events = function() { var self; self = this; return this.$el.change(function() { @@ -92,21 +159,26 @@ }); }; - WSF_TEXT_CONTROL.prototype.change = function() { + WSF_INPUT_CONTROL.prototype.change = function() { window.states[this.control_name]['text'] = this.$el.val(); if (window.states[this.control_name]['callback_change']) { - return trigger_callback(this.control_name, 'change'); + trigger_callback(this.control_name, 'change'); } + return this.trigger('change'); }; - WSF_TEXT_CONTROL.prototype.update = function(state) { + WSF_INPUT_CONTROL.prototype.value = function() { + return this.$el.val(); + }; + + WSF_INPUT_CONTROL.prototype.update = function(state) { if (state.text != null) { window.states[this.control_name]['text'] = state.text; return this.$el.val(state.text); } }; - return WSF_TEXT_CONTROL; + return WSF_INPUT_CONTROL; })(WSF_CONTROL); @@ -129,8 +201,13 @@ WSF_TEXTAREA_CONTROL.prototype.change = function() { window.states[this.control_name]['text'] = this.$el.val(); if (window.states[this.control_name]['callback_change']) { - return trigger_callback(this.control_name, 'change'); + trigger_callback(this.control_name, 'change'); } + return this.trigger('change'); + }; + + WSF_TEXTAREA_CONTROL.prototype.value = function() { + return this.$el.val(); }; WSF_TEXTAREA_CONTROL.prototype.update = function(state) { @@ -163,8 +240,13 @@ WSF_CHECKBOX_CONTROL.prototype.change = function() { window.states[this.control_name]['checked'] = this.$el.is(':checked'); if (window.states[this.control_name]['callback_change']) { - return trigger_callback(this.control_name, 'change'); + trigger_callback(this.control_name, 'change'); } + return this.trigger('change'); + }; + + WSF_CHECKBOX_CONTROL.prototype.value = function() { + return this.$el.is(':checked'); }; WSF_CHECKBOX_CONTROL.prototype.update = function(state) { @@ -178,11 +260,81 @@ })(WSF_CONTROL); + WSF_FORM_ELEMENT_CONTROL = (function(_super) { + + __extends(WSF_FORM_ELEMENT_CONTROL, _super); + + function WSF_FORM_ELEMENT_CONTROL() { + return WSF_FORM_ELEMENT_CONTROL.__super__.constructor.apply(this, arguments); + } + + WSF_FORM_ELEMENT_CONTROL.prototype.attach_events = function() { + var self, validator, _i, _len, _ref; + self = this; + this.value_control = controls[window.states[this.control_name]['value_control']]; + if (this.value_control != null) { + this.value_control.on('change', this.change, this); + } + this.serverside_validator = false; + this.validators = []; + _ref = window.states[this.control_name]['validators']; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + validator = _ref[_i]; + if (validatormap[validator.name] != null) { + this.validators.push(new validatormap[validator.name](this, validator)); + } else { + this.serverside_validator = true; + } + } + }; + + WSF_FORM_ELEMENT_CONTROL.prototype.change = function() { + var validator, _i, _len, _ref; + _ref = this.validators; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + validator = _ref[_i]; + if (!validator.validate()) { + this.showerror(validator.error); + return; + } + } + this.showerror(""); + if (this.serverside_validator) { + trigger_callback(this.control_name, 'validate'); + } + }; + + WSF_FORM_ELEMENT_CONTROL.prototype.showerror = function(message) { + var errordiv; + this.$el.removeClass("has-error"); + this.$el.find(".validation").remove(); + if (message.length > 0) { + this.$el.addClass("has-error"); + errordiv = $("
").addClass('help-block').addClass('validation').text(message); + return this.$el.find(".col-lg-10").append(errordiv); + } + }; + + WSF_FORM_ELEMENT_CONTROL.prototype.update = function(state) { + if (state.error != null) { + return this.showerror(state.error); + } + }; + + WSF_FORM_ELEMENT_CONTROL.prototype.value = function() { + return this.value_control.value(); + }; + + return WSF_FORM_ELEMENT_CONTROL; + + })(WSF_CONTROL); + typemap = { "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL, - "WSF_TEXT_CONTROL": WSF_TEXT_CONTROL, + "WSF_INPUT_CONTROL": WSF_INPUT_CONTROL, "WSF_TEXTAREA_CONTROL": WSF_TEXTAREA_CONTROL, - "WSF_CHECKBOX_CONTROL": WSF_CHECKBOX_CONTROL + "WSF_CHECKBOX_CONTROL": WSF_CHECKBOX_CONTROL, + "WSF_FORM_ELEMENT_CONTROL": WSF_FORM_ELEMENT_CONTROL }; _ref = window.states; @@ -195,4 +347,12 @@ } } + _ref1 = window.states; + for (name in _ref1) { + state = _ref1[name]; + if ((_ref2 = controls[name]) != null) { + _ref2.attach_events(); + } + } + }).call(this); diff --git a/library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e index f7fd7f6d..ad68866d 100644 --- a/library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e +++ b/library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e @@ -18,7 +18,7 @@ feature {NONE} make_decimal_validator (e: STRING) do - make_regexp_validator ("[0-9]+(\\.[0-9]*)?|\\.[0-9]+", e) + make_regexp_validator ("^[0-9]+(\.[0-9]*)?$|^\.[0-9]+$", e) end end diff --git a/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e index 68ff9360..552aead7 100644 --- a/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e +++ b/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e @@ -14,7 +14,7 @@ inherit create make_email_validator -feature{NONE} +feature {NONE} make_email_validator (e: STRING) do diff --git a/library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e index 8e20b710..5dcc6e7c 100644 --- a/library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e +++ b/library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e @@ -10,6 +10,9 @@ class inherit WSF_VALIDATOR [STRING] + redefine + state + end create make_regexp_validator @@ -18,21 +21,32 @@ feature {NONE} make_regexp_validator (r, e: STRING) do - make(e) + make (e) regexp_string := r create regexp - regexp.compile (r) end feature -- Implementation - validate (input: STRING): BOOLEAN + is_valid (input: STRING): BOOLEAN do + --Only compile when used + if not regexp.is_compiled then + regexp.compile (regexp_string) + end Result := regexp.matches (input) end feature + state: JSON_OBJECT + do + create Result.make + Result.put (create {JSON_STRING}.make_json ("WSF_REGEXP_VALIDATOR"), create {JSON_STRING}.make_json ("name")) + Result.put (create {JSON_STRING}.make_json (regexp_string), create {JSON_STRING}.make_json ("expression")) + Result.put (create {JSON_STRING}.make_json (error), create {JSON_STRING}.make_json ("error")) + end + regexp_string: STRING regexp: REGULAR_EXPRESSION diff --git a/library/server/wsf_html/webcontrol/validators/wsf_validatable.e b/library/server/wsf_html/webcontrol/validators/wsf_validatable.e new file mode 100644 index 00000000..4b7a60fa --- /dev/null +++ b/library/server/wsf_html/webcontrol/validators/wsf_validatable.e @@ -0,0 +1,20 @@ +note + description: "Summary description for {WSF_VALIDATABLE}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + WSF_VALIDATABLE + +feature + + validate + deferred + end + + is_valid: BOOLEAN + deferred + end + +end diff --git a/library/server/wsf_html/webcontrol/validators/wsf_validator.e b/library/server/wsf_html/webcontrol/validators/wsf_validator.e index 58415781..ad3f27bd 100644 --- a/library/server/wsf_html/webcontrol/validators/wsf_validator.e +++ b/library/server/wsf_html/webcontrol/validators/wsf_validator.e @@ -16,7 +16,14 @@ feature {NONE} feature - validate (input: G): BOOLEAN + state: JSON_OBJECT + do + create Result.make + Result.put (create {JSON_STRING}.make_json (generator), create {JSON_STRING}.make_json ("name")) + Result.put (create {JSON_STRING}.make_json (error), create {JSON_STRING}.make_json ("error")) + end + + is_valid (input: G): BOOLEAN deferred end diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e index 2e9a901d..cfd5ec05 100644 --- a/library/server/wsf_html/webcontrol/wsf_button_control.e +++ b/library/server/wsf_html/webcontrol/wsf_button_control.e @@ -19,6 +19,8 @@ feature {NONE} make_button (n: STRING; t: STRING) do make (n, "button") + add_class ("btn") + add_class ("btn-default") text := t end diff --git a/library/server/wsf_html/webcontrol/wsf_checkbox_control.e b/library/server/wsf_html/webcontrol/wsf_checkbox_control.e index b1281ac2..42233d74 100644 --- a/library/server/wsf_html/webcontrol/wsf_checkbox_control.e +++ b/library/server/wsf_html/webcontrol/wsf_checkbox_control.e @@ -68,7 +68,7 @@ feature -- Implementation if checked then attributes := attributes + " checked" end - Result := render_tag_with_tagname ("div",render_tag_with_tagname ("label", render_tag ("", attributes) + " " + label, "",""), "","checkbox") + Result := render_tag_with_tagname ("div", render_tag_with_tagname ("label", render_tag ("", attributes) + " " + label, "", ""), "", "checkbox") end value: BOOLEAN diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 8a092305..9032e940 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -88,14 +88,14 @@ feature loop css_classes_string := css_classes_string + " " + c.item 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 - 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 l_attributes: STRING do - l_attributes:=attributes + l_attributes := attributes if not css_classes_string.is_empty then l_attributes := " class=%"" + css_classes_string + "%"" end diff --git a/library/server/wsf_html/webcontrol/wsf_form_control.e b/library/server/wsf_html/webcontrol/wsf_form_control.e index dec7fa21..e4048080 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_control.e @@ -11,6 +11,8 @@ inherit WSF_MULTI_CONTROL [WSF_CONTROL] + WSF_VALIDATABLE + create make_form_control @@ -24,22 +26,23 @@ feature {NONE} feature -- Validation - validate: BOOLEAN + validate do - Result := True + is_valid := True across controls as c until - Result = False + is_valid = False loop - -- TODO: Change generic parameter of elm from ANY to if something like that is available in Eiffel. - -- Otherwise, check separately for STRING, LIST... - if attached {WSF_FORM_ELEMENT_CONTROL[ANY]} c.item as elem then + if attached {WSF_VALIDATABLE} c.item as elem then + elem.validate if not elem.is_valid then - Result := False + is_valid := False end end end end + is_valid: BOOLEAN + end 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 2550e79d..59ecfa99 100644 --- a/library/server/wsf_html/webcontrol/wsf_form_element_control.e +++ b/library/server/wsf_html/webcontrol/wsf_form_element_control.e @@ -11,9 +11,13 @@ inherit WSF_CONTROL redefine - read_state_changes,load_state,read_state + read_state_changes, + load_state, + read_state end + WSF_VALIDATABLE + create make_form_element, make_form_element_with_validators @@ -31,9 +35,8 @@ feature {NONE} do make (c.control_name + "_container", "div") add_class ("form-group") - if attached {WSF_TEXT_CONTROL}c or attached {WSF_TEXTAREA_CONTROL}c then + if attached {WSF_INPUT_CONTROL} c or attached {WSF_TEXTAREA_CONTROL} c then c.add_class ("form-control") - end value_control := c validators := v @@ -41,21 +44,6 @@ feature {NONE} error := "" end -feature - - is_valid (): BOOLEAN - do - Result := True - across - validators as c - until - not Result - loop - if not c.item.validate (value_control.value) then - Result := False - end - end - end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT load_state (new_states: JSON_OBJECT) @@ -67,27 +55,37 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT set_state (new_state: JSON_OBJECT) do - value_control.set_state(new_state) + value_control.set_state (new_state) end read_state (states: JSON_OBJECT) -- Read states in subcontrols do Precursor (states) - value_control.read_state(states) + value_control.read_state (states) end read_state_changes (states: JSON_OBJECT) -- Read states_changes in subcontrols do Precursor (states) - value_control.read_state_changes(states) + value_control.read_state_changes (states) end state: JSON_OBJECT --Read state + local + validator_description: JSON_ARRAY do create Result.make + create validator_description.make_array + across + validators as v + loop + validator_description.add (v.item.state) + end + Result.put (create {JSON_STRING}.make_json (value_control.control_name), create {JSON_STRING}.make_json ("value_control")) + Result.put (validator_description, create {JSON_STRING}.make_json ("validators")) end feature --EVENT HANDLING @@ -96,12 +94,15 @@ feature --EVENT HANDLING -- Pass callback to subcontrols do if equal (cname, control_name) then + if event.is_equal ("validate") then + validate + end else value_control.handle_callback (cname, event) end end -feature --Implementation +feature --Implementation render: STRING local @@ -117,6 +118,42 @@ feature --Implementation Result := render_tag (body, "") end +feature -- Validation + + add_validator (v: WSF_VALIDATOR [G]) + do + validators.extend (v) + end + + set_error (e: STRING) + do + error := e + state_changes.replace (create {JSON_STRING}.make_json (e), create {JSON_STRING}.make_json ("error")) + end + + validate + local + current_value: G + do + current_value := value_control.value + is_valid := True + across + validators as c + until + not is_valid + loop + if not c.item.is_valid (current_value) then + is_valid := False + set_error (c.item.error) + end + end + if is_valid then + set_error ("") + end + end + + is_valid: BOOLEAN + feature value_control: WSF_VALUE_CONTROL [G] diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_input_control.e similarity index 90% rename from library/server/wsf_html/webcontrol/wsf_text_control.e rename to library/server/wsf_html/webcontrol/wsf_input_control.e index 3a03340f..0499a1d9 100644 --- a/library/server/wsf_html/webcontrol/wsf_text_control.e +++ b/library/server/wsf_html/webcontrol/wsf_input_control.e @@ -5,20 +5,21 @@ note revision: "$Revision$" class - WSF_TEXT_CONTROL + WSF_INPUT_CONTROL inherit WSF_VALUE_CONTROL [STRING] create - make_text + make_input feature {NONE} - make_text (n: STRING; v: STRING) + make_input (n: STRING; v: STRING) do make (n, "input") + type := "text" text := v end @@ -61,7 +62,7 @@ feature -- Implementation render: STRING do - Result := render_tag ("", "type=%"text%" value=%"" + text + "%"") + Result := render_tag ("", "type=%"" + type + "%" value=%"" + text + "%"") end set_text (t: STRING) @@ -81,6 +82,8 @@ feature text: STRING + type: STRING + change_event: detachable PROCEDURE [ANY, TUPLE []] end diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e index 20521e12..be5c952c 100644 --- a/library/server/wsf_html/webcontrol/wsf_multi_control.e +++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e @@ -5,7 +5,7 @@ note revision: "$Revision$" class - WSF_MULTI_CONTROL[G -> WSF_CONTROL] + WSF_MULTI_CONTROL [G -> WSF_CONTROL] inherit diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 615118b9..d15e1ff7 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -78,7 +78,6 @@ feature control.read_state (states) data := "" data.append ("") - data.append ("") data.append (control.render) data.append ("") data.append ("") + data.append ("") data.append ("") data.append ("") create page.make diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf index a432e76f..132ebf86 100644 --- a/library/server/wsf_html/wsf_html-safe.ecf +++ b/library/server/wsf_html/wsf_html-safe.ecf @@ -22,6 +22,7 @@ + From 162735b328195bb39c98b4616223fbc0ff007acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Thu, 12 Sep 2013 17:15:05 +0200 Subject: [PATCH 054/191] Extended autocompletion with customized templates --- examples/widgetapp/application.e | 18 +++ examples/widgetapp/bootstrap.min.css | 9 ++ examples/widgetapp/flag_autocompletion.e | 48 ++++++++ examples/widgetapp/sample_page.e | 8 ++ examples/widgetapp/widget.coffee | 31 ++++- examples/widgetapp/widget.css | 77 +++++++++++++ examples/widgetapp/widget.js | 108 ++++++++---------- examples/widgetapp/widgetapp.ecf | 1 + .../autocompletions/wsf_autocompletion.e | 2 + .../wsf_simple_autocompletion.e | 4 +- .../input/wsf_autocomplete_control.e | 17 ++- .../wsf_html/webcontrol/wsf_page_control.e | 3 +- 12 files changed, 260 insertions(+), 66 deletions(-) create mode 100644 examples/widgetapp/bootstrap.min.css create mode 100644 examples/widgetapp/flag_autocompletion.e create mode 100644 examples/widgetapp/widget.css diff --git a/examples/widgetapp/application.e b/examples/widgetapp/application.e index 9163a630..f7dc2d93 100644 --- a/examples/widgetapp/application.e +++ b/examples/widgetapp/application.e @@ -34,6 +34,8 @@ feature {NONE} -- Initialization -- router.map (create {WSF_URI_MAPPING}.make ("/hello", create {WSF_AGENT_URI_HANDLER}.make (agent execute_hello))) map_agent_uri ("/", agent execute_hello, Void) map_agent_uri ("/widget.js", agent load_js, Void) + map_agent_uri ("/widget.css", agent load_css, Void) + map_agent_uri ("/bootstrap.min.css", agent load_bootstrap, Void) end feature -- Helper: mapping @@ -63,4 +65,20 @@ feature -- Execution res.send (f) end + load_css (req: WSF_REQUEST; res: WSF_RESPONSE) + local + f: WSF_FILE_RESPONSE + do + create f.make_html ("widget.css") + res.send (f) + end + + load_bootstrap (req: WSF_REQUEST; res: WSF_RESPONSE) + local + f: WSF_FILE_RESPONSE + do + create f.make_html ("bootstrap.min.css") + res.send (f) + end + end diff --git a/examples/widgetapp/bootstrap.min.css b/examples/widgetapp/bootstrap.min.css new file mode 100644 index 00000000..a553c4f5 --- /dev/null +++ b/examples/widgetapp/bootstrap.min.css @@ -0,0 +1,9 @@ +/*! + * Bootstrap v3.0.0 + * + * Copyright 2013 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world by @mdo and @fat. + *//*! normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0 0 0 0);border:0}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#468847}.text-info{color:#3a87ad}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h4,h5,h6{margin-top:10px;margin-bottom:10px}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}h1 small,.h1 small{font-size:24px}h2 small,.h2 small{font-size:18px}h3 small,.h3 small,h4 small,.h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429}code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11{float:left}.col-xs-1{width:8.333333333333332%}.col-xs-2{width:16.666666666666664%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333333333%}.col-xs-5{width:41.66666666666667%}.col-xs-6{width:50%}.col-xs-7{width:58.333333333333336%}.col-xs-8{width:66.66666666666666%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333333334%}.col-xs-11{width:91.66666666666666%}.col-xs-12{width:100%}@media(min-width:768px){.container{max-width:750px}.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11{float:left}.col-sm-1{width:8.333333333333332%}.col-sm-2{width:16.666666666666664%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333333333%}.col-sm-5{width:41.66666666666667%}.col-sm-6{width:50%}.col-sm-7{width:58.333333333333336%}.col-sm-8{width:66.66666666666666%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333333334%}.col-sm-11{width:91.66666666666666%}.col-sm-12{width:100%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-11{left:91.66666666666666%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-offset-1{margin-left:8.333333333333332%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-11{margin-left:91.66666666666666%}}@media(min-width:992px){.container{max-width:970px}.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11{float:left}.col-md-1{width:8.333333333333332%}.col-md-2{width:16.666666666666664%}.col-md-3{width:25%}.col-md-4{width:33.33333333333333%}.col-md-5{width:41.66666666666667%}.col-md-6{width:50%}.col-md-7{width:58.333333333333336%}.col-md-8{width:66.66666666666666%}.col-md-9{width:75%}.col-md-10{width:83.33333333333334%}.col-md-11{width:91.66666666666666%}.col-md-12{width:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.333333333333332%}.col-md-push-2{left:16.666666666666664%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333333333%}.col-md-push-5{left:41.66666666666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.333333333333336%}.col-md-push-8{left:66.66666666666666%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333333334%}.col-md-push-11{left:91.66666666666666%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-11{right:91.66666666666666%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-11{margin-left:91.66666666666666%}}@media(min-width:1200px){.container{max-width:1170px}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11{float:left}.col-lg-1{width:8.333333333333332%}.col-lg-2{width:16.666666666666664%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333333333%}.col-lg-5{width:41.66666666666667%}.col-lg-6{width:50%}.col-lg-7{width:58.333333333333336%}.col-lg-8{width:66.66666666666666%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333333334%}.col-lg-11{width:91.66666666666666%}.col-lg-12{width:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-11{left:91.66666666666666%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-11{margin-left:91.66666666666666%}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table thead>tr>th,.table tbody>tr>th,.table tfoot>tr>th,.table thead>tr>td,.table tbody>tr>td,.table tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8;border-color:#d6e9c6}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td{background-color:#d0e9c6;border-color:#c9e2b3}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede;border-color:#eed3d7}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td{background-color:#ebcccc;border-color:#e6c1c7}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3;border-color:#fbeed5}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td{background-color:#faf2cc;border-color:#f8e5be}@media(max-width:768px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0;background-color:#fff}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>thead>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>thead>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:45px;line-height:45px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label{color:#c09853}.has-warning .form-control{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label{color:#b94a48}.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label{color:#468847}.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.form-control-static{padding-top:7px;margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-print:before{content:"\e045"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-briefcase:before{content:"\1f4bc"}.glyphicon-calendar:before{content:"\1f4c5"}.glyphicon-pushpin:before{content:"\1f4cc"}.glyphicon-paperclip:before{content:"\1f4ce"}.glyphicon-camera:before{content:"\1f4f7"}.glyphicon-lock:before{content:"\1f512"}.glyphicon-bell:before{content:"\1f514"}.glyphicon-bookmark:before{content:"\1f516"}.glyphicon-fire:before{content:"\1f525"}.glyphicon-wrench:before{content:"\1f527"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-bottom:0 dotted;border-left:4px solid transparent;content:""}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#428bca}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0 dotted;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#333}.btn-primary .caret,.btn-success .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret{border-top-color:#fff}.dropup .btn-default .caret{border-bottom-color:#333}.dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified .btn{display:table-cell;float:none;width:1%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:45px;line-height:45px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}}.nav-tabs.nav-justified>li>a{margin-right:0;border-bottom:1px solid #ddd}.nav-tabs.nav-justified>.active>a{border-bottom-color:#fff}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:5px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-bottom:1px solid #ddd}.nav-tabs-justified>.active>a{border-bottom-color:#fff}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;z-index:1000;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-collapse .navbar-nav.navbar-left:first-child{margin-left:-15px}.navbar-collapse .navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-collapse .navbar-text:last-child{margin-right:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;border-width:0 0 1px}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;z-index:1030}.navbar-fixed-bottom{bottom:0;margin-bottom:0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-text{float:left;margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{margin-right:15px;margin-left:15px}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e6e6e6}.navbar-default .navbar-nav>.dropdown>a:hover .caret,.navbar-default .navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.open>a .caret,.navbar-default .navbar-nav>.open>a:hover .caret,.navbar-default .navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-default .navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1{font-size:63px}}.thumbnail{display:inline-block;display:block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img{display:block;height:auto;max-width:100%}a.thumbnail:hover,a.thumbnail:focus{border-color:#428bca}.thumbnail>img{margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.alert-warning hr{border-top-color:#f8e5be}.alert-warning .alert-link{color:#a47e3c}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger hr{border-top-color:#e6c1c7}.alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table{margin-bottom:0}.panel>.panel-body+.table{border-top:1px solid #ddd}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#fbeed5}.panel-warning>.panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#fbeed5}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#fbeed5}.panel-danger{border-color:#eed3d7}.panel-danger>.panel-heading{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#eed3d7}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#eed3d7}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}body.modal-open,.modal-open .navbar-fixed-top,.modal-open .navbar-fixed-bottom{margin-right:15px}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{z-index:1050;width:auto;padding:10px;margin-right:auto;margin-left:auto}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{right:auto;left:50%;width:600px;padding-top:30px;padding-bottom:30px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;left:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.affix{position:fixed}@-ms-viewport{width:device-width}@media screen and (max-width:400px){@-ms-viewport{width:320px}}.hidden{display:none!important;visibility:hidden!important}.visible-xs{display:none!important}tr.visible-xs{display:none!important}th.visible-xs,td.visible-xs{display:none!important}@media(max-width:767px){.visible-xs{display:block!important}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}tr.visible-xs.visible-sm{display:table-row!important}th.visible-xs.visible-sm,td.visible-xs.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}tr.visible-xs.visible-md{display:table-row!important}th.visible-xs.visible-md,td.visible-xs.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-xs.visible-lg{display:block!important}tr.visible-xs.visible-lg{display:table-row!important}th.visible-xs.visible-lg,td.visible-xs.visible-lg{display:table-cell!important}}.visible-sm{display:none!important}tr.visible-sm{display:none!important}th.visible-sm,td.visible-sm{display:none!important}@media(max-width:767px){.visible-sm.visible-xs{display:block!important}tr.visible-sm.visible-xs{display:table-row!important}th.visible-sm.visible-xs,td.visible-sm.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-sm{display:block!important}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}tr.visible-sm.visible-md{display:table-row!important}th.visible-sm.visible-md,td.visible-sm.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-sm.visible-lg{display:block!important}tr.visible-sm.visible-lg{display:table-row!important}th.visible-sm.visible-lg,td.visible-sm.visible-lg{display:table-cell!important}}.visible-md{display:none!important}tr.visible-md{display:none!important}th.visible-md,td.visible-md{display:none!important}@media(max-width:767px){.visible-md.visible-xs{display:block!important}tr.visible-md.visible-xs{display:table-row!important}th.visible-md.visible-xs,td.visible-md.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}tr.visible-md.visible-sm{display:table-row!important}th.visible-md.visible-sm,td.visible-md.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-md{display:block!important}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-md.visible-lg{display:block!important}tr.visible-md.visible-lg{display:table-row!important}th.visible-md.visible-lg,td.visible-md.visible-lg{display:table-cell!important}}.visible-lg{display:none!important}tr.visible-lg{display:none!important}th.visible-lg,td.visible-lg{display:none!important}@media(max-width:767px){.visible-lg.visible-xs{display:block!important}tr.visible-lg.visible-xs{display:table-row!important}th.visible-lg.visible-xs,td.visible-lg.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}tr.visible-lg.visible-sm{display:table-row!important}th.visible-lg.visible-sm,td.visible-lg.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}tr.visible-lg.visible-md{display:table-row!important}th.visible-lg.visible-md,td.visible-lg.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-lg{display:block!important}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}tr.hidden-xs{display:table-row!important}th.hidden-xs,td.hidden-xs{display:table-cell!important}@media(max-width:767px){.hidden-xs{display:none!important}tr.hidden-xs{display:none!important}th.hidden-xs,td.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm{display:none!important}tr.hidden-xs.hidden-sm{display:none!important}th.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md{display:none!important}tr.hidden-xs.hidden-md{display:none!important}th.hidden-xs.hidden-md,td.hidden-xs.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-xs.hidden-lg{display:none!important}tr.hidden-xs.hidden-lg{display:none!important}th.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}@media(max-width:767px){.hidden-sm.hidden-xs{display:none!important}tr.hidden-sm.hidden-xs{display:none!important}th.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}tr.hidden-sm{display:none!important}th.hidden-sm,td.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md{display:none!important}tr.hidden-sm.hidden-md{display:none!important}th.hidden-sm.hidden-md,td.hidden-sm.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-sm.hidden-lg{display:none!important}tr.hidden-sm.hidden-lg{display:none!important}th.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}@media(max-width:767px){.hidden-md.hidden-xs{display:none!important}tr.hidden-md.hidden-xs{display:none!important}th.hidden-md.hidden-xs,td.hidden-md.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-md.hidden-sm{display:none!important}tr.hidden-md.hidden-sm{display:none!important}th.hidden-md.hidden-sm,td.hidden-md.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}tr.hidden-md{display:none!important}th.hidden-md,td.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-md.hidden-lg{display:none!important}tr.hidden-md.hidden-lg{display:none!important}th.hidden-md.hidden-lg,td.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(max-width:767px){.hidden-lg.hidden-xs{display:none!important}tr.hidden-lg.hidden-xs{display:none!important}th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none!important}tr.hidden-lg.hidden-sm{display:none!important}th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none!important}tr.hidden-lg.hidden-md{display:none!important}th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-lg{display:none!important}tr.hidden-lg{display:none!important}th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print{display:none!important}tr.visible-print{display:none!important}th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print{display:none!important}tr.hidden-print{display:none!important}th.hidden-print,td.hidden-print{display:none!important}} \ No newline at end of file diff --git a/examples/widgetapp/flag_autocompletion.e b/examples/widgetapp/flag_autocompletion.e new file mode 100644 index 00000000..240d65fd --- /dev/null +++ b/examples/widgetapp/flag_autocompletion.e @@ -0,0 +1,48 @@ +note + description: "Summary description for {FLAG_AUTOCOMPLETION}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + FLAG_AUTOCOMPLETION + +inherit + + WSF_AUTOCOMPLETION + +create + make + +feature {NONE} -- Initialization + + make (l: ITERABLE [TUPLE [STRING, STRING]]) + do + template := " {{=value}}"; + list := l + end + +feature -- Implementation + + autocompletion (input: STRING): JSON_ARRAY + local + o: JSON_OBJECT + do + create Result.make_array + across + list as c + loop + if attached {STRING} c.item.item (1) as first and attached {STRING} c.item.item (2) as second then + if second.as_lower.has_substring (input.as_lower) then + create o.make + o.put (create {JSON_STRING}.make_json (first), "flag") + o.put (create {JSON_STRING}.make_json (second), "value") + Result.add (o) + end + end + end + end + + list: ITERABLE [TUPLE [STRING, STRING]] + +end diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index 00716044..5d626c98 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -21,10 +21,14 @@ feature form: WSF_FORM_CONTROL n1_container: WSF_FORM_ELEMENT_CONTROL [STRING] n2_container: WSF_FORM_ELEMENT_CONTROL [STRING] + n3_container: WSF_FORM_ELEMENT_CONTROL [STRING] cats_container: WSF_FORM_ELEMENT_CONTROL [LIST [STRING]] + s: FLAG_AUTOCOMPLETION do + create s.make(<<["dz", "Algeria"], ["be", "Belgium"] , ["ca", "Canada"],["de", "Deutschland"], ["england", "England"], ["fi", "Finland"], ["gr", "Greece"], ["hu", "Hungary"]>>) create textbox1.make_input ("txtBox1", "1") create textbox2.make_input ("txtBox2", "2") + create autocompletion1.make_autocomplete ("autocompletion1", s) create button1.make_button ("sample_button1", "SUM") create textbox_result.make_html ("txtBox3", "p", "") button1.set_click_event (agent handle_click) @@ -39,8 +43,10 @@ feature n1_container.add_validator (create {OWN_VALIDATOR}.make_own) create n2_container.make_form_element ("Number2", textbox2) n2_container.add_validator (create {WSF_DECIMAL_VALIDATOR}.make_decimal_validator ("Invalid Number")) + create n3_container.make_form_element ("Autoc1", autocompletion1) form.add_control (n1_container) form.add_control (n2_container) + form.add_control (n3_container) create cats_container.make_form_element ("Categories", cklist) cats_container.add_validator (create {WSF_MIN_VALIDATOR [STRING]}.make_min_validator (1, "Choose at least one category")) cats_container.add_validator (create {WSF_MAX_VALIDATOR [STRING]}.make_max_validator (1, "Choose at most one category")) @@ -82,6 +88,8 @@ feature textbox2: WSF_INPUT_CONTROL + autocompletion1: WSF_AUTOCOMPLETE_CONTROL + cklist: WSF_CHECKBOX_LIST_CONTROL textbox_result: WSF_HTML_CONTROL diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 2dd69883..5e652bfb 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -1,9 +1,22 @@ +cache = {} +template = tmpl = (str, data) -> + # Simple JavaScript Templating + # John Resig - http://ejohn.org/ - MIT Licensed + fn = (if not /\W/.test(str) then cache[str] = cache[str] or tmpl(str) else new Function("obj", "var p=[],print=function(){p.push.apply(p,arguments);};" + "with(obj){p.push('" + str.replace(/[\r\t\n]/g, " ").split("{{").join("\t").replace(/((^|}})[^\t]*)'/g, "$1\r").replace(/\t=(.*?)}}/g, "',$1,'").split("\t").join("');").split("}}").join("p.push('").split("\r").join("\\'") + "');}return p.join('');")) + (if data then fn(data) else fn) + +Mini = + compile:(t)-> + { + render:template(t) + } + trigger_callback = (control_name,event)-> $.ajax data: control_name: control_name event: event - states: JSON.stringify(states) + states: JSON.stringify(window.states) cache: no .done (new_states)-> #Update all classes @@ -118,11 +131,21 @@ class WSF_TEXTAREA_CONTROL extends WSF_INPUT_CONTROL class WSF_AUTOCOMPLETE_CONTROL extends WSF_INPUT_CONTROL attach_events: () -> super + self = @ @$el.typeahead({ name: @control_name - local: ["one", - "two", - "three"] + template: window.states[@control_name]['template'] + engine: Mini + remote: + url:"" + replace: (url, uriEncodedQuery) -> + window.states[self.control_name]['text'] = self.$el.val() + '?' + $.param + control_name: self.control_name + event: 'autocomplete' + states: JSON.stringify(window.states) + filter: (parsedResponse) -> + parsedResponse[self.control_name]['suggestions'] }) class WSF_CHECKBOX_CONTROL extends WSF_CONTROL diff --git a/examples/widgetapp/widget.css b/examples/widgetapp/widget.css new file mode 100644 index 00000000..a915272e --- /dev/null +++ b/examples/widgetapp/widget.css @@ -0,0 +1,77 @@ +/* ignore this line */ +.container { margin:30px; } + +.twitter-typeahead { + width: 100%; + position: relative; +} +.twitter-typeahead .tt-query, +.twitter-typeahead .tt-hint { + margin-bottom: 0; + width:100%; + height: 34px; + position: absolute; + top:0; + left:0; +} +.twitter-typeahead .tt-hint { + color:#a1a1a1; + z-index: 1; + padding: 6px 12px; + border:1px solid transparent; +} +.twitter-typeahead .tt-query { + z-index: 2; + border-radius: 4px!important; + /* add these 2 statements if you have an appended input group */ + border-top-right-radius: 0!important; + border-bottom-right-radius: 0!important; + /* add these 2 statements if you have an prepended input group */ + /* border-top-left-radius: 0!important; + border-bottom-left-radius: 0!important; */ +} + +.tt-dropdown-menu { + min-width: 160px; + margin-top: 2px; + padding: 5px 0; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.2); + *border-right-width: 2px; + *border-bottom-width: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2); + -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2); + box-shadow: 0 5px 10px rgba(0,0,0,.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; +} + +.tt-suggestion { + display: block; + padding: 3px 20px; +} + +.tt-suggestion.tt-is-under-cursor { + color: #fff; + background-color: #0081c2; + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0) +} + +.tt-suggestion.tt-is-under-cursor a { + color: #fff; +} + +.tt-suggestion p { + margin: 0; + diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index 1df3d11b..76efbde4 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -1,15 +1,35 @@ // Generated by CoffeeScript 1.6.1 (function() { - var $el, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CHECKBOX_LIST_CONTROL, WSF_CONTROL, WSF_FORM_ELEMENT_CONTROL, WSF_HTML_CONTROL, WSF_INPUT_CONTROL, WSF_MAX_VALIDATOR, WSF_MIN_VALIDATOR, WSF_REGEXP_VALIDATOR, WSF_TEXTAREA_CONTROL, WSF_VALIDATOR, controls, name, state, trigger_callback, type, typemap, validatormap, _ref, _ref1, _ref2, + var $el, Mini, WSF_AUTOCOMPLETE_CONTROL, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CHECKBOX_LIST_CONTROL, WSF_CONTROL, WSF_FORM_ELEMENT_CONTROL, WSF_HTML_CONTROL, WSF_INPUT_CONTROL, WSF_MAX_VALIDATOR, WSF_MIN_VALIDATOR, WSF_REGEXP_VALIDATOR, WSF_TEXTAREA_CONTROL, WSF_VALIDATOR, cache, controls, name, state, template, tmpl, trigger_callback, type, typemap, validatormap, _ref, _ref1, _ref2, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; + cache = {}; + + template = tmpl = function(str, data) { + var fn; + fn = (!/\W/.test(str) ? cache[str] = cache[str] || tmpl(str) : new Function("obj", "var p=[],print=function(){p.push.apply(p,arguments);};" + "with(obj){p.push('" + str.replace(/[\r\t\n]/g, " ").split("{{").join("\t").replace(/((^|}})[^\t]*)'/g, "$1\r").replace(/\t=(.*?)}}/g, "',$1,'").split("\t").join("');").split("}}").join("p.push('").split("\r").join("\\'") + "');}return p.join('');")); + if (data) { + return fn(data); + } else { + return fn; + } + }; + + Mini = { + compile: function(t) { + return { + render: template(t) + }; + } + }; + trigger_callback = function(control_name, event) { return $.ajax({ data: { control_name: control_name, event: event, - states: JSON.stringify(states) + states: JSON.stringify(window.states) }, cache: false }).done(function(new_states) { @@ -228,75 +248,46 @@ return WSF_TEXTAREA_CONTROL.__super__.constructor.apply(this, arguments); } - WSF_TEXTAREA_CONTROL.prototype.attach_events = function() { - var self; - self = this; - return this.$el.change(function() { - return self.change(); - }); - }; - - WSF_TEXTAREA_CONTROL.prototype.change = function() { - window.states[this.control_name]['text'] = this.$el.val(); - if (window.states[this.control_name]['callback_change']) { - trigger_callback(this.control_name, 'change'); - } - return this.trigger('change'); - }; - - WSF_TEXTAREA_CONTROL.prototype.value = function() { - return this.$el.val(); - }; - - WSF_TEXTAREA_CONTROL.prototype.update = function(state) { - if (state.text != null) { - window.states[this.control_name]['text'] = state.text; - return this.$el.val(state.text); - } - }; - return WSF_TEXTAREA_CONTROL; - })(WSF_CONTROL); + })(WSF_INPUT_CONTROL); - WSF_TEXTAREA_CONTROL = (function(_super) { + WSF_AUTOCOMPLETE_CONTROL = (function(_super) { - __extends(WSF_TEXTAREA_CONTROL, _super); + __extends(WSF_AUTOCOMPLETE_CONTROL, _super); - function WSF_TEXTAREA_CONTROL() { - return WSF_TEXTAREA_CONTROL.__super__.constructor.apply(this, arguments); + function WSF_AUTOCOMPLETE_CONTROL() { + return WSF_AUTOCOMPLETE_CONTROL.__super__.constructor.apply(this, arguments); } - WSF_TEXTAREA_CONTROL.prototype.attach_events = function() { + WSF_AUTOCOMPLETE_CONTROL.prototype.attach_events = function() { var self; + WSF_AUTOCOMPLETE_CONTROL.__super__.attach_events.apply(this, arguments); self = this; - return this.$el.change(function() { - return self.change(); + return this.$el.typeahead({ + name: this.control_name, + template: window.states[this.control_name]['template'], + engine: Mini, + remote: { + url: "", + replace: function(url, uriEncodedQuery) { + window.states[self.control_name]['text'] = self.$el.val(); + return '?' + $.param({ + control_name: self.control_name, + event: 'autocomplete', + states: JSON.stringify(window.states) + }); + }, + filter: function(parsedResponse) { + return parsedResponse[self.control_name]['suggestions']; + } + } }); }; - WSF_TEXTAREA_CONTROL.prototype.change = function() { - window.states[this.control_name]['text'] = this.$el.val(); - if (window.states[this.control_name]['callback_change']) { - trigger_callback(this.control_name, 'change'); - } - return this.trigger('change'); - }; + return WSF_AUTOCOMPLETE_CONTROL; - WSF_TEXTAREA_CONTROL.prototype.value = function() { - return this.$el.val(); - }; - - WSF_TEXTAREA_CONTROL.prototype.update = function(state) { - if (state.text != null) { - window.states[this.control_name]['text'] = state.text; - return this.$el.val(state.text); - } - }; - - return WSF_TEXTAREA_CONTROL; - - })(WSF_CONTROL); + })(WSF_INPUT_CONTROL); WSF_CHECKBOX_CONTROL = (function(_super) { @@ -476,6 +467,7 @@ "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL, "WSF_INPUT_CONTROL": WSF_INPUT_CONTROL, "WSF_TEXTAREA_CONTROL": WSF_TEXTAREA_CONTROL, + "WSF_AUTOCOMPLETE_CONTROL": WSF_AUTOCOMPLETE_CONTROL, "WSF_CHECKBOX_CONTROL": WSF_CHECKBOX_CONTROL, "WSF_FORM_ELEMENT_CONTROL": WSF_FORM_ELEMENT_CONTROL, "WSF_HTML_CONTROL": WSF_HTML_CONTROL, diff --git a/examples/widgetapp/widgetapp.ecf b/examples/widgetapp/widgetapp.ecf index 4e603bf6..082b483f 100644 --- a/examples/widgetapp/widgetapp.ecf +++ b/examples/widgetapp/widgetapp.ecf @@ -20,6 +20,7 @@ + diff --git a/library/server/wsf_html/webcontrol/autocompletions/wsf_autocompletion.e b/library/server/wsf_html/webcontrol/autocompletions/wsf_autocompletion.e index 4e89bb55..48db06cd 100644 --- a/library/server/wsf_html/webcontrol/autocompletions/wsf_autocompletion.e +++ b/library/server/wsf_html/webcontrol/autocompletions/wsf_autocompletion.e @@ -13,4 +13,6 @@ feature deferred end + template: detachable STRING + end diff --git a/library/server/wsf_html/webcontrol/autocompletions/wsf_simple_autocompletion.e b/library/server/wsf_html/webcontrol/autocompletions/wsf_simple_autocompletion.e index 8e67e971..10b94c99 100644 --- a/library/server/wsf_html/webcontrol/autocompletions/wsf_simple_autocompletion.e +++ b/library/server/wsf_html/webcontrol/autocompletions/wsf_simple_autocompletion.e @@ -16,7 +16,7 @@ create feature {NONE} - make (l: LIST [STRING]) + make (l: ITERABLE [STRING]) do list := l end @@ -41,6 +41,6 @@ feature -- Implementation feature - list: LIST [STRING] + list: ITERABLE [STRING] end diff --git a/library/server/wsf_html/webcontrol/input/wsf_autocomplete_control.e b/library/server/wsf_html/webcontrol/input/wsf_autocomplete_control.e index 1e3e7a7d..5ff19533 100644 --- a/library/server/wsf_html/webcontrol/input/wsf_autocomplete_control.e +++ b/library/server/wsf_html/webcontrol/input/wsf_autocomplete_control.e @@ -11,7 +11,8 @@ inherit WSF_INPUT_CONTROL redefine - handle_callback + handle_callback, + state end create @@ -22,12 +23,24 @@ feature {NONE} -- Creation make_autocomplete (n: STRING; c: WSF_AUTOCOMPLETION) do make_autocomplete_with_agent (n, agent c.autocompletion) + if attached c.template as t then + template := t + end end make_autocomplete_with_agent (n: STRING; c: FUNCTION [ANY, TUPLE [STRING], JSON_ARRAY]) do make_input (n, "") create_json_list := c + template := "{{=value}}" + end + +feature -- State + + state: JSON_OBJECT + do + Result := Precursor {WSF_INPUT_CONTROL} + Result.put (create {JSON_STRING}.make_json (template), create {JSON_STRING}.make_json ("template")) end feature -- Callback @@ -44,4 +57,6 @@ feature -- Autocomplete create_json_list: FUNCTION [ANY, TUPLE [STRING], JSON_ARRAY] + template: STRING + end diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 0ce7358f..846069b7 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -77,7 +77,8 @@ feature create states.make control.read_state (states) data := "" - data.append ("") + data.append ("") + data.append ("") data.append ("") data.append (control.render) data.append ("") data.append ("") From 26ec7d94c69c2432b80ca3cf4a81636c018a1388 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sat, 14 Sep 2013 17:46:57 +0200 Subject: [PATCH 063/191] Google news example --- examples/widgetapp/demo_data.e | 5 + examples/widgetapp/demo_datasource.e | 4 +- examples/widgetapp/google_autocompletion.e | 72 ++++++++++++ examples/widgetapp/google_news.e | 51 +++++++++ examples/widgetapp/google_news_datasource.e | 107 ++++++++++++++++++ examples/widgetapp/grid_page.e | 27 ++++- examples/widgetapp/widget.coffee | 3 +- examples/widgetapp/widget.js | 6 +- examples/widgetapp/widgetapp.ecf | 1 + .../wsf_html/webcontrol/grid/wsf_datasource.e | 4 +- .../webcontrol/grid/wsf_grid_image_column.e | 38 +++++++ .../webcontrol/grid/wsf_pagable_datasource.e | 22 +++- .../webcontrol/grid/wsf_pagination_control.e | 8 +- 13 files changed, 333 insertions(+), 15 deletions(-) create mode 100644 examples/widgetapp/google_autocompletion.e create mode 100644 examples/widgetapp/google_news.e create mode 100644 examples/widgetapp/google_news_datasource.e create mode 100644 library/server/wsf_html/webcontrol/grid/wsf_grid_image_column.e diff --git a/examples/widgetapp/demo_data.e b/examples/widgetapp/demo_data.e index c0e484f7..90171076 100644 --- a/examples/widgetapp/demo_data.e +++ b/examples/widgetapp/demo_data.e @@ -21,6 +21,7 @@ feature {NONE} id := a_id name := a_name description := a_description + image := "http://placehold.it/20x20&text=" + id.out end feature @@ -31,6 +32,8 @@ feature description: STRING + image: STRING + get (field: STRING): detachable ANY do if field.is_equal ("id") then @@ -39,6 +42,8 @@ feature Result := name elseif field.is_equal ("description") then Result := description + elseif field.is_equal ("image") then + Result := image end end diff --git a/examples/widgetapp/demo_datasource.e b/examples/widgetapp/demo_datasource.e index 22057e60..c26f635e 100644 --- a/examples/widgetapp/demo_datasource.e +++ b/examples/widgetapp/demo_datasource.e @@ -28,12 +28,12 @@ feature do create list.make across - ((page - 1) * page_size) |..| (page * page_size - 1).min(131) as c + ((page - 1) * page_size + 1) |..| (page * page_size).min (131) as c loop list.extend (create {DEMO_DATA}.make (c.item, "Name" + c.item.out, "desc " + c.item.out)) end Result := list - row_count:=132 + row_count := 132 end end diff --git a/examples/widgetapp/google_autocompletion.e b/examples/widgetapp/google_autocompletion.e new file mode 100644 index 00000000..89f35696 --- /dev/null +++ b/examples/widgetapp/google_autocompletion.e @@ -0,0 +1,72 @@ +note + description: "Summary description for {GOOGLE_AUTOCOMPLETION}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + GOOGLE_AUTOCOMPLETION + +inherit + + WSF_AUTOCOMPLETION + +create + make + +feature {NONE} -- Initialization + + make () + do + template := "{{=value}}"; + end + +feature -- Implementation + + autocompletion (input: STRING): JSON_ARRAY + local + o: JSON_OBJECT + l_result: INTEGER + l_curl_string: CURL_STRING + json_parser: JSON_PARSER + query_str: STRING + do + query_str := input + query_str.replace_substring_all (" ", "+") + curl_handle := curl_easy.init + create Result.make_array + if curl_handle /= default_pointer then + create l_curl_string.make_empty + curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_url, "http://suggestqueries.google.com/complete/search?client=firefox&q=" + query_str) + curl_easy.set_write_function (curl_handle) + curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_writedata, l_curl_string.object_id) + l_result := curl_easy.perform (curl_handle) + + -- Always cleanup + curl_easy.cleanup (curl_handle) + create json_parser.make_parser (l_curl_string.out) + if attached {JSON_ARRAY} json_parser.parse_json as data and then attached {JSON_ARRAY} data.i_th (2) as list then + across + 1 |..| list.count as c + loop + if attached {JSON_STRING} list.i_th (c.item) as row then + create o.make + o.put (create {JSON_STRING}.make_json (row.unescaped_string_32), "value") + Result.add (o) + end + end + end + end + end + +feature {NONE} -- Implementation + + curl_easy: CURL_EASY_EXTERNALS + once + create Result + end + + curl_handle: POINTER; + -- cURL handle + +end diff --git a/examples/widgetapp/google_news.e b/examples/widgetapp/google_news.e new file mode 100644 index 00000000..232e9571 --- /dev/null +++ b/examples/widgetapp/google_news.e @@ -0,0 +1,51 @@ +note + description: "Summary description for {GOOGLE_NEWS}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + GOOGLE_NEWS + +inherit + + WSF_ENTITY + +create + make_from_json + +feature {NONE} + + make_from_json (json: JSON_OBJECT) + do + if attached {JSON_STRING} json.item (create {JSON_STRING}.make_json ("title")) as a_title then + title := a_title.unescaped_string_32 + end + if attached {JSON_STRING} json.item (create {JSON_STRING}.make_json ("content")) as a_content then + content := a_content.unescaped_string_32 + end + if attached {JSON_OBJECT} json.item (create {JSON_STRING}.make_json ("image")) as img and then attached {JSON_STRING} img.item (create {JSON_STRING}.make_json ("url")) as a_image then + image := a_image.item + end + end + +feature + + title: detachable STRING + + content: detachable STRING + + image: detachable STRING + + get (field: STRING): detachable ANY + do + if field.is_equal ("title") then + Result := title + elseif field.is_equal ("content") then + Result := content + elseif field.is_equal ("image") then + Result := image + end + end + +end diff --git a/examples/widgetapp/google_news_datasource.e b/examples/widgetapp/google_news_datasource.e new file mode 100644 index 00000000..9a575887 --- /dev/null +++ b/examples/widgetapp/google_news_datasource.e @@ -0,0 +1,107 @@ +note + description: "Summary description for {GOOGLE_NEWS_DATASOURCE}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + GOOGLE_NEWS_DATASOURCE + +inherit + + WSF_PAGABLE_DATASOURCE [GOOGLE_NEWS] + redefine + state, + set_state + end + +create + make_news + +feature --States + + state: JSON_OBJECT + -- Return state which contains the current html and if there is an event handle attached + do + Result := Precursor + Result.put (create {JSON_STRING}.make_json (query), create {JSON_STRING}.make_json ("query")) + end + + set_state (new_state: JSON_OBJECT) + do + Precursor (new_state) + if attached {JSON_STRING} new_state.item (create {JSON_STRING}.make_json ("query")) as new_query then + query := new_query.item + end + end + +feature + + make_news + do + page := 1 + page_size := 8 + query := "eiffel" + end + + data: ITERABLE [GOOGLE_NEWS] + local + list: LINKED_LIST [GOOGLE_NEWS] + l_result: INTEGER + l_curl_string: CURL_STRING + json_parser: JSON_PARSER + query_str: STRING + do + curl_handle := curl_easy.init + create list.make + row_count := 0 + if curl_handle /= default_pointer then + create l_curl_string.make_empty + query_str := query.out + query_str.replace_substring_all (" ", "+") + curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_url, "https://ajax.googleapis.com/ajax/services/search/news?v=1.0&q=" + query_str + "&rsz=" + page_size.out + "&start=" + (page_size * (page - 1)).out) + curl_easy.set_write_function (curl_handle) + curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_writedata, l_curl_string.object_id) + l_result := curl_easy.perform (curl_handle) + + -- Always cleanup + curl_easy.cleanup (curl_handle) + create json_parser.make_parser (l_curl_string.out) + if attached {JSON_OBJECT} json_parser.parse_json as sp then + if attached {JSON_OBJECT} sp.item (create {JSON_STRING}.make_json ("responseData")) as responsedata and then attached {JSON_ARRAY} responsedata.item (create {JSON_STRING}.make_json ("results")) as results then + if attached {JSON_OBJECT} responsedata.item (create {JSON_STRING}.make_json ("cursor")) as cursor and then attached {JSON_STRING} cursor.item (create {JSON_STRING}.make_json ("estimatedResultCount")) as count then + row_count := count.item.to_integer.min (64) + end + across + 1 |..| results.count as c + loop + if attached {JSON_OBJECT} results.i_th (c.item) as j then + list.extend (create {GOOGLE_NEWS}.make_from_json (j)) + end + end + end + end + end + Result := list + end + +feature + + set_query (q: STRING) + do + query := q + end + + query: STRING + +feature {NONE} -- Implementation + + curl_easy: CURL_EASY_EXTERNALS + once + create Result + end + + curl_handle: POINTER; + -- cURL handle + +end diff --git a/examples/widgetapp/grid_page.e b/examples/widgetapp/grid_page.e index 98ef14ed..42f02a0e 100644 --- a/examples/widgetapp/grid_page.e +++ b/examples/widgetapp/grid_page.e @@ -18,17 +18,34 @@ feature initialize_controls local - ds: DEMO_DATASOURCE + container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] do - create ds.make_demo - create grid.make_grid ("mygrid", <>, ds) - control := grid + create container.make_multi_control ("container") + create datasource.make_news + create search_query.make_autocomplete ("query", create {GOOGLE_AUTOCOMPLETION}.make) + search_query.add_class ("form-control") + search_query.set_change_event (agent change_query) + container.add_control (search_query) + create grid.make_grid ("mygrid", <>, datasource) + container.add_control (grid) + control := container + end + + change_query + do + datasource.set_query (search_query.value) + datasource.set_page (1) + datasource.update end process do end - grid: WSF_GRID_CONTROL [DEMO_DATA] + grid: WSF_GRID_CONTROL [GOOGLE_NEWS] + + search_query: WSF_AUTOCOMPLETE_CONTROL + + datasource: GOOGLE_NEWS_DATASOURCE end diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 03687ac6..c813480c 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -131,7 +131,6 @@ class WSF_TEXTAREA_CONTROL extends WSF_INPUT_CONTROL class WSF_AUTOCOMPLETE_CONTROL extends WSF_INPUT_CONTROL attach_events: () -> - super self = @ @$el.typeahead({ name: @control_name @@ -148,6 +147,8 @@ class WSF_AUTOCOMPLETE_CONTROL extends WSF_INPUT_CONTROL filter: (parsedResponse) -> parsedResponse[self.control_name]['suggestions'] }) + @$el.on 'typeahead:closed',()-> + self.change() class WSF_CHECKBOX_CONTROL extends WSF_CONTROL attach_events: ()-> diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index a6740784..e8c86b0d 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -263,9 +263,8 @@ WSF_AUTOCOMPLETE_CONTROL.prototype.attach_events = function() { var self; - WSF_AUTOCOMPLETE_CONTROL.__super__.attach_events.apply(this, arguments); self = this; - return this.$el.typeahead({ + this.$el.typeahead({ name: this.control_name, template: window.states[this.control_name]['template'], engine: Mini, @@ -284,6 +283,9 @@ } } }); + return this.$el.on('typeahead:closed', function() { + return self.change(); + }); }; return WSF_AUTOCOMPLETE_CONTROL; diff --git a/examples/widgetapp/widgetapp.ecf b/examples/widgetapp/widgetapp.ecf index 082b483f..983564b1 100644 --- a/examples/widgetapp/widgetapp.ecf +++ b/examples/widgetapp/widgetapp.ecf @@ -10,6 +10,7 @@ + diff --git a/library/server/wsf_html/webcontrol/grid/wsf_datasource.e b/library/server/wsf_html/webcontrol/grid/wsf_datasource.e index e37d1c1c..8f19529a 100644 --- a/library/server/wsf_html/webcontrol/grid/wsf_datasource.e +++ b/library/server/wsf_html/webcontrol/grid/wsf_datasource.e @@ -16,8 +16,8 @@ feature -- Update event update do - if attached on_update_agent as a then - a.call([]) + if attached on_update_agent as a then + a.call ([]) end end diff --git a/library/server/wsf_html/webcontrol/grid/wsf_grid_image_column.e b/library/server/wsf_html/webcontrol/grid/wsf_grid_image_column.e new file mode 100644 index 00000000..d1824013 --- /dev/null +++ b/library/server/wsf_html/webcontrol/grid/wsf_grid_image_column.e @@ -0,0 +1,38 @@ +note + description: "Summary description for {WSF_GRID_IMAGE_COLUMN}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_GRID_IMAGE_COLUMN + +inherit + + WSF_GRID_COLUMN + redefine + render_column + end + +create + make_image_column + +feature {NONE} + + make_image_column (a_header, a_field: STRING) + do + make_column (a_header, a_field) + end + +feature + + render_column (e: WSF_ENTITY): STRING + do + if attached e.get (field_name) as data then + Result := "" + else + Result := "[VOID]" + end + end + +end diff --git a/library/server/wsf_html/webcontrol/grid/wsf_pagable_datasource.e b/library/server/wsf_html/webcontrol/grid/wsf_pagable_datasource.e index a0f28e4e..547b7269 100644 --- a/library/server/wsf_html/webcontrol/grid/wsf_pagable_datasource.e +++ b/library/server/wsf_html/webcontrol/grid/wsf_pagable_datasource.e @@ -12,9 +12,29 @@ inherit WSF_DATASOURCE [G] redefine state, - set_state + set_state, + update end +feature -- Update event + + set_on_update_page_agent (f: PROCEDURE [ANY, TUPLE []]) + do + on_update_page_agent := f + end + + update + do + if attached on_update_agent as a then + a.call ([]) + end + if attached on_update_page_agent as a then + a.call ([]) + end + end + + on_update_page_agent: detachable PROCEDURE [ANY, TUPLE []] + feature --States state: JSON_OBJECT diff --git a/library/server/wsf_html/webcontrol/grid/wsf_pagination_control.e b/library/server/wsf_html/webcontrol/grid/wsf_pagination_control.e index 85bbd099..2024746d 100644 --- a/library/server/wsf_html/webcontrol/grid/wsf_pagination_control.e +++ b/library/server/wsf_html/webcontrol/grid/wsf_pagination_control.e @@ -21,6 +21,7 @@ feature {NONE} make_control (n, "ul") add_class ("pagination") datasource := ds + datasource.set_on_update_page_agent (agent update) end feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT @@ -49,16 +50,19 @@ feature --EVENT HANDLING datasource.set_page (i) end end - state_changes.replace (create {JSON_STRING}.make_json (render), create {JSON_STRING}.make_json ("_html")) datasource.update end end feature + update + do + state_changes.replace (create {JSON_STRING}.make_json (render), create {JSON_STRING}.make_json ("_html")) + end + render: STRING local - page_count: INTEGER paging_start: INTEGER paging_end: INTEGER cssclass: STRING From cfe452543a5f88f7babe5328b5a5dcefe51c47ad Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sat, 14 Sep 2013 18:41:49 +0200 Subject: [PATCH 064/191] Implement repeater --- examples/widgetapp/application.e | 11 ++ examples/widgetapp/google_news_repeater.e | 38 +++++++ examples/widgetapp/repeater_page.e | 51 +++++++++ examples/widgetapp/widget.coffee | 15 ++- examples/widgetapp/widget.js | 34 +++++- .../webcontrol/grid/wsf_grid_control.e | 79 +++----------- .../webcontrol/grid/wsf_repeater_control.e | 100 ++++++++++++++++++ .../server/wsf_html/webcontrol/wsf_control.e | 9 +- 8 files changed, 266 insertions(+), 71 deletions(-) create mode 100644 examples/widgetapp/google_news_repeater.e create mode 100644 examples/widgetapp/repeater_page.e create mode 100644 library/server/wsf_html/webcontrol/grid/wsf_repeater_control.e diff --git a/examples/widgetapp/application.e b/examples/widgetapp/application.e index 82a22f54..c1e342a9 100644 --- a/examples/widgetapp/application.e +++ b/examples/widgetapp/application.e @@ -34,6 +34,7 @@ feature {NONE} -- Initialization -- router.map (create {WSF_URI_MAPPING}.make ("/hello", create {WSF_AGENT_URI_HANDLER}.make (agent execute_hello))) map_agent_uri ("/", agent execute_hello, Void) map_agent_uri ("/grid", agent grid_demo, Void) + map_agent_uri ("/repeater", agent repeater_demo, Void) map_agent_uri ("/widget.js", agent load_js, Void) map_agent_uri ("/widget.css", agent load_css, Void) map_agent_uri ("/bootstrap.min.css", agent load_bootstrap, Void) @@ -68,6 +69,16 @@ feature -- Execution page.execute end + repeater_demo (req: WSF_REQUEST; res: WSF_RESPONSE) + local + page: REPEATER_PAGE + do + -- To send a response we need to setup, the status code and + -- the response headers. + create page.make (req, res) + page.execute + end + load_js (req: WSF_REQUEST; res: WSF_RESPONSE) local f: WSF_FILE_RESPONSE diff --git a/examples/widgetapp/google_news_repeater.e b/examples/widgetapp/google_news_repeater.e new file mode 100644 index 00000000..44e54c68 --- /dev/null +++ b/examples/widgetapp/google_news_repeater.e @@ -0,0 +1,38 @@ +note + description: "Summary description for {GOOGLE_NEWS_REPEATER}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + GOOGLE_NEWS_REPEATER + +inherit + + WSF_REPEATER_CONTROL [GOOGLE_NEWS] + +create + make_repeater + +feature + + render_item (item: GOOGLE_NEWS): STRING + local + body: STRING + do + Result := "" + if attached item.image as image then + Result.append (render_tag_with_tagname ("a", render_tag_with_tagname ("img", "", "style=%"max-width: 200px;%" src=%"" + image + "%"", "media-object"), "href=%"#%"", "pull-left")) + end + body := "" + if attached item.title as title then + body.append (render_tag_with_tagname ("h4", title, "", "media-heading")) + end + if attached item.content as content then + body.append (content) + end + Result.append (render_tag_with_tagname ("div", body, "", "media-body")) + Result := render_tag_with_tagname ("div", Result, "", "media") + "
" + end + +end diff --git a/examples/widgetapp/repeater_page.e b/examples/widgetapp/repeater_page.e new file mode 100644 index 00000000..ee1d700b --- /dev/null +++ b/examples/widgetapp/repeater_page.e @@ -0,0 +1,51 @@ +note + description: "Summary description for {REPEATER_PAGE}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + REPEATER_PAGE +inherit + + WSF_PAGE_CONTROL + +create + make + +feature + + initialize_controls + local + container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] + do + create container.make_multi_control ("container") + create datasource.make_news + create search_query.make_autocomplete ("query", create {GOOGLE_AUTOCOMPLETION}.make) + search_query.add_class ("form-control") + search_query.set_change_event (agent change_query) + container.add_control (search_query) + create repeater.make_repeater ("myrepeater", datasource) + container.add_control (repeater) + control := container + end + + change_query + do + datasource.set_query (search_query.value) + datasource.set_page (1) + datasource.update + end + + process + do + end + + repeater: GOOGLE_NEWS_REPEATER + + search_query: WSF_AUTOCOMPLETE_CONTROL + + datasource: GOOGLE_NEWS_DATASOURCE + +end + diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index c813480c..0aee32a2 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -277,7 +277,19 @@ class WSF_GRID_CONTROL extends WSF_CONTROL if state.datasource? window.states[@control_name]['datasource'] = state.datasource if state._body? - @$el.find('tbody').html($(state._body).html()) + @$el.find('tbody').html(state._body) + +class WSF_REPEATER_CONTROL extends WSF_CONTROL + attach_events: ()-> + self = @ + + update: (state) -> + if state.datasource? + window.states[@control_name]['datasource'] = state.datasource + if state._body? + @$el.find('.repeater_content').html(state._body) + console.log state._body + #map class name to effective class typemap = @@ -291,6 +303,7 @@ typemap = "WSF_CHECKBOX_LIST_CONTROL": WSF_CHECKBOX_LIST_CONTROL "WSF_PAGINATION_CONTROL": WSF_PAGINATION_CONTROL "WSF_GRID_CONTROL": WSF_GRID_CONTROL + "WSF_REPEATER_CONTROL":WSF_REPEATER_CONTROL #create a js class for each control for name,state of window.states diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index e8c86b0d..226fa86d 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.6.1 (function() { - var $el, Mini, WSF_AUTOCOMPLETE_CONTROL, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CHECKBOX_LIST_CONTROL, WSF_CONTROL, WSF_FORM_ELEMENT_CONTROL, WSF_GRID_CONTROL, WSF_HTML_CONTROL, WSF_INPUT_CONTROL, WSF_MAX_VALIDATOR, WSF_MIN_VALIDATOR, WSF_PAGINATION_CONTROL, WSF_REGEXP_VALIDATOR, WSF_TEXTAREA_CONTROL, WSF_VALIDATOR, cache, controls, name, state, template, tmpl, trigger_callback, type, typemap, validatormap, _ref, _ref1, _ref2, + var $el, Mini, WSF_AUTOCOMPLETE_CONTROL, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CHECKBOX_LIST_CONTROL, WSF_CONTROL, WSF_FORM_ELEMENT_CONTROL, WSF_GRID_CONTROL, WSF_HTML_CONTROL, WSF_INPUT_CONTROL, WSF_MAX_VALIDATOR, WSF_MIN_VALIDATOR, WSF_PAGINATION_CONTROL, WSF_REGEXP_VALIDATOR, WSF_REPEATER_CONTROL, WSF_TEXTAREA_CONTROL, WSF_VALIDATOR, cache, controls, name, state, template, tmpl, trigger_callback, type, typemap, validatormap, _ref, _ref1, _ref2, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -523,7 +523,7 @@ window.states[this.control_name]['datasource'] = state.datasource; } if (state._body != null) { - return this.$el.find('tbody').html($(state._body).html()); + return this.$el.find('tbody').html(state._body); } }; @@ -531,6 +531,33 @@ })(WSF_CONTROL); + WSF_REPEATER_CONTROL = (function(_super) { + + __extends(WSF_REPEATER_CONTROL, _super); + + function WSF_REPEATER_CONTROL() { + return WSF_REPEATER_CONTROL.__super__.constructor.apply(this, arguments); + } + + WSF_REPEATER_CONTROL.prototype.attach_events = function() { + var self; + return self = this; + }; + + WSF_REPEATER_CONTROL.prototype.update = function(state) { + if (state.datasource != null) { + window.states[this.control_name]['datasource'] = state.datasource; + } + if (state._body != null) { + this.$el.find('.repeater_content').html(state._body); + return console.log(state._body); + } + }; + + return WSF_REPEATER_CONTROL; + + })(WSF_CONTROL); + typemap = { "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL, "WSF_INPUT_CONTROL": WSF_INPUT_CONTROL, @@ -541,7 +568,8 @@ "WSF_HTML_CONTROL": WSF_HTML_CONTROL, "WSF_CHECKBOX_LIST_CONTROL": WSF_CHECKBOX_LIST_CONTROL, "WSF_PAGINATION_CONTROL": WSF_PAGINATION_CONTROL, - "WSF_GRID_CONTROL": WSF_GRID_CONTROL + "WSF_GRID_CONTROL": WSF_GRID_CONTROL, + "WSF_REPEATER_CONTROL": WSF_REPEATER_CONTROL }; _ref = window.states; diff --git a/library/server/wsf_html/webcontrol/grid/wsf_grid_control.e b/library/server/wsf_html/webcontrol/grid/wsf_grid_control.e index ba50519c..0dd39b37 100644 --- a/library/server/wsf_html/webcontrol/grid/wsf_grid_control.e +++ b/library/server/wsf_html/webcontrol/grid/wsf_grid_control.e @@ -9,11 +9,8 @@ class inherit - WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] + WSF_REPEATER_CONTROL [G] redefine - set_state, - state, - handle_callback, render end @@ -24,48 +21,23 @@ feature {NONE} make_grid (n: STRING; a_columns: ITERABLE [WSF_GRID_COLUMN]; a_datasource: WSF_DATASOURCE [G]) do - make_multi_control (n) + make_repeater (n, a_datasource) columns := a_columns - datasource := a_datasource - datasource.set_on_update_agent (agent update) - if attached {WSF_PAGABLE_DATASOURCE [G]} a_datasource as ds then - create pagination_control.make_paging (n + "_paging", ds) - add_control (pagination_control) - end - end - -feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT - - update - do - state_changes.replace (create {JSON_STRING}.make_json (render_body), create {JSON_STRING}.make_json ("_body")) - state_changes.replace (datasource.state, create {JSON_STRING}.make_json ("datasource")) - end - - set_state (new_state: JSON_OBJECT) - -- Restore html from json - do - if attached {JSON_OBJECT} new_state.item (create {JSON_STRING}.make_json ("datasource")) as datasource_state then - datasource.set_state (datasource_state) - end - end - - state: JSON_OBJECT - -- Return state which contains the current html and if there is an event handle attached - do - create Result.make - Result.put (datasource.state, create {JSON_STRING}.make_json ("datasource")) - end - -feature --EVENT HANDLING - - handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING) - do - Precursor (cname, event, event_parameter) end feature -- Implementation + render_item (item: G): STRING + do + Result := "" + across + columns as c + loop + Result.append (render_tag_with_tagname ("td", c.item.render_column (item), "", "")) + end + Result := render_tag_with_tagname ("tr", Result, "", "") + end + render_header: STRING do Result := "" @@ -77,30 +49,11 @@ feature -- Implementation Result := render_tag_with_tagname ("thead", render_tag_with_tagname ("tr", Result, "", ""), "", "") end - render_body: STRING - local - row: STRING - do - Result := "" - across - datasource.data as entity - loop - row := "" - across - columns as c - loop - row.append (render_tag_with_tagname ("td", c.item.render_column (entity.item), "", "")) - end - Result.append (render_tag_with_tagname ("tr", row, "", "")) - end - Result := render_tag_with_tagname ("tbody", Result, "", "") - end - render: STRING local table: STRING do - table := render_tag_with_tagname ("table", render_header + render_body, "", "table table-striped") + table := render_tag_with_tagname ("table", render_header + render_tag_with_tagname ("tbody", render_body, "", ""), "", "table table-striped") Result := "" across controls as c @@ -114,8 +67,4 @@ feature columns: ITERABLE [WSF_GRID_COLUMN] - datasource: WSF_DATASOURCE [G] - - pagination_control: detachable WSF_PAGINATION_CONTROL [G] - end diff --git a/library/server/wsf_html/webcontrol/grid/wsf_repeater_control.e b/library/server/wsf_html/webcontrol/grid/wsf_repeater_control.e new file mode 100644 index 00000000..e4246dac --- /dev/null +++ b/library/server/wsf_html/webcontrol/grid/wsf_repeater_control.e @@ -0,0 +1,100 @@ +note + description: "Summary description for {WSF_REPEATER_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + WSF_REPEATER_CONTROL [G -> WSF_ENTITY] + +inherit + + WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] + redefine + set_state, + state, + handle_callback, + render + end + +feature {NONE} + + make_repeater (n: STRING; a_datasource: WSF_DATASOURCE [G]) + do + make_multi_control (n) + datasource := a_datasource + datasource.set_on_update_agent (agent update) + if attached {WSF_PAGABLE_DATASOURCE [G]} a_datasource as ds then + create pagination_control.make_paging (n + "_paging", ds) + add_control (pagination_control) + end + end + +feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT + + update + do + state_changes.replace (create {JSON_STRING}.make_json (render_body), create {JSON_STRING}.make_json ("_body")) + state_changes.replace (datasource.state, create {JSON_STRING}.make_json ("datasource")) + end + + set_state (new_state: JSON_OBJECT) + -- Restore html from json + do + if attached {JSON_OBJECT} new_state.item (create {JSON_STRING}.make_json ("datasource")) as datasource_state then + datasource.set_state (datasource_state) + end + end + + state: JSON_OBJECT + -- Return state which contains the current html and if there is an event handle attached + do + create Result.make + Result.put (datasource.state, create {JSON_STRING}.make_json ("datasource")) + end + +feature --EVENT HANDLING + + handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING) + do + Precursor (cname, event, event_parameter) + end + +feature -- Implementation + + render_item (item: G): STRING + deferred + end + + render_body: STRING + do + Result := "" + across + datasource.data as entity + loop + Result.append (render_item (entity.item)) + end + end + + render: STRING + local + content: STRING + do + content := render_tag_with_tagname ("div", render_body, "", "repeater_content") + Result := "" + across + controls as c + loop + Result := c.item.render + Result + end + -- Fix generator name since the user will extend this class to define item_render + Result := render_tag_with_generator_name ("WSF_REPEATER_CONTROL", content + Result, "") + end + +feature + + datasource: WSF_DATASOURCE [G] + + pagination_control: detachable WSF_PAGINATION_CONTROL [G] + +end diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e index 53198959..10c8900a 100644 --- a/library/server/wsf_html/webcontrol/wsf_control.e +++ b/library/server/wsf_html/webcontrol/wsf_control.e @@ -1,4 +1,4 @@ - note +note description: "Summary description for {WSF_CONTROL}." author: "" date: "$Date$" @@ -68,6 +68,11 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT feature -- Rendering render_tag (body, attrs: STRING): STRING + do + Result:=render_tag_with_generator_name (generator, body, attrs) + end + + render_tag_with_generator_name (a_generator, body, attrs: STRING): STRING local css_classes_string: STRING l_attributes: STRING @@ -78,7 +83,7 @@ feature -- Rendering loop css_classes_string := css_classes_string + " " + c.item end - l_attributes := "id=%"" + control_name + "%" data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attrs + l_attributes := "id=%"" + control_name + "%" data-name=%"" + control_name + "%" data-type=%"" + a_generator + "%" " + attrs Result := render_tag_with_tagname (tag_name, body, l_attributes, css_classes_string) end From 6230d643c8e259d0c880d79a3dc6ef8f164fd341 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sat, 14 Sep 2013 19:39:08 +0200 Subject: [PATCH 065/191] Style demo pages --- examples/widgetapp/grid_page.e | 3 ++ examples/widgetapp/repeater_page.e | 3 ++ .../webcontrol/wsf_stateless_html_control.e | 40 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 library/server/wsf_html/webcontrol/wsf_stateless_html_control.e diff --git a/examples/widgetapp/grid_page.e b/examples/widgetapp/grid_page.e index 42f02a0e..7ca591d6 100644 --- a/examples/widgetapp/grid_page.e +++ b/examples/widgetapp/grid_page.e @@ -21,11 +21,14 @@ feature container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] do create container.make_multi_control ("container") + container.add_class ("container") + container.add_control (create {WSF_STATELESS_HTML_CONTROL}.make_html("h1","Grid Demo")) create datasource.make_news create search_query.make_autocomplete ("query", create {GOOGLE_AUTOCOMPLETION}.make) search_query.add_class ("form-control") search_query.set_change_event (agent change_query) container.add_control (search_query) + container.add_control (create {WSF_STATELESS_HTML_CONTROL}.make_html("h2","Results")) create grid.make_grid ("mygrid", <>, datasource) container.add_control (grid) control := container diff --git a/examples/widgetapp/repeater_page.e b/examples/widgetapp/repeater_page.e index ee1d700b..afd0dcf3 100644 --- a/examples/widgetapp/repeater_page.e +++ b/examples/widgetapp/repeater_page.e @@ -20,11 +20,14 @@ feature container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] do create container.make_multi_control ("container") + container.add_class ("container") + container.add_control (create {WSF_STATELESS_HTML_CONTROL}.make_html("h1","Repeater Demo")) create datasource.make_news create search_query.make_autocomplete ("query", create {GOOGLE_AUTOCOMPLETION}.make) search_query.add_class ("form-control") search_query.set_change_event (agent change_query) container.add_control (search_query) + container.add_control (create {WSF_STATELESS_HTML_CONTROL}.make_html("h2","Results")) create repeater.make_repeater ("myrepeater", datasource) container.add_control (repeater) control := container diff --git a/library/server/wsf_html/webcontrol/wsf_stateless_html_control.e b/library/server/wsf_html/webcontrol/wsf_stateless_html_control.e new file mode 100644 index 00000000..7d1f4c5d --- /dev/null +++ b/library/server/wsf_html/webcontrol/wsf_stateless_html_control.e @@ -0,0 +1,40 @@ +note + description: "Summary description for {WSF_STATELESS_HTML_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_STATELESS_HTML_CONTROL + +inherit + + WSF_STATELESS_CONTROL + +create + make_html + +feature {NONE} + + make_html (t, v: STRING) + do + make ( t) + html := v + end + + +feature -- Implementation + + render: STRING + do + Result := render_tag (html, "") + end + + + +feature + + html: STRING + +end + From 0f8444a585559d21ed472641ceeada70bc807c4b Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sat, 14 Sep 2013 20:39:07 +0200 Subject: [PATCH 066/191] Remove column from grid --- examples/widgetapp/grid_page.e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/widgetapp/grid_page.e b/examples/widgetapp/grid_page.e index 7ca591d6..b035ff1e 100644 --- a/examples/widgetapp/grid_page.e +++ b/examples/widgetapp/grid_page.e @@ -29,7 +29,7 @@ feature search_query.set_change_event (agent change_query) container.add_control (search_query) container.add_control (create {WSF_STATELESS_HTML_CONTROL}.make_html("h2","Results")) - create grid.make_grid ("mygrid", <>, datasource) + create grid.make_grid ("mygrid", <>, datasource) container.add_control (grid) control := container end From 15dd993b957b1a8192d428c6dcbc7fccc478925d Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sat, 14 Sep 2013 22:45:58 +0200 Subject: [PATCH 067/191] Fix change event --- examples/widgetapp/widget.coffee | 2 ++ examples/widgetapp/widget.js | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 0aee32a2..1fcb81c6 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -149,6 +149,8 @@ class WSF_AUTOCOMPLETE_CONTROL extends WSF_INPUT_CONTROL }) @$el.on 'typeahead:closed',()-> self.change() + @$el.on 'typeahead:blured',()-> + self.change() class WSF_CHECKBOX_CONTROL extends WSF_CONTROL attach_events: ()-> diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index 226fa86d..53f59f4e 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -283,7 +283,10 @@ } } }); - return this.$el.on('typeahead:closed', function() { + this.$el.on('typeahead:closed', function() { + return self.change(); + }); + return this.$el.on('typeahead:blured', function() { return self.change(); }); }; From 9db93cf4c9712c1d656ed8bcbddc19538e8d8806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Sun, 15 Sep 2013 00:44:20 +0200 Subject: [PATCH 068/191] Included navbar example --- examples/widgetapp/sample_page.e | 14 ++- examples/widgetapp/widget.css | 2 +- .../webcontrol/navbar/wsf_navbar_control.e | 100 +++++------------- .../webcontrol/wsf_stateless_control.e | 2 +- 4 files changed, 40 insertions(+), 78 deletions(-) diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index 90c6b1a7..e8143306 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -18,16 +18,18 @@ feature initialize_controls local - container: WSF_MULTI_CONTROL[WSF_STATELESS_CONTROL] + container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] navbar: WSF_NAVBAR_CONTROL form: WSF_FORM_CONTROL n1_container: WSF_FORM_ELEMENT_CONTROL [STRING] n2_container: WSF_FORM_ELEMENT_CONTROL [STRING] n3_container: WSF_FORM_ELEMENT_CONTROL [STRING] cats_container: WSF_FORM_ELEMENT_CONTROL [LIST [STRING]] + link1: WSF_BASIC_CONTROL + link2: WSF_BASIC_CONTROL s: FLAG_AUTOCOMPLETION do - create s.make(<<["dz", "Algeria"], ["be", "Belgium"] , ["ca", "Canada"],["de", "Deutschland"], ["england", "England"], ["fi", "Finland"], ["gr", "Greece"], ["hu", "Hungary"]>>) + create s.make (<<["dz", "Algeria"], ["be", "Belgium"], ["ca", "Canada"], ["de", "Deutschland"], ["england", "England"], ["fi", "Finland"], ["gr", "Greece"], ["hu", "Hungary"]>>) create container.make_multi_control ("container") create navbar.make_navbar ("Sample Page") create textbox1.make_input ("txtBox1", "1") @@ -35,6 +37,14 @@ feature create autocompletion1.make_autocomplete ("autocompletion1", s) create button1.make_button ("sample_button1", "SUM") create textbox_result.make_html ("txtBox3", "p", "") + create link1.make_control ("a") + create link2.make_control ("a") + link1.set_content ("Home") + link1.set_attributes ("href=%"#%"") + link2.set_content ("About") + link2.set_attributes ("href=%"#%"") + navbar.add_element (link1) + navbar.add_element_right (link2) button1.set_click_event (agent handle_click) button1.add_class ("col-lg-offset-2") create form.make_form_control ("panel") diff --git a/examples/widgetapp/widget.css b/examples/widgetapp/widget.css index cc8042c2..3d4a966f 100644 --- a/examples/widgetapp/widget.css +++ b/examples/widgetapp/widget.css @@ -1,5 +1,5 @@ body { - padding-top: 30px; + padding-top: 80px; } .twitter-typeahead { diff --git a/library/server/wsf_html/webcontrol/navbar/wsf_navbar_control.e b/library/server/wsf_html/webcontrol/navbar/wsf_navbar_control.e index 435df76c..162b37c4 100644 --- a/library/server/wsf_html/webcontrol/navbar/wsf_navbar_control.e +++ b/library/server/wsf_html/webcontrol/navbar/wsf_navbar_control.e @@ -20,6 +20,29 @@ feature nav: WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL] + nav_right: WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL] + +feature + + add_element (c: WSF_STATELESS_CONTROL) + do + add_element_to_nav (c, nav) + end + + add_element_right (c: WSF_STATELESS_CONTROL) + do + add_element_to_nav (c, nav_right) + end + + add_element_to_nav (e: WSF_STATELESS_CONTROL; n: WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL]) + local + li: WSF_STATELESS_MULTI_CONTROL [WSF_STATELESS_CONTROL] + do + create li.make_with_tag_name ("li") + li.add_control (e) + n.add_control (li) + end + feature {NONE} -- Initialization make_navbar (b: STRING) @@ -37,6 +60,7 @@ feature {NONE} -- Initialization create collapse_button.make_with_tag_name ("button") create collapse.make_multi_control create nav.make_with_tag_name ("ul") + create nav_right.make_with_tag_name ("ul") create brand.make_control ("a") create icon_bar.make_control ("span") container.add_class ("container") @@ -53,85 +77,13 @@ feature {NONE} -- Initialization header.add_control (collapse_button) header.add_control (brand) nav.add_class ("nav navbar-nav") + nav_right.add_class ("nav navbar-nav navbar-right") collapse.add_class ("navbar-collapse") collapse.add_control (nav) + collapse.add_control (nav_right) container.add_control (header) container.add_control (collapse) add_control (container) - - -- EXAMPLE NAVBAR USED AS REFERENCE - --
- --
- --
- -- - -- WG Manager - -- - --
- --
- -- - -- - -- - --
- --
- --
end end diff --git a/library/server/wsf_html/webcontrol/wsf_stateless_control.e b/library/server/wsf_html/webcontrol/wsf_stateless_control.e index 4c033a75..6497f6c8 100644 --- a/library/server/wsf_html/webcontrol/wsf_stateless_control.e +++ b/library/server/wsf_html/webcontrol/wsf_stateless_control.e @@ -54,7 +54,7 @@ feature l_attributes := l_attributes + " class=%"" + css_classes_string + "%"" end Result := "<" + tag + " " + l_attributes - if body.is_empty and not tag.is_equal ("textarea") and not tag.is_equal ("span") and not tag.is_equal ("button") then + if body.is_empty and not tag.is_equal ("textarea") and not tag.is_equal ("span") and not tag.is_equal ("button") and not tag.is_equal ("ul") then Result := Result + " />" else Result := Result + " >" + body + "" From 6761d22fa8bd5a2d7f104d32bbac5e8e709ffc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Sun, 15 Sep 2013 01:55:17 +0200 Subject: [PATCH 069/191] Added Progress Control --- examples/widgetapp/widget.coffee | 19 ++++-- .../progressbar/wsf_progress_control.e | 59 +++++++++++++++++++ .../progressbar/wsf_progresssource.e | 16 +++++ library/server/wsf_html/wsf_html-safe.ecf | 1 + 4 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e create mode 100644 library/server/wsf_html/webcontrol/progressbar/wsf_progresssource.e diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee index 5e652bfb..b570e09e 100644 --- a/examples/widgetapp/widget.coffee +++ b/examples/widgetapp/widget.coffee @@ -96,6 +96,7 @@ class WSF_BUTTON_CONTROL extends WSF_CONTROL @$el.click (e)-> e.preventDefault() self.click() + click: ()-> if window.states[@control_name]['callback_click'] trigger_callback(@control_name, 'click') @@ -247,16 +248,24 @@ class WSF_CHECKBOX_LIST_CONTROL extends WSF_CONTROL result.push(subc.checked_value) return result +class WSF_PROGRESS_CONTROL extends WSF_CONTROL + + update: (state)-> + if state.progress? + window.states[@control_name]['progress'] = state.progress + $('#' + @control_name).children('.progress-bar').attr('aria-valuenow', state.progress).width(state.progress + '%') + #map class name to effective class typemap = - "WSF_BUTTON_CONTROL":WSF_BUTTON_CONTROL - "WSF_INPUT_CONTROL":WSF_INPUT_CONTROL - "WSF_TEXTAREA_CONTROL":WSF_TEXTAREA_CONTROL - "WSF_AUTOCOMPLETE_CONTROL":WSF_AUTOCOMPLETE_CONTROL - "WSF_CHECKBOX_CONTROL":WSF_CHECKBOX_CONTROL + "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL + "WSF_INPUT_CONTROL": WSF_INPUT_CONTROL + "WSF_TEXTAREA_CONTROL": WSF_TEXTAREA_CONTROL + "WSF_AUTOCOMPLETE_CONTROL": WSF_AUTOCOMPLETE_CONTROL + "WSF_CHECKBOX_CONTROL": WSF_CHECKBOX_CONTROL "WSF_FORM_ELEMENT_CONTROL": WSF_FORM_ELEMENT_CONTROL "WSF_HTML_CONTROL": WSF_HTML_CONTROL "WSF_CHECKBOX_LIST_CONTROL": WSF_CHECKBOX_LIST_CONTROL + "WSF_PROGRESS_CONTROL": WSF_PROGRESS_CONTROL #create a js class for each control for name,state of window.states diff --git a/library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e b/library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e new file mode 100644 index 00000000..f41fe96b --- /dev/null +++ b/library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e @@ -0,0 +1,59 @@ +note + description: "Summary description for {WSF_PROGRESS_CONTROL}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + WSF_PROGRESS_CONTROL + +inherit + + WSF_CONTROL + +create + make_progress + +feature {NONE} -- Initialization + + make_progress (n: STRING; p: WSF_PROGRESSSOURCE) + do + make_control (n, "div") + add_class ("progress") + progress_source := p + end + +feature -- State handling + + set_state (new_state: JSON_OBJECT) + do + end + + state: JSON_OBJECT + do + create Result.make + Result.put (create {JSON_NUMBER}.make_integer (progress_source.progress), "progress") + end + +feature -- Event handling + + handle_callback (cname: STRING; event: STRING) + do + if cname.is_equal (control_name) and event.is_equal ("progress_fetch") then + state_changes.put (create {JSON_NUMBER}.make_integer (progress_source.progress), create {JSON_STRING}.make_json ("progress")) + end + end + +feature -- Rendering + + render: STRING + do + Result := render_tag_with_tagname ("div", "", "role=%"progressbar%" aria-valuenow=%"" + progress_source.progress.out + "%" aria-valuemin=%"0%" aria-valuemax=%"100%" style=%"width: " + progress_source.progress.out + "%%;%"", "progress-bar") + Result := render_tag (Result, "") + end + +feature + + progress_source: WSF_PROGRESSSOURCE + +end diff --git a/library/server/wsf_html/webcontrol/progressbar/wsf_progresssource.e b/library/server/wsf_html/webcontrol/progressbar/wsf_progresssource.e new file mode 100644 index 00000000..e581b1dd --- /dev/null +++ b/library/server/wsf_html/webcontrol/progressbar/wsf_progresssource.e @@ -0,0 +1,16 @@ +note + description: "Summary description for {WSF_PROGRESSSOURCE}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + WSF_PROGRESSSOURCE + +feature + + progress: INTEGER + deferred + end + +end diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf index 35670474..5de37699 100644 --- a/library/server/wsf_html/wsf_html-safe.ecf +++ b/library/server/wsf_html/wsf_html-safe.ecf @@ -25,6 +25,7 @@ + From be05edac7d5b1add307ad8236b50170a5b22dd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Sun, 15 Sep 2013 01:57:03 +0200 Subject: [PATCH 070/191] Added Progress Control --- examples/widgetapp/widget.js | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js index 76efbde4..8d0122c5 100644 --- a/examples/widgetapp/widget.js +++ b/examples/widgetapp/widget.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.6.1 (function() { - var $el, Mini, WSF_AUTOCOMPLETE_CONTROL, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CHECKBOX_LIST_CONTROL, WSF_CONTROL, WSF_FORM_ELEMENT_CONTROL, WSF_HTML_CONTROL, WSF_INPUT_CONTROL, WSF_MAX_VALIDATOR, WSF_MIN_VALIDATOR, WSF_REGEXP_VALIDATOR, WSF_TEXTAREA_CONTROL, WSF_VALIDATOR, cache, controls, name, state, template, tmpl, trigger_callback, type, typemap, validatormap, _ref, _ref1, _ref2, + var $el, Mini, WSF_AUTOCOMPLETE_CONTROL, WSF_BUTTON_CONTROL, WSF_CHECKBOX_CONTROL, WSF_CHECKBOX_LIST_CONTROL, WSF_CONTROL, WSF_FORM_ELEMENT_CONTROL, WSF_HTML_CONTROL, WSF_INPUT_CONTROL, WSF_MAX_VALIDATOR, WSF_MIN_VALIDATOR, WSF_PROGRESS_CONTROL, WSF_REGEXP_VALIDATOR, WSF_TEXTAREA_CONTROL, WSF_VALIDATOR, cache, controls, name, state, template, tmpl, trigger_callback, type, typemap, validatormap, _ref, _ref1, _ref2, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -463,6 +463,25 @@ })(WSF_CONTROL); + WSF_PROGRESS_CONTROL = (function(_super) { + + __extends(WSF_PROGRESS_CONTROL, _super); + + function WSF_PROGRESS_CONTROL() { + return WSF_PROGRESS_CONTROL.__super__.constructor.apply(this, arguments); + } + + WSF_PROGRESS_CONTROL.prototype.update = function(state) { + if (state.progress != null) { + window.states[this.control_name]['progress'] = state.progress; + return $('#' + this.control_name).children('.progress-bar').attr('aria-valuenow', state.progress).width(state.progress + '%'); + } + }; + + return WSF_PROGRESS_CONTROL; + + })(WSF_CONTROL); + typemap = { "WSF_BUTTON_CONTROL": WSF_BUTTON_CONTROL, "WSF_INPUT_CONTROL": WSF_INPUT_CONTROL, @@ -471,7 +490,8 @@ "WSF_CHECKBOX_CONTROL": WSF_CHECKBOX_CONTROL, "WSF_FORM_ELEMENT_CONTROL": WSF_FORM_ELEMENT_CONTROL, "WSF_HTML_CONTROL": WSF_HTML_CONTROL, - "WSF_CHECKBOX_LIST_CONTROL": WSF_CHECKBOX_LIST_CONTROL + "WSF_CHECKBOX_LIST_CONTROL": WSF_CHECKBOX_LIST_CONTROL, + "WSF_PROGRESS_CONTROL": WSF_PROGRESS_CONTROL }; _ref = window.states; From 45e3a6d7ccd8289e10d08a2c36e10c4f33ad425b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCnger?= Date: Sun, 15 Sep 2013 13:25:01 +0200 Subject: [PATCH 071/191] Small changes --- examples/widgetapp/demo_progresssource.e | 36 ++++++++++++++++++++++++ examples/widgetapp/sample_page.e | 5 ++++ 2 files changed, 41 insertions(+) create mode 100644 examples/widgetapp/demo_progresssource.e diff --git a/examples/widgetapp/demo_progresssource.e b/examples/widgetapp/demo_progresssource.e new file mode 100644 index 00000000..ce023d33 --- /dev/null +++ b/examples/widgetapp/demo_progresssource.e @@ -0,0 +1,36 @@ +note + description: "Summary description for {DEMO_PROGRESSSOURCE}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + DEMO_PROGRESSSOURCE + +inherit + + WSF_PROGRESSSOURCE + +create + make + +feature {NONE} -- Initialization + + make + do + prog := 20 + end + +feature -- Implementation + + progress: INTEGER + do + if prog < 100 then + prog := prog + 1 + end + Result := prog + end + + prog: INTEGER + +end diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index e8143306..fd684c81 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -25,6 +25,8 @@ feature n2_container: WSF_FORM_ELEMENT_CONTROL [STRING] n3_container: WSF_FORM_ELEMENT_CONTROL [STRING] cats_container: WSF_FORM_ELEMENT_CONTROL [LIST [STRING]] + progress: WSF_PROGRESS_CONTROL + progress_source: WSF_PROGRESSSOURCE link1: WSF_BASIC_CONTROL link2: WSF_BASIC_CONTROL s: FLAG_AUTOCOMPLETION @@ -37,6 +39,8 @@ feature create autocompletion1.make_autocomplete ("autocompletion1", s) create button1.make_button ("sample_button1", "SUM") create textbox_result.make_html ("txtBox3", "p", "") + create {DEMO_PROGRESSSOURCE} progress_source.make + create progress.make_progress ("progress1", progress_source) create link1.make_control ("a") create link2.make_control ("a") link1.set_content ("Home") @@ -69,6 +73,7 @@ feature form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING]}.make_form_element ("Result", textbox_result)) container.add_control (navbar) container.add_control (form) + container.add_control (progress) control := container end From 1ba9792547097f87b10940a4e5957fc150aec596 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sun, 15 Sep 2013 13:33:43 +0200 Subject: [PATCH 072/191] Fix suggestions --- examples/widgetapp/google_autocompletion.e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/widgetapp/google_autocompletion.e b/examples/widgetapp/google_autocompletion.e index 89f35696..75979911 100644 --- a/examples/widgetapp/google_autocompletion.e +++ b/examples/widgetapp/google_autocompletion.e @@ -37,7 +37,7 @@ feature -- Implementation create Result.make_array if curl_handle /= default_pointer then create l_curl_string.make_empty - curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_url, "http://suggestqueries.google.com/complete/search?client=firefox&q=" + query_str) + curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_url, "http://google.com/complete/search?client=chrome&q=" + query_str) curl_easy.set_write_function (curl_handle) curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_writedata, l_curl_string.object_id) l_result := curl_easy.perform (curl_handle) From 251974fd2f0ec860c6a3f6abff96adb60471e98d Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sun, 15 Sep 2013 14:16:18 +0200 Subject: [PATCH 073/191] Create basepage --- examples/widgetapp/base_page.e | 35 ++++++++++++++++++++++++++++++ examples/widgetapp/grid_page.e | 10 ++++----- examples/widgetapp/repeater_page.e | 12 +++++----- examples/widgetapp/sample_page.e | 19 ++++++---------- 4 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 examples/widgetapp/base_page.e diff --git a/examples/widgetapp/base_page.e b/examples/widgetapp/base_page.e new file mode 100644 index 00000000..67debeb1 --- /dev/null +++ b/examples/widgetapp/base_page.e @@ -0,0 +1,35 @@ +note + description: "Summary description for {BASE_PAGE}." + author: "" + date: "$Date$" + revision: "$Revision$" + +deferred class + BASE_PAGE + +inherit + + WSF_PAGE_CONTROL + +feature + + initialize_controls + local + navbar: WSF_NAVBAR_CONTROL + do + create container.make_multi_control ("container") + container.add_class ("container") + create navbar.make_navbar ("Sample Page") + navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/%"", "Home")) + navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/grid%"", "Grid")) + navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/repeater%"", "Repeater")) + navbar.add_element_right (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"#%"", "About")) + container.add_control (navbar) + control:=container + end + +feature + + container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] + +end diff --git a/examples/widgetapp/grid_page.e b/examples/widgetapp/grid_page.e index 5e2eafbd..09401298 100644 --- a/examples/widgetapp/grid_page.e +++ b/examples/widgetapp/grid_page.e @@ -9,7 +9,10 @@ class inherit - WSF_PAGE_CONTROL + BASE_PAGE + redefine + initialize_controls + end create make @@ -17,11 +20,8 @@ create feature initialize_controls - local - container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] do - create container.make_multi_control ("container") - container.add_class ("container") + Precursor container.add_control (create {WSF_BASIC_CONTROL}.make_with_body("h1","","Grid Demo")) create datasource.make_news create search_query.make_autocomplete ("query", create {GOOGLE_AUTOCOMPLETION}.make) diff --git a/examples/widgetapp/repeater_page.e b/examples/widgetapp/repeater_page.e index 911315e8..705ff149 100644 --- a/examples/widgetapp/repeater_page.e +++ b/examples/widgetapp/repeater_page.e @@ -6,9 +6,13 @@ note class REPEATER_PAGE + inherit - WSF_PAGE_CONTROL + BASE_PAGE + redefine + initialize_controls + end create make @@ -16,11 +20,8 @@ create feature initialize_controls - local - container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] do - create container.make_multi_control ("container") - container.add_class ("container") + Precursor container.add_control (create {WSF_BASIC_CONTROL}.make_with_body("h1","","Repeater Demo")) create datasource.make_news create search_query.make_autocomplete ("query", create {GOOGLE_AUTOCOMPLETION}.make) @@ -30,7 +31,6 @@ feature container.add_control (create {WSF_BASIC_CONTROL}.make_with_body("h2","","Results")) create repeater.make_repeater ("myrepeater", datasource) container.add_control (repeater) - control := container end change_query diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index 43a0e2a7..e234e5ea 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -9,7 +9,10 @@ class inherit - WSF_PAGE_CONTROL + BASE_PAGE + redefine + initialize_controls + end create make @@ -18,8 +21,6 @@ feature initialize_controls local - container: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL] - navbar: WSF_NAVBAR_CONTROL n1_container: WSF_FORM_ELEMENT_CONTROL [STRING] n2_container: WSF_FORM_ELEMENT_CONTROL [STRING] n3_container: WSF_FORM_ELEMENT_CONTROL [STRING] @@ -27,20 +28,15 @@ feature s: FLAG_AUTOCOMPLETION do + Precursor create s.make (<<["dz", "Algeria"], ["be", "Belgium"], ["ca", "Canada"], ["de", "Deutschland"], ["england", "England"], ["fi", "Finland"], ["gr", "Greece"], ["hu", "Hungary"]>>) - create container.make_multi_control ("container") - container.add_class ("container") - create navbar.make_navbar ("Sample Page") + create textbox1.make_input ("txtBox1", "1") create textbox2.make_input ("txtBox2", "2") create autocompletion1.make_autocomplete ("autocompletion1", s) create button1.make_button ("sample_button1", "SUM") create textbox_result.make_html ("txtBox3", "p", "") create progress.make_progress ("progress1") - navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body("a","href=%"/%"","Home")) - navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body("a","href=%"/grid%"","Grid")) - navbar.add_element (create {WSF_BASIC_CONTROL}.make_with_body("a","href=%"/repeater%"","Repeater")) - navbar.add_element_right (create {WSF_BASIC_CONTROL}.make_with_body("a","href=%"#%"","About")) button1.set_click_event (agent handle_click) button1.add_class ("col-lg-offset-2") create form.make_form_control ("panel") @@ -63,10 +59,9 @@ feature form.add_control (cats_container) form.add_control (button1) form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING]}.make_form_element ("Result", textbox_result)) - container.add_control (navbar) + container.add_control (form) container.add_control (progress) - control := container end handle_click From 647beea2453e3af9095ebb62b30cbbf8fa0b87f4 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sun, 15 Sep 2013 15:25:13 +0200 Subject: [PATCH 074/191] Rearrange demo Add contact autocompletion --- .../autocompletion/contact_autocompletion.e | 50 +++++++++++++ .../flag_autocompletion.e | 0 .../google_autocompletion.e | 0 examples/widgetapp/demo_data.e | 50 ------------- examples/widgetapp/demo_datasource.e | 39 ---------- .../widgetapp/{ => googlenews}/google_news.e | 0 .../{ => googlenews}/google_news_datasource.e | 0 .../{ => googlenews}/google_news_repeater.e | 0 examples/widgetapp/sample_page.e | 74 ++++++++++++------- examples/widgetapp/widgetapp.ecf | 3 +- 10 files changed, 100 insertions(+), 116 deletions(-) create mode 100644 examples/widgetapp/autocompletion/contact_autocompletion.e rename examples/widgetapp/{ => autocompletion}/flag_autocompletion.e (100%) rename examples/widgetapp/{ => autocompletion}/google_autocompletion.e (100%) delete mode 100644 examples/widgetapp/demo_data.e delete mode 100644 examples/widgetapp/demo_datasource.e rename examples/widgetapp/{ => googlenews}/google_news.e (100%) rename examples/widgetapp/{ => googlenews}/google_news_datasource.e (100%) rename examples/widgetapp/{ => googlenews}/google_news_repeater.e (100%) diff --git a/examples/widgetapp/autocompletion/contact_autocompletion.e b/examples/widgetapp/autocompletion/contact_autocompletion.e new file mode 100644 index 00000000..62b494eb --- /dev/null +++ b/examples/widgetapp/autocompletion/contact_autocompletion.e @@ -0,0 +1,50 @@ +note + description: "Summary description for {CONTACT_AUTOCOMPLETION}." + author: "" + date: "$Date$" + revision: "$Revision$" + +class + CONTACT_AUTOCOMPLETION + +inherit + + WSF_AUTOCOMPLETION + +create + make + +feature {NONE} -- Initialization + + make () + do + template := "
{{=value}}
{{=company}}
"; + list := <<["Zelma Hays","Applideck","women/13"],["Little Dixon","Centregy","men/20"],["Marta Fuentes","Papricut","women/11"],["Aileen Dillon","Neteria","women/9"],["Noel Melendez","Corporana","men/19"],["Gutierrez Francis","Capscreen","men/3"],["Valerie Weiss","Zizzle","women/9"],["Mabel Hammond","Pyramax","women/19"],["Mckay Logan","Providco","men/17"],["Hazel Colon","Translink","women/14"],["Margery Whitney","Tropoli","women/21"],["Saundra Neal","Geekmosis","women/20"],["Meghan Pittman","Micronaut","women/16"],["Adrienne Woodward","Mixers","women/8"],["Harriett Macdonald","Anarco","women/4"],["Velasquez Curtis","Zensus","men/4"],["Victoria Greene","Zorromop","women/10"],["Hood Barron","Kangle","men/2"],["Mccullough Cross","Kindaloo","men/15"],["Porter Hart","Kongle","men/15"],["Fox Bryant","Columella","men/17"],["Singleton Knapp","Marketoid","men/10"],["Gracie Lane","Solgan","women/15"],["Randall Cobb","Barkarama","men/7"],["Miranda Brooks","Earwax","men/1"],["Teresa Taylor","Stockpost","women/6"]>> + + end + +feature -- Implementation + + autocompletion (input: STRING): JSON_ARRAY + local + o: JSON_OBJECT + do + create Result.make_array + across + list as c + loop + if attached {STRING} c.item.item (1) as value and attached {STRING} c.item.item (3) as img and attached {STRING} c.item.item (2) as company then + if value.as_lower.has_substring (input.as_lower) then + create o.make + o.put (create {JSON_STRING}.make_json (img), "img") + o.put (create {JSON_STRING}.make_json (value), "value") + o.put (create {JSON_STRING}.make_json (company), "company") + Result.add (o) + end + end + end + end + + list: ITERABLE [TUPLE [STRING, STRING]] + +end diff --git a/examples/widgetapp/flag_autocompletion.e b/examples/widgetapp/autocompletion/flag_autocompletion.e similarity index 100% rename from examples/widgetapp/flag_autocompletion.e rename to examples/widgetapp/autocompletion/flag_autocompletion.e diff --git a/examples/widgetapp/google_autocompletion.e b/examples/widgetapp/autocompletion/google_autocompletion.e similarity index 100% rename from examples/widgetapp/google_autocompletion.e rename to examples/widgetapp/autocompletion/google_autocompletion.e diff --git a/examples/widgetapp/demo_data.e b/examples/widgetapp/demo_data.e deleted file mode 100644 index 90171076..00000000 --- a/examples/widgetapp/demo_data.e +++ /dev/null @@ -1,50 +0,0 @@ -note - description: "Summary description for {DEMO_DATA}." - author: "" - date: "$Date$" - revision: "$Revision$" - -class - DEMO_DATA - -inherit - - WSF_ENTITY - -create - make - -feature {NONE} - - make (a_id: INTEGER; a_name, a_description: STRING) - do - id := a_id - name := a_name - description := a_description - image := "http://placehold.it/20x20&text=" + id.out - end - -feature - - id: INTEGER - - name: STRING - - description: STRING - - image: STRING - - get (field: STRING): detachable ANY - do - if field.is_equal ("id") then - Result := id - elseif field.is_equal ("name") then - Result := name - elseif field.is_equal ("description") then - Result := description - elseif field.is_equal ("image") then - Result := image - end - end - -end diff --git a/examples/widgetapp/demo_datasource.e b/examples/widgetapp/demo_datasource.e deleted file mode 100644 index c26f635e..00000000 --- a/examples/widgetapp/demo_datasource.e +++ /dev/null @@ -1,39 +0,0 @@ -note - description: "Summary description for {DEMO_DATASOURCE}." - author: "" - date: "$Date$" - revision: "$Revision$" - -class - DEMO_DATASOURCE - -inherit - - WSF_PAGABLE_DATASOURCE [DEMO_DATA] - -create - make_demo - -feature - - make_demo - do - page := 1 - page_size := 10 - end - - data: ITERABLE [DEMO_DATA] - local - list: LINKED_LIST [DEMO_DATA] - do - create list.make - across - ((page - 1) * page_size + 1) |..| (page * page_size).min (131) as c - loop - list.extend (create {DEMO_DATA}.make (c.item, "Name" + c.item.out, "desc " + c.item.out)) - end - Result := list - row_count := 132 - end - -end diff --git a/examples/widgetapp/google_news.e b/examples/widgetapp/googlenews/google_news.e similarity index 100% rename from examples/widgetapp/google_news.e rename to examples/widgetapp/googlenews/google_news.e diff --git a/examples/widgetapp/google_news_datasource.e b/examples/widgetapp/googlenews/google_news_datasource.e similarity index 100% rename from examples/widgetapp/google_news_datasource.e rename to examples/widgetapp/googlenews/google_news_datasource.e diff --git a/examples/widgetapp/google_news_repeater.e b/examples/widgetapp/googlenews/google_news_repeater.e similarity index 100% rename from examples/widgetapp/google_news_repeater.e rename to examples/widgetapp/googlenews/google_news_repeater.e diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index e234e5ea..5b2f6a58 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -10,9 +10,9 @@ class inherit BASE_PAGE - redefine - initialize_controls - end + redefine + initialize_controls + end create make @@ -24,43 +24,60 @@ feature n1_container: WSF_FORM_ELEMENT_CONTROL [STRING] n2_container: WSF_FORM_ELEMENT_CONTROL [STRING] n3_container: WSF_FORM_ELEMENT_CONTROL [STRING] + n4_container: WSF_FORM_ELEMENT_CONTROL [STRING] + n5_container: WSF_FORM_ELEMENT_CONTROL [STRING] cats_container: WSF_FORM_ELEMENT_CONTROL [LIST [STRING]] - s: FLAG_AUTOCOMPLETION do Precursor - create s.make (<<["dz", "Algeria"], ["be", "Belgium"], ["ca", "Canada"], ["de", "Deutschland"], ["england", "England"], ["fi", "Finland"], ["gr", "Greece"], ["hu", "Hungary"]>>) - - create textbox1.make_input ("txtBox1", "1") - create textbox2.make_input ("txtBox2", "2") - create autocompletion1.make_autocomplete ("autocompletion1", s) - create button1.make_button ("sample_button1", "SUM") - create textbox_result.make_html ("txtBox3", "p", "") - create progress.make_progress ("progress1") - button1.set_click_event (agent handle_click) - button1.add_class ("col-lg-offset-2") create form.make_form_control ("panel") form.add_class ("form-horizontal") - 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 ("os", "Operating Systems", "os")) + --Number 1 + create textbox1.make_input ("txtBox1", "1") create n1_container.make_form_element ("Number1", textbox1) n1_container.add_validator (create {WSF_DECIMAL_VALIDATOR}.make_decimal_validator ("Invalid Number")) n1_container.add_validator (create {OWN_VALIDATOR}.make_own) + form.add_control (n1_container) + --Number 2 + create textbox2.make_input ("txtBox2", "2") create n2_container.make_form_element ("Number2", textbox2) n2_container.add_validator (create {WSF_DECIMAL_VALIDATOR}.make_decimal_validator ("Invalid Number")) - create n3_container.make_form_element ("Autoc1", autocompletion1) - form.add_control (n1_container) form.add_control (n2_container) + --Flag autocomplete + create s.make (<<["dz", "Algeria"], ["be", "Belgium"], ["ca", "Canada"], ["de", "Deutschland"], ["england", "England"], ["fi", "Finland"], ["gr", "Greece"], ["hu", "Hungary"]>>) + create autocompletion1.make_autocomplete ("autocompletion1", s) + create n3_container.make_form_element ("Flag Autocomplete", autocompletion1) form.add_control (n3_container) + --Contact autocomplete + create autocompletion2.make_autocomplete ("autocompletion2", create {CONTACT_AUTOCOMPLETION}.make) + create n4_container.make_form_element ("Contact Autocomplete", autocompletion2) + form.add_control (n4_container) + --Google autocomplete + create autocompletion3.make_autocomplete ("autocompletion4", create {GOOGLE_AUTOCOMPLETION}.make) + create n5_container.make_form_element ("Google Autocomplete", autocompletion3) + form.add_control (n5_container) + --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 ("os", "Operating Systems", "os")) + cklist.add_control (create {WSF_CHECKBOX_CONTROL}.make_checkbox ("fmfp", "Formal Methods and Functional Programming", "fmfp")) create cats_container.make_form_element ("Categories", cklist) cats_container.add_validator (create {WSF_MIN_VALIDATOR [STRING]}.make_min_validator (1, "Choose at least one category")) - cats_container.add_validator (create {WSF_MAX_VALIDATOR [STRING]}.make_max_validator (1, "Choose at most one category")) + cats_container.add_validator (create {WSF_MAX_VALIDATOR [STRING]}.make_max_validator (2, "Choose at most two category")) form.add_control (cats_container) + --Button 1 + create button1.make_button ("sample_button1", "Update") + button1.set_click_event (agent handle_click) + button1.add_class ("col-lg-offset-2") form.add_control (button1) - form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING]}.make_form_element ("Result", textbox_result)) - + --Result + create result_html.make_html ("txtBox3", "p", "") + form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING]}.make_form_element ("Result", result_html)) container.add_control (form) + + --Progress bar + container.add_control (create {WSF_BASIC_CONTROL}.make_with_body("h4","","Number1/Number2")) + create progress.make_progress ("progress1") container.add_control (progress) end @@ -70,7 +87,7 @@ feature do form.validate if form.is_valid then - progress.set_progress ((textbox1.text.to_integer_64 / textbox2.text.to_integer_64*100).ceiling) + progress.set_progress ((textbox1.text.to_integer_64 / textbox2.text.to_integer_64 * 100).ceiling) text := textbox1.text + " + " + textbox2.text + " = " + (textbox1.text.to_integer_64 + textbox2.text.to_integer_64).out text.append ("
    ") across @@ -79,9 +96,9 @@ feature text.append ("
  • " + s.item + "
    • ") end text.append ("
") - textbox_result.set_html (text) + result_html.set_html (text) else - textbox_result.set_html ("VALIDATION ERROR") + result_html.set_html ("VALIDATION ERROR") end end @@ -97,11 +114,16 @@ feature autocompletion1: WSF_AUTOCOMPLETE_CONTROL + autocompletion2: WSF_AUTOCOMPLETE_CONTROL + + autocompletion3: WSF_AUTOCOMPLETE_CONTROL + cklist: WSF_CHECKBOX_LIST_CONTROL - textbox_result: WSF_HTML_CONTROL + result_html: WSF_HTML_CONTROL form: WSF_FORM_CONTROL progress: WSF_PROGRESS_CONTROL + end diff --git a/examples/widgetapp/widgetapp.ecf b/examples/widgetapp/widgetapp.ecf index 983564b1..69cf01a3 100644 --- a/examples/widgetapp/widgetapp.ecf +++ b/examples/widgetapp/widgetapp.ecf @@ -22,7 +22,8 @@ - + + From 358fe04699344cca6aed1a8cee1b26c3d0023dde Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sun, 15 Sep 2013 17:32:23 +0200 Subject: [PATCH 075/191] Add all countries to flag list Set encoding (Must be changed to UTF-8 in future) --- examples/widgetapp/autocompletion/flag_autocompletion.e | 9 ++++----- examples/widgetapp/sample_page.e | 4 +--- library/server/wsf_html/webcontrol/wsf_page_control.e | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/examples/widgetapp/autocompletion/flag_autocompletion.e b/examples/widgetapp/autocompletion/flag_autocompletion.e index 240d65fd..76941cfb 100644 --- a/examples/widgetapp/autocompletion/flag_autocompletion.e +++ b/examples/widgetapp/autocompletion/flag_autocompletion.e @@ -16,18 +16,19 @@ create feature {NONE} -- Initialization - make (l: ITERABLE [TUPLE [STRING, STRING]]) + make () do template := " {{=value}}"; - list := l end feature -- Implementation autocompletion (input: STRING): JSON_ARRAY local + list: ITERABLE [TUPLE [STRING, STRING]] o: JSON_OBJECT do + list := <<["AF", "Afghanistan"], ["AX", "Åland Islands"], ["AL", "Albania"], ["DZ", "Algeria"], ["AS", "American Samoa"], ["AD", "Andorra"], ["AO", "Angola"], ["AI", "Anguilla"], ["AQ", "Antarctica"], ["AG", "Antigua and Barbuda"], ["AR", "Argentina"], ["AM", "Armenia"], ["AW", "Aruba"], ["AU", "Australia"], ["AT", "Austria"], ["AZ", "Azerbaijan"], ["BS", "Bahamas"], ["BH", "Bahrain"], ["BD", "Bangladesh"], ["BB", "Barbados"], ["BY", "Belarus"], ["BE", "Belgium"], ["BZ", "Belize"], ["BJ", "Benin"], ["BM", "Bermuda"], ["BT", "Bhutan"], ["BO", "Bolivia, Plurinational State of"], ["BQ", "Bonaire, Sint Eustatius and Saba"], ["BA", "Bosnia and Herzegovina"], ["BW", "Botswana"], ["BV", "Bouvet Island"], ["BR", "Brazil"], ["IO", "British Indian Ocean Territory"], ["BN", "Brunei Darussalam"], ["BG", "Bulgaria"], ["BF", "Burkina Faso"], ["BI", "Burundi"], ["KH", "Cambodia"], ["CM", "Cameroon"], ["CA", "Canada"], ["CV", "Cape Verde"], ["KY", "Cayman Islands"], ["CF", "Central African Republic"], ["TD", "Chad"], ["CL", "Chile"], ["CN", "China"], ["CX", "Christmas Island"], ["CC", "Cocos (Keeling) Islands"], ["CO", "Colombia"], ["KM", "Comoros"], ["CG", "Congo"], ["CD", "Congo, the Democratic Republic of the"], ["CK", "Cook Islands"], ["CR", "Costa Rica"], ["CI", "Côte d'Ivoire"], ["HR", "Croatia"], ["CU", "Cuba"], ["CW", "Curaçao"], ["CY", "Cyprus"], ["CZ", "Czech Republic"], ["DK", "Denmark"], ["DJ", "Djibouti"], ["DM", "Dominica"], ["DO", "Dominican Republic"], ["EC", "Ecuador"], ["EG", "Egypt"], ["SV", "El Salvador"], ["GQ", "Equatorial Guinea"], ["ER", "Eritrea"], ["EE", "Estonia"], ["ET", "Ethiopia"], ["FK", "Falkland Islands (Malvinas)"], ["FO", "Faroe Islands"], ["FJ", "Fiji"], ["FI", "Finland"], ["FR", "France"], ["GF", "French Guiana"], ["PF", "French Polynesia"], ["TF", "French Southern Territories"], ["GA", "Gabon"], ["GM", "Gambia"], ["GE", "Georgia"], ["DE", "Germany"], ["GH", "Ghana"], ["GI", "Gibraltar"], ["GR", "Greece"], ["GL", "Greenland"], ["GD", "Grenada"], ["GP", "Guadeloupe"], ["GU", "Guam"], ["GT", "Guatemala"], ["GG", "Guernsey"], ["GN", "Guinea"], ["GW", "Guinea-Bissau"], ["GY", "Guyana"], ["HT", "Haiti"], ["HM", "Heard Island and McDonald Islands"], ["VA", "Holy See (Vatican City State)"], ["HN", "Honduras"], ["HK", "Hong Kong"], ["HU", "Hungary"], ["IS", "Iceland"], ["IN", "India"], ["ID", "Indonesia"], ["IR", "Iran, Islamic Republic of"], ["IQ", "Iraq"], ["IE", "Ireland"], ["IM", "Isle of Man"], ["IL", "Israel"], ["IT", "Italy"], ["JM", "Jamaica"], ["JP", "Japan"], ["JE", "Jersey"], ["JO", "Jordan"], ["KZ", "Kazakhstan"], ["KE", "Kenya"], ["KI", "Kiribati"], ["KP", "Korea, Democratic People's Republic of"], ["KR", "Korea, Republic of"], ["KW", "Kuwait"], ["KG", "Kyrgyzstan"], ["LA", "Lao People's Democratic Republic"], ["LV", "Latvia"], ["LB", "Lebanon"], ["LS", "Lesotho"], ["LR", "Liberia"], ["LY", "Libya"], ["LI", "Liechtenstein"], ["LT", "Lithuania"], ["LU", "Luxembourg"], ["MO", "Macao"], ["MK", "Macedonia, the former Yugoslav Republic of"], ["MG", "Madagascar"], ["MW", "Malawi"], ["MY", "Malaysia"], ["MV", "Maldives"], ["ML", "Mali"], ["MT", "Malta"], ["MH", "Marshall Islands"], ["MQ", "Martinique"], ["MR", "Mauritania"], ["MU", "Mauritius"], ["YT", "Mayotte"], ["MX", "Mexico"], ["FM", "Micronesia, Federated States of"], ["MD", "Moldova, Republic of"], ["MC", "Monaco"], ["MN", "Mongolia"], ["ME", "Montenegro"], ["MS", "Montserrat"], ["MA", "Morocco"], ["MZ", "Mozambique"], ["MM", "Myanmar"], ["NA", "Namibia"], ["NR", "Nauru"], ["NP", "Nepal"], ["NL", "Netherlands"], ["NC", "New Caledonia"], ["NZ", "New Zealand"], ["NI", "Nicaragua"], ["NE", "Niger"], ["NG", "Nigeria"], ["NU", "Niue"], ["NF", "Norfolk Island"], ["MP", "Northern Mariana Islands"], ["NO", "Norway"], ["OM", "Oman"], ["PK", "Pakistan"], ["PW", "Palau"], ["PS", "Palestinian Territory, Occupied"], ["PA", "Panama"], ["PG", "Papua New Guinea"], ["PY", "Paraguay"], ["PE", "Peru"], ["PH", "Philippines"], ["PN", "Pitcairn"], ["PL", "Poland"], ["PT", "Portugal"], ["PR", "Puerto Rico"], ["QA", "Qatar"], ["RE", "Réunion"], ["RO", "Romania"], ["RU", "Russian Federation"], ["RW", "Rwanda"], ["BL", "Saint Barthélemy"], ["SH", "Saint Helena, Ascension and Tristan da Cunha"], ["KN", "Saint Kitts and Nevis"], ["LC", "Saint Lucia"], ["MF", "Saint Martin (French part)"], ["PM", "Saint Pierre and Miquelon"], ["VC", "Saint Vincent and the Grenadines"], ["WS", "Samoa"], ["SM", "San Marino"], ["ST", "Sao Tome and Principe"], ["SA", "Saudi Arabia"], ["SN", "Senegal"], ["RS", "Serbia"], ["SC", "Seychelles"], ["SL", "Sierra Leone"], ["SG", "Singapore"], ["SX", "Sint Maarten (Dutch part)"], ["SK", "Slovakia"], ["SI", "Slovenia"], ["SB", "Solomon Islands"], ["SO", "Somalia"], ["ZA", "South Africa"], ["GS", "South Georgia and the South Sandwich Islands"], ["SS", "South Sudan"], ["ES", "Spain"], ["LK", "Sri Lanka"], ["SD", "Sudan"], ["SR", "Suriname"], ["SJ", "Svalbard and Jan Mayen"], ["SZ", "Swaziland"], ["SE", "Sweden"], ["CH", "Switzerland"], ["SY", "Syrian Arab Republic"], ["TW", "Taiwan, Province of China"], ["TJ", "Tajikistan"], ["TZ", "Tanzania, United Republic of"], ["TH", "Thailand"], ["TL", "Timor-Leste"], ["TG", "Togo"], ["TK", "Tokelau"], ["TO", "Tonga"], ["TT", "Trinidad and Tobago"], ["TN", "Tunisia"], ["TR", "Turkey"], ["TM", "Turkmenistan"], ["TC", "Turks and Caicos Islands"], ["TV", "Tuvalu"], ["UG", "Uganda"], ["UA", "Ukraine"], ["AE", "United Arab Emirates"], ["GB", "United Kingdom"], ["US", "United States"], ["UM", "United States Minor Outlying Islands"], ["UY", "Uruguay"], ["UZ", "Uzbekistan"], ["VU", "Vanuatu"], ["VE", "Venezuela, Bolivarian Republic of"], ["VN", "Viet Nam"], ["VG", "Virgin Islands, British"], ["VI", "Virgin Islands, U.S."], ["WF", "Wallis and Futuna"], ["EH", "Western Sahara"], ["YE", "Yemen"], ["ZM", "Zambia"], ["ZW", "Zimbabwe"]>> create Result.make_array across list as c @@ -35,7 +36,7 @@ feature -- Implementation if attached {STRING} c.item.item (1) as first and attached {STRING} c.item.item (2) as second then if second.as_lower.has_substring (input.as_lower) then create o.make - o.put (create {JSON_STRING}.make_json (first), "flag") + o.put (create {JSON_STRING}.make_json (first.as_lower), "flag") o.put (create {JSON_STRING}.make_json (second), "value") Result.add (o) end @@ -43,6 +44,4 @@ feature -- Implementation end end - list: ITERABLE [TUPLE [STRING, STRING]] - end diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e index 5b2f6a58..452a4019 100644 --- a/examples/widgetapp/sample_page.e +++ b/examples/widgetapp/sample_page.e @@ -27,7 +27,6 @@ feature n4_container: WSF_FORM_ELEMENT_CONTROL [STRING] n5_container: WSF_FORM_ELEMENT_CONTROL [STRING] cats_container: WSF_FORM_ELEMENT_CONTROL [LIST [STRING]] - s: FLAG_AUTOCOMPLETION do Precursor create form.make_form_control ("panel") @@ -44,8 +43,7 @@ feature n2_container.add_validator (create {WSF_DECIMAL_VALIDATOR}.make_decimal_validator ("Invalid Number")) form.add_control (n2_container) --Flag autocomplete - create s.make (<<["dz", "Algeria"], ["be", "Belgium"], ["ca", "Canada"], ["de", "Deutschland"], ["england", "England"], ["fi", "Finland"], ["gr", "Greece"], ["hu", "Hungary"]>>) - create autocompletion1.make_autocomplete ("autocompletion1", s) + create autocompletion1.make_autocomplete ("autocompletion1", create {FLAG_AUTOCOMPLETION}.make) create n3_container.make_form_element ("Flag Autocomplete", autocompletion1) form.add_control (n3_container) --Contact autocomplete diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e index 856a51c9..b0592bab 100644 --- a/library/server/wsf_html/webcontrol/wsf_page_control.e +++ b/library/server/wsf_html/webcontrol/wsf_page_control.e @@ -61,7 +61,7 @@ feature control.handle_callback (control_name, event, event_parameter) create states_changes.make control.read_state_changes (states_changes) - response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>) + response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json; charset=ISO-8859-1"]>>) response.put_string (states_changes.representation) else process @@ -91,7 +91,7 @@ feature data.append ("") data.append ("") create page.make - page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html"]>>) + page.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "text/html; charset=ISO-8859-1"]>>) page.set_body (data) response.send (page) end From dd8bddd45cba2232058b3a81806d5552ca036541 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sun, 15 Sep 2013 18:33:39 +0200 Subject: [PATCH 076/191] Make js files local --- examples/widgetapp/application.e | 28 +++++-------------- examples/widgetapp/jquery.min.js | 5 ++++ examples/widgetapp/typeahead.min.js | 7 +++++ .../wsf_html/webcontrol/wsf_page_control.e | 4 +-- 4 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 examples/widgetapp/jquery.min.js create mode 100644 examples/widgetapp/typeahead.min.js diff --git a/examples/widgetapp/application.e b/examples/widgetapp/application.e index c1e342a9..a84e7c74 100644 --- a/examples/widgetapp/application.e +++ b/examples/widgetapp/application.e @@ -35,9 +35,11 @@ feature {NONE} -- Initialization map_agent_uri ("/", agent execute_hello, Void) map_agent_uri ("/grid", agent grid_demo, Void) map_agent_uri ("/repeater", agent repeater_demo, Void) - map_agent_uri ("/widget.js", agent load_js, Void) - map_agent_uri ("/widget.css", agent load_css, Void) - map_agent_uri ("/bootstrap.min.css", agent load_bootstrap, Void) + map_agent_uri ("/widget.js", agent load_file("widget.js", ?, ?), Void) + map_agent_uri ("/jquery.min.js", agent load_file("jquery.min.js", ?, ?), Void) + map_agent_uri ("/typeahead.min.js", agent load_file("typeahead.min.js", ?, ?), Void) + map_agent_uri ("/widget.css", agent load_file("widget.css", ?, ?), Void) + map_agent_uri ("/bootstrap.min.css", agent load_file("bootstrap.min.css", ?, ?), Void) end feature -- Helper: mapping @@ -79,27 +81,11 @@ feature -- Execution page.execute end - load_js (req: WSF_REQUEST; res: WSF_RESPONSE) + load_file (name: STRING; req: WSF_REQUEST; res: WSF_RESPONSE) local f: WSF_FILE_RESPONSE do - create f.make_html ("widget.js") - res.send (f) - end - - load_css (req: WSF_REQUEST; res: WSF_RESPONSE) - local - f: WSF_FILE_RESPONSE - do - create f.make_html ("widget.css") - res.send (f) - end - - load_bootstrap (req: WSF_REQUEST; res: WSF_RESPONSE) - local - f: WSF_FILE_RESPONSE - do - create f.make_html ("bootstrap.min.css") + create f.make_html (name) res.send (f) end diff --git a/examples/widgetapp/jquery.min.js b/examples/widgetapp/jquery.min.js new file mode 100644 index 00000000..ce1b6b6e --- /dev/null +++ b/examples/widgetapp/jquery.min.js @@ -0,0 +1,5 @@ +/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license +*/ +(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="
",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
a",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="
t
",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t +}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
","
"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); +u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("