From 3298b8f8f93289a4b2523a5a51c9728043ed7748 Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Sun, 12 Aug 2018 19:53:52 +0500 Subject: [PATCH 01/91] Fixed unicode issue in element_crud --- src/cms_modules/admin.erl | 6 +++--- src/db.erl | 2 +- src/elements/element_crud.erl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 72c056e..8d745cb 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -68,8 +68,8 @@ install() -> % {{{2 add_page(PID, Title, Description, Role, Module) -> % {{{2 #cms_page{ id=PID, - title=unicode:characters_to_binary(Title), - description=unicode:characters_to_binary(Description), + title=wf:f("~ts", [Title]), + description=wf:f("~ts", [Description]), accepted_role=Role, module=Module }. @@ -79,7 +79,7 @@ add_form(PID, Phone, Text, Email, Rating) -> % {{{2 id=crypto:hash(sha512, Email++Text), page=PID, phone=Phone, - text=unicode:characters_to_binary(Text), + text=wf:f("~ts", [Text]), email=Email, rating=Rating }). diff --git a/src/db.erl b/src/db.erl index 2cd7773..940ac3f 100644 --- a/src/db.erl +++ b/src/db.erl @@ -237,7 +237,7 @@ update("0.1.4"=VSN) -> % {{{1 mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("1.0.0"=VSN) -> ?CREATE_TABLE(cms_form, set, []), - transaction(fun() -> % {{{1 : replace commmon -> html5 + transaction(fun() -> % {{{2 : replace commmon -> html5 Replaced_items = [list, list_item, link_url, link_event, block], lists:foreach( fun(Replaced) -> diff --git a/src/elements/element_crud.erl b/src/elements/element_crud.erl index bfaef86..e824ae5 100644 --- a/src/elements/element_crud.erl +++ b/src/elements/element_crud.erl @@ -220,7 +220,7 @@ cast(Value, Old) when is_atom(Old) -> % {{{1 cast(Value, Old) when is_list(Old) -> % {{{1 wf:to_list(Value); cast(Value, Old) when is_binary(Old) -> % {{{1 - wf:to_binary(Value); + unicode:characters_to_binary(Value); cast(Value, Old) when is_integer(Old) -> % {{{1 wf:to_integer(Value); cast(Value, Type) -> % {{{1 From 43edc06cdd639810223bcfbef7052ac06ff4b296 Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Mon, 27 Aug 2018 13:41:19 +0500 Subject: [PATCH 02/91] Fixed FromEmail and Email missmatch in emailform --- src/collections/emailform.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index 65e6838..d082228 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -141,7 +141,7 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail}) -> % {{{2 FromEmail = application:get_env(nitrogen, form_email, "form@" ++ Host), Email = wf:to_list(common:q(email, FromEmail)), Text = [ - add_if_not_empty("E-mail: ", FromEmail), + add_if_not_empty("E-mail: ", Email), add_if_not_empty("Phone: ", Phone), add_if_not_empty("Your ratings: ", [wf:f("~s: ~p~n", [K, V]) || {K, V} <- RatingsPL]), @@ -158,7 +158,7 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail}) -> % {{{2 target=FlashID, actions=#hide{effect=blind, speed=40} }), - smtp:send_html(Email, ToEmail, "Form sent from site", Text), + smtp:send_html(FromEmail, ToEmail, "Form sent from site", Text), admin:add_form(PID, Phone, TextForm, Email, RatingsPL), wf:flash(FlashID, Flash); event(Ev) -> % {{{2 From 634086219a007e27a7891d7dcb50b4e8829b5ec6 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 28 Aug 2018 18:45:39 +0500 Subject: [PATCH 03/91] added validation for email_field --- src/collections/common.erl | 2 +- src/collections/emailform.erl | 43 +++++++++++++++++++++++++++++++---- src/collections/html5.erl | 1 - src/db.erl | 1 - 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/collections/common.erl b/src/collections/common.erl index c02e72f..ff42e8e 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -317,7 +317,7 @@ maybe_render_block(Page, MFA) -> % {{{2 render_block(true, Page, MFA). render_block(false, _, _) -> % {{{2 - ?PRINT("Dont't show"), + % ?PRINT("Dont't show"), ""; render_block(true, Page, #cms_mfa{id=_Id, mfa={?MODULE, text=F, Args}}=MFA) -> % {{{2 apply(?MODULE, F, [Page, MFA | Args]); diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index d082228..ef2ecff 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -53,6 +53,21 @@ form_data(rating, A) -> % {{{2 [], Block, Classes}; +form_data(email_field, A) -> % {{{2 + [_PID, Block, Required, Classes] = admin:maybe_empty(A, 4), + {[], + [ + #checkbox{ + text="Required", + % value=true, + label_position=before, + id=email_required, + checked=Required + } + ], + Block, + Classes + }; form_data(submit, A) -> % {{{2 [_, Block, ToEmail, Classes] = admin:maybe_empty(A, 4), {[ @@ -67,7 +82,6 @@ form_data(_F, []) -> % {{{2 {[], []}. save_block(#cms_mfa{id={_PID, _}, mfa={_M, rating=Fun, A}}=Rec) -> % {{{2 - % ?LOG("save rating: ~p", [Rec]), [Block, Min, Max, Step, Size, Classes, _DataAttr] = admin:maybe_empty(A, 7), ShowCaption = wf:to_atom(common:q(show_caption, false)), ShowClear = wf:to_atom(common:q(show_clear, false)), @@ -75,19 +89,38 @@ save_block(#cms_mfa{id={_PID, _}, mfa={_M, rating=Fun, A}}=Rec) -> % {{{2 save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Classes, _DataAttr]}}=Rec) -> % {{{2 Rec#cms_mfa{mfa={?MODULE, Fun, [B,Email, Classes]}}; +save_block(#cms_mfa{id={_PID, _}, mfa={_M, email_field=Fun, [B, Classes, _DataAttr]}}=Rec) -> % {{{2 + Required = wf:to_atom(common:q(email_required, false)), + Rec#cms_mfa{mfa={?MODULE, Fun, [B, Required, Classes]}}; save_block(#cms_mfa{id={_PID, _}, mfa={_M, Fun, [B, Classes, _DataAttr]}}=Rec) -> % {{{2 Rec#cms_mfa{mfa={?MODULE, Fun, [B, Classes]}}. %% Block renderers {{{1 email_field(Page, Block, Classes) -> % {{{2 - #panel{ + email_field(Page, Block, on, Classes). +email_field(Page, Block, Required, Classes) -> % {{{2 + + case Required of + on -> wf:defer(submit, + email, + #validate{ + validators=[ + #is_email{text="Not a valid email."} + ] + } + ); + + _ -> ok + end, + #panel{ class="form-group", body=#txtbx{ id=email, - html_id=common:block_to_html_id(Block), + html_id=common:block_to_html_id(Block), class=Classes, - placeholder=common:parallel_block(Page, Block)}}. + placeholder=common:parallel_block(Page, Block)} + }. phone_field(Page, Block, Classes) -> % {{{2 #panel{ @@ -123,6 +156,7 @@ rating(_Page, Block, Min, Max, Step, Size, ShowCaption, ShowClear, _Classes) -> submit(Page, Block, ToEmail, Classes) -> % {{{2 #btn{ %type=success, + id=submit, size=lg, html_id=common:block_to_html_id(Block), class=["btn-block"|Classes], @@ -158,6 +192,7 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail}) -> % {{{2 target=FlashID, actions=#hide{effect=blind, speed=40} }), + ?LOG("Send email to ~p", [ToEmail]), smtp:send_html(FromEmail, ToEmail, "Form sent from site", Text), admin:add_form(PID, Phone, TextForm, Email, RatingsPL), wf:flash(FlashID, Flash); diff --git a/src/collections/html5.erl b/src/collections/html5.erl index 33928aa..19a8d9b 100644 --- a/src/collections/html5.erl +++ b/src/collections/html5.erl @@ -80,7 +80,6 @@ form_data(link_url, A) -> % {{{2 [], Block, Classes, DataAttr}; form_data(iframe, A) -> % {{{2 [_, Block, URL, Width, Height, AllowFls, Classes, DataAttr] = admin:maybe_empty(A, 8), - ?LOG("form_data iframe ~p",[AllowFls]), {[ {"URL", #txtbx{ diff --git a/src/db.erl b/src/db.erl index 940ac3f..9e147f1 100644 --- a/src/db.erl +++ b/src/db.erl @@ -39,7 +39,6 @@ install([])-> % {{{1 (M):default_data()) || M <- DataModules] end). - %% Don't remove! This is is used to update your Mnesia DB backend from CLI tool update([]) -> % {{{1 {ok, VSN} = application:get_key(nitrogen, vsn), From 0d23eba737ada9f98ca5102e7a25dac451d6bd39 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 1 Sep 2018 00:06:29 +0500 Subject: [PATCH 04/91] remove some logs --- src/cms_modules/account.erl | 6 +++--- src/collections/common.erl | 4 ++-- src/collections/router.erl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cms_modules/account.erl b/src/cms_modules/account.erl index 027222b..ddb5144 100644 --- a/src/cms_modules/account.erl +++ b/src/cms_modules/account.erl @@ -1,7 +1,7 @@ %% -*- mode: nitrogen -*- %% vim: ts=4 sw=4 et -module (account). --compile([export_all, {parse_transform, lager_transform}]). +-compile(export_all). -include_lib("nitrogen_core/include/wf.hrl"). -include("records.hrl"). -include("db.hrl"). @@ -269,7 +269,7 @@ maybe_redirect_to_login(Page) -> % {{{2 maybe_redirect_to_login(#cms_page{accepted_role=undefined} = Page, URL) -> % {{{2 maybe_redirect_to_login(Page#cms_page{accepted_role=nobody}, URL); maybe_redirect_to_login(#cms_page{accepted_role=nobody} = Page, _URL) -> % {{{2 - ?LOG("Not redirect to login: ~p", [Page]), + % ?LOG("Not redirect to login: ~p", [Page]), Page; maybe_redirect_to_login(#cms_page{accepted_role=Role} = Page, URL) -> % {{{2 ?LOG("role: ~p,wf:role(Role):~p, url:~p", [Role,wf:role(Role),URL]), @@ -278,7 +278,7 @@ maybe_redirect_to_login(#cms_page{accepted_role=Role} = Page, URL) -> % {{{2 ?LOG("Role: ~p", [Role]), Page; false -> - ?LOG("Redirect to login: ~p", [Page]), + % ?LOG("Redirect to login: ~p", [Page]), wf:redirect_to_login(URL) end. diff --git a/src/collections/common.erl b/src/collections/common.erl index ff42e8e..427ce2b 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -187,7 +187,7 @@ parallel_block(#cms_page{id = PID} = Page, Block) -> % {{{2 waterfall(#cms_page{id = PID} = Page, Block) -> % {{{2 Functions = db:get_mfa(PID, Block), - ?LOG("Waterfall: ~p", [Functions]), + % ?LOG("Waterfall: ~p", [Functions]), lists:foldl(fun(#cms_mfa{mfa={M, F, Args}}, #cms_page{}=P) -> apply(M, F, [P | Args]); (#cms_mfa{mfa=Fun}, #cms_page{}=P) when is_function(Fun) -> @@ -311,7 +311,7 @@ module_by_function(FunTuple) -> % {{{2 F == FunTuple]. maybe_render_block(Page, #cms_mfa{settings=#{filters := Filters}}=MFA) -> % {{{2 - ?LOG("Filters: ~p", [Filters]), + % ?LOG("Filters: ~p", [Filters]), render_block(apply_filters(Filters), Page, MFA); maybe_render_block(Page, MFA) -> % {{{2 render_block(true, Page, MFA). diff --git a/src/collections/router.erl b/src/collections/router.erl index 04b78a6..30538f9 100644 --- a/src/collections/router.erl +++ b/src/collections/router.erl @@ -115,11 +115,11 @@ common_redirect(_Page, _Block, URL) -> % {{{2 maybe_change_module(#cms_page{module=Module} = Page) -> % {{{2 maybe_change_module(#cms_page{module=Module} = Page, []). maybe_change_module(#cms_page{module=Module} = Page, _) -> % {{{2 - ?LOG("Change module: ~p(~p)", [Page, Module]), case wf:page_module() of Module -> Page; _Other -> + ?LOG("Change module: ~p(~p)", [Page, Module]), URI = wf:uri(), QS = get_qs(URI), wf:redirect(wf:f("/~s~s", [Module, QS])) @@ -127,7 +127,7 @@ maybe_change_module(#cms_page{module=Module} = Page, _) -> % {{{2 render(Page, _) -> % {{{2 render(Page). render(Page) -> % {{{2 - ?LOG("render:: ~p", [Page]), + % ?LOG("render:: ~p", [Page]), try common:waterfall(Page, "page") catch error:unauthorized -> From 5e47644785107c118ca982b63a17f41e565ed61d Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 1 Sep 2018 00:55:33 +0500 Subject: [PATCH 05/91] added sending form to email using smtp --- rebar.config | 3 ++- sample/esmtp.config | 4 +++ src/collections/emailform.erl | 49 +++++++++++++++++++++++++---------- src/nitrogen_app.erl | 1 + src/nitrogen_sup.erl | 2 ++ 5 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 sample/esmtp.config diff --git a/rebar.config b/rebar.config index e6e8434..fc8824d 100644 --- a/rebar.config +++ b/rebar.config @@ -2,5 +2,6 @@ {lager, ".*", {git, "git://github.com/basho/lager.git", {branch, master}}}, %{esocial, ".*", {git, "https://github.com/T0ha/esocial.git"}}, %{coldstrap, ".*", {git, "https://github.com/choptastic/coldstrap.git"}}, - {gettexter, ".*", {git, "https://github.com/seriyps/gettexter.git"}} + {gettexter, ".*", {git, "https://github.com/seriyps/gettexter.git"}}, + {gen_smtpc, ".*", {git, "git://github.com/dan-kihot8/gen_smtpc.git"}} ]}. diff --git a/sample/esmtp.config b/sample/esmtp.config new file mode 100644 index 0000000..2034ea9 --- /dev/null +++ b/sample/esmtp.config @@ -0,0 +1,4 @@ +[{esmtp, [{host, "smtp.gmail.com"}, + {port, 465}, + {smtp_auth_data, {"server@gmail.com","password"}}] +}]. \ No newline at end of file diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index ef2ecff..d841bc8 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -69,11 +69,16 @@ form_data(email_field, A) -> % {{{2 Classes }; form_data(submit, A) -> % {{{2 - [_, Block, ToEmail, Classes] = admin:maybe_empty(A, 4), + [_, Block, ToEmail, Smtp, Classes] = admin:maybe_empty(A, 5), {[ {"Email to send form", {to_email, ToEmail}} ], - [], + [#checkbox{ + text="Use Smtp", + label_position=before, + id=use_smtp, + checked=Smtp + }], Block, Classes}; form_data(_F, [_, Block, Classes]) -> % {{{2 @@ -87,8 +92,9 @@ save_block(#cms_mfa{id={_PID, _}, mfa={_M, rating=Fun, A}}=Rec) -> % {{{2 ShowClear = wf:to_atom(common:q(show_clear, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [Block, Min, Max, Step, Size, ShowCaption, ShowClear, Classes]}}; -save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Classes, _DataAttr]}}=Rec) -> % {{{2 - Rec#cms_mfa{mfa={?MODULE, Fun, [B,Email, Classes]}}; +save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Smtp, Classes, _DataAttr]}}=Rec) -> % {{{2 + Smtp = wf:to_atom(common:q(use_smtp, false)), + Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, Smtp, Classes]}}; save_block(#cms_mfa{id={_PID, _}, mfa={_M, email_field=Fun, [B, Classes, _DataAttr]}}=Rec) -> % {{{2 Required = wf:to_atom(common:q(email_required, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [B, Required, Classes]}}; @@ -154,31 +160,35 @@ rating(_Page, Block, Min, Max, Step, Size, ShowCaption, ShowClear, _Classes) -> ]}. submit(Page, Block, ToEmail, Classes) -> % {{{2 - #btn{ + submit(Page, Block, ToEmail, off, Classes). +submit(Page, Block, ToEmail, Smtp, Classes) -> % {{{2 + #btn{ %type=success, id=submit, size=lg, html_id=common:block_to_html_id(Block), class=["btn-block"|Classes], body=common:parallel_block(Page, Block), - postback={submit, Page, Block, ToEmail}, + postback={submit, Page, Block, ToEmail, Smtp}, delegate=?MODULE }. %% Event handlers % {{{1 -event({submit, #cms_page{id=PID}=Page, Block, ToEmail}) -> % {{{2 +event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp}) -> % {{{2 Phone = wf:to_list(common:q(phone, "")), RatingsPL = wf:q_pl(get_form_rating_ids(Page, Block)), - ?LOG("Ratings: ~p~n", [RatingsPL]), + % ?LOG("Ratings: ~p~n", [RatingsPL]), TextForm = unicode:characters_to_binary(wf:to_list(common:q(text, ""))), Host = application:get_env(nitrogen, host, "site.com"), - FromEmail = application:get_env(nitrogen, form_email, "form@" ++ Host), - Email = wf:to_list(common:q(email, FromEmail)), + FromEmailForm = application:get_env(nitrogen, form_email, "form@" ++ Host), + Subject = "Form sent from " ++ Host, + Email = wf:to_list(common:q(email, FromEmailForm)), Text = [ - add_if_not_empty("E-mail: ", Email), + add_if_not_empty("Email: ", Email), add_if_not_empty("Phone: ", Phone), add_if_not_empty("Your ratings: ", [wf:f("~s: ~p~n", [K, V]) || {K, V} <- RatingsPL]), + "\n", TextForm ], Flash = #span{ @@ -192,8 +202,19 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail}) -> % {{{2 target=FlashID, actions=#hide{effect=blind, speed=40} }), - ?LOG("Send email to ~p", [ToEmail]), - smtp:send_html(FromEmail, ToEmail, "Form sent from site", Text), + + case Smtp of + on -> + AuthData = application:get_env(esmpt, smtp_auth_data), + HostSmtp = application:get_env(esmpt, host), + Port = application:get_env(esmpt, port, 465), + Options = [{use_ssl, true}, {host, HostSmtp}, {port, Port}], + Body = lists:concat([Text]), + gen_smtpc:send(AuthData, ToEmail, Subject, Body, Options); + _ -> + smtp:send_html(FromEmailForm, ToEmail, Subject, Text) + end, + ?LOG("Send email to ~p from ~p", [ToEmail, Email]), admin:add_form(PID, Phone, TextForm, Email, RatingsPL), wf:flash(FlashID, Flash); event(Ev) -> % {{{2 @@ -219,5 +240,5 @@ add_if_not_empty(_Header, undefined) -> % {{{2 add_if_not_empty(_Header, "") -> % {{{2 ""; add_if_not_empty(Header, Text) -> % {{{2 - [Header, "\n", Text]. + [Header, Text, "\n"]. %% Dropdown formatters {{{1 diff --git a/src/nitrogen_app.erl b/src/nitrogen_app.erl index 7dba16a..a482799 100644 --- a/src/nitrogen_app.erl +++ b/src/nitrogen_app.erl @@ -10,6 +10,7 @@ start(_StartType, _StartArgs) -> Node = node(), case mnesia:create_schema([Node]) of ok -> + io:format("STARTTT",[]), {ok, _}=application:ensure_all_started(lager), {ok, _}=application:ensure_all_started(mnesia), {atomic, _}=db:install([]), diff --git a/src/nitrogen_sup.erl b/src/nitrogen_sup.erl index d58f0b9..d6590ca 100644 --- a/src/nitrogen_sup.erl +++ b/src/nitrogen_sup.erl @@ -26,5 +26,7 @@ init([]) -> application:start(nprocreg), application:start(simple_bridge), application:start(ct), + application:start(gen_smtpc), + application:start(ssl), {ok, { {one_for_one, 5, 10}, []} }. From c060fd9a249f1f84a252a85eadde8ccb1ee66f3b Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 4 Sep 2018 13:44:43 +0500 Subject: [PATCH 06/91] fixed returned code if error is on page --- src/collections/common.erl | 3 ++- src/collections/web_404.erl | 7 +++++-- templates/404.html | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/collections/common.erl b/src/collections/common.erl index 427ce2b..7bf658d 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -182,7 +182,8 @@ parallel_block(#cms_page{id = PID} = Page, Block) -> % {{{2 [maybe_render_block(Page, MFA) || MFA <- db:get_mfa(PID, Block)] catch error:E -> ?LOG("~nError: ~p ~p ~p",[E,PID, Block]), - wf:redirect("/?page=500") + wf:status_code(500), + common:template(Page,"templates/500.html") end. waterfall(#cms_page{id = PID} = Page, Block) -> % {{{2 diff --git a/src/collections/web_404.erl b/src/collections/web_404.erl index 9bfdb16..4b48fcb 100644 --- a/src/collections/web_404.erl +++ b/src/collections/web_404.erl @@ -1,8 +1,11 @@ %% vim: ts=4 sw=4 et -module(web_404). +-compile(export_all). -export ([main/0]). main() -> - URI = wf:uri(), + % URI = wf:uri(), % io:format("~n ~p:check_page ~p",[?MODULE,URI]), - wf:redirect('/?page=404'). + Page = db:get_page("404"), + wf:status_code(404), + common:template(Page,"templates/404.html"). diff --git a/templates/404.html b/templates/404.html index 6038076..ec16647 100644 --- a/templates/404.html +++ b/templates/404.html @@ -13,6 +13,7 @@

Take Me Home +

Contact Support
From bf0b646ad4b72724e6ba3c69d077f2200b569a30 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 5 Sep 2018 17:35:05 +0500 Subject: [PATCH 07/91] added sitemap freq to pages, generating sitemap function --- include/db.hrl | 1 + src/cms_modules/admin.erl | 58 +++++++++++++++++++++++++++++++++++++-- src/db.erl | 17 ++++++++++++ src/nitrogen.app.src | 2 +- 4 files changed, 74 insertions(+), 4 deletions(-) diff --git a/include/db.hrl b/include/db.hrl index a803551..ef9fda2 100644 --- a/include/db.hrl +++ b/include/db.hrl @@ -68,6 +68,7 @@ title = <<"LiquidCMS">> :: binary(), ?TIMESTAMPS, active=true :: boolean(), + sitemap = none :: atom(), settings = #{} :: map() }). diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 8d745cb..a2b00df 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -3,6 +3,7 @@ -module (admin). -compile([export_all, {parse_transform, lager_transform}]). -include_lib("nitrogen_core/include/wf.hrl"). +-include_lib("xmerl/include/xmerl.hrl"). -include("records.hrl"). -include("db.hrl"). -include("cms.hrl"). @@ -65,13 +66,14 @@ install() -> % {{{2 ok. %% Different components adding to pages {{{1 -add_page(PID, Title, Description, Role, Module) -> % {{{2 +add_page(PID, Title, Description, Role, Module, Sitemap) -> % {{{2 #cms_page{ id=PID, title=wf:f("~ts", [Title]), description=wf:f("~ts", [Description]), accepted_role=Role, - module=Module + module=Module, + sitemap=Sitemap }. add_form(PID, Phone, Text, Email, Rating) -> % {{{2 @@ -1041,6 +1043,7 @@ event({?MODULE, page, show}) -> % {{{2 {description, "Description", ta}, {module, "Module", {select, modules()}}, {accepted_role, "Assess role", {select, cms_roles()}}, + {sitemap, "Sitemap", {select, sitemap_frequencies()}}, {undefined, "Actions", button} ], funs=#{ @@ -1103,6 +1106,13 @@ event({?MODULE, page, new}) -> % {{{2 id=role, value=undefined, options=cms_roles() + }, + + #span{text="Sitemap frequency"}, + #dd{ + id=sitemap, + value=none, + options=sitemap_frequencies() } ]); event({?MODULE, page, construct}) -> % {{{2 @@ -1215,8 +1225,9 @@ event({?MODULE, page, save}) -> % {{{2 onclick btn Description = wf:q(description), Module = wf:to_atom(wf:q(module)), Role = wf:to_atom(wf:q(role)), + Sitemap = wf:to_atom(wf:q(sitemap)), db:save( - add_page(PID, Title, Description, Role, Module)), + add_page(PID, Title, Description, Role, Module, Sitemap)), coldstrap:close_modal(), wf:wire(#event{postback={?MODULE, page, show}, delegate=?MODULE}); event({?MODULE, block, change, module}) -> % {{{2 @@ -1528,8 +1539,49 @@ modules() -> % {{{2 lists:map(fun(M) -> {M, M:description()} end, Modules). cms_roles() -> % {{{2 +?LOG("cms_roles: ~p", [ [{Id, Name} || #{ role := Id, name := Name} <- db:get_roles()]]), [{Id, Name} || #{ role := Id, name := Name} <- db:get_roles()]. collections() -> % {{{2 Modules = common:module_by_function({functions, 0}), lists:map(fun(M) -> {M, M:description()} end, Modules). + +sitemap_frequencies() -> % {{{2 + [{always,"always"},{hourly,"hourly"}, {daily,"daily"}, {weekly,"weekly"}, + {monthly,"monthly"}, {yearly,"yearly"}, {never,"never"}, {none,"none"}]. + + +%% @doc Helper function to generate XML from a data structure and print it +serialize_xml(Data) -> + Prolog = [""], + Xml = lists:flatten(xmerl:export_simple(Data, xmerl_xml,[{prolog,Prolog}])), + io:format("~s~n", [Xml]). + +%% @doc Prints \ +%% url_n>nl... +generate_sitemap() -> % % {{{2 + Ns1 = "http://www.sitemaps.org/schemas/sitemap/0.9", + Pages = db:get_pages(), + BaseUrl = application:get_env(nitrogen, host, "http://site.com") ++ "/", + RootElem = #xmlElement{name=urlset, + namespace=#xmlNamespace{default=Ns1}, + attributes=[#xmlAttribute{name=xmlns, value=Ns1}], + content = + lists:map( + fun(I) -> + {url, [#xmlElement{ name=loc, + content=[BaseUrl++maps:get(id,I)] + }, + case maps:get(sitemap,I) of + none -> []; + Fr -> + #xmlElement{ name=changefreq, + content=[atom_to_list(Fr)] + } + end + ] + } + end, Pages + ) + }, + serialize_xml([RootElem]). diff --git a/src/db.erl b/src/db.erl index 9e147f1..f802471 100644 --- a/src/db.erl +++ b/src/db.erl @@ -300,6 +300,23 @@ update("1.0.0"=VSN) -> update("1.0.1"=VSN) -> % {{{1 : add social-btn images admin:get_social_files("static/images"), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); +update("1.0.2"=VSN) -> % {{{1 : add sitemap column for cms_page table + CurTime = calendar:universal_time(), + mnesia:transform_table(cms_page, fun({cms_page, Id,D,M,Ar,T,CT,_UT,A,S}) -> + #cms_page{ + id=Id, + description=D, + module=M, + accepted_role=Ar, + title=T, + settings=S, + created_at=CT, + updated_at=CurTime, + active=A, + sitemap=none + } + end, record_info(fields, cms_page)), + mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("fix_sort") -> % {{{1 F = fun() -> FoldFun = diff --git a/src/nitrogen.app.src b/src/nitrogen.app.src index 9a8c904..56d77f4 100644 --- a/src/nitrogen.app.src +++ b/src/nitrogen.app.src @@ -1,7 +1,7 @@ {application, nitrogen, [ {description, "My Nitrogen Web Project"}, - {vsn, "1.0.1"}, + {vsn, "1.0.2"}, {registered, []}, {applications, [kernel, stdlib]}, {mod, { nitrogen_app, []}}, From 45b45b7ae1e61ccf6ff3bcc30578df798a725caf Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 6 Sep 2018 14:53:50 +0500 Subject: [PATCH 08/91] added sitemap handler --- include/db.hrl | 2 +- src/cms_modules/admin.erl | 58 ++--------------------------------- src/cms_modules/sitemap.erl | 60 +++++++++++++++++++++++++++++++++++++ src/db.erl | 2 +- src/xml_handler.erl | 11 +++++++ 5 files changed, 76 insertions(+), 57 deletions(-) create mode 100644 src/cms_modules/sitemap.erl create mode 100644 src/xml_handler.erl diff --git a/include/db.hrl b/include/db.hrl index ef9fda2..334c5b6 100644 --- a/include/db.hrl +++ b/include/db.hrl @@ -68,7 +68,7 @@ title = <<"LiquidCMS">> :: binary(), ?TIMESTAMPS, active=true :: boolean(), - sitemap = none :: atom(), + sitemap = never :: atom(), settings = #{} :: map() }). diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index a2b00df..37f82d8 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -273,7 +273,7 @@ maybe_set(Id, Val) -> % {{{2 "" -> wf:set(Id, Val); A -> - ?LOG("~s vaue is ~p", [Id, A]) + ?LOG("~s value is ~p", [Id, A]) end. update_container(Header, ButtonText, ButtonPostBack, Body) -> % {{{2 @@ -483,7 +483,6 @@ form_fields(M, F, A) -> % {{{2 catch error:E when E /= undef; E /= function_clause -> [_, Block, Classes, DataAttrs] = maybe_empty(A, 4), - ?LOG("~nErorr: ~p",[Block]), {[], [], Block, Classes, DataAttrs} end. @@ -495,13 +494,11 @@ form_elements(M, F, A) -> % {{{2 render_fields(Cols) -> % {{{2 try 12 div length(Cols) of Width when Width >= 4 -> - %?LOG("Width: ~p", [Width]), [ #bs_row{ body=[render_field(Col, Width) || Col <- Cols] }]; _Width -> - %?LOG("Width: ~p", [Width]), {Row, Rows} = lists:split(3, Cols), [render_fields(Row) | render_fields(Rows)] @@ -563,7 +560,6 @@ extract_data_attrs([]) -> % {{{2 []; extract_data_attrs(DataAttrs) -> % {{{2 Pairs = string:tokens(DataAttrs, ", "), - ?LOG("Pairs: ~p~n", [Pairs]), [{data_attr_key(K), V} || Pair <- Pairs, [K, V] <- [string:tokens(Pair, "=")]]. data_attr_key([$d, $a, $t, $a, $- | K]) -> % {{{2 @@ -576,9 +572,7 @@ format_data_attrs(Attrs) -> % {{{2 get_data(M, F) -> % {{{2 Fields = data_fields(form_fields(M, F, [])), - ?LOG("Fields: ~p", [Fields]), Data = wf:mq([block | Fields]), - ?LOG("Data: ~p", [Data]), lists:map(fun(none) -> ""; (undefined) -> ""; ("") -> ""; @@ -730,7 +724,6 @@ rec_from_qs(R) -> % {{{2 settings=#{filters => Filters}}. apply_element_transform(#cms_mfa{mfa={M, _, _}}=Rec) -> % {{{2 - % ?LOG("~nsave_block(apply_element_transform) ~p", [Rec]), try apply(M, save_block, [Rec]) catch error:undef -> Rec; @@ -1043,7 +1036,7 @@ event({?MODULE, page, show}) -> % {{{2 {description, "Description", ta}, {module, "Module", {select, modules()}}, {accepted_role, "Assess role", {select, cms_roles()}}, - {sitemap, "Sitemap", {select, sitemap_frequencies()}}, + {sitemap, "Sitemap", {select, sitemap:sitemap_frequencies()}}, {undefined, "Actions", button} ], funs=#{ @@ -1112,14 +1105,13 @@ event({?MODULE, page, new}) -> % {{{2 #dd{ id=sitemap, value=none, - options=sitemap_frequencies() + options=sitemap:sitemap_frequencies() } ]); event({?MODULE, page, construct}) -> % {{{2 Pages = get_pages(), [#{id := P} | _] = Pages, PID = common:q(page_select, P), - ?LOG("~nconstruct page:~p",[PID]), Block = common:q(block_select, "page"), wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}); @@ -1128,7 +1120,6 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 Blocks = [format_block(B#cms_mfa{id={PID, BID}}) || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, Block)], AllBlocks = db:get_all_blocks(PID), - ?LOG("~nconstruct page(2) Block:~p",[Block]), ParentBlock=db:get_parent_block(PID,Block), ParentBody=case ParentBlock of S when is_list(S) -> @@ -1244,7 +1235,6 @@ event({?MODULE, block, change, module}) -> % {{{2 event({?MODULE, block, change, function}) -> % {{{2 M = wf:to_atom(common:q(module, common)), F = wf:to_atom(common:q(function, common)), - % ?LOG("M: ~p, F: ~p", [M, F]), wf:update(block_data, admin:form_elements(M, F, [])); event({?MODULE, block, add}) -> % {{{2 PID = common:q(page_select, "index"), @@ -1524,7 +1514,6 @@ api_event(Name, Tag, Args) -> % {{{2 ?LOG("~p API event ~p(~p; ~p)", [?MODULE, Name, Tag, Args]). sort_event({PID, Block}, Blocks) -> % {{{2 - % ?LOG("Blocks: ~p", [Blocks]), lists:foreach(fun({N, {block, _PID, B}}) -> db:update(B, B#cms_mfa{sort=N}) end, @@ -1539,49 +1528,8 @@ modules() -> % {{{2 lists:map(fun(M) -> {M, M:description()} end, Modules). cms_roles() -> % {{{2 -?LOG("cms_roles: ~p", [ [{Id, Name} || #{ role := Id, name := Name} <- db:get_roles()]]), [{Id, Name} || #{ role := Id, name := Name} <- db:get_roles()]. collections() -> % {{{2 Modules = common:module_by_function({functions, 0}), lists:map(fun(M) -> {M, M:description()} end, Modules). - -sitemap_frequencies() -> % {{{2 - [{always,"always"},{hourly,"hourly"}, {daily,"daily"}, {weekly,"weekly"}, - {monthly,"monthly"}, {yearly,"yearly"}, {never,"never"}, {none,"none"}]. - - -%% @doc Helper function to generate XML from a data structure and print it -serialize_xml(Data) -> - Prolog = [""], - Xml = lists:flatten(xmerl:export_simple(Data, xmerl_xml,[{prolog,Prolog}])), - io:format("~s~n", [Xml]). - -%% @doc Prints \ -%% url_n>nl... -generate_sitemap() -> % % {{{2 - Ns1 = "http://www.sitemaps.org/schemas/sitemap/0.9", - Pages = db:get_pages(), - BaseUrl = application:get_env(nitrogen, host, "http://site.com") ++ "/", - RootElem = #xmlElement{name=urlset, - namespace=#xmlNamespace{default=Ns1}, - attributes=[#xmlAttribute{name=xmlns, value=Ns1}], - content = - lists:map( - fun(I) -> - {url, [#xmlElement{ name=loc, - content=[BaseUrl++maps:get(id,I)] - }, - case maps:get(sitemap,I) of - none -> []; - Fr -> - #xmlElement{ name=changefreq, - content=[atom_to_list(Fr)] - } - end - ] - } - end, Pages - ) - }, - serialize_xml([RootElem]). diff --git a/src/cms_modules/sitemap.erl b/src/cms_modules/sitemap.erl new file mode 100644 index 0000000..6271d98 --- /dev/null +++ b/src/cms_modules/sitemap.erl @@ -0,0 +1,60 @@ +%% -*- mode: nitrogen -*- +%% vim: ts=4 sw=4 et +-module(sitemap). +-compile(export_all). +-include_lib("nitrogen_core/include/wf.hrl"). +-include_lib("xmerl/include/xmerl.hrl"). +-include("db.hrl"). + + +%% @doc Generate sitemap.xml content +generate_sitemap() -> % {{{2 + Ns1 = "http://www.sitemaps.org/schemas/sitemap/0.9", + PagesAll = db:get_pages(), + OnlyActive = fun(I) -> maps:get(active,I)==true end, + Pages = lists:filter(OnlyActive, PagesAll), + BaseUrl = application:get_env(nitrogen, host, "http://site.com") ++ "/", + RootElem = #xmlElement{name=urlset, + namespace=#xmlNamespace{default=Ns1}, + attributes=[#xmlAttribute{name=xmlns, value=Ns1}], + content = + lists:map( + fun(I) -> + case maps:get(sitemap,I) of + none -> + ""; + Fr -> + {url, [#xmlElement{ name=loc, + content=[BaseUrl++maps:get(id,I)] + }, + #xmlElement{ name=changefreq, + content=[atom_to_list(Fr)] + } + ] + } + end + end, Pages + ) + }, + serialize_xml([RootElem]). + + +%% @doc Helper function to generate XML from a data structure +serialize_xml(Data) -> % {{{2 + Prolog = [""], + Xml = lists:flatten(xmerl:export_simple(Data, xmerl_xml,[{prolog,Prolog}])), + % ?LOG("~s~n", [Xml]), + Xml. + + +%% changefreq for page +sitemap_frequencies() -> % {{{2 + [{always,"always"}, + {hourly,"hourly"}, + {daily,"daily"}, + {weekly,"weekly"}, + {monthly,"monthly"}, + {yearly,"yearly"}, + {never,"never"}, + {none,"none"} + ]. \ No newline at end of file diff --git a/src/db.erl b/src/db.erl index f802471..e3b371a 100644 --- a/src/db.erl +++ b/src/db.erl @@ -313,7 +313,7 @@ update("1.0.2"=VSN) -> % {{{1 : add sitemap column for cms_page table created_at=CT, updated_at=CurTime, active=A, - sitemap=none + sitemap=never } end, record_info(fields, cms_page)), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); diff --git a/src/xml_handler.erl b/src/xml_handler.erl new file mode 100644 index 0000000..3ea9a77 --- /dev/null +++ b/src/xml_handler.erl @@ -0,0 +1,11 @@ +-module(xml_handler). +-compile(export_all). +-include_lib("nitrogen_core/include/wf.hrl"). + + +handle(EntryFun) -> % {{{2 + %% Return sitemap.xml + + wf:content_type("text/xml"), + EntryFun(). + From 6571af3fc43d045525eaf6a7662a7ee464d0eee2 Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Wed, 12 Sep 2018 15:01:09 +0500 Subject: [PATCH 09/91] smart_extensions for sitemal.xml moved from LN CLI to cms --- priv/cms.config | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 priv/cms.config diff --git a/priv/cms.config b/priv/cms.config new file mode 100644 index 0000000..7a7fc31 --- /dev/null +++ b/priv/cms.config @@ -0,0 +1,9 @@ +[ + {nitrogen, [ + % Smart extensions + {smart_extensions, [ + {"xml", generate_sitemap, {xml_handler, handle}} + ]} + ]} +]. + From 3845949c2d7988d518f01fc8337c2e5cca3f8bae Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Wed, 12 Sep 2018 15:13:55 +0500 Subject: [PATCH 10/91] Added Reply-To field to email from sendmail --- src/collections/emailform.erl | 22 ++++++++++++---------- src/smtp.erl | 4 ++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index d841bc8..155f876 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -108,15 +108,17 @@ email_field(Page, Block, Classes) -> % {{{2 email_field(Page, Block, Required, Classes) -> % {{{2 case Required of - on -> wf:defer(submit, - email, - #validate{ - validators=[ - #is_email{text="Not a valid email."} - ] - } - ); - + on -> + ValidatorBlock = common:sub_block(Block, "validate"), + wf:defer(submit, + email, + #validate{ + validators=[ + #is_email{text=common:parallel_block(Page, ValidatorBlock)} + ] + } + ); + _ -> ok end, #panel{ @@ -212,7 +214,7 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp}) -> % {{{2 Body = lists:concat([Text]), gen_smtpc:send(AuthData, ToEmail, Subject, Body, Options); _ -> - smtp:send_html(FromEmailForm, ToEmail, Subject, Text) + smtp:send_html(FromEmailForm, ToEmail, Subject, Text, Email) end, ?LOG("Send email to ~p from ~p", [ToEmail, Email]), admin:add_form(PID, Phone, TextForm, Email, RatingsPL), diff --git a/src/smtp.erl b/src/smtp.erl index e63a1cc..25c0382 100644 --- a/src/smtp.erl +++ b/src/smtp.erl @@ -20,11 +20,15 @@ send_forgot(Email, Passwd) -> % {{{1 send_html("no-reply@liquid-nitrogen.org", Email, "Password changed foraccount on liquid-nitrogen.org", Body3). send_html(From, To, Subject, Message) -> % {{{1 + send_html(From, To, Subject, Message, From). + +send_html(From, To, Subject, Message, Reply) -> % {{{1 Sendmail = open_port({spawn, "/usr/sbin/sendmail -t"}, []), MessageWithHeader = "From: " ++ From ++ "\n" ++ "To: " ++ To ++ "\n" ++ "MIME-Version: 1.0\n" ++ "Content-Type: text/html; charset=utf8\n" ++ + "Reply-To: " ++ Reply ++ "\n" ++ "Subject: " ++ Subject ++ "\n\n" ++ Message ++ "\n\n", Sendmail ! {self(), {command, MessageWithHeader}}, From a00dfc8f803034771d91080ece0a72ec8d123c71 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 13 Sep 2018 11:51:16 +0500 Subject: [PATCH 11/91] fixed sitemap.xml --- include/db.hrl | 2 +- src/cms_modules/admin.erl | 3 ++- src/cms_modules/sitemap.erl | 25 ++++++++++++++----------- src/db.erl | 4 ++++ src/elements/element_crud.erl | 3 --- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/include/db.hrl b/include/db.hrl index 334c5b6..ef9fda2 100644 --- a/include/db.hrl +++ b/include/db.hrl @@ -68,7 +68,7 @@ title = <<"LiquidCMS">> :: binary(), ?TIMESTAMPS, active=true :: boolean(), - sitemap = never :: atom(), + sitemap = none :: atom(), settings = #{} :: map() }). diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 37f82d8..26520c3 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -1319,7 +1319,8 @@ event({?MODULE, block, save, OldMFA}) -> % {{{2 apply_element_transform( rec_from_qs(OldMFA)), OldMFA))), - + [Page]=db:get_page(PID), + db:save(Page), coldstrap:close_modal(), wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}); event({?MODULE, block, remove, B}) -> % {{{2 diff --git a/src/cms_modules/sitemap.erl b/src/cms_modules/sitemap.erl index 6271d98..87149da 100644 --- a/src/cms_modules/sitemap.erl +++ b/src/cms_modules/sitemap.erl @@ -13,25 +13,28 @@ generate_sitemap() -> % {{{2 PagesAll = db:get_pages(), OnlyActive = fun(I) -> maps:get(active,I)==true end, Pages = lists:filter(OnlyActive, PagesAll), - BaseUrl = application:get_env(nitrogen, host, "http://site.com") ++ "/", + BaseUrl = application:get_env(nitrogen, host, "http://site.com") ++ "/?page=", RootElem = #xmlElement{name=urlset, namespace=#xmlNamespace{default=Ns1}, attributes=[#xmlAttribute{name=xmlns, value=Ns1}], content = lists:map( fun(I) -> - case maps:get(sitemap,I) of + case maps:get(sitemap,I) of none -> - ""; + ""; Fr -> - {url, [#xmlElement{ name=loc, - content=[BaseUrl++maps:get(id,I)] - }, - #xmlElement{ name=changefreq, - content=[atom_to_list(Fr)] - } - ] - } + {url, [ #xmlElement{ name=loc, + content=[BaseUrl++maps:get(id,I)] + }, + #xmlElement{ name=changefreq, + content=[atom_to_list(Fr)] + }, + #xmlElement{ name=lastmod, + content=[db:datetime_tostr(maps:get(updated_at,I))] + } + ] + } end end, Pages ) diff --git a/src/db.erl b/src/db.erl index e3b371a..40664f4 100644 --- a/src/db.erl +++ b/src/db.erl @@ -890,3 +890,7 @@ update_timestamps(#cms_asset{}=Rec) -> % {{{1 update_timestamps(#cms_template{}=Rec) -> % {{{1 CT = calendar:universal_time(), Rec#cms_template{updated_at=CT}. + +datetime_tostr(Date) -> + {{Year, Month, Day}, {Hour, Minute, Second}} = Date, + _StrTime = lists:flatten(io_lib:format("~4..0w-~2..0w-~2..0wT~2..0w:~2..0w:~2..0w+00:00",[Year,Month,Day,Hour,Minute,Second])). diff --git a/src/elements/element_crud.erl b/src/elements/element_crud.erl index e824ae5..a63fb05 100644 --- a/src/elements/element_crud.erl +++ b/src/elements/element_crud.erl @@ -227,6 +227,3 @@ cast(Value, Type) -> % {{{1 wf:warning("Can't cast ~p to ~p", [Value, Type]), Value. -datetime_tostr(Date) -> - {{Year, Month, Day}, {Hour, Minute, Second}} = Date, - _StrTime = lists:flatten(io_lib:format("~4..0w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w",[Year,Month,Day,Hour,Minute,Second])). From f6d99de592d6a07fcd5be5cb57578507f9a06d3f Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Thu, 13 Sep 2018 13:46:23 +0500 Subject: [PATCH 12/91] Config format fixed for sitemap.xml --- src/cms_modules/sitemap.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cms_modules/sitemap.erl b/src/cms_modules/sitemap.erl index 87149da..510313f 100644 --- a/src/cms_modules/sitemap.erl +++ b/src/cms_modules/sitemap.erl @@ -13,7 +13,9 @@ generate_sitemap() -> % {{{2 PagesAll = db:get_pages(), OnlyActive = fun(I) -> maps:get(active,I)==true end, Pages = lists:filter(OnlyActive, PagesAll), - BaseUrl = application:get_env(nitrogen, host, "http://site.com") ++ "/?page=", + Proto = application:get_env(nitrogen, protocol, "http"), + Host = application:get_env(nitrogen, host, "site.com"), + BaseUrl = wf:f("~s://~s/?page=", [Proto, Host]), RootElem = #xmlElement{name=urlset, namespace=#xmlNamespace{default=Ns1}, attributes=[#xmlAttribute{name=xmlns, value=Ns1}], @@ -60,4 +62,4 @@ sitemap_frequencies() -> % {{{2 {yearly,"yearly"}, {never,"never"}, {none,"none"} - ]. \ No newline at end of file + ]. From 84a80f11efc320d8425ee8f645aae2271016632d Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Thu, 13 Sep 2018 13:57:32 +0500 Subject: [PATCH 13/91] Fixed bug with emailform:submit calasses --- src/collections/emailform.erl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index 155f876..6752d31 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -68,6 +68,9 @@ form_data(email_field, A) -> % {{{2 Block, Classes }; +form_data(submit, [Page, Block, ToEmail, Classes]) -> % {{{2 + form_data(submit, [Page, Block, ToEmail, off, Classes]); + form_data(submit, A) -> % {{{2 [_, Block, ToEmail, Smtp, Classes] = admin:maybe_empty(A, 5), {[ @@ -163,6 +166,7 @@ rating(_Page, Block, Min, Max, Step, Size, ShowCaption, ShowClear, _Classes) -> submit(Page, Block, ToEmail, Classes) -> % {{{2 submit(Page, Block, ToEmail, off, Classes). + submit(Page, Block, ToEmail, Smtp, Classes) -> % {{{2 #btn{ %type=success, From 9978c152a0dae3caeaee68367146b88c95d051d4 Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Thu, 13 Sep 2018 14:20:20 +0500 Subject: [PATCH 14/91] Fixed save_block for emailform:submit old version --- src/collections/emailform.erl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index 6752d31..4460cb7 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -95,6 +95,8 @@ save_block(#cms_mfa{id={_PID, _}, mfa={_M, rating=Fun, A}}=Rec) -> % {{{2 ShowClear = wf:to_atom(common:q(show_clear, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [Block, Min, Max, Step, Size, ShowCaption, ShowClear, Classes]}}; +save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Classes, _DataAttr]}}=Rec) -> % {{{2 + Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, off, Classes]}}; save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Smtp, Classes, _DataAttr]}}=Rec) -> % {{{2 Smtp = wf:to_atom(common:q(use_smtp, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, Smtp, Classes]}}; From b26b5b25f36ab06c3d145cb04418dc9f789a932e Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Thu, 13 Sep 2018 15:31:40 +0500 Subject: [PATCH 15/91] Close modal if present on emailform submit --- src/collections/emailform.erl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index 4460cb7..e857094 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -224,6 +224,7 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp}) -> % {{{2 end, ?LOG("Send email to ~p from ~p", [ToEmail, Email]), admin:add_form(PID, Phone, TextForm, Email, RatingsPL), + coldstrap:close_modal(), wf:flash(FlashID, Flash); event(Ev) -> % {{{2 ?LOG("~p event ~p", [?MODULE, Ev]). From e95acc8eac14a4420eca878a2e3ec5a8884e2420 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 18 Sep 2018 12:29:55 +0500 Subject: [PATCH 16/91] added clear page func to db --- src/db.erl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/db.erl b/src/db.erl index 40664f4..273347b 100644 --- a/src/db.erl +++ b/src/db.erl @@ -894,3 +894,11 @@ update_timestamps(#cms_template{}=Rec) -> % {{{1 datetime_tostr(Date) -> {{Year, Month, Day}, {Hour, Minute, Second}} = Date, _StrTime = lists:flatten(io_lib:format("~4..0w-~2..0w-~2..0wT~2..0w:~2..0w:~2..0w+00:00",[Year,Month,Day,Hour,Minute,Second])). + +clear_page_by_id(PID)-> + transaction(fun() -> + Elements = mnesia:match_object(#cms_mfa{id={PID,'_'}, _='_'}), + lists:foreach(fun(MFA) -> + mnesia:delete_object(MFA) + end, Elements) + end). From 610f69c6974c77894912be4c9011d0f433fb420f Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 27 Sep 2018 15:04:06 +0500 Subject: [PATCH 17/91] added APIs table --- include/db.hrl | 8 +++++ src/cms_modules/admin.erl | 73 +++++++++++++++++++++++++++++++++++++-- src/db.erl | 34 +++++++++++++++++- 3 files changed, 111 insertions(+), 4 deletions(-) diff --git a/include/db.hrl b/include/db.hrl index ef9fda2..89f9958 100644 --- a/include/db.hrl +++ b/include/db.hrl @@ -102,4 +102,12 @@ active=true :: boolean(), comment="" :: string(), ?TIMESTAMPS + }). + +-record(cms_api, { + name :: string(), + apikey :: string(), + ?TIMESTAMPS, + active=true :: boolean(), + settings = #{} :: map() }). \ No newline at end of file diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 26520c3..2f96445 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -52,11 +52,15 @@ default_data() -> % {{{2 add_navbar_button("admin", "accounts-menu", "users-all", {{"fa", "user", []}, "Users"}, {event, ?POSTBACK({?MODULE, user, show}, ?MODULE)}), add_navbar_button("admin", "accounts-menu", "roles-all", {{"fa", "group", []}, "Roles"}, {event, ?POSTBACK({?MODULE, role, show}, ?MODULE)}), - add_navbar_button("admin", "sidebar-nav", "forms", {{"fa", "wpforms", ["fab"]}, "Forms"}, {event, ?POSTBACK({?MODULE, forms, show}, ?MODULE)}) + add_navbar_button("admin", "sidebar-nav", "forms", {{"fa", "wpforms", ["fab"]}, "Forms"}, {event, ?POSTBACK({?MODULE, forms, show}, ?MODULE)}), + add_navbar_button("admin", "sidebar-nav", "apis", {{"fa", "wpapis", ["fab"]}, "APIs"}, {event, ?POSTBACK({?MODULE, apis, show}, ?MODULE)}) ] }. - +append_apis_menu()->#{ + cms_mfa => [add_navbar_button("admin", "sidebar-nav", "apis", {{"fa", "wpapis", ["fab"]}, "APIs"}, {event, ?POSTBACK({?MODULE, apis, show}, ?MODULE)}) + ] +}. install() -> % {{{2 lager:info("Installing ~p module", [?MODULE]), get_files_from_folder("static"), @@ -85,6 +89,11 @@ add_form(PID, Phone, Text, Email, Rating) -> % {{{2 email=Email, rating=Rating }). +add_api(Name, Key) -> % {{{2 + db:save(#cms_api{ + name = Name, + apikey = Key + }). add_template(TemplatePath, Bindings) -> % {{{2 add_template(TemplatePath, TemplatePath, TemplatePath, Bindings). @@ -917,6 +926,25 @@ event({?MODULE, asset, show, Type}) -> % {{{2 body=CRUD } }]); +event({?MODULE, api, new}) -> % {{{2 + new_modal("Add API", + {?MODULE, api, save}, + api, + [ + #span{text="Name"}, + #txtbx{id=name, + placeholder="API name"}, + + #span{text="Api Key"}, + #txtarea{id=apikey, + placeholder=""} + + %, #hidden{id=path} + ]); +event({?MODULE, api, save}) -> % {{{2 + add_api(wf:q(name), wf:q(apikey)), + coldstrap:close_modal(), + wf:wire(#event{postback={?MODULE, apis, show}, delegate=?MODULE}); event({?MODULE, template, new}) -> % {{{2 new_modal("Upload Template", {?MODULE, template, save}, @@ -940,7 +968,7 @@ event({?MODULE, template, save}) -> % {{{2 Path = wf:q(path), add_template(wf:q(name), wf:q(description), Path, []), coldstrap:close_modal(), - wf:wire(#event{postback={template, show}}); + wf:wire(#event{postback={?MODULE, template, show}, delegate=?MODULE}); event({?MODULE, template, show}) -> % {{{2 CRUD = #crud{ pagination_class=["btn", "btn-default"], @@ -1023,6 +1051,45 @@ event({?MODULE, forms, show}) -> % {{{2 body=CRUD } }]); +event({?MODULE, apis, show}) -> % {{{2 + CRUD = #crud{ + pagination_class=["btn", "btn-default"], + button_class=["btn", "btn-link"], + table_class=["table-striped", "table-bordered", "table-hover"], + start=0, + count=10, + cols=[ + {name, "Name", tb} + ], + funs=#{ + list => fun db:get_apis/0, + update => fun db:update_map/1, + delete => fun db:delete/1 + } + }, + wf:update(container, [#bs_row{ + body=[ + #bs_col{ + cols={lg, 8}, + body=#h1{text="APIs"} + }, + #bs_col{ + cols={lg, 2}, + body=#button{ + text="Add API", + class=["btn", + "btn-success", + "btn-block", + "btn-upload"], + actions=?POSTBACK({?MODULE, api, new}, ?MODULE) + }} + ]}, + #bs_row{ + body=#bs_col{ + cols={lg, 12}, + body=CRUD + } + }]); event({?MODULE, page, show}) -> % {{{2 CRUD = #crud{ pagination_class=["btn", "btn-default"], diff --git a/src/db.erl b/src/db.erl index 273347b..d78e63b 100644 --- a/src/db.erl +++ b/src/db.erl @@ -18,6 +18,7 @@ install([])-> % {{{1 ?CREATE_TABLE(cms_user, set, []), ?CREATE_TABLE(cms_role, set, []), ?CREATE_TABLE(cms_form, set, []), + ?CREATE_TABLE(cms_api, set, []), {ok, VSN} = application:get_key(nitrogen, vsn), DataModules = common:module_by_function({default_data, 0}), mnesia:transaction( @@ -317,6 +318,23 @@ update("1.0.2"=VSN) -> % {{{1 : add sitemap column for cms_page table } end, record_info(fields, cms_page)), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); +update("1.0.3"=VSN) -> % {{{1 : added Apis table in admin menu + ?CREATE_TABLE(cms_api, set, []), + mnesia:transaction( + fun() -> + [maps:map( + fun(_K, V) -> + lists:foreach( + fun(#cms_mfa{}=R) -> + mnesia:write( + fix_sort( + update_timestamps(R))) + end, + lists:flatten(V)) + end, + admin:append_apis_menu())] + end), + mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("fix_sort") -> % {{{1 F = fun() -> FoldFun = @@ -525,6 +543,12 @@ get_forms() -> % {{{1 [record_to_map(A) || A <- Forms] end). +get_apis() -> % {{{1 + transaction(fun() -> + APIs = mnesia:match_object(#cms_api{active=true, _='_'}), + [record_to_map(A) || A <- APIs] + end). + fix_sort(Recs) when is_list(Recs) -> % {{{1 [fix_sort(Rec) || Rec <- Recs]; fix_sort(#cms_mfa{sort=new}=Rec) -> % {{{1 @@ -747,7 +771,9 @@ fields(cms_role) -> % {{{1 fields(cms_template) -> % {{{1 record_info(fields, cms_template); fields(cms_form) -> % {{{1 - record_info(fields, cms_form). + record_info(fields, cms_form); +fields(cms_api) -> % {{{1 + record_info(fields, cms_api). empty_mfa(PID, Block, Sort) -> % {{{1 CT = calendar:universal_time(), @@ -857,6 +883,9 @@ update_timestamps(#cms_page{created_at=undefined}=Rec) -> % {{{1 update_timestamps(#cms_form{created_at=undefined}=Rec) -> % {{{1 CT = calendar:universal_time(), Rec#cms_form{created_at=CT, updated_at=CT}; +update_timestamps(#cms_api{created_at=undefined}=Rec) -> % {{{1 + CT = calendar:universal_time(), + Rec#cms_api{created_at=CT, updated_at=CT}; update_timestamps(#cms_user{created_at=undefined}=Rec) -> % {{{1 CT = calendar:universal_time(), Rec#cms_user{created_at=CT, updated_at=CT}; @@ -878,6 +907,9 @@ update_timestamps(#cms_page{}=Rec) -> % {{{1 update_timestamps(#cms_form{}=Rec) -> % {{{1 CT = calendar:universal_time(), Rec#cms_form{updated_at=CT}; +update_timestamps(#cms_api{}=Rec) -> % {{{1 + CT = calendar:universal_time(), + Rec#cms_api{updated_at=CT}; update_timestamps(#cms_user{}=Rec) -> % {{{1 CT = calendar:universal_time(), Rec#cms_user{updated_at=CT}; From 150463a1a16d905325c790490dac5c56cdb0accb Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 29 Sep 2018 15:52:19 +0500 Subject: [PATCH 18/91] added Api call to emailform submit; added cms_api table --- src/collections/emailform.erl | 142 ++++++++++++++++++++++++++-------- src/db.erl | 4 + src/nitrogen_app.erl | 1 - src/nitrogen_sup.erl | 1 + static/css/admin.css | 17 ++++ 5 files changed, 133 insertions(+), 32 deletions(-) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index e857094..8415ace 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -69,19 +69,48 @@ form_data(email_field, A) -> % {{{2 Classes }; form_data(submit, [Page, Block, ToEmail, Classes]) -> % {{{2 - form_data(submit, [Page, Block, ToEmail, off, Classes]); - + form_data(submit, [Page, Block, ToEmail, false, Classes]); +form_data(submit, [Page, Block, ToEmail, Smtp, Classes])-> % {{{2 + form_data(submit, [Page, Block, ToEmail, Smtp, none, [], Classes]); form_data(submit, A) -> % {{{2 - [_, Block, ToEmail, Smtp, Classes] = admin:maybe_empty(A, 5), + [_, Block, ToEmail, Smtp, Apicall, AddFields, Classes] = admin:maybe_empty(A, 7), {[ - {"Email to send form", {to_email, ToEmail}} + {"Email to send form", {to_email, ToEmail}}, + #checkbox{ + text="Use Smtp", + label_position=before, + id=use_smtp, + checked=Smtp + }, + {"API call",#dd{ id=api, + value=Apicall, + options=[none | cms_apis()], + postback=switch_add_field, + delegate=?MODULE + }}, + #btn{ + id=add_field_btn, + size=md, + class=["btn-upload btn-block " ++ case lists:member(Apicall,cms_apis()) of + false -> "hidden"; + true-> "" + end + ], + text="Add field(api)", + postback=add_field, + delegate=?MODULE + }, + #p{id=for_pretty}, + [#p{id=addfields, + body=[ + + #txtbx{text=K, placeholder="field name", class="form-fields"}, + #txtbx{text=V, placeholder="field value", class="form-fields"} + ]} || {K, V} <- AddFields + ], + #span{id=for_insert} ], - [#checkbox{ - text="Use Smtp", - label_position=before, - id=use_smtp, - checked=Smtp - }], + [ ], Block, Classes}; form_data(_F, [_, Block, Classes]) -> % {{{2 @@ -95,18 +124,23 @@ save_block(#cms_mfa{id={_PID, _}, mfa={_M, rating=Fun, A}}=Rec) -> % {{{2 ShowClear = wf:to_atom(common:q(show_clear, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [Block, Min, Max, Step, Size, ShowCaption, ShowClear, Classes]}}; -save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Classes, _DataAttr]}}=Rec) -> % {{{2 - Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, off, Classes]}}; -save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Smtp, Classes, _DataAttr]}}=Rec) -> % {{{2 +save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Apicall, Classes, _DataAttr]}}=Rec) -> % {{{2 Smtp = wf:to_atom(common:q(use_smtp, false)), - Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, Smtp, Classes]}}; + AddFields = + case wf:to_atom(Apicall) of + none -> + []; + _ -> + Proplist = list_to_proplist(wf:qs(addfields)), + lists:filter(fun(I)-> I /={} end, Proplist) + end, + Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, Smtp, Apicall, AddFields, Classes]}}; save_block(#cms_mfa{id={_PID, _}, mfa={_M, email_field=Fun, [B, Classes, _DataAttr]}}=Rec) -> % {{{2 Required = wf:to_atom(common:q(email_required, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [B, Required, Classes]}}; save_block(#cms_mfa{id={_PID, _}, mfa={_M, Fun, [B, Classes, _DataAttr]}}=Rec) -> % {{{2 Rec#cms_mfa{mfa={?MODULE, Fun, [B, Classes]}}. - %% Block renderers {{{1 email_field(Page, Block, Classes) -> % {{{2 email_field(Page, Block, on, Classes). @@ -167,9 +201,10 @@ rating(_Page, Block, Min, Max, Step, Size, ShowCaption, ShowClear, _Classes) -> ]}. submit(Page, Block, ToEmail, Classes) -> % {{{2 - submit(Page, Block, ToEmail, off, Classes). - + submit(Page, Block, ToEmail, false, Classes). submit(Page, Block, ToEmail, Smtp, Classes) -> % {{{2 + submit(Page, Block, ToEmail, Smtp, none, [], Classes). +submit(Page, Block, ToEmail, Smtp, Apicall, AddFields, Classes) -> % {{{2 #btn{ %type=success, id=submit, @@ -177,12 +212,12 @@ submit(Page, Block, ToEmail, Smtp, Classes) -> % {{{2 html_id=common:block_to_html_id(Block), class=["btn-block"|Classes], body=common:parallel_block(Page, Block), - postback={submit, Page, Block, ToEmail, Smtp}, + postback={submit, Page, Block, ToEmail, Smtp, Apicall, AddFields}, delegate=?MODULE }. %% Event handlers % {{{1 -event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp}) -> % {{{2 +event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp, Apicall, AddFields}) -> % {{{2 Phone = wf:to_list(common:q(phone, "")), RatingsPL = wf:q_pl(get_form_rating_ids(Page, Block)), % ?LOG("Ratings: ~p~n", [RatingsPL]), @@ -211,21 +246,58 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp}) -> % {{{2 actions=#hide{effect=blind, speed=40} }), - case Smtp of - on -> - AuthData = application:get_env(esmpt, smtp_auth_data), - HostSmtp = application:get_env(esmpt, host), - Port = application:get_env(esmpt, port, 465), - Options = [{use_ssl, true}, {host, HostSmtp}, {port, Port}], - Body = lists:concat([Text]), - gen_smtpc:send(AuthData, ToEmail, Subject, Body, Options); - _ -> - smtp:send_html(FromEmailForm, ToEmail, Subject, Text, Email) + + case Apicall of + none -> + case Smtp of + on -> + AuthData = application:get_env(esmpt, smtp_auth_data), + HostSmtp = application:get_env(esmpt, host), + Port = application:get_env(esmpt, port, 465), + Options = [{use_ssl, true}, {host, HostSmtp}, {port, Port}], + Body = lists:concat([Text]), + gen_smtpc:send(AuthData, ToEmail, Subject, Body, Options); + _ -> + smtp:send_html(FromEmailForm, ToEmail, Subject, Text, Email) + end, + ?LOG("Send email to ~p from ~p", [ToEmail, Email]), + admin:add_form(PID, Phone, TextForm, Email, RatingsPL); + ApiName -> + case string:str(Apicall, "unisender") of % unisender api + Index when Index > 0 -> + [#cms_api{apikey=Key}] = db:get_api(ApiName), + PreUrl = wf:f("~s?api_key=~s", [ApiName, Key]), + Args = lists:append([AddFields,[{"fields[email]",Email}]]), + FormatFields = [wf:f("&~s=~s", [K, V]) || {K, V} <- Args], + FullUrl = string:concat(PreUrl,FormatFields), + ?LOG("FullUrl: ~s", [FullUrl]), + {ok, {{_Version, 200, ResultPhrase}, _Headers, _Body}} = httpc:request(get, {FullUrl, []}, [], []), + ?LOG("Result:~p",[ResultPhrase]); + _ -> + undefined + end end, - ?LOG("Send email to ~p from ~p", [ToEmail, Email]), - admin:add_form(PID, Phone, TextForm, Email, RatingsPL), coldstrap:close_modal(), wf:flash(FlashID, Flash); +event(switch_add_field) -> % {{{2 + case wf:to_atom(common:q(api, "false")) of + none -> + wf:wire(add_field_btn, #add_class { class=hidden, speed=40 }), + wf:wire(addfields, #add_class { class=hidden, speed=40 }); + _ -> + wf:wire(add_field_btn, #remove_class { class=hidden, speed=40 }), + wf:wire(addfields, #remove_class { class=hidden, speed=40 }) + end; +event(add_field) -> % {{{2 + wf:insert_before(for_insert, + #p{id=addfields, + class="flex", + body=[ + #txtbx{placeholder="field name", class="form-fields"}, + #txtbx{placeholder="field value", class="form-fields"} + ] + } + ); event(Ev) -> % {{{2 ?LOG("~p event ~p", [?MODULE, Ev]). @@ -251,3 +323,11 @@ add_if_not_empty(_Header, "") -> % {{{2 add_if_not_empty(Header, Text) -> % {{{2 [Header, Text, "\n"]. %% Dropdown formatters {{{1 + +list_to_proplist([]) -> []; +list_to_proplist([K, V | Tail]) -> + [if K/="" ->{K, V}; + true -> {} end | list_to_proplist(Tail)]. + +cms_apis() -> % {{{2 + [Name || #{ name := Name} <- db:get_apis()]. \ No newline at end of file diff --git a/src/db.erl b/src/db.erl index d78e63b..79f1e94 100644 --- a/src/db.erl +++ b/src/db.erl @@ -542,6 +542,10 @@ get_forms() -> % {{{1 Forms = mnesia:match_object(#cms_form{active=true, _='_'}), [record_to_map(A) || A <- Forms] end). +get_api(ApiName) -> % {{{1 + transaction(fun() -> + mnesia:match_object(#cms_api{name=ApiName, active=true, _='_'}) + end). get_apis() -> % {{{1 transaction(fun() -> diff --git a/src/nitrogen_app.erl b/src/nitrogen_app.erl index a482799..7dba16a 100644 --- a/src/nitrogen_app.erl +++ b/src/nitrogen_app.erl @@ -10,7 +10,6 @@ start(_StartType, _StartArgs) -> Node = node(), case mnesia:create_schema([Node]) of ok -> - io:format("STARTTT",[]), {ok, _}=application:ensure_all_started(lager), {ok, _}=application:ensure_all_started(mnesia), {atomic, _}=db:install([]), diff --git a/src/nitrogen_sup.erl b/src/nitrogen_sup.erl index d6590ca..2c79fcb 100644 --- a/src/nitrogen_sup.erl +++ b/src/nitrogen_sup.erl @@ -27,6 +27,7 @@ init([]) -> application:start(simple_bridge), application:start(ct), application:start(gen_smtpc), + application:start(inets), application:start(ssl), {ok, { {one_for_one, 5, 10}, []} }. diff --git a/static/css/admin.css b/static/css/admin.css index a0790af..6e2b095 100644 --- a/static/css/admin.css +++ b/static/css/admin.css @@ -60,4 +60,21 @@ #flash { width: fit-content; margin: auto; +} + +.form-fields { + display: inline-block; + width: 128px; + margin-right: 5px; +} +.chb-before-label { + font-weight: 700; + float:left; + margin-right: 5px; +} +.apicall-paragraph label{ + display: block !important; +} +.flex { + display: flex; } \ No newline at end of file From a30827dac3c430802592907475550a375f82f444 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 1 Oct 2018 10:04:24 +0500 Subject: [PATCH 19/91] fixed sitemap for index --- src/cms_modules/sitemap.erl | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/cms_modules/sitemap.erl b/src/cms_modules/sitemap.erl index 510313f..9cc7a35 100644 --- a/src/cms_modules/sitemap.erl +++ b/src/cms_modules/sitemap.erl @@ -15,7 +15,7 @@ generate_sitemap() -> % {{{2 Pages = lists:filter(OnlyActive, PagesAll), Proto = application:get_env(nitrogen, protocol, "http"), Host = application:get_env(nitrogen, host, "site.com"), - BaseUrl = wf:f("~s://~s/?page=", [Proto, Host]), + BaseUrl = wf:f("~s://~s/", [Proto, Host]), RootElem = #xmlElement{name=urlset, namespace=#xmlNamespace{default=Ns1}, attributes=[#xmlAttribute{name=xmlns, value=Ns1}], @@ -26,17 +26,24 @@ generate_sitemap() -> % {{{2 none -> ""; Fr -> - {url, [ #xmlElement{ name=loc, - content=[BaseUrl++maps:get(id,I)] - }, - #xmlElement{ name=changefreq, - content=[atom_to_list(Fr)] - }, - #xmlElement{ name=lastmod, - content=[db:datetime_tostr(maps:get(updated_at,I))] - } - ] - } + Id = maps:get(id,I), + Url = case wf:to_atom(Id) of + index -> + BaseUrl; + _ -> + wf:f("~s?page=~s", [BaseUrl, Id]) + end, + {url, [ #xmlElement{ name=loc, + content=[Url] + }, + #xmlElement{ name=changefreq, + content=[atom_to_list(Fr)] + }, + #xmlElement{ name=lastmod, + content=[db:datetime_tostr(maps:get(updated_at,I))] + } + ] + } end end, Pages ) From a791912d57694e5ada0cc30cebe3c721bbe83a6d Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 1 Oct 2018 10:19:55 +0500 Subject: [PATCH 20/91] upd version --- src/nitrogen.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nitrogen.app.src b/src/nitrogen.app.src index 56d77f4..99b31dc 100644 --- a/src/nitrogen.app.src +++ b/src/nitrogen.app.src @@ -1,7 +1,7 @@ {application, nitrogen, [ {description, "My Nitrogen Web Project"}, - {vsn, "1.0.2"}, + {vsn, "1.0.3"}, {registered, []}, {applications, [kernel, stdlib]}, {mod, { nitrogen_app, []}}, From 708bea9028fd0ac9dc1d9dafa75124417c98317d Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Wed, 3 Oct 2018 13:38:22 +0500 Subject: [PATCH 21/91] Added undefined case for qs filter --- src/collections/common.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collections/common.erl b/src/collections/common.erl index 7bf658d..693286c 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -339,10 +339,10 @@ apply_filters(["", "", Role]) -> % {{{2 apply_filters([K, V, ""]) -> % {{{2 D = wf:q(wf:to_atom(K)), ?LOG("K: ~p, V: ~p, Q: ~p", [K, V, D]), - D == wf:to_list(V); + wf:to_list(D) == wf:to_list(V); apply_filters([K, V, R]) -> % {{{2 #cms_user{role=Role} = account:user(), - (Role == wf:to_atom(R)) and wf:q(wf:to_atom(K)) == wf:to_list(V); + (Role == wf:to_atom(R)) and wf:to_list(wf:q(wf:to_atom(K))) == wf:to_list(V); apply_filters(_) -> % {{{2 true. From cfd0c306933a6448721699fc7b2e6da08ad5e7e2 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 4 Oct 2018 17:06:30 +0500 Subject: [PATCH 22/91] changed apicall for emailform submit --- src/collections/emailform.erl | 87 ++++++++++++++++++++++------------- src/db.erl | 14 ++++++ src/nitrogen.app.src | 2 +- src/nitrogen_sup.erl | 1 + 4 files changed, 71 insertions(+), 33 deletions(-) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index e857094..e4bdd72 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -69,19 +69,30 @@ form_data(email_field, A) -> % {{{2 Classes }; form_data(submit, [Page, Block, ToEmail, Classes]) -> % {{{2 - form_data(submit, [Page, Block, ToEmail, off, Classes]); + form_data(submit, [Page, Block, ToEmail, false, Classes]); + +form_data(submit, [Page, Block, ToEmail, Smtp, Classes]) -> % {{{2 + form_data(submit, [Page, Block, ToEmail, Smtp, [], Classes]); form_data(submit, A) -> % {{{2 - [_, Block, ToEmail, Smtp, Classes] = admin:maybe_empty(A, 5), + [_, Block, ToEmail, Smtp, Apicall, Classes] = admin:maybe_empty(A, 6), {[ - {"Email to send form", {to_email, ToEmail}} + {"Email to send form", {to_email, ToEmail}}, + #checkbox{ + text="Use Smtp", + label_position=before, + id=use_smtp, + checked=Smtp + }, + {"API call:", + #txtbx{ + id=api, + text=Apicall, + placeholder="https://api.name/method?email={{email}}" + } + } ], - [#checkbox{ - text="Use Smtp", - label_position=before, - id=use_smtp, - checked=Smtp - }], + [], Block, Classes}; form_data(_F, [_, Block, Classes]) -> % {{{2 @@ -95,17 +106,18 @@ save_block(#cms_mfa{id={_PID, _}, mfa={_M, rating=Fun, A}}=Rec) -> % {{{2 ShowClear = wf:to_atom(common:q(show_clear, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [Block, Min, Max, Step, Size, ShowCaption, ShowClear, Classes]}}; -save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Classes, _DataAttr]}}=Rec) -> % {{{2 - Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, off, Classes]}}; -save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Smtp, Classes, _DataAttr]}}=Rec) -> % {{{2 +save_block(#cms_mfa{id={_PID, _}, mfa={_M, submit=Fun, [B, Email, Apicall, Classes, _DataAttr]}}=Rec) -> % {{{2 Smtp = wf:to_atom(common:q(use_smtp, false)), - Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, Smtp, Classes]}}; + Rec#cms_mfa{mfa={?MODULE, Fun, [B, Email, Smtp, Apicall, Classes]}}; save_block(#cms_mfa{id={_PID, _}, mfa={_M, email_field=Fun, [B, Classes, _DataAttr]}}=Rec) -> % {{{2 Required = wf:to_atom(common:q(email_required, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [B, Required, Classes]}}; save_block(#cms_mfa{id={_PID, _}, mfa={_M, Fun, [B, Classes, _DataAttr]}}=Rec) -> % {{{2 - Rec#cms_mfa{mfa={?MODULE, Fun, [B, Classes]}}. - + Rec#cms_mfa{mfa={?MODULE, Fun, [B, Classes]}}; +save_block(#cms_mfa{id={_PID, _}, mfa={_M, Fun, A}}=Rec) -> % {{{2 + ?LOG("save block last:~p",[A]) + ,Rec#cms_mfa{mfa={?MODULE, Fun, A}} + . %% Block renderers {{{1 email_field(Page, Block, Classes) -> % {{{2 @@ -167,9 +179,10 @@ rating(_Page, Block, Min, Max, Step, Size, ShowCaption, ShowClear, _Classes) -> ]}. submit(Page, Block, ToEmail, Classes) -> % {{{2 - submit(Page, Block, ToEmail, off, Classes). - + submit(Page, Block, ToEmail, false, Classes). submit(Page, Block, ToEmail, Smtp, Classes) -> % {{{2 + submit(Page, Block, ToEmail, Smtp, [], Classes). +submit(Page, Block, ToEmail, Smtp, Apicall, Classes) -> % {{{2 #btn{ %type=success, id=submit, @@ -177,12 +190,12 @@ submit(Page, Block, ToEmail, Smtp, Classes) -> % {{{2 html_id=common:block_to_html_id(Block), class=["btn-block"|Classes], body=common:parallel_block(Page, Block), - postback={submit, Page, Block, ToEmail, Smtp}, + postback={submit, Page, Block, ToEmail, Smtp, Apicall}, delegate=?MODULE }. %% Event handlers % {{{1 -event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp}) -> % {{{2 +event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp, Apicall}) -> % {{{2 Phone = wf:to_list(common:q(phone, "")), RatingsPL = wf:q_pl(get_form_rating_ids(Page, Block)), % ?LOG("Ratings: ~p~n", [RatingsPL]), @@ -210,19 +223,28 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp}) -> % {{{2 target=FlashID, actions=#hide{effect=blind, speed=40} }), - - case Smtp of - on -> - AuthData = application:get_env(esmpt, smtp_auth_data), - HostSmtp = application:get_env(esmpt, host), - Port = application:get_env(esmpt, port, 465), - Options = [{use_ssl, true}, {host, HostSmtp}, {port, Port}], - Body = lists:concat([Text]), - gen_smtpc:send(AuthData, ToEmail, Subject, Body, Options); - _ -> - smtp:send_html(FromEmailForm, ToEmail, Subject, Text, Email) + case Apicall of + [] -> + case Smtp of + on -> + AuthData = application:get_env(esmpt, smtp_auth_data), + HostSmtp = application:get_env(esmpt, host), + Port = application:get_env(esmpt, port, 465), + Options = [{use_ssl, true}, {host, HostSmtp}, {port, Port}], + Body = lists:concat([Text]), + gen_smtpc:send(AuthData, ToEmail, Subject, Body, Options); + _ -> + smtp:send_html(FromEmailForm, ToEmail, Subject, Text, Email) + end, + ?LOG("Send email to ~p from ~p", [ToEmail, Email]); + Url -> + UrlWithEmail = re:replace(Url,"{{email}}",Email, [{return, list}]), + ?LOG("Apicall: ~p", [UrlWithEmail]), + {ok, {{_Version, 200, ResultPhrase}, _Headers, _Body}} = httpc:request(get, {UrlWithEmail, []}, [], []), + ?LOG("Result:~p",[ResultPhrase]) end, - ?LOG("Send email to ~p from ~p", [ToEmail, Email]), + + admin:add_form(PID, Phone, TextForm, Email, RatingsPL), coldstrap:close_modal(), wf:flash(FlashID, Flash); @@ -235,8 +257,9 @@ get_form_rating_ids(#cms_page{id=PID}, Block) -> % {{{2 fun() -> [#cms_mfa{id={PID, FormBlock}} | _] = mnesia:match_object( #cms_mfa{id={PID, '_'}, - mfa={emailform, submit, [Block, '_', '_']}, + mfa={emailform, submit, [Block, '_', '_','_','_']}, _='_'}), + Elements = mnesia:match_object( #cms_mfa{id={PID, FormBlock}, mfa={emailform, rating, '_'}, diff --git a/src/db.erl b/src/db.erl index 273347b..39f05a4 100644 --- a/src/db.erl +++ b/src/db.erl @@ -317,6 +317,20 @@ update("1.0.2"=VSN) -> % {{{1 : add sitemap column for cms_page table } end, record_info(fields, cms_page)), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); +update("1.0.3"=VSN) -> % update submit button + transaction( + fun() -> + ReplElements = mnesia:match_object(#cms_mfa{mfa={emailform,submit, ['_','_','_']}, _='_'}), + lists:foreach(fun(#cms_mfa{mfa={M, F, [Block, Email, Classes]}}=MFA) -> + New_mfa = MFA#cms_mfa{mfa={M, F, [Block, Email, false, [], Classes]}, + updated_at=calendar:universal_time()}, + % ?LOG("~nReplace ~p to ~p",[MFA, New_mfa]), + mnesia:delete_object(MFA), + mnesia:write(New_mfa) + end, + ReplElements) + end), + mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("fix_sort") -> % {{{1 F = fun() -> FoldFun = diff --git a/src/nitrogen.app.src b/src/nitrogen.app.src index 56d77f4..99b31dc 100644 --- a/src/nitrogen.app.src +++ b/src/nitrogen.app.src @@ -1,7 +1,7 @@ {application, nitrogen, [ {description, "My Nitrogen Web Project"}, - {vsn, "1.0.2"}, + {vsn, "1.0.3"}, {registered, []}, {applications, [kernel, stdlib]}, {mod, { nitrogen_app, []}}, diff --git a/src/nitrogen_sup.erl b/src/nitrogen_sup.erl index d6590ca..2c79fcb 100644 --- a/src/nitrogen_sup.erl +++ b/src/nitrogen_sup.erl @@ -27,6 +27,7 @@ init([]) -> application:start(simple_bridge), application:start(ct), application:start(gen_smtpc), + application:start(inets), application:start(ssl), {ok, { {one_for_one, 5, 10}, []} }. From 2856b939074782cad83f9150755fc7905c0a2091 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 4 Oct 2018 17:32:04 +0500 Subject: [PATCH 23/91] added phone and name to submit apicall --- src/collections/emailform.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index e4bdd72..f8680eb 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -239,8 +239,10 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp, Apicall}) -> % {{{2 ?LOG("Send email to ~p from ~p", [ToEmail, Email]); Url -> UrlWithEmail = re:replace(Url,"{{email}}",Email, [{return, list}]), - ?LOG("Apicall: ~p", [UrlWithEmail]), - {ok, {{_Version, 200, ResultPhrase}, _Headers, _Body}} = httpc:request(get, {UrlWithEmail, []}, [], []), + UrlWithPhone = re:replace(UrlWithEmail,"{{phone}}",Phone, [{return, list}]), + UrlWithName = re:replace(UrlWithPhone,"{{name}}",wf:to_list(common:q(name, "")), [{return, list}]), + ?LOG("Apicall: ~p", [UrlWithName]), + {ok, {{_Version, 200, ResultPhrase}, _Headers, _Body}} = httpc:request(get, {UrlWithName, []}, [], []), ?LOG("Result:~p",[ResultPhrase]) end, From 96854bd37ffca0f1ecfa313de833b8ce63051ee0 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 4 Oct 2018 18:12:06 +0500 Subject: [PATCH 24/91] added html5:input --- src/collections/emailform.erl | 7 +----- src/collections/html5.erl | 46 +++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index f8680eb..c94a696 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -113,12 +113,7 @@ save_block(#cms_mfa{id={_PID, _}, mfa={_M, email_field=Fun, [B, Classes, _DataA Required = wf:to_atom(common:q(email_required, false)), Rec#cms_mfa{mfa={?MODULE, Fun, [B, Required, Classes]}}; save_block(#cms_mfa{id={_PID, _}, mfa={_M, Fun, [B, Classes, _DataAttr]}}=Rec) -> % {{{2 - Rec#cms_mfa{mfa={?MODULE, Fun, [B, Classes]}}; -save_block(#cms_mfa{id={_PID, _}, mfa={_M, Fun, A}}=Rec) -> % {{{2 - ?LOG("save block last:~p",[A]) - ,Rec#cms_mfa{mfa={?MODULE, Fun, A}} - . - + Rec#cms_mfa{mfa={?MODULE, Fun, [B, Classes]}}. %% Block renderers {{{1 email_field(Page, Block, Classes) -> % {{{2 email_field(Page, Block, on, Classes). diff --git a/src/collections/html5.erl b/src/collections/html5.erl index 19a8d9b..a117006 100644 --- a/src/collections/html5.erl +++ b/src/collections/html5.erl @@ -28,7 +28,8 @@ functions() -> % {{{2 {main, "Main"}, {section, "Section"}, {time, "Time"}, - {iframe, "Iframe"} + {iframe, "Iframe"}, + {input, "Input"} ]. format_block(block, [Block, Classes, DataAttr]) -> % {{{2 @@ -67,6 +68,29 @@ form_data(list, A) -> % {{{2 } ], [], Block, Classes, DataAttr}; +form_data(input, A) -> % {{{2 + [_, Block, Readonly, Maxlen, Text, Classes, DataAttr] = admin:maybe_empty(A, 7), + {[ + #checkbox{ + text="Readonly", + label_position=before, + id=readonly_input, + checked=Readonly + }, + {"Max length (optional)", + #txtbx{ + id=maxlength_input, + text=Maxlen, + placeholder="" + }}, + {"Text (optional)", + #txtbx{ + id=text_input, + text=Text, + placeholder="" + }} + ], + [], Block, Classes, DataAttr}; form_data(link_url, A) -> % {{{2 [_, Block, URL, Classes, DataAttr] = admin:maybe_empty(A, 5), {[ @@ -162,15 +186,23 @@ form_data(article, A) -> % {{{2 }. save_block(#cms_mfa{mfa={html5, list, [Block, Classes, DataAttr]}}=Rec) -> % {{{2 - Num = wf:to_atom(common:q(numbered, "false")), + Num = wf:to_atom(common:q(numbered, false)), Rec#cms_mfa{mfa={html5, list, [Block, Num, Classes, DataAttr]}}; + +save_block(#cms_mfa{mfa={html5, input, [Block, Maxlen, Text, Classes, DataAttr]}}=Rec) -> % {{{2 + Readonly = wf:to_atom(common:q(readonly_input, false)), + Rec#cms_mfa{mfa={html5, input, [Block, Readonly, Maxlen, Text, Classes, DataAttr]}}; + save_block(#cms_mfa{mfa={html5, link_url, [Block, URL, Classes, DataAttr]}}=Rec) -> % {{{2 Rec#cms_mfa{mfa={html5, link_url, [Block, URL, Classes, DataAttr]}}; + save_block(#cms_mfa{mfa={html5, iframe, [Block, URL, Width, Height, Classes, DataAttr]}}=Rec) -> % {{{2 AllowFls = wf:to_atom(common:q(allowfullscreen, false)), Rec#cms_mfa{mfa={html5, iframe, [Block, URL, Width, Height, AllowFls, Classes, DataAttr]}}; + save_block(#cms_mfa{mfa={html5, email_link, [Block, URL, Classes, DataAttr]}}=Rec) -> % {{{2 Rec#cms_mfa{mfa={html5, email_link, [Block, URL, Classes, DataAttr]}}; + save_block(#cms_mfa{mfa={html5, header, [Block, Level, Classes, DataAttr]}}=Rec) -> % {{{2 L = try case list_to_integer(Level) of @@ -419,3 +451,13 @@ iframe(_Page, Block, URL, Width, Height, AllowFls, Classes, DataAttr) -> % {{{2 height=Height, data_fields = DataAttr }. + +input(_Page, Block, Readonly, Maxlen, Text, Classes, DataAttr) -> % {{{2 + #txtbx { + html_id=common:block_to_html_id(Block), + class=Classes, + text=Text, + readonly=Readonly, + maxlength=Maxlen, + data_fields = DataAttr + }. From 1fa3d1f3014554030e30f7a3c0567b8b8cc5804e Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Tue, 16 Oct 2018 05:47:40 +0500 Subject: [PATCH 25/91] Fixed applications start at node starup --- src/nitrogen_sup.erl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/nitrogen_sup.erl b/src/nitrogen_sup.erl index 2c79fcb..81134ca 100644 --- a/src/nitrogen_sup.erl +++ b/src/nitrogen_sup.erl @@ -22,12 +22,12 @@ start_link() -> %% =================================================================== init([]) -> - application:start(crypto), - application:start(nprocreg), - application:start(simple_bridge), - application:start(ct), - application:start(gen_smtpc), - application:start(inets), - application:start(ssl), + application:ensure_all_started(crypto), + application:ensure_all_started(nprocreg), + application:ensure_all_started(simple_bridge), + application:ensure_all_started(ct), + application:ensure_all_started(gen_smtpc), + application:ensure_all_started(inets), + application:ensure_all_started(ssl), {ok, { {one_for_one, 5, 10}, []} }. From c210a11561f896cf61295dfa42f590b795209cd4 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 18 Oct 2018 10:50:14 +0500 Subject: [PATCH 26/91] saving page when changing element from * page --- src/cms_modules/admin.erl | 12 ++++++++++-- src/db.erl | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 26520c3..2f0aa5f 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -1319,8 +1319,16 @@ event({?MODULE, block, save, OldMFA}) -> % {{{2 apply_element_transform( rec_from_qs(OldMFA)), OldMFA))), - [Page]=db:get_page(PID), - db:save(Page), + case PID of + "*" -> + Pages=db:get_indexed_pages(), + lists:foreach(fun(Page) -> + db:save(Page) + end, Pages); + PID -> + [Page]=db:get_page(PID), + db:save(Page) + end, coldstrap:close_modal(), wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}); event({?MODULE, block, remove, B}) -> % {{{2 diff --git a/src/db.erl b/src/db.erl index 39f05a4..b529d8a 100644 --- a/src/db.erl +++ b/src/db.erl @@ -916,3 +916,12 @@ clear_page_by_id(PID)-> mnesia:delete_object(MFA) end, Elements) end). + +get_indexed_pages() -> +%% get pages where sitemap is not none + transaction(fun() -> + L = mnesia:match_object(#cms_page{active=true, _='_'}), + lists:filter(fun(#cms_page{sitemap=S}) -> + S/=none + end, L) + end). \ No newline at end of file From fd9bd2015b5a4a15f4c6a0e53ed7193a3a0c24c0 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 20 Oct 2018 00:39:57 +0500 Subject: [PATCH 27/91] added languages managing: added translation block for any element --- include/db.hrl | 9 ++- src/cms_modules/admin.erl | 109 +++++++++++++++++++++++++++++++++++-- src/collections/common.erl | 40 +++++++++----- src/db.erl | 88 +++++++++++++++++++++++++++--- src/index.erl | 10 ++-- static/images/flag_en.png | Bin 0 -> 17867 bytes static/images/flag_ru.png | Bin 0 -> 1338 bytes 7 files changed, 222 insertions(+), 34 deletions(-) create mode 100644 static/images/flag_en.png create mode 100644 static/images/flag_ru.png diff --git a/include/db.hrl b/include/db.hrl index ef9fda2..f45f1aa 100644 --- a/include/db.hrl +++ b/include/db.hrl @@ -21,6 +21,7 @@ -type role() :: 'admin' | 'editor' | 'nobody' | atom(). -type asset_type() :: 'image' | 'script' | 'css' | 'less' | binary. +-type language() :: 'any' | 'ru' | 'en' | atom(). %% DB tables records goes here -record(cms_settings, { @@ -102,4 +103,10 @@ active=true :: boolean(), comment="" :: string(), ?TIMESTAMPS - }). \ No newline at end of file + }). + +-record(cms_language, { + id :: language(), + icon :: string(), + default= false :: boolean() + }). \ No newline at end of file diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 2f0aa5f..7e9735b 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -52,7 +52,8 @@ default_data() -> % {{{2 add_navbar_button("admin", "accounts-menu", "users-all", {{"fa", "user", []}, "Users"}, {event, ?POSTBACK({?MODULE, user, show}, ?MODULE)}), add_navbar_button("admin", "accounts-menu", "roles-all", {{"fa", "group", []}, "Roles"}, {event, ?POSTBACK({?MODULE, role, show}, ?MODULE)}), - add_navbar_button("admin", "sidebar-nav", "forms", {{"fa", "wpforms", ["fab"]}, "Forms"}, {event, ?POSTBACK({?MODULE, forms, show}, ?MODULE)}) + add_navbar_button("admin", "sidebar-nav", "forms", {{"fa", "wpforms", ["fab"]}, "Forms"}, {event, ?POSTBACK({?MODULE, forms, show}, ?MODULE)}), + add_navbar_button("admin", "sidebar-nav", "languages", {{"fa", "globe", ["fab"]}, "Languages"}, {event, ?POSTBACK({?MODULE, languages, show}, ?MODULE)}) ] }. @@ -62,7 +63,9 @@ install() -> % {{{2 get_files_from_folder("static"), get_files_from_folder("templates"), get_files_from_folder("templates/internal"), - + add_language("any","",false), + add_language("ru","flag_ru.png",true), + add_language("en","flag_en.png",false), ok. %% Different components adding to pages {{{1 @@ -86,6 +89,12 @@ add_form(PID, Phone, Text, Email, Rating) -> % {{{2 rating=Rating }). +add_language(Lid, ImageName, IsDefault) -> % {{{2 + mnesia:transaction( + fun() -> + mnesia:write(#cms_language{id=Lid, icon=ImageName, default=IsDefault}) + end). + add_template(TemplatePath, Bindings) -> % {{{2 add_template(TemplatePath, TemplatePath, TemplatePath, Bindings). @@ -684,9 +693,10 @@ get_social_files("static/images"=SubFolder) -> % {{{2 db:save(Assets). get_filters(#cms_mfa{settings=#{filters := Filters}}) -> % {{{2 + ?LOG("Filters:~p",[Filters]), Filters; get_filters(_) -> % {{{2 - ["", "", ""]. + ["", "", "", ""]. maybe_fix_sort(#cms_mfa{sort=new}=R, _) -> % {{{2 db:fix_sort(R); @@ -717,7 +727,7 @@ rec_from_qs(R) -> % {{{2 Classes = get_with_prefix(M, wf:to_atom(F), classes), DataAttrs =extract_data_attrs(common:q(data_fields, "")), - Filters = wf:mq([qs_key, qs_val, role]), + Filters = wf:mq([qs_key, qs_val, role, translation]), R#cms_mfa{id={PID, Block}, mfa={M, F, Args ++ [Classes] ++ [DataAttrs]}, @@ -1023,6 +1033,56 @@ event({?MODULE, forms, show}) -> % {{{2 body=CRUD } }]); +event({?MODULE, languages, show}) -> % {{{2 + AssetsDup = db:get_assets(image), + GetName = fun(Id)-> + string:join(lists:reverse(Id),".") + end, + Options = [ + {GetName(maps:get(id, K)), GetName(maps:get(id, K))} + || K <- AssetsDup + ], + CRUD = #crud{ + pagination_class=["btn", "btn-default"], + button_class=["btn", "btn-link"], + table_class=["table-striped", "table-bordered", "table-hover"], + start=0, + count=10, + cols=[ + {id, "Id", none}, + {icon, "Icon", {select, Options}}, + {default, "Is default", {select, [{true,"true"},{false,"false"}]}} + ], + funs=#{ + list => fun db:get_languages/0, + update => fun db:update_language/1, + delete => fun db:full_delete/1 + } + }, + wf:update(container, [ + #bs_row{ + body=[ + #bs_col{ + cols={lg, 10}, + body=#h2{text="All languages"} + }, + #bs_col{ + cols={lg, 2}, + body=#button{ + text="Add language", + class=["btn", + "btn-success", + "btn-block", + "btn-upload"], + actions=?POSTBACK({?MODULE, language, new}, ?MODULE) + }} + ]}, + #bs_row{ + body=#bs_col{ + cols={lg, 12}, + body=CRUD + } + }]); event({?MODULE, page, show}) -> % {{{2 CRUD = #crud{ pagination_class=["btn", "btn-default"], @@ -1254,7 +1314,13 @@ event({?MODULE, block, add, Block}) -> % {{{2 event({?MODULE, block, edit, #cms_mfa{id={PID, Block}, mfa={M, F, A}}=B}) -> % {{{2 Pages = get_pages(), [#{id := _P} | _] = Pages, - [QSKey, QSVal, Role] = get_filters(B), + [QSKey, QSVal, Role, Tr] = get_filters(B), + Translation = case Tr of + undefined -> any; + [] -> any; + Tr -> Tr + end, + LanguageOptions = [ {I, I} || #{id := I} <- db:get_languages()], Header = [ "Add new block to page: ", #dropdown{ @@ -1302,11 +1368,42 @@ event({?MODULE, block, edit, #cms_mfa{id={PID, Block}, mfa={M, F, A}}=B}) -> % { {"Key", {qs_key, QSKey}}, {"Value", {qs_val, QSVal}} ]}, - {"Role", {role, Role}} + {"Role", {role, Role}}, + {"Translation", #dd{ + id=translation, + value=Translation, + options=LanguageOptions + }} ]}]) } ]); +event({?MODULE, language, new}) -> % {{{2 + new_modal("Add language", + {?MODULE, language, save}, + undefined, + [ + #span{text="Name (ID)"}, + #txtbx{id=id, + placeholder="language_abbr"}, + + #span{id=icon,text="Icon"}, + common:assets_dropdown(image), + + #span{text="Default"}, + #checkbox{id=default_language} + ]); +event({?MODULE, language, save}) -> % {{{2 + AssetId=wf:q(asset_id), + IconName=string:join(lists:reverse(string:split(AssetId,".")),"."), + Default=case wf:q(default_language) of + "on"->true; + _->false + end, + add_language(wf:q(id),IconName,Default), + coldstrap:close_modal(), + wf:wire(#event{postback={?MODULE, languages, show}, delegate=?MODULE}); + event({?MODULE, block, move, Old}) -> % {{{2 db:full_delete(Old), event({?MODULE, block, save, Old}); diff --git a/src/collections/common.erl b/src/collections/common.erl index 693286c..cd4b6f1 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -180,7 +180,7 @@ save_block(#cms_mfa{mfa={common, template, [_Block, File, _Classes, _DataAttr]}} parallel_block(#cms_page{id = PID} = Page, Block) -> % {{{2 try [maybe_render_block(Page, MFA) || MFA <- db:get_mfa(PID, Block)] - catch error:E -> + catch error2:E -> ?LOG("~nError: ~p ~p ~p",[E,PID, Block]), wf:status_code(500), common:template(Page,"templates/500.html") @@ -234,7 +234,7 @@ template(Page, TID) -> % {{{2 template(Page, TID, []). template(Page, TID, AdditionalBindings) -> % {{{2 - ?LOG("Page for template: ~p, TID: ~p", [Page, TID]), + % ?LOG("Page for template: ~p, TID: ~p", [Page, TID]), [#cms_template{file=File, bindings=Bindings}] = db:get_template(TID), #template{file=File, @@ -323,27 +323,39 @@ render_block(false, _, _) -> % {{{2 render_block(true, Page, #cms_mfa{id=_Id, mfa={?MODULE, text=F, Args}}=MFA) -> % {{{2 apply(?MODULE, F, [Page, MFA | Args]); render_block(true, Page, #cms_mfa{mfa={M, F, Args}}) -> % {{{2 + % ?LOG("render_block: M:~p Args~p fun:~p", [M, Args,F]), apply(M, F, [Page | Args]); render_block(true, Page, #cms_mfa{mfa=Fun}) when is_function(Fun) -> % {{{2 ?LOG("render_block: ~p fun:~p", [Page,Fun]), Fun(Page). -apply_filters(["", "", ""]) -> % {{{2 +apply_filters(["", "", "", ""]) -> % {{{2 true; -apply_filters([undefined, undefined, undefined]) -> % {{{2 +apply_filters([undefined, undefined, undefined, undefined]) -> % {{{2 true; -apply_filters(["", "", Role]) -> % {{{2 - #cms_user{role=R} = account:user(), - ?LOG("Am I ~p - ~p", [Role, wf:to_atom(Role) == R]), - wf:to_atom(Role) == R; -apply_filters([K, V, ""]) -> % {{{2 - D = wf:q(wf:to_atom(K)), - ?LOG("K: ~p, V: ~p, Q: ~p", [K, V, D]), - wf:to_list(D) == wf:to_list(V); -apply_filters([K, V, R]) -> % {{{2 +apply_filters([K, V, R, T]) -> % {{{2 + % ?LOG("K: ~p, V: ~p, R: ~p, T:~p", [K, V, R, T]), + FilterKV = case K of + "" -> true; + K -> wf:to_list(wf:q(wf:to_atom(K))) == wf:to_list(V) + end, #cms_user{role=Role} = account:user(), - (Role == wf:to_atom(R)) and wf:to_list(wf:q(wf:to_atom(K))) == wf:to_list(V); + FilterRole = case R of + "" -> true; + R -> Role == wf:to_atom(R) + end, + FilterLang = case T of + "" -> true; + "any" -> true; + Lang -> + wf:to_atom(wf:qs(lang))==wf:to_atom(Lang) + end, + % ?LOG("result:~p",[FilterKV and FilterRole and FilterLang]), + FilterKV and FilterRole and FilterLang; + + apply_filters(_) -> % {{{2 + ?LOG("apply_filters true", []), true. maybe_list(L) when is_list(L) -> % {{{2 diff --git a/src/db.erl b/src/db.erl index b529d8a..c464e6a 100644 --- a/src/db.erl +++ b/src/db.erl @@ -7,6 +7,7 @@ -compile([export_all]). -include("db.hrl"). -include_lib("nitrogen_core/include/wf.hrl"). +-include("cms.hrl"). %% Don't remove! This is is used to install your Mnesia DB backend from CLI tool install([])-> % {{{1 @@ -18,6 +19,7 @@ install([])-> % {{{1 ?CREATE_TABLE(cms_user, set, []), ?CREATE_TABLE(cms_role, set, []), ?CREATE_TABLE(cms_form, set, []), + ?CREATE_TABLE(cms_language, set, []), {ok, VSN} = application:get_key(nitrogen, vsn), DataModules = common:module_by_function({default_data, 0}), mnesia:transaction( @@ -324,13 +326,57 @@ update("1.0.3"=VSN) -> % update submit button lists:foreach(fun(#cms_mfa{mfa={M, F, [Block, Email, Classes]}}=MFA) -> New_mfa = MFA#cms_mfa{mfa={M, F, [Block, Email, false, [], Classes]}, updated_at=calendar:universal_time()}, - % ?LOG("~nReplace ~p to ~p",[MFA, New_mfa]), mnesia:delete_object(MFA), mnesia:write(New_mfa) end, ReplElements) end), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); +update("1.0.4"=VSN) -> +%% update filter for Translation; create language table and fill it + transaction( + fun() -> + ReplElements = mnesia:match_object(#cms_mfa{settings=#{filters => ['_','_','_']}, _='_'}), + ?LOG("~nUpdate 1.0.4: ~p blocks ", [length(ReplElements)]), + lists:foreach(fun(#cms_mfa{settings=#{filters := [K,V,R]}}=Item) -> + New_item = Item#cms_mfa{settings=#{filters => [K,V,R,[]]}, + updated_at=calendar:universal_time()}, + mnesia:delete_object(Item), + mnesia:write(New_item) + end, + ReplElements) + end), + ?CREATE_TABLE(cms_language, set, []), + Languages_flags = ["flag_en.png","flag_ru.png"], + Path = "images", + lists:foreach(fun(Flag_name) -> + Asset=admin:file_to_asset(Flag_name, Path), + db:save(Asset) + end, + Languages_flags), + AddLangBtn = #{cms_mfa => [admin:add_navbar_button("admin", "sidebar-nav", "languages", + {{"fa", "globe", ["fab"]}, "Languages"}, {event, ?POSTBACK({admin, languages, show}, admin)})]}, + mnesia:transaction( + fun() -> + [maps:map( + fun(_K, V) -> + lists:foreach( + fun(#cms_mfa{}=R) -> + mnesia:write( + fix_sort( + update_timestamps(R))); + (R) -> + mnesia:write( + update_timestamps(R)) + end, + lists:flatten(V)) + end, + AddLangBtn )] + end), + admin:add_language("ru","flag_ru.png",true), + admin:add_language("en","flag_en.png",false), + admin:add_language("any","",false), + mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("fix_sort") -> % {{{1 F = fun() -> FoldFun = @@ -539,6 +585,12 @@ get_forms() -> % {{{1 [record_to_map(A) || A <- Forms] end). +get_languages() -> % {{{1 + transaction(fun() -> + Langs = mnesia:match_object(#cms_language{_='_'}), + [record_to_map(A) || A <- Langs] + end). + fix_sort(Recs) when is_list(Recs) -> % {{{1 [fix_sort(Rec) || Rec <- Recs]; fix_sort(#cms_mfa{sort=new}=Rec) -> % {{{1 @@ -592,9 +644,22 @@ update_map(Map) -> % {{{1 update_map(Map, fun fields/1). update_map(Map, FieldsFun) -> % {{{1 - io:format("~nDb update_map:", []), + % io:format("~nDb update_map:", []), save(map_to_record(Map, FieldsFun)). +update_language(#{id := Id, icon:= Icon, default:=Default}) -> % {{{1 + transaction( + fun() -> + case mnesia:match_object(#cms_language{id=Id, _='_'}) of + [] -> ok; + [DbItem] -> + NewDbItem1 = update_record_field(DbItem, icon, Icon), + NewDbItem2 = update_record_field(NewDbItem1, default, Default), + mnesia:delete_object(DbItem), + mnesia:write(NewDbItem2) + end + end). + rename_page(#{id := NewPID, old_value := OldValue} = Map) -> % {{{1 update_map(Map), %io:format("~nDb rename_page: ~p~n~p", [OldValue,Map]), @@ -684,7 +749,6 @@ delete(#cms_page{id=PID}=Record) -> % {{{1 end, UP = update_record_field(Record, updated_at, calendar:universal_time()), DP = update_record_field(UP, active, false), - io:format("Deleted page: ~p:~n", [DP]), mnesia:delete_object(Record), mnesia:write(DP) end), @@ -699,15 +763,21 @@ delete(Record) -> % {{{1 mnesia:delete_object(Record), mnesia:write(DP) end). + +%% For convenience in install and update process +delete(#{}=Map, FieldsFun) -> % {{{1 + delete(map_to_record(Map, FieldsFun)). + +%% Delete item from DB +full_delete(#{}=Map) -> % {{{1 + full_delete_map(Map, fun fields/1); full_delete(Record) -> % {{{1 io:format("~nFull_delete: ~p~n", [Record]), transaction(fun() -> mnesia:delete_object(Record) end). -%% For convenience in install and update process -delete(#{}=Map, FieldsFun) -> % {{{1 - % io:format("~nDelete map: ~p~n", [Map]), - delete(map_to_record(Map, FieldsFun)). +full_delete_map(#{}=Map, FieldsFun) -> % {{{1 + full_delete(map_to_record(Map, FieldsFun)). verify_create_table({atomic, ok}) -> ok; % {{{1 verify_create_table({aborted, {already_exists, _Table}}) -> ok. % {{{1 @@ -761,7 +831,9 @@ fields(cms_role) -> % {{{1 fields(cms_template) -> % {{{1 record_info(fields, cms_template); fields(cms_form) -> % {{{1 - record_info(fields, cms_form). + record_info(fields, cms_form); +fields(cms_language) -> % {{{1 + record_info(fields, cms_language). empty_mfa(PID, Block, Sort) -> % {{{1 CT = calendar:universal_time(), diff --git a/src/index.erl b/src/index.erl index f44ebbc..33a7ee2 100644 --- a/src/index.erl +++ b/src/index.erl @@ -49,16 +49,16 @@ default_data() -> % {{{2 {common, asset, [["js", "bootstrap"]]}, {{common, asset, [["js", "hotkeys", "jquery"]]}, - #{filters => ["", "", "editor"]}}, + #{filters => ["", "", "editor", ""]}}, {{common, asset, [["js", "bootstrap-wysiwyg"]]}, - #{filters => ["", "", "editor"]}}, + #{filters => ["", "", "editor", ""]}}, {{common, asset, [["js", "hotkeys", "jquery"]]}, - #{filters => ["", "", "admin"]}}, + #{filters => ["", "", "admin", ""]}}, {{common, asset, [["js", "bootstrap-wysiwyg"]]}, - #{filters => ["", "", "admin"]}} + #{filters => ["", "", "admin", ""]}} ]), %CSS @@ -73,7 +73,7 @@ default_data() -> % {{{2 admin:add_to_block({"index", "body"}, [ {{router, common_redirect, [[], "/?page=admin"]}, - #{filters => ["", "", "admin"]}}, + #{filters => ["", "", "admin", ""]}}, {router, common_redirect, [[], "/?page=register"]} ]), diff --git a/static/images/flag_en.png b/static/images/flag_en.png new file mode 100644 index 0000000000000000000000000000000000000000..1bccb078e7469d4f674463de70597ac2f27a0375 GIT binary patch literal 17867 zcmYg&1yCDp8*PzNq!ekPP~4>ycP(1n-QC?SP~6=ein|jmNTIkCcPK?dfIxAFyWcdFGyNSuD zqXG|qRP#t+9nD!<$L-atcZ2^u5z;=tBLY4obeGh2S97v-_cC#{cqMA?WNJY!<6vTC zp=x1b?&C6QA^7SQ`70R-QFZTJc%GNPn#DszeaZr@LZ{bC>6e_Q^0zKQyk{O*>ljPZ zVLi6qQ_| zf;)a&Jhx{%&}6As+C7drI!w3*eZ}bMNL1vgZIne*%{!js&3~2`pWg=WiP-x|zM3%R z&iR5hkvaK&<=o!K3FNS0sJG=K@D4s{c@fsmpCJ^yV@1EbsV5?S#4U=Q+w(s7$*m6b z1$ExX=s~CfzVuAudaq9+?AJ^^BPl&-den^CC><(czecM)Hb_ZL8Nr@Z(bfZr zztT}(lfwS$#9G9Y`I|8I;F9*zw|Eb-8M$dJQO;AiL{z(0dsxp0Ft(%GY5u&{^?Tj=fs#41c^E675b@Y0 z|B;4_hQl@sR)lSa+Yw@4pvJ3>(d z>^WyR$|%V=u`8a6YBKD6!S?f_UF8zR>e57zgrVQ{ZvMrqTil$LD)6rI!9v?zu77Sm z?|%!WWfH2P1-Nrkmd+Y7pO>+KPBGy&DcFB6`oCQ|4Hzu7U37qMJZIL~+iR!ccnG+p z-Hk}+ucD?OyicZ1TAc8<-5!YEP;(!Cy6y1CsZ0%paHUs_8c`^?KIO*@nz}#+^0?6` z217r$mnEEf%~f~Ou$q3gD_Aqy0^?1ZsY`^8fo!)*9X`C;@b4x9+u?~eThkPW(>~0T z8asn6V-L25pw|J+N*{RM(Rube(K~kcn~{LQ={av`X2EWPh}iFOko&kGdWp+S9}p1Y zG^e4>o<)nF)=yd-E|l|os|A9|3(=E{R7X(Xp&JjiZ(CPgMM_Z8POgndb)$pfA-k&o z?Iaua0U^k<_9ue(wMeD<5&`yiytSs$>))h*+9({*-l6x|bHB$Ywtnfl_lO^`W^V)q z3dby3`Pc_ed%y`ZKP8NsQ*!Gg^ue|0X6iHuESs}jThn=H9ZJO1cG^I)F|39?^>mgg zQRE#T(!`_^^~Wx~!qti@`|Y_eCc8I?g)|P&h#&QPMv_xd17LiJo#m@mu|nIP@}1s0 zY}aI8%G}nZO@Dros!APa@}fqF3DP_gI=Qq~BzzAo#Ua9xP`zOF^Kp$~RYxZ@dg+X) zA)Yo;RA|k&k-J9v-Q&>?>Gp|@-e+T6gimc-D`pK}zZwUdt7%r!H0scAYf{C%O`EIJ z;HA6xtlf6!4S_@J_y_C6!!GT~7Uyjg(@Rjz+apnR!{O@Z`4m$y;oVS_9%L?yM`-|y&Vbb zLCpvrtx%ToxSCv5(r4q>cUD~2O^>Er)3HY4=^woke$3i#7Iem?+)a6nV+F2CNok(( zt=V~?JZtCtDuZ+=?tKPZa@gG!xwXB?Jh$R^3VcaWTPb>P)$x*Np>90|!em!UbKMe< zQxPC=d)C1;6MpF0Bx4ZCpgX4siOd&@`!h^tquk|d<)t^QM;l}BHA!Fxp4R(I85|jd z`eXKl2x6Bi6aBFWWVUzkqQLV1PbBd0|u{x&Nm4i0m*gCJ6?9S+nF@%U#W51(&Mr-{0gq;^CHgXYD}3` zF6(3Y(>6b^A$!bLXhXHT7bW0%16kyXfX&T{oQ!=03i5tzlZyDvo3A&u)O&(}yl5}- z>ue5hP=b*+|41(pQW1);%iObAx8vk zjPg_8M4X_Pgj}YLec;|x3u9Zv^H*s6Av1>cplau-RE^@gx!3UDw82K{#N_Z1!anvz zVdt965oJD$G+jSPrt@n62JDyJ#wtPnCCLMHa^6olm6xuGFIF6y)7PMHdS6i&hWjy$68MyY)&y9mUP)Q5jJdCXzguC z*TXYvJ?Bf((4cO&A7C7Qzq0G2d6hZhl4DWcdPwulLuW&+hD!ZCGJ+_z79RCvha+@j9htNbXoYL>dyi;FG|nxfb` zv2xT+y`KK~QMOxVpPN6KI|z+)tK_l!5qTMXDVkdPb+1TW-r6t;Z^+OI ziev(t-}QP@mK#BAe;OTIky3sxpMd9aN-*sF^6Q*qm$HE6XUeBrHKV1B#;%y}Z;){}8yl1j z3&18^24D-qLmiOH>x_%8I~#eO#FO3>e#q6945%X|8iCaN_UuN}u{myd%AuqhTp&@* z^}AZUW-e@2{pjvbxdYRt_qv&v7B=#=CBDnCJ0D13_&vEBDSrJ%*1#>HK*jF^>?kH9 z^dxC#-#nullb1%*Rd9TR+><@o{OBY4ejUHOVIvA~P&4gc1`K3Gweyo}PAy#Z=Y#SUx_g3B7)*Cb{1wi4-AC@Mq-wo)0~nQ_glC9^(oBczP9C^T-Jl56X^ zaj8jE<-3=#-r^45j?_u}zyVjcall!ADwU+A%dI$%p1Tc?>wn?$k&x@=k`-)}Eo8NRS zFyXpkd0j z=Sfe%#@nH0IeYRJCh%MRXeB#odRZn1)zxe_`fHS)R%|cyLR?K{yPV?_ zUR-V`ouD@?hmci*BDWh!?A04*)zjRRl)G z<0V##+JG^ehF-Z*&?0MRyqX+h_>j^TiHY(j>!n0hwMg<6zCEvPfwSxIzku4PcUs<; zbOv1)AMDz!{OkjT9|6>9#gOe7+ziuVH1`agl~uqLVOfFxRnq0NYcs<4#<2+c8|qzR zAkfv@2TdaJQ@R+sP20uyzK&|!R+(_VD3r)=uZh%J%Dd=~zK4sV9t#*gCg35Y-RWeTXl7K%LE)UlDP?A|{9vqBlZ7z4J^ z<3|y!L$W|9tKlp5`w6`qcODBxZc-SJ(+%d&r<^PUzV>C_|#Q6Y{-oHxrFdrjCbH6{^^sMC8@5tH(wc9)_Q9d_p!RY=F`9af_dL5tMM;}EOA$Kt$7JxYA~wX8C{$k z2hs`jClxv-#qHTQRMMwcKmL{F_-ys?MC6d>jq>!`m;S^kQZP8=n(fKk(QetMp9bCY zkjb~!n0dNz1nt^5xJ$e&mXPobR4l#xEpquh!lKDh;m48Tdy;PO3dPGw%0-8(Kz^;? zPsGu}%{N~!aQ17~vcm)S83i(m^sSo#z7yz13G!Sb+u>(*Qtj7jJk%8O7Iesy|7_0n zT`y2oY3dKv8`>tQGX)sZmiT5%PYPhFS{`l?pvswoLQrteFL$KZT5Oxl)YWZ$u6FR& zAJzrmS>&Dhh>*5+0mx83U7^!`M&KI~HD@&sFsDzY`j(Jp^lLVlUc$B6#tCsbTcrc` z`BMSx;4Q7}SS!<-KO%C_&t%4G(k0510N5t!v501Dzjf6DEE@S|Fj5wnKP5PsF_!i{ zp^jul^(8<@*|I0DeSsOyj6JJz_EXJId)BOpP~_JQmQaRw#3C`H=KH^+a6L(w`mEX2 zbV{4;eDr?3o-0=)eiQ#u;J{yj9f7-dhZbRLs^a;%rCv(D>lQKR=(g#X!J}QHXdvh`m74LeuaO(0lJr=tr z9l3B0>)zR1Qxg&Z*;QTHuVtK4|6yjT{LwJ)BgF;q6$FF#k#VR^_bH32JUz-5Y56S! zR@gClPJawiejF^(OU^lvd|Xm3$efj((HwZFq5325G7<{yX^?=r({f zx7-PRXlXpqia{*?WpC(&hIN_=W7fWo=h4%%Dk+)=bp`Z71pxNA1V3n znxobJ6-RATTwad792v#6{30SD6Si0^ViPwt5?xD|_(od)QHDb)?fiZ)4gj(t{^yc$ zZnAQ*;$k~hYWB+I(Spk?G&}8%FKatt^;j>NEoWw`q7-!hs-EfV2&1J-Yy51XgKKOy ziUEX5-93o_HYw{GZv5Ht9)N($?>9FLT7_~nJbEGvCYJj*Xn&yp7E~pfUX4pRb5W)PUB)t9Gcvd?4-K9;_IZq;6|FB2rzZ;Loa6 z%58QgwKNiu-*A_5BB=d!+LLWvu;PoISKehO$beFW#OZW%l{&yfK>XUFjpxq?5lQUa zfl6LU&OTQjt$$b-JJ-!;g15p~r}#l3OiSt$ zb;gfMPj2FvAoT9X1>f1`Xu{vEgl1%i4q1D(#g!Uk7LLVV-pVT&pP%~av_I3!eEI3U z_nhx88|&^z7yUL(O>?^&d!2zTIq-VF$#aQe&=lup>v#TtjId*7S1NSGVEwnRSFG8~ z4CUsN3x+QwiO%t8LZcGRF^*H4qPXPe-KV!l3y25=PtWK;&jmfqpY(Z&dafWI#NbwU zU1Ikd>2yCE=KcG3h}ZSobC#^|i^=AOKgHgF^tA{SWA2I{3r$ zldz8Ui$zs1{IruhOwRBBHlP1|55d%tk31?eR!kLO6t)Xf5ze2;BVKqcD++TB+>Ab?@-(^ zDSOS(XfQq`oh+@jOOfsI*PUY+rkBCe6dVxwU>6UwPq6_$!bEKybs%%w|5Sn~6kvnN`b2WNMh2EQLY-nYj(+ZW+kEWCe%%V7Xro0JIz74elP zUAJ0}Tyrry>YHN&0|)TFtm&1WdRc|9IP???-vX6$QfHQ~2WqmWj`%@-a{497yZa_@ z4;P6okX*NKJ9z)=Ic|@b4IjK;4=Z+TqB3(jF3Ch(*^cgjJsWS`76}8j*B8zYZ&P&X zc4|408*yZX13U{;a&+OD(tnn1Hl#zl0y#s#`YGlt5Vm;Z~E^_6c>iOE)&7F*ojX^vZw#R#|dq=>T^>PtA$# ziT=W0s*u~`uzqSDi~(~8Gd(q~oJnFnjh{JNjwOZ5o=aE58;}n}B}d@AKf@gY^k1sW zq^!P{FBQ+}^pJIag6!!yeJyVmv~@>u=ZAzu!x3v!@<*zTr<24~b;IA2GJ%aE8Ef+k zUikYy0Q2^po{C+`p{-C1H>r4K;tT`ZEX;IDFJ+V{g-6GujWUBvIZ3+Dn6uHrNO*w@ zC0Q?&B263lGMGFuUuO^;SfZw>vr}^6Vb6k^{#ZEdI%d7ak62mKHlVDpJ4wgkne18e z+lFMpntf#}N8a+CRe{Ca<{WTqwRojWT5{lJf7;Ay%9^%1Es;89VsS5NlAV6^$fCzn zm2>8Lurk{(|MlQ~Iy~v<)_uQo!aqge$35G*7q_Qw$d^*)WHy>jWo`GCAdYr?!2G8* zr(QwrsY5*pDec@{(yPVNO^;ci%VF9)s1cYPVYD<6T4_8wpLDVTklSc-1@7^%r`N>5 z=wV2m58g*z;M$z5BbojT?Q?;ijGYXG<(~f}B4yfH(;3e*!*JRvIBgYS>`TDl0A_%| z=kcyqV-W?VR?X?;-UQZ@@m@avmIKp*c)dd}jb_VM!{#08LtB!k&Otx-&u+t!&$TLy z=JxUe3Yv-xE=jU6KZoUhi0!q+VwAPlWKS*@uC;l{IH9IS!Io)*4?iL4-RL0Zw%UDN z6{}d-dG2720UCy-Ya1IaKA(XPL63UY&4v2io;KdthBWPf3&} zp3Mpgb+{N4(LV1JH?c}HOX}^cdJu2+a(!;IY_=XyvAvW6P_x5A`G*|jYZd{de^+(0 zQ32UU($m<8g!mS=nact_F+Hggr{7aG?5-A|x(9C`Z85K#wv$J+Q(e z(0{`Ov2>X6))k3^j3H*aLq+k7lbNVtK-c)7^lmqgL64Z4HN9WjK6JK;nrgmEa;G@; zLz<>QsW7oXCyxm8azxwEpVWI+fRoLl*QWFt;!%q;;TCZaz?toUKDAh^nCeKqQteQ@ zRA1J_CJoqu68|?*Y^sJWoGsqBC810*HoD;Bsav$m2Xee(4gz|HYERr{Ithl_6I;u! zlbZ~1J#_mfV{M!%Gb#adc{yVnUi@%ux=$-v zAQa%j;JqUb2Ik5tub-!?gLLpZi;bCc49jsP{=-9RO-F$!2hSygM0+9tq)}B+$N_Q6 zkuYABd2dzt3j=el72eWl1xqOXFHT3s90#!LZ1iEUw_cCbcq>T z_oJmpq-k*=4emGoY0NqcRuhc=iiWkZoMi9@gOwmQRb9OcPhk0AgKg3Efjy^V<&(k7 z^EQcgI|assB_kIXG2g;JW(NhSaJiMe!z%p8-$n}{DvLe|0x^CzSq~|8yyZ9kp{cQ9y@2X8}tP~JU$o^8M0UbTF0~L&Y zpAlKqc(iPXc#7GjV`sHu@sqc+#2efnb{mO^7PwLgEhWjku1zhQgv*SzLGcch9cI?a zDIy04NhChNe(~lR|IW3J4xfl{f2en#DLbX2S3;h?gsi&G^>G6acpxf1-87F%P0 zjzbm*ETT(~)+9uQ3YKs z2l~!|)B4@oZ};pKeh$WLfRU3BxYA#A+$=3fK(FoEC!g7oqM}8|2Qz8qM1)V=P)V?tCSEZ`6_fA%gG-kmt^>Z(h7< z%6ez9Ust0Na)c+&U~RL<^Cti(ZNKS}oZMvl<0oF^FUnY{_r4IckQsKKq9r0W0{Mel z2m_=)bkmrj8BNdL?S1+Z%F)2Vy`d8@@#sD&keHI_Y_0jHeR+|8x0A7YW&;wT67H(P zOSk6r?3@^tzOls9`FJq>giulK{@Bd3G%AfDSG62ivux9?LneTQ-yXRLCZqp%e<9*r zL!i*QIVzpubY>`#r&qG?>?uP+HF-uxM4V8crt+K1d))1R>|s>&BnUGo}brvNj|KYF+)ocYHcU`#;KuHW<57) zxc|KsTB?k+4eaTY`Oz)5E?sDYg%K%6&Bjjnfu9CC;ec-|Iaqp9Z|h0CRB9Ns1itBf zO8ZVt5tKn`CRhG!>-4Gudm=oA21Gq&^%pMMi_qjZDc zxOr#YOS#Ga%K}6to=z3G?`lNJ8)WvA*>TLkFpq`x`)Whh*sXq1WL%#-%GARalEaP? z*kK8rjPqQNkPB)u!Igs4^lj#>h3+dlNG__+wT{@3pkJfXj#0v}hw7T0Xv5&blS{ww z_<4*+iYl|)=LW4Yi+5(Ka(f?7PWor&EST1ED(e zQbHoj0W!gVjhYzAP+1{W53b2sK}-TYohutYyOQjEss#}jsY+M6Q#ELfmTHF7kYseb zdtm`WR)hORXOE2y@{ZJiyd48U+4ZOap)@~PP(__< z?a@iRpTU-DcRVq7?QXp++}qb-RuMrDR+h>u<)EyqlwbJVREJ-OqG?#kWD zT}!y#Z)aBInFza5T|(h8{J>@odzeoDc&@|#U*?Gg++loHyfAinaOH`HVU39Cu*p<+ok9GJs>*2l^!$uyT zv;^WYJ5AyMuHAl8jsTyB^6T6jyg#!G$=)Z1&?RtiKhcyYlb^oRUxAq2@<;-A?BGnFlzPK-lM+QC$=PHTb)f zo$+yrg1I@KfQ{G29$i|bWQz^{*yo!Y>alDz1#ILp7NNc=q_EbhP14++E0p)9NqwM! zwUkU{qO1U*GwaFe1#5QMO{*Mc7pRx>oKKm7I&6%Iy5?^BcO(U`Ms0y#+VxmsT=q?t zvp|?9vhXVdZMDeZvJ8>5fGK9%HOt~j_JZwTfBy?3ypHFwdZ^^&FXqC+$>KNB#vum% zNLdOhc*D&~sp5W@r`2@24aCt2O?h8Xs&-bFJS5=N^fR^`oxfFo=BXu2Q;D_SjwC`cR znGZLML{Do5GW0^T9MmS)v0FbVgCp_pY*P3q{EVw~ zQHRR;18O_0C%J0&F3V_rq(3w8=Ca*62as+ zdilTNr%hS2S&1$)uTWSCi1V*9F|Pt*FY-=H*+#WiLuarwe^hce0KF0TosC>CGaB;@ zVJGdkq{a^YRoYC3iVjMALY!y=O3`+6Satm{z@0d%gC7oDm=3Y$qY<%~5LpQi-6ylI{3V z$@qQFD))4qF)S9a({6g3Q=9h|YL;DNBOH%MS|NJu4pDBGkA@_sD?Y4Sdrs1hI8$mn zT1h@t$P*1vXM_z^(`OAS+o~D~4l8CnwE*6F#D}t}*CFz@Lg~oO{gFE5NO|v?6%%xv zK#Q=Ny~QP8652e{V#SD2*tT-nl8%wySS&vYEd(J4^|#3%HR!f=AO1RDa|a|HQ(@UW z(1ZkI;?9`*rUx=%A+NhucI~y~k~hyy`}7ZnFrnj;nR17xXr{WxZ?h4qplGJj*!Lv_ zmrqSsK}s_T5N3g0*-TO#{`&!v^;^6{I;{~2#z((7GTU?KC z_Jt~BtY)f%>EdQ@hD^rBcl`bOZ{sf4rK(=sRCd(J-W_Crja?|8|Cox-fYeFr?2yMb z68^hL0U55xLwRKa<*hqf8#8M=bz`e3r{RI^rQZL}EKoZ8T(5dLm_l&=DFby$Y3HAe zao}1a^|*N?d1AJ`&OrChAvNGkOJXC(=QBeKF7*@OZ#?XzWUHMeC~?kI(nli#4F1Bi zIwdKCEOL|pM+lz$LFR%0k22}2a$zc~2KjcsYxt$LV*!q!^CJ^q*vW7lKxM&iWe2TW zyd^J>J|v9V?_a&~a{*LIl#nQKy67W=Z=i#r_=*pz0Bi}Z=?!%NGE`71zDedJZG0}1 z$;Qb=PWic5QU1f{G_}B=`Z_DOMlK?8Lv&Od$w|Y0O4{r5_H$bXDaA4hQI>ALq=7ZH zBH5eyRAKA9tVyC9IV(>xWKeS*34Y6cTp2jgZaFMN3-RRwQZDf4 z5}@8^iw!sdLD2jJ1LD{czvaz4Im_QU|$O6%N_SDbk z=wZ@vFCZQOo9;U}EfB3bQV%FAi5?cw-%F1FO#*bM7jUvEIKWmp(n-mwj@F9^n=i(E z?y9eHD>&31AFb@}Y|c8w9ry7oJK(L7j|Oz)E9K3e=d&3{6@oyB1{j7ahKF;z=zPKu z=D7#w(g5bSak3!o4DIUB1~xz%0&KoT8fDrddHAQLiXO8COqDA8uOq5ngWtFXZQ#F3 zY*$xyzxh;=P)ftKV#0KO8cWC_OoGVJwo- z@av1(RZlGv@zY5CsAXfdyQ4^V6pq)lD$L6nRLnofB#;5bRR#=p@4cfd;LI^^=-?a4 zByTXd?(R&vJ|cF)VsTxFAQ}|jIi>@9PeeE<S&&+)6@on4bbUDDb%Fzwd zq&C!kjE=aTphUcR1Nc0IxeT>pOijova`MhjyFl$Md;Hdc&6S%Glf87u#rY`}&k?ml zYfIMyL;Nrg;o>Qo;MJAs%Qgxb`DdXxncniCl?e=^n!RVDRe%S<^Kr!&E0f*sQ}+!- z)=O(D4Hh2tSG_GtZZ?1C1M((a=`>JW%!m(nb{sA@GYJP<;edM-pu5ZT%KJD(% z`_s1=KKCDkrCn=^ZRCqkjKhXca6$)ey5F$JjF`6}rT^W$tUA|IgO%B{Tv{s9EkcnKmOr1E& zw+938%iNQSxn1RWa*^UY4m5x>f>M&98rECNoh@-qC5rO#=arx?O&rb`O?F%BCM7rm zikIDx!BWZX`sQ?6%$fj9XbD{GwnmTK5HnB@+Xx=CEJ8)KZn@{L#LBZ-6HJAk9>$Yv zKgs~zK))!$1OX2*pu;9f50?1&3EiiljFt)pYI(^4F1g=xy46dHtVbLI!g8W#wm6;O za4WY-J5H21n`93Vj z0DK5=e9QD}_u^!TDu1^ZRLI)k42|Dh4cfEg04h0y&8Da@vRY*gwiV zagsQmmH>Ge%a<8besEk#+`^~tBJ8G{lA~%}p$eC9l^+CRvzzU28`doIPA&ODe_3W#!0X;bX%*sN7nSo!~x_2^$-HpRoY;BBW>mnBv}^kDt)x1TkLQoA0Hb z|9kT}clKFB6XyMI!-5$`zOJIKI|)Q6^w$@JA8m5Rm*+`z^DGv<<_xX&=EiDQCUj3W z+MUM=VBJp;x5Oj(!$rqkT9{!+HC$MK1a!*e(Sx$!D;3z#{a+|BfVk32UYDoaQhb&a zaZnPuNPS*vRP8P?T9|Rdhd6uoI}QH#LCdLTND?OT(rUa`QR5?KyvhZHg1Kpm%X*i; zrr>je+diF8zTQxt)8nsWyog9NtR}BOh>7>h;%>nL>;7D;|Lp}gW3~HRPtY-LJxSdkZ$~~L0s00z6Y_`+ zTudM(^YcvqbVyY;EOur`QyZ6eFV%&!JT^(I)#BHpef=sp7HhwE>v;giVLNCVbQ8Ef z2IMGQ&*-isBDirLn|5E>e47GT&7IF#K=`$_RF~$qxp|&|n8g1V)O#xh93K{6SlT6w zV7S1LA5{H;{Up$fAx(qJJfD%~LLH6j{!Vxf4jtR+zD@CscG;~JsVpb>wt4@5S8PCR z@jz>O^TTjjJ+*9r8z-?1bQm#P*;g@|&-6qyn%1ts=W*|pcF98OG( zHzBZ#n`?SmUE)5(m_9h-{&qYRy0^k6Qn_N!rk+Ewg1KUAEmb^fYE0WKlwPOimm-e( zZMccwgG5{?`;eegz@6}+;?@!U-t4L#e%~R;S6^ovFvUXK8XnCcQmE6q$`aZed`1ML zkzJ@-Q1=)4wbgpH!!s*~`P8_R8YuGGKx*ihFrG*TY5)~Pg0+&%8lSn)b^ka9#2CQL z_9*3xR=ClWc79rJ%+xJ7t8~lP3-B;XQ+oQ6QgW8 zn{`8KYW0l`^H1XMf>8rwz`43Z4m96*uCgSc$L+WKqo z$~7UJn7mC4T((G(HW}L^R9v*>PJuRuU}M{?%hgKB(%S3!HmelHgwgBOMUTel z3I_{rw$@SOhKleSgAebg5N*}+nByI~{BJRl6MXQ4KapiDPp3uncCCdx?hKe|b) zb*)+i1w3+o=uP5ApiINvD^9?6hXx+68i)k=|8gpU65jn0Mee;s{F_Pek~cT)(+_-x z=AuuWblMZwqF1$nF_chn5ws;ejnuCstoU2VivpPeu67gfn9K4gwTg=9cTIl$6UNnHm(K7+6zwWG&l*>4|efq>3!xGGxEFok#|x0oq{K$`Q-*Z{QWQ}-i7*| zW)U$T;;+PN{p`u}NoG|gR`#!)^N4MY9x1T_{Ya#>$C)4nXG z?X~vbvv&3@5wU6)doG7D?5}ETa#u$06^x4NsuSIe%}qaa)$0S5g%QTfogUd(PXV9( zRouBNE1I16b)ws7X5uMr%&1H>uC4!pRm*OM=@H{;dw|}l15L(17o=zWJ=6pVS4JRl zcq&#!0~5-oK-{&4wOW0*&j(B^3)d_k(9r=m@k>5U!Qj}QX$8nuGJ~x+NMb< zirGiJGQ}5dK}{Md6U3#8l+eUWLX`j#zu5NErfiY+({22eek7vy4tBK(i`+#mwG+U5`Y*rQU%o4SZ7bH|ZkSI(c8svptCDv;K8xJ$MYVSX%R*2O*&zr$<{(5m&wF9?l8N@8MNIC#VXQ zln@_oBvDZtoa7=g_Zz$XnrxslZO6i4icn#yKc$g@@`otmq6jo({_sVR|@v3`%1Nny*lO`or_oHo4t)|6-zh&j7ho7-lvP)(DkW~zODV*+@* zoX;gJub$a#NEpkfe;mxvRm!Zb6?z7%O72?iMBTazCbzfy9-XXajQbhAY-G-L(|6y` zu(y@w*`Du=@Ox3-51*=RUXc~tnAFXvw3>2h$fcX93Rv}FV7}XZUQ_k4R_FN%l9vZj zoNdX}9$dqV%^yD=C_znUx$N~zx^EoSl>|K%*~AS^UKc2?^mRH6AIvZmHJ1DLk4^%9 zl@-)^qwvF~A51rU*sq{_{9~%uQ$$}6WM(2ihT^C~>4A0kqjIY^LlbjelE>knmRdF0 zw^3gP?))xX@N51#Y;KD=|01f?DK0vWDEM8Yz4526mWd`SQOihb5wgbj>+RO$=2XpV z8+F@HJ?qYujkadAYqN@H2OAKdyE9P*UnZOC^iaqZ%0l&`GQ^yL;FEAV=aIWL82;7k zANF}s2+p^Ksp~PM(pchjv5f1+iARpO%a9DikGIh$C${Oeg$I?;3d63Reut2PfaGN# zH?)J5;!R%xcEyVVtNni)H4Z?k!(VVtE&;tYou%CI@BN#yCXbs@T9N#}_jYJRH}9I} z>x54SwEgj~j*Vs@*o_8+f&5199LNNm0JWbZ+mT+s(?VHS^ zs3=i=?q%E`uGJvMIQwI6R(f6$o)?<7v)8zsuDr>bU-H^8VQbl>c{^FHoFL-grvLTH zUEF$~`!ddFC@n4OF*3GxKm4*i@%F`k!=A$(-XKl!&F2Vk@2+^0Z?y|r=rZ8&<oOdS@jWr4?`Z7cQ3tdy-K= zG`;p-qhVNQI2K*qUfHl^1IS6yOzF;OdU1oUrbNErV_CQDBefh!ABbI z@w%%MmB+%9uP_8%h8j0Wx?z{8wJOnGMw-NE%{?-Bj$5VHQw94N8nqMfYQpkzSW&sv zHjV~c2T5hq=gn9I8DiLvO^Y-QqGs=xqh3A(<;_24`X};vT_I^l9E3OLt?R7Rr7{UL zWc-=mPb$^F7(`KsY?Xr!63kW3HzSbWk;FcxCn>J|{h=Z6eSzXx=CwPCRy{Ihvy2sB z)<9$f>mqxVVbaovLaAUcKJuA`LdM=D&~-&4!%VXlqUDtc<GEgsm$e?NHPS#}-~qst zJk6m!yTc;NdDL!-hpPxZzM5V9GHtMe6rMuI5U_{I7?8csozj;Xao=A*T;7A6^6cS3oFrmjUqutuQCaUg zOURZ^Kg>L~#{PvGNp*R2jkj4gQcUEze^jGeSG>4Q9LjZs=+8(o(tijQyy3(lixVd% zfj4df`CU?whj4LzzPMsf;PHyKA~eJ8)XmL%zcvg=UUR}42VENJ9eZX@qG1?A99Hxs zH*7Sg0S7;jP}&2WajUI_ewumR*iTgY?nZOX_K6}zWnba};B-{W1Hajb_4elf%wuU# z$kFAheKD=#=x0jH@v(#p=7O9R+ZO;)+2li4Nj-h{XLVAKq5DX5{$jt&9z*jr>&Z)a zqv^i&y@%6GWV6R!G>58-1hR>l5ykH4F!pN(!Ns+tfNVXof?p9Si)t!9d$m4>^#7&1 zZv%w960!zPK;=1?+J8q-)o(Tw{=Bj>nhQ5pt!8+!WS5-o{!TINf!|@K%Gs;XljCJX zEZZ;(Hk;pzW}hug8bI^AQ80%Kvb+Jn@z#AziqywKI3fYhps%^BX;jc~aPGxmL`%d$ zYGd#dv=8A4HQ?B!q}IQ8XW>|;_|Luo{mb(=@ETc1HQmcZV6X}m|DFF^BCXIQ*}pre zBo9p%xT4#4Cmrr^97i8_+UAd?Mt#i}J0sn_?Clp>d^OqyD<#7?Vc~_ox1#DdTRYTf z_VjpLN;IdPITb67;}&`ijEPEH-9dcsPfI|_P`(7W{Oaj1FRxL9f{-^jgMVijeNDzb zZQPtmvGRG|pz*(*f({e0zx()aT_7f_i=IS5WA4ct-IcHE;gsTX4~ioxaob%mmgP3mdqSH~ zmoOc7GW??w%XzZzerfy2REwD5l-PpLL@)H~8yK1PY@NMNvW5;{61j>fo_N!^))J|!|Tw)-4viHyThE%?iqh*L{PXiK2XUb5B6 z-?!W+BmeQ18G%;VAkyqEHRTW_%=eCwG2mgK9F)oUnIT{s53!z9{y(sYcEf+68${u_ z8^~G7Pah!K(eiCYw&0m96!>OvX&n^)ekD~YKe)1Lj1s|~JP6`PN#>6yRtRO5oYBD) zdFqS_^vsi}f4Px}?V9Ct(;To8vH#(8gAb5Lfte(Qltdk6delz1Wl5z0{fiI(D(BWd zUDcA~*Dg1#DmpT%gG~X0wi`uprW+-a;Iofyl?CjR#l0Y*0FmxLW&_@78N{sMu`NYaGBt zah)+roz6t+Y(hC5P}h-Ju`*I^4M3t`>HS`!c&b?X)_6i3)N$2${a=hyU~Yp&)Zmh> z(sP`9DmEav>X)3qEejcU={2fFZQxVp_1lP)Ndhqi|H zBDC6W<&OHGj40}H-wpBM>dc3XtLs|XdsE3DKP@M!G{&-I zC|GQ&M=(A4MtHEs1&_4=!^V_I%#b+5e_1)fqpH={l0_OCQ<=lS{B$G9e4{2}C0BiW z51pJa%v5Y`+a^`oq>PH9J>K9!BfHTocJIRzd6d`&VW~B*L4F=C9`QH$E)EDf`|&_` z9{eT9*eVw)pezzXZt)u$wG^nXe4YzUW5nq^>^n66Km|Og2_6uL{In%T|`xAFf>X3sv8pe=FON1 ziDZ0S&_$A4B&FDKMgSXZB`wo$oqAtUs4}2|wsjCuE=$dSek8adyR;F>rWvnXZHQ_B zZ;?Cy{+a=Y;}&O%>=`QVW*8AraRF46%?F(;r)@c}2dEZG#62M|+~r9(-eDkUX2(Nj zrl>7+3-+#ip;Mm>cz^&r3h#J&a_cg`oU55r<*pJKB zef`p0n%@?O#t^IVnSRzR-p;qCc^rQ|z?i0tk3ZLjjxp2K8@$pxyWnOrBC}q&9E! z^A#^uuIr~?i_F>4kB#*l2vcSOpeF=T_B}74n zkx2YAw|*MW!K^bJIaW;n9xb?GNK%s=L!?p>`pSzaZW_VacRxUP#5W(=i)N(a*cigc zzFP0H%KpqkrvIKsPJX%d?&h*;%*!C6zKW@zj69$a&q!3nDE_3`gCi~ z{kNqO7|=9Bso*CbMSkOOO2&PJ)`K+A9T(I{rAdiI{P%SNQapDrR&C7U$GN-E>I{D4 z^m9Skv?H6XdrooxZCx4Mr&W_2LlPfH)b|t7ELleB7vFf5zVU(>sYt0L_~8c#zH5}n ziJ_y}XZddC4)$jjTJD|_zk&L>@Mx;^Oq{ljl^e5o^v)i%Zr(Jrz=|7(6L8f)%D$Y4 zX6f>J>o&QO%2K-!_QoqnJxHD^H8uS5+aCU0alkJ~@N>zq|8ODCytSB{h9z_VZCz2w z&wuuBkxEJUJ8z)4@diph_@8|?w=PX)q#|VyVXwb};;Q~0@17gBXEX8Vt(-Zl@!vW9 zT$0RRae#H(j`Pg@y&2H+{06VFXZxSPwUw;i@&pwG*w}{DgZ2Bx6LdTT|k4eNepcXfWaa7S#1!s+U+*kp+j5yvn{bPwfZOlFoW4_ zwmdLnHUnnMv*o?@wRL-Kedp~swD%?7r5{(Eq^ClyycD5!n{z@y z+pqmQ!^H5v_-m6ep1mQqnsK~+^1 zH8nLD4E~6Ee*9c4Boc|GyK4)rDHe;7NF+$5Qe-ljy^>Z!J#feU@-EP16aO6Fa%+2X@plhHBPWA~Q8t3$-j3 zB;C|qJ=C*EQ5&Y=8ljPJq*c>2T{AS93Twb14NGW|V=&l2gGFw7A}kX1kfPSoEyEId_yJA2u><{(Kq0IFgETBDg$IMd1{$m^=PFIi3HK}` z(Z^V#2#>^9FVCNvI`Z7lQoH^9^zlWJ!N>KqZtWW!;qpmm za=drx-j|o-16O5eef`JBuefds&bS} literal 0 HcmV?d00001 From c6872526ec524e3c61e2b93d83d610919f71a5d3 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 20 Oct 2018 23:34:29 +0500 Subject: [PATCH 28/91] changed lang value in main.html to actual lang --- src/collections/common.erl | 2 +- src/index.erl | 19 +++++++++++++++++++ templates/internal/main.html | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/collections/common.erl b/src/collections/common.erl index cd4b6f1..2440ae8 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -180,7 +180,7 @@ save_block(#cms_mfa{mfa={common, template, [_Block, File, _Classes, _DataAttr]}} parallel_block(#cms_page{id = PID} = Page, Block) -> % {{{2 try [maybe_render_block(Page, MFA) || MFA <- db:get_mfa(PID, Block)] - catch error2:E -> + catch error:E -> ?LOG("~nError: ~p ~p ~p",[E,PID, Block]), wf:status_code(500), common:template(Page,"templates/500.html") diff --git a/src/index.erl b/src/index.erl index 33a7ee2..6b5f457 100644 --- a/src/index.erl +++ b/src/index.erl @@ -106,6 +106,25 @@ head(_Page) -> % {{{2 title(#cms_page{title=Title}) -> % {{{2 Title. +%% Func to Define language for a page in header: check QS and Default db language {{{1 +language(_Page) -> % {{{2 + QLang=wf:qs(lang), + Langs=db:get_languages(), + LangsList=[Id || #{id := Id} <- Langs, Id/="any"], + DefLangs=[Id || #{id := Id, default := D} <- Langs, D==true], + DefLang=case DefLangs of + [] -> undefined; + L -> lists:nth(1,L) + end, + case QLang of + [Elem] -> case lists:member(Elem, LangsList) of + true ->Elem; + false -> DefLang + end; + _ -> DefLang + end. + + body(Page) -> % {{{2 wf:state(page, Page), maybe_add_editor(Page), diff --git a/templates/internal/main.html b/templates/internal/main.html index 9e94b21..1c9e3c1 100644 --- a/templates/internal/main.html +++ b/templates/internal/main.html @@ -1,5 +1,5 @@ - + From b18b2d55f41d4a7bccba7fe1d5459645a8df2025 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 23 Oct 2018 12:53:57 +0500 Subject: [PATCH 29/91] updated bootstrap.css: added dropdown style --- static/css/bootstrap.css | 47 +++++++++++++++++++++++++++++++++++ static/css/bootstrap.min.css | 48 +++++++++++++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css index 6167622..700f001 100755 --- a/static/css/bootstrap.css +++ b/static/css/bootstrap.css @@ -6755,3 +6755,50 @@ button.close { } } /*# sourceMappingURL=bootstrap.css.map */ + +/*MANUAL Added:*/ +.dropdown-toggle::after { + display: inline-block; + width: 0; + height: 0; + margin-left: .255em; + vertical-align: .255em; + content: ""; + border-top: .3em solid; + border-right: .3em solid transparent; + border-bottom: 0; + border-left: .3em solid transparent; + +} +.dropdown-menu{ + min-width: 80px; +} +.dropdown-item { + display: block; + width: 100%; + padding: .25rem 1.1rem; + clear: both; + font-weight: 400; + color: #212529; + text-align: inherit; + white-space: nowrap; + background-color: transparent; + border: 0; +} + +.dropdown-item:hover, .dropdown-item:focus { + color: #16181b; + text-decoration: none; + background-color: #f8f9fa; +} + +.dropdown-item.active, .dropdown-item:active { + color: #fff; + text-decoration: none; + background-color: #007bff; +} + +.dropdown-item.disabled, .dropdown-item:disabled { + color: #6c757d; + background-color: transparent; +} \ No newline at end of file diff --git a/static/css/bootstrap.min.css b/static/css/bootstrap.min.css index ed3905e..8ffcf78 100755 --- a/static/css/bootstrap.min.css +++ b/static/css/bootstrap.min.css @@ -3,4 +3,50 @@ * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}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}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@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.woff2) format('woff2'),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';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.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-lock:before{content:"\e033"}.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-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.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-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.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-bell:before{content:"\e123"}.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-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.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-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-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}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.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}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}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}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.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-md-1,.col-md-10,.col-md-11,.col-md-12,.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-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.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-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;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>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;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;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-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,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.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}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top: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;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{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,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{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;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.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:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{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-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.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{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.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{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-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-top-left-radius:0;border-bottom-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:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.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,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.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,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.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-left-radius:4px;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-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;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:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,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}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,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 .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn: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:400;line-height:1;color:#555;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=checkbox],.input-group-addon input[type=radio]{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>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.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:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.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.42857143;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:focus,.nav-tabs>li.active>a:hover{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{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.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{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;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-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .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;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.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;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{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}}.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,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.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;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@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-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{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:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{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:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.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:#777}.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.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-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:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-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;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-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 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:focus,.pager li>a:hover{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:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.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:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 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,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-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-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.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-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.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,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>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>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.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-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.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,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(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:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.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}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.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;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-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.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;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{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.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;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.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,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.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;background-color:#000\9;background-color:rgba(0,0,0,0);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,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.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}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} -/*# sourceMappingURL=bootstrap.min.css.map */ \ No newline at end of file +/*# sourceMappingURL=bootstrap.min.css.map */ +/*MANUAL Added:*/ +.dropdown-toggle::after { + display: inline-block; + width: 0; + height: 0; + margin-left: .255em; + vertical-align: .255em; + content: ""; + border-top: .3em solid; + border-right: .3em solid transparent; + border-bottom: 0; + border-left: .3em solid transparent; + +} +.dropdown-menu{ + min-width: 80px; +} +.dropdown-item { + display: block; + width: 100%; + padding: .25rem 1.1rem; + clear: both; + font-weight: 400; + color: #212529; + text-align: inherit; + white-space: nowrap; + background-color: transparent; + border: 0; +} + +.dropdown-item:hover, .dropdown-item:focus { + color: #16181b; + text-decoration: none; + background-color: #f8f9fa; +} + +.dropdown-item.active, .dropdown-item:active { + color: #fff; + text-decoration: none; + background-color: #007bff; +} + +.dropdown-item.disabled, .dropdown-item:disabled { + color: #6c757d; + background-color: transparent; +} \ No newline at end of file From 8095a0238b4db52a7ec237dd77d3109050d8be47 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 23 Oct 2018 13:03:22 +0500 Subject: [PATCH 30/91] updated style.css: added img.flags-icon class --- static/css/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static/css/style.css b/static/css/style.css index 46dc689..970afbb 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -57,3 +57,8 @@ a, a:visited { a:hover, a:active { text-decoration: underline; } + +img.flags-icon { + height: 20px; + margin-left: 5px; +} From 5dd30ec7ecd3a2fe69383f5eb16d3827fe83d153 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 23 Oct 2018 13:07:58 +0500 Subject: [PATCH 31/91] added bootstrap:languages_menu; auto-append lang param to some links' ; some clear code and fixes --- src/cms_modules/account.erl | 3 -- src/cms_modules/admin.erl | 17 +++---- src/collections/bootstrap.erl | 87 ++++++++++++++++++++++++++++++++--- src/collections/common.erl | 31 ++++++------- src/collections/html5.erl | 8 +++- src/db.erl | 22 ++++----- src/elements/element_crud.erl | 1 - src/index.erl | 16 ++++++- src/nitrogen.app.src | 2 +- 9 files changed, 132 insertions(+), 55 deletions(-) diff --git a/src/cms_modules/account.erl b/src/cms_modules/account.erl index ddb5144..0b95dc9 100644 --- a/src/cms_modules/account.erl +++ b/src/cms_modules/account.erl @@ -269,16 +269,13 @@ maybe_redirect_to_login(Page) -> % {{{2 maybe_redirect_to_login(#cms_page{accepted_role=undefined} = Page, URL) -> % {{{2 maybe_redirect_to_login(Page#cms_page{accepted_role=nobody}, URL); maybe_redirect_to_login(#cms_page{accepted_role=nobody} = Page, _URL) -> % {{{2 - % ?LOG("Not redirect to login: ~p", [Page]), Page; maybe_redirect_to_login(#cms_page{accepted_role=Role} = Page, URL) -> % {{{2 - ?LOG("role: ~p,wf:role(Role):~p, url:~p", [Role,wf:role(Role),URL]), case wf:role(Role) of true -> ?LOG("Role: ~p", [Role]), Page; false -> - % ?LOG("Redirect to login: ~p", [Page]), wf:redirect_to_login(URL) end. diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 7e9735b..f698cae 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -282,7 +282,8 @@ maybe_set(Id, Val) -> % {{{2 "" -> wf:set(Id, Val); A -> - ?LOG("~s value is ~p", [Id, A]) + ?LOG("~s value is ~p", [Id, A]), + "" end. update_container(Header, ButtonText, ButtonPostBack, Body) -> % {{{2 @@ -487,10 +488,12 @@ add_default_fields(Data, Formatting, Block, Classes, DataAttrs) -> % {{{2 ]. form_fields(M, F, A) -> % {{{2 + % ?LOG("fe:~p A:~p",[ F, A]), try apply(M, form_data, [F, A]) catch error:E when E /= undef; E /= function_clause -> + ?LOG("Error in form_fields:~p",[E]), [_, Block, Classes, DataAttrs] = maybe_empty(A, 4), {[], [], Block, Classes, DataAttrs} end. @@ -645,7 +648,6 @@ maybe_empty(A, _N) -> % {{{2 get_files_from_folder("static"=SubFolder) -> % {{{2 %{ok, StaticFolders} = application:get_env(simple_bridge, static_paths), {ok, StaticFolders} = file:list_dir(SubFolder), - %io:format("Folders: ~p~n", [Folders]), {ok, OldCWD} = file:get_cwd(), file:set_cwd(SubFolder), Static = [{wf:f("~s", [Path]), Files} || @@ -653,13 +655,12 @@ get_files_from_folder("static"=SubFolder) -> % {{{2 filelib:is_dir(Path), {ok, Files} <- [file:list_dir(Path)], Path /= "nitrogen"], - io:format("Static: ~p~n", [Static]), + % ?LOG("Static: ~p~n", [Static]), Assets = lists:foldl(fun({Path, Files}, A) -> [file_to_asset(File, Path) || File <- Files, File /= ".empty"] ++ A end, [], Static), - %io:format("Assets: ~p~n", [Assets]), NitrogenStatic = [ {"nitrogen/", ["bert.js", "bert.min.js", @@ -672,7 +673,6 @@ get_files_from_folder("static"=SubFolder) -> % {{{2 ], NitrogenAssets = [ file_to_asset(File, Path) || {Path, Files} <- NitrogenStatic, File <- Files], - io:format("Assets NitrogenAssets: ~p~n", [Assets ++ NitrogenAssets]), db:save(Assets ++ NitrogenAssets), file:set_cwd(OldCWD); @@ -683,7 +683,6 @@ get_files_from_folder(SubFolder) -> % {{{2 get_social_files("static/images"=SubFolder) -> % {{{2 {ok, StaticImages} = file:list_dir(SubFolder), Static = [{"images", StaticImages}], - % io:format("StaticImages: ~p~n", [StaticImages]), Assets = lists:foldl(fun({Path, Files}, A) -> [file_to_asset(File, Path) || File <- Files, string:str(File, "_icon.png") > 0 ] ++ A @@ -1582,7 +1581,8 @@ event({?MODULE, pages, merge}) -> % {{{2 event({?MODULE, auth, call_restore_password}) -> % {{{2 account:call_restore_password(); event(Ev) -> % {{{2 - ?LOG("~p event ~p", [?MODULE, Ev]). + ?LOG("~p event ~p", [?MODULE, Ev]), + "". inplace_textbox_event({asset, Record, Field}, Value) -> % {{{2 Val = db:update(Record, Field, Value), @@ -1617,7 +1617,8 @@ finish_upload_event(asset, Fname, Path, _Node) -> % {{{2 wf:set(path, URLPath). api_event(Name, Tag, Args) -> % {{{2 - ?LOG("~p API event ~p(~p; ~p)", [?MODULE, Name, Tag, Args]). + ?LOG("~p API event ~p(~p; ~p)", [?MODULE, Name, Tag, Args]), + "". sort_event({PID, Block}, Blocks) -> % {{{2 lists:foreach(fun({N, {block, _PID, B}}) -> diff --git a/src/collections/bootstrap.erl b/src/collections/bootstrap.erl index 0421cde..c86df9e 100644 --- a/src/collections/bootstrap.erl +++ b/src/collections/bootstrap.erl @@ -25,7 +25,8 @@ functions() -> % {{{2 {table, "Table"}, {th, "Table header"}, {tr, "Table row"}, - {td, "Table cell"} + {td, "Table cell"}, + {languages_menu, "Language selector"} ]. format_block(col, [Block, Width, Offset, Classes]) -> % {{{2 @@ -245,6 +246,27 @@ form_data(container, A) -> % {{{2 Block, Classes }; +form_data(languages_menu, A) -> % {{{2 + [_, Block, ShowText, ShowFlag, Classes, DataAttr] = admin:maybe_empty(A, 6), + + {[#checkbox{ + text="Show text", + label_position=before, + id=showtext, + checked=ShowText==on + }, + #checkbox{ + text="Show flag", + label_position=before, + id=showflag, + checked=ShowFlag==on + } + ], + [], + Block, + Classes, + DataAttr + }; form_data(_F, [_, Block, Classes]) -> % {{{2 {[], [], Block, Classes}; form_data(_F, []) -> % {{{2 @@ -299,9 +321,12 @@ save_block(#cms_mfa{id={PID, Block}, mfa={bootstrap, tab, [TabBlock, Classes, _D ]); save_block(#cms_mfa{id={_PID, _}, mfa={bootstrap, col, [Block, [Classes, W, O ], _DataAttr]}}=Rec) -> % {{{2 Rec#cms_mfa{mfa={bootstrap, col, [Block, W, O, Classes]}}; -%save_block(#cms_mfa{id={PID, _}, mfa={bootstrap, full_block, [Block ]}}=Rec) -> % {{{2 -% ColClass = common:q(col_class, ""), -% Rec#cms_mfa{mfa={bootstrap, full_block, [Block, RowClass, ColClass]}}; + +save_block(#cms_mfa{id={_PID, _}, mfa={bootstrap, languages_menu, [Block, Classes, DataAttr]}}=Rec) -> % {{{2 + ShowText = wf:to_atom(common:q(showtext, false)), + ShowFlag = wf:to_atom(common:q(showflag, false)), + Rec#cms_mfa{mfa={bootstrap, languages_menu, [Block, ShowText, ShowFlag, Classes, DataAttr]}}; + save_block(#cms_mfa{id={PID, _}, mfa={bootstrap, nav_item, [Block, URL, Text, Classes, DataAttr]}}=Rec) -> % {{{2 NavItemBlock = common:private_block(common:sub_block(Block, "li")), @@ -521,9 +546,58 @@ tab_body(Page, Block, Classes, _DataAttr) -> % {{{2 #panel{ html_id=common:block_to_html_id(Block), %role="tabpanel", - class=["tab-pane" | Classes], + class=["tab-panel" | Classes], body=common:parallel_block(Page, Block) }. +languages_menu(Page, Block, ShowText, ShowFlag, Classes, DataAttr) -> % {{{2 + Language = index:language(Page), + [#cms_language{icon=LanguageIcon}]=db:get_language(Language), + AssetId=lists:reverse(string:split(LanguageIcon,".")), + Current=#span{ + text=case ShowText of + on -> Language; + _ -> "" + end, + body=case ShowFlag of + on ->[common:img(Page, AssetId, "flags-icon icon")]; + _ -> [] + end + }, + #panel{ + html_id=common:block_to_html_id(Block), + body=[ + #btn{ + id=dropdownMenuButton, + body=[Current], + class="btn dropdown-toggle", + data_fields=[{toggle, "dropdown"}] + }, + languages_items(Page, ShowText, ShowFlag) + ], + class=["dropdown" | Classes], + data_fields = DataAttr + }. +languages_items(Page, ShowText, ShowFlag) -> % {{{2 + URI=wf:uri(), + Languages= + [ #link{ + url=index:set_url_with_lang(URI, Id), + class="dropdown-item", + body=[#span{ + text=case ShowText of + on -> Id; + _ -> "" + end, + body=case ShowFlag of + on ->[common:img(Page, lists:reverse(string:split(Icon,".")), "flags-icon icon")]; + _ -> [] + end + }]} || #{id := Id, icon := Icon} <- db:get_languages(), Id/="any" + ], + #panel{ + body=Languages, + class="dropdown-menu" + }. modal(Page, Block, TitleBlock, BodyBlock, FooterBlock, Classes) -> % {{{2 modal(Page, Block, TitleBlock, BodyBlock, FooterBlock, Classes, []). @@ -553,7 +627,8 @@ event(submenu) -> % {{{2 ]}) end; event(Ev) -> % {{{2 - ?LOG("~p event ~p", [?MODULE, Ev]). + ?LOG("~p event ~p", [?MODULE, Ev]), + "". %% Dropdown formatters {{{1 position_classes(navbar) -> % {{{2 diff --git a/src/collections/common.erl b/src/collections/common.erl index 2440ae8..930203b 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -31,7 +31,6 @@ format_block(asset, [AID]) -> % {{{2 [#cms_asset{type=Type, file=File, name=Name}|_] = db:get_asset(AID), {wf:f("Asset ~s: ~s(~p)", [Type, Name, File]), undefined}; format_block(F, A) -> % {{{2 - % ?LOG("format_block: F:~p, A:~p",[F,A]), {wf:f("common:~s(~p)", [F, A]), undefined}. @@ -129,7 +128,6 @@ form_data(template, A) -> % {{{2 } ]; form_data(img, A) -> % {{{2 - ?LOG("Image: ~p", [A]), [_, AID, Classes] = admin:maybe_empty(A, 3), {[ @@ -139,7 +137,6 @@ form_data(img, A) -> % {{{2 [], "", Classes}; form_data(asset, A) -> % {{{2 - ?LOG("Asset: ~p", [A]), [_, AID] = admin:maybe_empty(A, 2), Type = case db:get_asset(AID) of [] -> binary; @@ -188,7 +185,6 @@ parallel_block(#cms_page{id = PID} = Page, Block) -> % {{{2 waterfall(#cms_page{id = PID} = Page, Block) -> % {{{2 Functions = db:get_mfa(PID, Block), - % ?LOG("Waterfall: ~p", [Functions]), lists:foldl(fun(#cms_mfa{mfa={M, F, Args}}, #cms_page{}=P) -> apply(M, F, [P | Args]); (#cms_mfa{mfa=Fun}, #cms_page{}=P) when is_function(Fun) -> @@ -234,7 +230,6 @@ template(Page, TID) -> % {{{2 template(Page, TID, []). template(Page, TID, AdditionalBindings) -> % {{{2 - % ?LOG("Page for template: ~p, TID: ~p", [Page, TID]), [#cms_template{file=File, bindings=Bindings}] = db:get_template(TID), #template{file=File, @@ -270,7 +265,8 @@ event({asset, type, change}) -> % {{{2 wf:replace(asset_id, assets_dropdown(AssetType)); event(Ev) -> % {{{2 - ?LOG("~p event(common.erl) ~p", [?MODULE, Ev]). + ?LOG("~p undefined event ~p", [?MODULE, Ev]), + undefined. %% Helpers {{{1 block_to_html_id(Block) -> % {{{2 @@ -312,7 +308,6 @@ module_by_function(FunTuple) -> % {{{2 F == FunTuple]. maybe_render_block(Page, #cms_mfa{settings=#{filters := Filters}}=MFA) -> % {{{2 - % ?LOG("Filters: ~p", [Filters]), render_block(apply_filters(Filters), Page, MFA); maybe_render_block(Page, MFA) -> % {{{2 render_block(true, Page, MFA). @@ -323,10 +318,8 @@ render_block(false, _, _) -> % {{{2 render_block(true, Page, #cms_mfa{id=_Id, mfa={?MODULE, text=F, Args}}=MFA) -> % {{{2 apply(?MODULE, F, [Page, MFA | Args]); render_block(true, Page, #cms_mfa{mfa={M, F, Args}}) -> % {{{2 - % ?LOG("render_block: M:~p Args~p fun:~p", [M, Args,F]), apply(M, F, [Page | Args]); render_block(true, Page, #cms_mfa{mfa=Fun}) when is_function(Fun) -> % {{{2 - ?LOG("render_block: ~p fun:~p", [Page,Fun]), Fun(Page). apply_filters(["", "", "", ""]) -> % {{{2 @@ -334,7 +327,6 @@ apply_filters(["", "", "", ""]) -> % {{{2 apply_filters([undefined, undefined, undefined, undefined]) -> % {{{2 true; apply_filters([K, V, R, T]) -> % {{{2 - % ?LOG("K: ~p, V: ~p, R: ~p, T:~p", [K, V, R, T]), FilterKV = case K of "" -> true; K -> wf:to_list(wf:q(wf:to_atom(K))) == wf:to_list(V) @@ -350,12 +342,10 @@ apply_filters([K, V, R, T]) -> % {{{2 Lang -> wf:to_atom(wf:qs(lang))==wf:to_atom(Lang) end, - % ?LOG("result:~p",[FilterKV and FilterRole and FilterLang]), FilterKV and FilterRole and FilterLang; apply_filters(_) -> % {{{2 - ?LOG("apply_filters true", []), true. maybe_list(L) when is_list(L) -> % {{{2 @@ -370,12 +360,17 @@ maybe_wrap_to_edit(Text, #cms_mfa{id={"admin", _}}, true) -> % {{{2 Text; maybe_wrap_to_edit(Text, #cms_mfa{id={_PID, Block}, sort=S}=MFA, true) -> % {{{2 %% @doc "Return panel for edit a textblock if user have permission", - #panel{ - id=common:block_to_html_id(wf:f("~s-~p", [Block, S])), - body=Text, - style="border: #c33 1px dashed; cursor: text;padding: 10px;", - actions=?POSTBACK({?MODULE, edit, text, MFA, Text}, admin) - }. + case string:find(Block, "/validate") of %% dirty hack prevent error + nomatch -> + #panel{ + id=common:block_to_html_id(wf:f("~s-~p", [Block, S])), + body=Text, + style="border: #c33 1px dashed; cursor: text;padding: 10px;", + actions=?POSTBACK({?MODULE, edit, text, MFA, Text}, admin) + }; + _Some -> + Text + end. %% Dropdown formatters {{{1 diff --git a/src/collections/html5.erl b/src/collections/html5.erl index a117006..80608a6 100644 --- a/src/collections/html5.erl +++ b/src/collections/html5.erl @@ -52,7 +52,6 @@ format_block(F, [Block, Data, Classes, DataAttr]) -> % {{{2 format_block(F, [Block, Classes, DataAttr]) -> % {{{2 {wf:f("html5(~s): (id:~p class=~p attr:~p)", [F, Block, Classes, DataAttr]), Block}; format_block(F, A) -> % {{{2 - % ?LOG("format_block: F:~p, A:~p",[F,A]), {wf:f("html5: ~s(~p)", [F, A]), undefined}. @@ -262,8 +261,13 @@ link_url(Page, Block, URL) -> % {{{2 link_url(Page, Block, URL, Classes) -> % {{{2 link_url(Page, Block, URL, Classes, []). link_url(Page, Block, URL, Classes, DataAttr) -> % {{{2 + LangId=index:language(Page), + UpdUrl=case re:run(URL,"\\w+\\.\\w+") of %check if html link contanis url with domain_name + nomatch->index:set_url_with_lang(URL, LangId); + _->URL + end, #link{ - url=URL, + url=UpdUrl, html_id=common:block_to_html_id(Block), class=Classes, body=common:parallel_block(Page, Block), diff --git a/src/db.erl b/src/db.erl index c464e6a..2782de5 100644 --- a/src/db.erl +++ b/src/db.erl @@ -248,7 +248,6 @@ update("1.0.0"=VSN) -> updated_at=calendar:universal_time()}, mnesia:delete_object(MFA), mnesia:write(New_mfa) - % io:format("~nReplace ~p to ~p",[MFA, New_mfa]) end, Common_elements) end, @@ -292,7 +291,6 @@ update("1.0.0"=VSN) -> updated_at=calendar:universal_time()}, mnesia:delete_object(MFA), mnesia:write(New_mfa) - % ,io:format("~nReplace ~p to ~p",[MFA, New_mfa]) end, ReplElements) end, @@ -388,9 +386,7 @@ update("fix_sort") -> % {{{1 [ if Cur_mfa#cms_mfa.mfa /= Mfa -> New_sort = Sort -1 + string:str(L, [Cur_mfa]), - %io:format("~nold_sort ~p,new_sort: ~p", [Sort, New_sort]), New_mfa = update_record_field(Cur_mfa, sort, New_sort), - %io:format("~nupdate [~p]~p", [Sort, New_mfa]), mnesia:delete_object(Cur_mfa), mnesia:write(New_mfa); true -> ok @@ -503,7 +499,6 @@ get_mfa(Page, Block, Replaced) -> % {{{1 end end), - % io:format("~nget_mfa ~p",[lists:keysort(#cms_mfa.sort, Funs)]), lists:keysort(#cms_mfa.sort, Funs). get_all_blocks(PID) -> % {{{1 Blocks = transaction(fun() -> @@ -517,7 +512,6 @@ get_all_blocks(PID) -> % {{{1 ] ) end), - % io:format("~n_block~p",[sets:from_list(Blocks)]), sets:to_list(sets:from_list(Blocks)). get_parent_block(PID, BID) -> % {{{1 transaction(fun() -> @@ -590,6 +584,10 @@ get_languages() -> % {{{1 Langs = mnesia:match_object(#cms_language{_='_'}), [record_to_map(A) || A <- Langs] end). +get_language(Lid) -> % {{{1 + transaction(fun() -> + mnesia:match_object(#cms_language{id=Lid,_='_'}) + end). fix_sort(Recs) when is_list(Recs) -> % {{{1 [fix_sort(Rec) || Rec <- Recs]; @@ -613,7 +611,6 @@ update(OldRecord, NewRecord) -> % {{{1 end). update(Record, Field, Value) -> % {{{1 - % io:format("Db update: ~p~n", [Record]), transaction(fun() -> mnesia:delete_object(Record), R1 = update_record_field(Record, Field, Value), @@ -625,7 +622,6 @@ update(Record, Field, Value) -> % {{{1 copy_page(#{id := PID}= Map) -> % {{{1 NewPID = "copy_" ++ PID, NewMap = maps:update(id, NewPID, Map), - %io:format("~nDb copy PID: ~p to ~p~n", [PID, NewPID]), update_map(NewMap), transaction(fun() -> case mnesia:match_object(#cms_mfa{id={PID, '_'}, _='_'}) of @@ -634,7 +630,6 @@ copy_page(#{id := PID}= Map) -> % {{{1 L -> lists:foreach(fun(#cms_mfa{id={_, Block}}=DbItem) -> NewDbItem = update_record_field(DbItem, id, {NewPID, Block}), - % io:format("~nCopy NewDbItem: ~p~n", [NewDbItem]), mnesia:write(NewDbItem) end, L) end @@ -644,7 +639,6 @@ update_map(Map) -> % {{{1 update_map(Map, fun fields/1). update_map(Map, FieldsFun) -> % {{{1 - % io:format("~nDb update_map:", []), save(map_to_record(Map, FieldsFun)). update_language(#{id := Id, icon:= Icon, default:=Default}) -> % {{{1 @@ -662,7 +656,6 @@ update_language(#{id := Id, icon:= Icon, default:=Default}) -> % {{{1 rename_page(#{id := NewPID, old_value := OldValue} = Map) -> % {{{1 update_map(Map), - %io:format("~nDb rename_page: ~p~n~p", [OldValue,Map]), transaction(fun() -> case mnesia:match_object(#cms_mfa{id={OldValue, '_'}, _='_'}) of [] -> @@ -670,13 +663,11 @@ rename_page(#{id := NewPID, old_value := OldValue} = Map) -> % {{{1 L -> lists:foreach(fun(#cms_mfa{id={_, Block}}=DbItem) -> NewDbItem = update_record_field(DbItem, id, {NewPID, Block}), - % io:format("~nCopy NewDbItem: ~p~n", [NewDbItem]), mnesia:write(NewDbItem), mnesia:delete_object(DbItem) end, L) end, OldPages = mnesia:match_object(#cms_page{id=OldValue, _='_'}), - % io:format("~ndelete_object: ~p", [OldPage ]), [mnesia:delete_object(O) || O <- OldPages] end). @@ -996,4 +987,7 @@ get_indexed_pages() -> lists:filter(fun(#cms_page{sitemap=S}) -> S/=none end, L) - end). \ No newline at end of file + end). + +temp()-> +?CREATE_TABLE(cms_page, set, []). \ No newline at end of file diff --git a/src/elements/element_crud.erl b/src/elements/element_crud.erl index a63fb05..81e0892 100644 --- a/src/elements/element_crud.erl +++ b/src/elements/element_crud.erl @@ -188,7 +188,6 @@ event({update=Fun, Rec, Data, Field, ElementId, OldValue}) -> % {{{1 event({show, Rec}=_E) -> % {{{1 wf:replace(Rec#crud.id, Rec); event({Fun, Rec, Data}=_E) -> % {{{1 - % io:format("Event: ~p~n", [E]), call(Fun, Rec, Data), wf:replace(Rec#crud.id, Rec); event(Ev) -> % {{{1 diff --git a/src/index.erl b/src/index.erl index 6b5f457..a0b8114 100644 --- a/src/index.erl +++ b/src/index.erl @@ -66,7 +66,8 @@ default_data() -> % {{{2 [ {common, asset, [["css", "jquery-ui"]]}, {common, asset, [["css", "bootstrap"]]}, - {common, asset, [["css", "font-awesome"]]} + {common, asset, [["css", "font-awesome"]]}, + {common, asset, [["css", "style"]]} ]), % Index page @@ -124,6 +125,16 @@ language(_Page) -> % {{{2 _ -> DefLang end. +%% Make uri with choosen lang +set_url_with_lang(URI,LangId) -> % {{{2 + case re:run(URI,"lang=\\w+") of + {match,[{_S,_L}]} -> + re:replace(URI,"lang=\\w+","lang="++LangId,[{return,list}]); + _ -> case re:run(URI, "\\?\\w") of + {match,[{_S,_L}]} -> wf:f("~s&lang=~s",[URI, LangId]); + nomatch -> wf:f("~s?lang=~s",[URI, LangId]) + end + end. body(Page) -> % {{{2 wf:state(page, Page), @@ -154,7 +165,8 @@ event(display_source_code) -> % {{{2 }) end; event(Ev) -> % {{{2 - ?LOG("~p event ~p", [?MODULE, Ev]). + ?LOG("~p event ~p", [?MODULE, Ev]), + "". %% Block renderers {{{1 maybe_block(_Page, "", _Classes) -> % {{{2 diff --git a/src/nitrogen.app.src b/src/nitrogen.app.src index 99b31dc..431b6a6 100644 --- a/src/nitrogen.app.src +++ b/src/nitrogen.app.src @@ -1,7 +1,7 @@ {application, nitrogen, [ {description, "My Nitrogen Web Project"}, - {vsn, "1.0.3"}, + {vsn, "1.0.4"}, {registered, []}, {applications, [kernel, stdlib]}, {mod, { nitrogen_app, []}}, From 5e7c8ed0eb8859f884167a6193169f196e82e24f Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 23 Oct 2018 13:26:12 +0500 Subject: [PATCH 32/91] hotfix --- src/db.erl | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/db.erl b/src/db.erl index 2782de5..f0a7d20 100644 --- a/src/db.erl +++ b/src/db.erl @@ -988,6 +988,3 @@ get_indexed_pages() -> S/=none end, L) end). - -temp()-> -?CREATE_TABLE(cms_page, set, []). \ No newline at end of file From 7ddc4ed389563d542ee5a597bfda4ed6af1eb7aa Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 26 Oct 2018 20:44:26 +0500 Subject: [PATCH 33/91] fixed text-editor: update element after text changing --- src/cms_modules/admin.erl | 48 +++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index f698cae..39ceab3 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -606,7 +606,7 @@ formatting_fields({_, Formats, _, _}) -> % {{{2 formatting_fields({_, Formats}) -> % {{{2 [get_fields(F) || F <- Formats, get_fields(F) /= []]; formatting_fields(_Any) -> % {{{2 - ?LOG("Other fields", []), %?LOG("Other fields: ~p", [Any]), + ?LOG("Other fields", []), []. get_fields({_, {ID, _}}) when is_atom(ID) -> % {{{2 @@ -625,8 +625,8 @@ get_fields(#panel{body=Body}) when is_list(Body) -> % {{{2 [get_fields(E) || E <- Body]; get_fields(#panel{body=Body}) -> % {{{2 get_fields(Body); -get_fields(D) -> % {{{2 - ?LOG("Data: ~p", [D]), +get_fields(_D) -> % {{{2 + % ?LOG("Data: ~p", [D]), []. prefix_classes(Prefix, Classes) -> % {{{2 @@ -655,7 +655,6 @@ get_files_from_folder("static"=SubFolder) -> % {{{2 filelib:is_dir(Path), {ok, Files} <- [file:list_dir(Path)], Path /= "nitrogen"], - % ?LOG("Static: ~p~n", [Static]), Assets = lists:foldl(fun({Path, Files}, A) -> [file_to_asset(File, Path) || File <- Files, File /= ".empty"] ++ A end, @@ -742,7 +741,15 @@ get_pages() -> % {{{2 [#{id => "*"} | db:get_pages()]. %% Event handlers {{{1 -event({common, edit, text, #cms_mfa{id={PID, Block}}=MFA, Text}) -> % {{{2 +event({common, edit, text, #cms_mfa{id={PID, Block}, sort=S}=MFA, Text}) -> % {{{2 + {atomic, UpdText}=mnesia:transaction( + fun() -> + case mnesia:match_object(#cms_mfa{id={PID, Block}, sort=S, _='_'}) of + L when is_list(L), length(L) > 0 -> + [ Itext || #cms_mfa{mfa={common,text, [Itext]}} <-L]; + _ -> Text + end + end), new_modal("Edit text", {?MODULE, block, move, MFA}, undefined, @@ -753,7 +760,7 @@ event({common, edit, text, #cms_mfa{id={PID, Block}}=MFA, Text}) -> % {{{2 #hidden{id=add_block, text=Block}, #wysiwyg{class=["form-control"], id=text_mfa, - html=Text, + html=UpdText, buttons=[ #panel{ class="btn-group", @@ -1408,8 +1415,16 @@ event({?MODULE, block, move, Old}) -> % {{{2 event({?MODULE, block, save, Old}); event({?MODULE, block, copy, Old}) -> % {{{2 event({?MODULE, block, save, Old#cms_mfa{sort=new}}); -event({?MODULE, block, save, OldMFA}) -> % {{{2 - [#cms_mfa{id={PID, Block}}|_] = common:maybe_list( +event({?MODULE, block, save, #cms_mfa{id={PID, Block}, sort=S}=OldMFA}) -> % {{{2 + mnesia:transaction( %% remove dublicating sort + fun() -> + case mnesia:match_object(#cms_mfa{id={PID, Block}, sort=S, _='_'}) of + L when is_list(L), length(L) > 0 -> + [ mnesia:delete_object(Mfa) || Mfa<-L]; + _ -> undefined + end + end), + [#cms_mfa{id={PID, Block}, sort=S, mfa=MFA}|_] = common:maybe_list( db:save( maybe_fix_sort( apply_element_transform( @@ -1426,14 +1441,14 @@ event({?MODULE, block, save, OldMFA}) -> % {{{2 db:save(Page) end, coldstrap:close_modal(), - wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}); + wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}), + update_block_on_page(Block, MFA, S); event({?MODULE, block, remove, B}) -> % {{{2 admin:new_modal( "Are you sure to delete?", {block, remove_block, B}, [] ); - event({?MODULE, block, remove_block, B}) -> % {{{2 {PID, Block} = B#cms_mfa.id, db:maybe_delete(B), @@ -1640,3 +1655,16 @@ cms_roles() -> % {{{2 collections() -> % {{{2 Modules = common:module_by_function({functions, 0}), lists:map(fun(M) -> {M, M:description()} end, Modules). + +update_block_on_page(Block, MFA, S) -> % {{{2 + PageQs=wf:qs(page), + NewText=case MFA of + {common, text, Text} -> Text; + _-> undefined + end, + ChangedBlock=common:block_to_html_id(wf:f("~s-~p", [Block, S])), + case PageQs of + ["admin"] -> ""; + _ -> + wf:wire(#update{target=ChangedBlock, elements=NewText}) + end. \ No newline at end of file From 607b55e34e2aadba14f65b9cb739f245d8539a6d Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 29 Oct 2018 23:38:48 +0500 Subject: [PATCH 34/91] some styled admin --- static/css/sb-admin-2.css | 4 ++++ static/css/sb-admin-2.min.css | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/static/css/sb-admin-2.css b/static/css/sb-admin-2.css index ef5e53b..377ff9c 100755 --- a/static/css/sb-admin-2.css +++ b/static/css/sb-admin-2.css @@ -22,6 +22,10 @@ body { border-left: 1px solid #e7e7e7; } } +.flex-panel{ + display: flow-root; +} + .navbar-top-links { margin-right: 0; } diff --git a/static/css/sb-admin-2.min.css b/static/css/sb-admin-2.min.css index a685970..a1d01f4 100755 --- a/static/css/sb-admin-2.min.css +++ b/static/css/sb-admin-2.min.css @@ -2,4 +2,4 @@ * Start Bootstrap - SB Admin 2 v3.3.7+1 (http://startbootstrap.com/template-overviews/sb-admin-2) * Copyright 2013-2016 Start Bootstrap * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE) - */.chat,.timeline{list-style:none}body{background-color:#f8f8f8}#wrapper{width:100%}#page-wrapper{padding:0 15px;min-height:568px;background-color:#fff}@media (min-width:768px){#page-wrapper{position:inherit;margin:0 0 0 250px;padding:0 30px;border-left:1px solid #e7e7e7}}.navbar-top-links{margin-right:0}.navbar-top-links li{display:inline-block}.flot-chart,.navbar-top-links .dropdown-menu li{display:block}.navbar-top-links li:last-child{margin-right:15px}.navbar-top-links li a{padding:15px;min-height:50px}.navbar-top-links .dropdown-menu li:last-child{margin-right:0}.navbar-top-links .dropdown-menu li a{padding:3px 20px;min-height:0}.navbar-top-links .dropdown-menu li a div{white-space:normal}.navbar-top-links .dropdown-alerts,.navbar-top-links .dropdown-messages,.navbar-top-links .dropdown-tasks{width:310px;min-width:0}.navbar-top-links .dropdown-messages{margin-left:5px}.navbar-top-links .dropdown-tasks{margin-left:-59px}.navbar-top-links .dropdown-alerts{margin-left:-123px}.navbar-top-links .dropdown-user{right:0;left:auto}.sidebar .sidebar-nav.navbar-collapse{padding-left:0;padding-right:0}.sidebar .sidebar-search{padding:15px}.sidebar ul li{border-bottom:1px solid #e7e7e7}.sidebar ul li a.active{background-color:#eee}.sidebar .arrow{float:right}.sidebar .fa.arrow:before{content:"\f104"}.sidebar .active>a>.fa.arrow:before{content:"\f107"}.sidebar .nav-second-level li,.sidebar .nav-third-level li{border-bottom:none!important}.sidebar .nav-second-level li a{padding-left:37px}.sidebar .nav-third-level li a{padding-left:52px}@media (min-width:768px){.sidebar{z-index:1;position:absolute;width:250px;margin-top:51px}.navbar-top-links .dropdown-alerts,.navbar-top-links .dropdown-messages,.navbar-top-links .dropdown-tasks{margin-left:auto}}.btn-outline{color:inherit;background-color:transparent;transition:all .5s}.btn-primary.btn-outline{color:#428bca}.btn-success.btn-outline{color:#5cb85c}.btn-info.btn-outline{color:#5bc0de}.btn-warning.btn-outline{color:#f0ad4e}.btn-danger.btn-outline{color:#d9534f}.btn-danger.btn-outline:hover,.btn-info.btn-outline:hover,.btn-primary.btn-outline:hover,.btn-success.btn-outline:hover,.btn-warning.btn-outline:hover{color:#fff}.chat{margin:0;padding:0}.chat li{margin-bottom:10px;padding-bottom:5px;border-bottom:1px dotted #999}.chat li.left .chat-body{margin-left:60px}.chat li.right .chat-body{margin-right:60px}.chat li .chat-body p{margin:0}.chat .glyphicon,.panel .slidedown .glyphicon{margin-right:5px}.chat-panel .panel-body{height:350px;overflow-y:scroll}.login-panel{margin-top:25%}.flot-chart{height:400px}.flot-chart-content{width:100%;height:100%}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_desc_disabled{background:0 0}table.dataTable thead .sorting_asc:after{content:"\f0de";float:right;font-family:fontawesome}table.dataTable thead .sorting_desc:after{content:"\f0dd";float:right;font-family:fontawesome}table.dataTable thead .sorting:after{content:"\f0dc";float:right;font-family:fontawesome;color:rgba(50,50,50,.5)}.btn-circle{width:30px;height:30px;padding:6px 0;border-radius:15px;text-align:center;font-size:12px;line-height:1.428571429}.btn-circle.btn-lg{width:50px;height:50px;padding:10px 16px;border-radius:25px;font-size:18px;line-height:1.33}.btn-circle.btn-xl{width:70px;height:70px;padding:10px 16px;border-radius:35px;font-size:24px;line-height:1.33}.show-grid [class^=col-]{padding-top:10px;padding-bottom:10px;border:1px solid #ddd;background-color:#eee!important}.show-grid{margin:15px 0}.huge{font-size:40px}.panel-green{border-color:#5cb85c}.panel-green>.panel-heading{border-color:#5cb85c;color:#fff;background-color:#5cb85c}.panel-green>a{color:#5cb85c}.panel-green>a:hover{color:#3d8b3d}.panel-red{border-color:#d9534f}.panel-red>.panel-heading{border-color:#d9534f;color:#fff;background-color:#d9534f}.panel-red>a{color:#d9534f}.panel-red>a:hover{color:#b52b27}.panel-yellow{border-color:#f0ad4e}.panel-yellow>.panel-heading{border-color:#f0ad4e;color:#fff;background-color:#f0ad4e}.panel-yellow>a{color:#f0ad4e}.panel-yellow>a:hover{color:#df8a13}.timeline{position:relative;padding:20px 0}.timeline:before{content:" ";position:absolute;top:0;bottom:0;left:50%;width:3px;margin-left:-1.5px;background-color:#eee}.timeline>li{position:relative;margin-bottom:20px}.timeline>li:after,.timeline>li:before{content:" ";display:table}.timeline>li:after{clear:both}.timeline>li>.timeline-panel{float:left;position:relative;width:46%;padding:20px;border:1px solid #d4d4d4;border-radius:2px;-webkit-box-shadow:0 1px 6px rgba(0,0,0,.175);box-shadow:0 1px 6px rgba(0,0,0,.175)}.timeline>li>.timeline-panel:before{content:" ";display:inline-block;position:absolute;top:26px;right:-15px;border-top:15px solid transparent;border-right:0 solid #ccc;border-bottom:15px solid transparent;border-left:15px solid #ccc}.timeline>li>.timeline-panel:after{content:" ";display:inline-block;position:absolute;top:27px;right:-14px;border-top:14px solid transparent;border-right:0 solid #fff;border-bottom:14px solid transparent;border-left:14px solid #fff}.timeline>li>.timeline-badge{z-index:100;position:absolute;top:16px;left:50%;width:50px;height:50px;margin-left:-25px;border-radius:50%;text-align:center;font-size:1.4em;line-height:50px;color:#fff;background-color:#999}.timeline>li.timeline-inverted>.timeline-panel{float:right}.timeline>li.timeline-inverted>.timeline-panel:before{right:auto;left:-15px;border-right-width:15px;border-left-width:0}.timeline>li.timeline-inverted>.timeline-panel:after{right:auto;left:-14px;border-right-width:14px;border-left-width:0}.timeline-badge.primary{background-color:#2e6da4!important}.timeline-badge.success{background-color:#3f903f!important}.timeline-badge.warning{background-color:#f0ad4e!important}.timeline-badge.danger{background-color:#d9534f!important}.timeline-badge.info{background-color:#5bc0de!important}.timeline-title{margin-top:0;color:inherit}.timeline-body>p,.timeline-body>ul{margin-bottom:0}.timeline-body>p+p{margin-top:5px}@media (max-width:767px){ul.timeline:before{left:40px}ul.timeline>li>.timeline-panel{width:calc(10%);width:-moz-calc(10%);width:-webkit-calc(10%);float:right}ul.timeline>li>.timeline-badge{top:16px;left:15px;margin-left:0}ul.timeline>li>.timeline-panel:before{right:auto;left:-15px;border-right-width:15px;border-left-width:0}ul.timeline>li>.timeline-panel:after{right:auto;left:-14px;border-right-width:14px;border-left-width:0}} \ No newline at end of file + */body{background-color:#f8f8f8}#wrapper{width:100%}#page-wrapper{padding:0 15px;min-height:568px;background-color:white}@media(min-width:768px){#page-wrapper{position:inherit;margin:0 0 0 250px;padding:0 30px;border-left:1px solid #e7e7e7}}.flex-panel{display:flow-root}.navbar-top-links{margin-right:0}.navbar-top-links li{display:inline-block}.navbar-top-links li:last-child{margin-right:15px}.navbar-top-links li a{padding:15px;min-height:50px}.navbar-top-links .dropdown-menu li{display:block}.navbar-top-links .dropdown-menu li:last-child{margin-right:0}.navbar-top-links .dropdown-menu li a{padding:3px 20px;min-height:0}.navbar-top-links .dropdown-menu li a div{white-space:normal}.navbar-top-links .dropdown-messages,.navbar-top-links .dropdown-tasks,.navbar-top-links .dropdown-alerts{width:310px;min-width:0}.navbar-top-links .dropdown-messages{margin-left:5px}.navbar-top-links .dropdown-tasks{margin-left:-59px}.navbar-top-links .dropdown-alerts{margin-left:-123px}.navbar-top-links .dropdown-user{right:0;left:auto}.sidebar .sidebar-nav.navbar-collapse{padding-left:0;padding-right:0}.sidebar .sidebar-search{padding:15px}.sidebar ul li{border-bottom:1px solid #e7e7e7}.sidebar ul li a.active{background-color:#eee}.sidebar .arrow{float:right}.sidebar .fa.arrow:before{content:"\f104"}.sidebar .active>a>.fa.arrow:before{content:"\f107"}.sidebar .nav-second-level li,.sidebar .nav-third-level li{border-bottom:none!important}.sidebar .nav-second-level li a{padding-left:37px}.sidebar .nav-third-level li a{padding-left:52px}@media(min-width:768px){.sidebar{z-index:1;position:absolute;width:250px;margin-top:51px}.navbar-top-links .dropdown-messages,.navbar-top-links .dropdown-tasks,.navbar-top-links .dropdown-alerts{margin-left:auto}}.btn-outline{color:inherit;background-color:transparent;transition:all .5s}.btn-primary.btn-outline{color:#428bca}.btn-success.btn-outline{color:#5cb85c}.btn-info.btn-outline{color:#5bc0de}.btn-warning.btn-outline{color:#f0ad4e}.btn-danger.btn-outline{color:#d9534f}.btn-primary.btn-outline:hover,.btn-success.btn-outline:hover,.btn-info.btn-outline:hover,.btn-warning.btn-outline:hover,.btn-danger.btn-outline:hover{color:white}.chat{margin:0;padding:0;list-style:none}.chat li{margin-bottom:10px;padding-bottom:5px;border-bottom:1px dotted #999}.chat li.left .chat-body{margin-left:60px}.chat li.right .chat-body{margin-right:60px}.chat li .chat-body p{margin:0}.panel .slidedown .glyphicon,.chat .glyphicon{margin-right:5px}.chat-panel .panel-body{height:350px;overflow-y:scroll}.login-panel{margin-top:25%}.flot-chart{display:block;height:400px}.flot-chart-content{width:100%;height:100%}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background:transparent}table.dataTable thead .sorting_asc:after{content:"\f0de";float:right;font-family:fontawesome}table.dataTable thead .sorting_desc:after{content:"\f0dd";float:right;font-family:fontawesome}table.dataTable thead .sorting:after{content:"\f0dc";float:right;font-family:fontawesome;color:rgba(50,50,50,0.5)}.btn-circle{width:30px;height:30px;padding:6px 0;border-radius:15px;text-align:center;font-size:12px;line-height:1.428571429}.btn-circle.btn-lg{width:50px;height:50px;padding:10px 16px;border-radius:25px;font-size:18px;line-height:1.33}.btn-circle.btn-xl{width:70px;height:70px;padding:10px 16px;border-radius:35px;font-size:24px;line-height:1.33}.show-grid [class^="col-"]{padding-top:10px;padding-bottom:10px;border:1px solid #ddd;background-color:#eee!important}.show-grid{margin:15px 0}.huge{font-size:40px}.panel-green{border-color:#5cb85c}.panel-green>.panel-heading{border-color:#5cb85c;color:white;background-color:#5cb85c}.panel-green>a{color:#5cb85c}.panel-green>a:hover{color:#3d8b3d}.panel-red{border-color:#d9534f}.panel-red>.panel-heading{border-color:#d9534f;color:white;background-color:#d9534f}.panel-red>a{color:#d9534f}.panel-red>a:hover{color:#b52b27}.panel-yellow{border-color:#f0ad4e}.panel-yellow>.panel-heading{border-color:#f0ad4e;color:white;background-color:#f0ad4e}.panel-yellow>a{color:#f0ad4e}.panel-yellow>a:hover{color:#df8a13}.timeline{position:relative;padding:20px 0 20px;list-style:none}.timeline:before{content:" ";position:absolute;top:0;bottom:0;left:50%;width:3px;margin-left:-1.5px;background-color:#eee}.timeline>li{position:relative;margin-bottom:20px}.timeline>li:before,.timeline>li:after{content:" ";display:table}.timeline>li:after{clear:both}.timeline>li:before,.timeline>li:after{content:" ";display:table}.timeline>li:after{clear:both}.timeline>li>.timeline-panel{float:left;position:relative;width:46%;padding:20px;border:1px solid #d4d4d4;border-radius:2px;-webkit-box-shadow:0 1px 6px rgba(0,0,0,0.175);box-shadow:0 1px 6px rgba(0,0,0,0.175)}.timeline>li>.timeline-panel:before{content:" ";display:inline-block;position:absolute;top:26px;right:-15px;border-top:15px solid transparent;border-right:0 solid #ccc;border-bottom:15px solid transparent;border-left:15px solid #ccc}.timeline>li>.timeline-panel:after{content:" ";display:inline-block;position:absolute;top:27px;right:-14px;border-top:14px solid transparent;border-right:0 solid #fff;border-bottom:14px solid transparent;border-left:14px solid #fff}.timeline>li>.timeline-badge{z-index:100;position:absolute;top:16px;left:50%;width:50px;height:50px;margin-left:-25px;border-radius:50% 50% 50% 50%;text-align:center;font-size:1.4em;line-height:50px;color:#fff;background-color:#999}.timeline>li.timeline-inverted>.timeline-panel{float:right}.timeline>li.timeline-inverted>.timeline-panel:before{right:auto;left:-15px;border-right-width:15px;border-left-width:0}.timeline>li.timeline-inverted>.timeline-panel:after{right:auto;left:-14px;border-right-width:14px;border-left-width:0}.timeline-badge.primary{background-color:#2e6da4!important}.timeline-badge.success{background-color:#3f903f!important}.timeline-badge.warning{background-color:#f0ad4e!important}.timeline-badge.danger{background-color:#d9534f!important}.timeline-badge.info{background-color:#5bc0de!important}.timeline-title{margin-top:0;color:inherit}.timeline-body>p,.timeline-body>ul{margin-bottom:0}.timeline-body>p+p{margin-top:5px}@media(max-width:767px){ul.timeline:before{left:40px}ul.timeline>li>.timeline-panel{width:calc(10%);width:-moz-calc(10%);width:-webkit-calc(10%)}ul.timeline>li>.timeline-badge{top:16px;left:15px;margin-left:0}ul.timeline>li>.timeline-panel{float:right}ul.timeline>li>.timeline-panel:before{right:auto;left:-15px;border-right-width:15px;border-left-width:0}ul.timeline>li>.timeline-panel:after{right:auto;left:-14px;border-right-width:14px;border-left-width:0}} \ No newline at end of file From 9beb4d53688b98cf599da87bd88f789031ed8ef3 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 29 Oct 2018 23:40:29 +0500 Subject: [PATCH 35/91] some fixed admin; added Defragment and Clear Trash buttons --- src/cms_modules/admin.erl | 135 ++++++++++++++++++++++++-------------- src/db.erl | 102 +++++++++++++++++++++++----- static/css/admin.css | 5 ++ 3 files changed, 174 insertions(+), 68 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 39ceab3..bf5248f 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -291,11 +291,11 @@ update_container(Header, ButtonText, ButtonPostBack, Body) -> % {{{2 #bs_row{ body=[ #bs_col{ - cols={lg, 10}, + cols=[{lg, 10},{md, 9},{sm, 9}], body=#h1{text=Header} }, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3},{sm, 3}], body=#button{ text=ButtonText, class=["btn", @@ -488,12 +488,11 @@ add_default_fields(Data, Formatting, Block, Classes, DataAttrs) -> % {{{2 ]. form_fields(M, F, A) -> % {{{2 - % ?LOG("fe:~p A:~p",[ F, A]), try apply(M, form_data, [F, A]) catch error:E when E /= undef; E /= function_clause -> - ?LOG("Error in form_fields:~p",[E]), + % ?LOG("Error in form_fields:~p",[E]), [_, Block, Classes, DataAttrs] = maybe_empty(A, 4), {[], [], Block, Classes, DataAttrs} end. @@ -606,7 +605,7 @@ formatting_fields({_, Formats, _, _}) -> % {{{2 formatting_fields({_, Formats}) -> % {{{2 [get_fields(F) || F <- Formats, get_fields(F) /= []]; formatting_fields(_Any) -> % {{{2 - ?LOG("Other fields", []), + % ?LOG("Other fields", []), []. get_fields({_, {ID, _}}) when is_atom(ID) -> % {{{2 @@ -725,11 +724,14 @@ rec_from_qs(R) -> % {{{2 Classes = get_with_prefix(M, wf:to_atom(F), classes), DataAttrs =extract_data_attrs(common:q(data_fields, "")), - Filters = wf:mq([qs_key, qs_val, role, translation]), - + Filters=wf:mq([qs_key, qs_val, role, translation]), + Settings = case Filters of + [undefined,undefined,undefined,undefined] -> R#cms_mfa.settings; + _ -> #{filters => Filters} + end, R#cms_mfa{id={PID, Block}, mfa={M, F, Args ++ [Classes] ++ [DataAttrs]}, - settings=#{filters => Filters}}. + settings=Settings}. apply_element_transform(#cms_mfa{mfa={M, _, _}}=Rec) -> % {{{2 try apply(M, save_block, [Rec]) @@ -1186,7 +1188,7 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 Blocks = [format_block(B#cms_mfa{id={PID, BID}}) || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, Block)], AllBlocks = db:get_all_blocks(PID), - ParentBlock=db:get_parent_block(PID,Block), + ParentBlock=db:get_parent_block(PID,Block,undefined), ParentBody=case ParentBlock of S when is_list(S) -> #button{ @@ -1207,55 +1209,83 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 ShowAll = (common:q(show_all, "false") /= "false"), PageSelect = [ - #dropdown{ - id=page_select, - options=lists:keysort(1, [{N, N} || #{id := N} <- Pages]), - value=PID, - delegate=?MODULE, - postback={?MODULE, page, construct} - }, - #span{text=" / "}, - #dropdown{ - id=block_select, - options=lists:keysort(1, [{N, N} || N <- AllBlocks, not common:is_private_block(N) or ShowAll, (N /= "router") or (PID == "*")]), - value=Block, - delegate=?MODULE, - postback={?MODULE, page, construct} + #panel{id=left_manage_panel, + class="col-md-6", + style="width:auto;", + body=[ + #dropdown{ + id=page_select, + options=lists:keysort(1, [{N, N} || #{id := N} <- Pages]), + value=PID, + delegate=?MODULE, + postback={?MODULE, page, construct} + }, + #span{text=" / "}, + #dropdown{ + id=block_select, + options=lists:keysort(1, [{N, N} || N <- AllBlocks, not common:is_private_block(N) or ShowAll, (N /= "router") or (PID == "*")]), + value=Block, + delegate=?MODULE, + postback={?MODULE, page, construct} + }, + #span{text=" Show All "}, + #checkbox{ + text="", + id=show_all, + checked=ShowAll, + delegate=?MODULE, + postback={?MODULE, page, construct} + }, + #span{ + text=" Parent: " + }, + ParentBody] + }, + #panel{ + class="right_manage_panel pull-right", + body=[ + #btn{ + body="", + title="Clear trash", + % text="", + class=["pull-right "], + style="margin-left: 5px;", + % type=warning, + actions=?POSTBACK({?MODULE, db, clean}, ?MODULE) }, - #span{text=" Show All "}, - #checkbox{ - text="", - id=show_all, - checked=ShowAll, - delegate=?MODULE, - postback={?MODULE, page, construct} + #btn{ + body="", + class=["pull-right"], + title="Defragmentation db", + style="margin-left: 5px;", + % type=warning, + actions=?POSTBACK({?MODULE, db, defragment}, ?MODULE) }, - #span{ - text=" Parent: " - }, - ParentBody, #btn{ - text="Export Pages", + text=" Export Pages", class=["pull-right"], - style="", + body="", + style="margin-left: 5px;", type=success, actions=?POSTBACK({?MODULE, pages, export}, ?MODULE) }, #btn{ - text="Merge Pages", + body="", + text=" Merge Pages", class=["pull-right"], - style="margin: 0 10px;", + style="margin-left: 5px;", type=info, actions=?POSTBACK({?MODULE, pages, merge}, ?MODULE) }, #btn{ - text="Import Pages", + text=" Import Pages", class=["pull-right"], + body="", type=warning, actions=?POSTBACK({?MODULE, pages, import}, ?MODULE) } - - + ] + } ], Sort = #sortblock{ tag={PID, Block}, @@ -1268,7 +1298,7 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 class=["panel", "panel-default"], body=[ #panel{ - class=["panel-heading"], + class=["panel-heading flex-panel"], body=PageSelect }, Sort @@ -1424,12 +1454,13 @@ event({?MODULE, block, save, #cms_mfa{id={PID, Block}, sort=S}=OldMFA}) -> % {{{ _ -> undefined end end), - [#cms_mfa{id={PID, Block}, sort=S, mfa=MFA}|_] = common:maybe_list( - db:save( - maybe_fix_sort( - apply_element_transform( - rec_from_qs(OldMFA)), - OldMFA))), + Saved= common:maybe_list(db:save( + maybe_fix_sort( + apply_element_transform( + rec_from_qs(OldMFA)), + OldMFA))), + + % [#cms_mfa{id={PID, Block}}]=Saved, case PID of "*" -> Pages=db:get_indexed_pages(), @@ -1442,7 +1473,7 @@ event({?MODULE, block, save, #cms_mfa{id={PID, Block}, sort=S}=OldMFA}) -> % {{{ end, coldstrap:close_modal(), wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}), - update_block_on_page(Block, MFA, S); + update_block_on_page(Saved); event({?MODULE, block, remove, B}) -> % {{{2 admin:new_modal( "Are you sure to delete?", @@ -1593,6 +1624,10 @@ event({?MODULE, pages, merge}) -> % {{{2 {popup, close}, merge_backup, undefined); +event({?MODULE, db, defragment}) -> % {{{2 + db:remove_blocks_without_parent(); +event({?MODULE, db, clean}) -> % {{{2 + db:remove_old_unused_blocks(); event({?MODULE, auth, call_restore_password}) -> % {{{2 account:call_restore_password(); event(Ev) -> % {{{2 @@ -1656,7 +1691,7 @@ collections() -> % {{{2 Modules = common:module_by_function({functions, 0}), lists:map(fun(M) -> {M, M:description()} end, Modules). -update_block_on_page(Block, MFA, S) -> % {{{2 +update_block_on_page([#cms_mfa{id={_,Block},mfa=MFA,sort=S}]) -> % {{{2 PageQs=wf:qs(page), NewText=case MFA of {common, text, Text} -> Text; diff --git a/src/db.erl b/src/db.erl index f0a7d20..3d6490a 100644 --- a/src/db.erl +++ b/src/db.erl @@ -375,6 +375,8 @@ update("1.0.4"=VSN) -> admin:add_language("en","flag_en.png",false), admin:add_language("any","",false), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); +% update("1.0.5"=VSN) -> % +% mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("fix_sort") -> % {{{1 F = fun() -> FoldFun = @@ -513,17 +515,24 @@ get_all_blocks(PID) -> % {{{1 ) end), sets:to_list(sets:from_list(Blocks)). -get_parent_block(PID, BID) -> % {{{1 +get_parent_block(PID, BID, DeleteBlock) -> % {{{1 +%% @doc "Return parent BlockId if it exists; unactive block without parent" transaction(fun() -> P1=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_']}, active=true, _='_'}), P2=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_']}, active=true, _='_'}), P3=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_']}, active=true, _='_'}), P4=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_','_']}, active=true, _='_'}), P5=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_','_','_']}, active=true, _='_'}), - P12=lists:append(P1,P2), - P34=lists:append(P3,P4), - P35=lists:append(P34,P5), - P=lists:append(P12,P35), + AB=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={html5,article,['_',BID,'_','_','_']}, active=true, _='_'}), + AF=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={html5,article,['_','_',BID,'_','_']}, active=true, _='_'}), + PB=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_',BID,'_','_','_','_','_','_','_','_']}, active=true, _='_'}), + PH=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,[BID,'_','_','_','_','_','_','_','_','_']}, active=true, _='_'}), + PA=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_','_',BID,'_','_','_','_','_','_','_']}, active=true, _='_'}), + PF=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_','_','_',BID,'_','_','_','_','_','_']}, active=true, _='_'}), + P1_5=lists:append([P1,P2,P3,P4,P5]), + Arts=lists:append(AF,AB), + Panels=lists:append([PB,PA,PH,PF]), + P=lists:append([P1_5,Arts,Panels]), case P of L when is_list(L), length(L) > 1 -> length(L); @@ -531,7 +540,11 @@ get_parent_block(PID, BID) -> % {{{1 {_, ParentID}=I#cms_mfa.id, ParentID; - _ -> undefined + _ -> case DeleteBlock of + undefined -> undefined; + _Some -> delete(DeleteBlock) + end + end end). @@ -630,7 +643,8 @@ copy_page(#{id := PID}= Map) -> % {{{1 L -> lists:foreach(fun(#cms_mfa{id={_, Block}}=DbItem) -> NewDbItem = update_record_field(DbItem, id, {NewPID, Block}), - mnesia:write(NewDbItem) + UR = update_record_field(NewDbItem, updated_at, calendar:universal_time()), + mnesia:write(UR) end, L) end end). @@ -730,13 +744,10 @@ delete(#cms_page{id=PID}=Record) -> % {{{1 [] -> ok; L when is_list(L) -> - lists:foreach(fun(DbItem) -> - UR = update_record_field(DbItem, updated_at, calendar:universal_time()), - DR = update_record_field(UR, active, false), - mnesia:delete_object(DbItem), - mnesia:write(DR) - end, L) - % [mnesia:delete_object(B1) || B1 <- L] % full_delete + % lists:foreach(fun(DbItem) -> + % delete(DbItem) + % end, L) + [full_delete(B1) || B1 <- L] % full_delete end, UP = update_record_field(Record, updated_at, calendar:universal_time()), DP = update_record_field(UP, active, false), @@ -968,23 +979,78 @@ update_timestamps(#cms_template{}=Rec) -> % {{{1 CT = calendar:universal_time(), Rec#cms_template{updated_at=CT}. -datetime_tostr(Date) -> +datetime_tostr(Date) -> % {{{1 {{Year, Month, Day}, {Hour, Minute, Second}} = Date, _StrTime = lists:flatten(io_lib:format("~4..0w-~2..0w-~2..0wT~2..0w:~2..0w:~2..0w+00:00",[Year,Month,Day,Hour,Minute,Second])). -clear_page_by_id(PID)-> +clear_page_by_id(PID)-> % {{{1 transaction(fun() -> Elements = mnesia:match_object(#cms_mfa{id={PID,'_'}, _='_'}), lists:foreach(fun(MFA) -> - mnesia:delete_object(MFA) + full_delete(MFA) end, Elements) end). -get_indexed_pages() -> %% get pages where sitemap is not none +get_indexed_pages() -> % {{{1 transaction(fun() -> L = mnesia:match_object(#cms_page{active=true, _='_'}), lists:filter(fun(#cms_page{sitemap=S}) -> S/=none end, L) end). + +remove_old_unused_blocks() -> % {{{1 +%% @doc "Remove blocks from db: if its have new analog block" + transaction( + fun() -> + Unactive = mnesia:match_object(#cms_mfa{active=false, _='_'}), + lists:foreach(fun(#cms_mfa{id=Id,mfa={M, F, A}}=MbDelete) -> + Args = case A of + [BlockId] -> [BlockId]; + [BlockId, _A2] -> [BlockId, '_']; + [BlockId, _A2, _A3] -> [BlockId, '_', '_']; + [BlockId, _A2, _A3, _A4] -> [BlockId, '_', '_', '_']; + [BlockId, _A2, _A3, _A4, _A5] -> [BlockId, '_', '_', '_', '_']; + [BlockId, _A2, _A3, _A4, _A5, _A6] -> [BlockId, '_', '_', '_', '_', '_']; + [BlockId, _A2, _A3, _A4, _A5, _A6, _A7] -> [BlockId, '_', '_', '_', '_', '_', '_']; + [BlockId, _A2, _A3, _A4, _A5, _A6, _A7, _A8] -> [BlockId, '_', '_', '_', '_', '_', '_', '_']; + [BlockId, _A2, _A3, _A4, _A5, _A6, _A7, _A8, _A9] -> [BlockId, '_', '_', '_', '_', '_', '_', '_', '_']; + [BlockId, _A2, _A3, _A4, _A5, _A6, _A7, _A8, _A9, _A10] -> [BlockId, '_', '_', '_', '_', '_', '_', '_', '_', '_']; + _ -> A + end, + case mnesia:match_object(#cms_mfa{id=Id, active=true,mfa={M, F, Args}, _='_'}) of + [] -> + undefined; + _L -> + full_delete(MbDelete) + end + end, Unactive) + end + ), + wf:wire(#alert{ text="Trash was cleared!"}). + +remove_blocks_without_parent() -> % {{{1 +%% @doc "Unactive all blocks if its havent parent" + transaction( + fun() -> + AllBlocks = mnesia:match_object(#cms_mfa{_ = '_'}), + Exclude_blocks = [css,body,page,router,script], + Exclude_pages = [admin,login,restore,register], + lists:foreach(fun(#cms_mfa{id={PID,BID}}=Block) -> + NotSubblock= + case re:run(BID,"[(^\\+),(\\/)]",[global]) of + nomatch -> true; + _ -> false + end, + Condition = not lists:member(wf:to_atom(BID), Exclude_blocks) and NotSubblock + and not lists:member(wf:to_atom(PID), Exclude_pages), + case Condition of + false -> undefined; + _-> get_parent_block(PID,BID,Block) + + end + end, AllBlocks) + end + ), + wf:wire(#alert{ text="Database was defragmented!"}). \ No newline at end of file diff --git a/static/css/admin.css b/static/css/admin.css index bc15118..3ee731d 100644 --- a/static/css/admin.css +++ b/static/css/admin.css @@ -70,4 +70,9 @@ .flex { display: flex; +} + +.right_manage_panel{ + display: inline-block; + margin-top:2px; } \ No newline at end of file From e602f5b7f139a24762f14a7d271e57644e753a63 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 30 Oct 2018 17:47:36 +0500 Subject: [PATCH 36/91] added navigation btns for panel subblocks --- src/cms_modules/admin.erl | 18 ++++++++++++ src/collections/bootstrap.erl | 52 +++++++++++++++++++++++------------ src/collections/html5.erl | 35 +++++++++++++++-------- static/css/admin.css | 6 ++++ 4 files changed, 81 insertions(+), 30 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index bf5248f..1525dc6 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -465,6 +465,23 @@ format_block(#cms_mfa{ % {{{2$ ]} ]}. +format_subblock(#cms_mfa{ id={PID, Name}}=B) -> % {{{2 + #sortitem{ + tag={block, PID, B}, + % class="well", + body=[ + #span{ + class="panel-format-btn", + body=[ + #link{ + class="btn btn-link", + body=common:icon("fa", "arrow-right", []), + % show_if=(Sub /= undefined), + actions=?POSTBACK({?MODULE, page, construct, PID, [Name]}, ?MODULE) + } + ]} + ]}. + add_default_fields({Data, Formatting}) -> % {{{2 add_default_fields(Data, Formatting, "", "", ""); add_default_fields({Data, Formatting, Block, Classes}) -> % {{{2 @@ -1184,6 +1201,7 @@ event({?MODULE, page, construct}) -> % {{{2 wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}); event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 + coldstrap:close_modal(), Pages = get_pages(), Blocks = [format_block(B#cms_mfa{id={PID, BID}}) || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, Block)], diff --git a/src/collections/bootstrap.erl b/src/collections/bootstrap.erl index c86df9e..b89f66a 100644 --- a/src/collections/bootstrap.erl +++ b/src/collections/bootstrap.erl @@ -79,25 +79,41 @@ form_data(col, A) -> % {{{2 form_data(panel, A) -> % {{{2 [_, HeaderBlock, Block, AddonsBlock, FooterBlock, HeaderCls, BodyCls, FooterCls, AddonCls, Classes0, DataAttr] = admin:maybe_empty(A, 11), [Classes, Context] = admin:maybe_empty(Classes0, 2), + PID = common:q(add_page_select, "index"), {[ - {"Block for panel header", - #txtbx{ - id=panel_header_block, - text=HeaderBlock, - placeholder="Block name for panel header (leave blank for none)" - }}, - {"Block for panel addons", - #txtbx{ - id=panel_addons_block, - text=AddonsBlock, - placeholder="Block name for panel addons (leave blank for none)" - }}, - {"Block for panel footer", - #txtbx{ - id=panel_footer_block, - text=FooterBlock, - placeholder="Block name for panel footer (leave blank for none)" - }} + #panel{ + body=[ + #span{text="Block for panel header"}, + #txtbx{ + id=panel_header_block, + text=HeaderBlock, + placeholder="Block name for panel header (leave blank for none)" + }, + [admin:format_subblock(B#cms_mfa{id={PID, BID}}) + || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, HeaderBlock)] + ]}, + #panel{ + body=[ + #span{text="Block for panel addons"}, + #txtbx{ + id=panel_addons_block, + text=AddonsBlock, + placeholder="Block name for panel addons (leave blank for none)" + }, + [admin:format_subblock(B#cms_mfa{id={PID, BID}}) + || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, AddonsBlock)] + ]}, + #panel{ + body=[ + #span{text="Block for panel footer"}, + #txtbx{ + id=panel_footer_block, + text=FooterBlock, + placeholder="Block name for panel footer (leave blank for none)" + }, + [admin:format_subblock(B#cms_mfa{id={PID, BID}}) + || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, FooterBlock)] + ]} ], [ {"Context", diff --git a/src/collections/html5.erl b/src/collections/html5.erl index 80608a6..c100f9b 100644 --- a/src/collections/html5.erl +++ b/src/collections/html5.erl @@ -164,19 +164,30 @@ form_data(header, A) -> % {{{2 [], Block, Classes, DataAttr}; form_data(article, A) -> % {{{2 [_, HeaderBlock, Block, FooterBlock, Classes, DataAttr] = admin:maybe_empty(A, 6), + PID = common:q(add_page_select, "index"), {[ - {"Block for header", - #txtbx{ - id=article_header_block, - text=HeaderBlock, - placeholder="Block name for article header (leave blank for none)" - }}, - {"Block for footer", - #txtbx{ - id=article_footer_block, - text=FooterBlock, - placeholder="Block name for article footer (leave blank for none)" - }} + #panel{ + body=[ + #span{text="Block for header"}, + #txtbx{ + id=article_header_block, + text=HeaderBlock, + placeholder="Block name for article header (leave blank for none)" + }, + [admin:format_subblock(B#cms_mfa{id={PID, BID}}) + || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, HeaderBlock)] + ]}, + #panel{ + body=[ + #span{text="Block for footer"}, + #txtbx{ + id=article_footer_block, + text=FooterBlock, + placeholder="Block name for article footer (leave blank for none)" + }, + [admin:format_subblock(B#cms_mfa{id={PID, BID}}) + || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, FooterBlock)] + ]} ], [], Block, diff --git a/static/css/admin.css b/static/css/admin.css index 3ee731d..09d7b27 100644 --- a/static/css/admin.css +++ b/static/css/admin.css @@ -75,4 +75,10 @@ .right_manage_panel{ display: inline-block; margin-top:2px; +} + +.panel-format-btn{ + position: absolute; + margin-top: -35px; + right: 5px; } \ No newline at end of file From 2ace79d6f93636d49bbdf3f353b857b7edf4e66a Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 30 Oct 2018 17:52:04 +0500 Subject: [PATCH 37/91] fix in db:remove_blocks_without_parent --- src/db.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/db.erl b/src/db.erl index 3d6490a..b6ac5da 100644 --- a/src/db.erl +++ b/src/db.erl @@ -1039,7 +1039,7 @@ remove_blocks_without_parent() -> % {{{1 Exclude_pages = [admin,login,restore,register], lists:foreach(fun(#cms_mfa{id={PID,BID}}=Block) -> NotSubblock= - case re:run(BID,"[(^\\+),(\\/)]",[global]) of + case re:run(BID,"^\\+|\\/",[global]) of nomatch -> true; _ -> false end, From 516b8516cdc51140668b41712c298ac3f5b41692 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 2 Nov 2018 14:51:07 +0500 Subject: [PATCH 38/91] moved admin sidebar nav to top; some styled --- src/cms_modules/admin.erl | 70 ++++++----- src/db.erl | 35 +++++- src/index.erl | 6 +- src/nitrogen.app.src | 2 +- static/css/admin.css | 28 ++++- static/css/metisMenu.min.css | 17 ++- static/css/metisMenu.min.js | 29 ++++- static/css/sb-admin-2.css | 10 +- static/css/sb-admin-2.min.css | 2 +- templates/internal/admin.html | 231 ++-------------------------------- 10 files changed, 155 insertions(+), 275 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 1525dc6..6de9e80 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -55,7 +55,6 @@ default_data() -> % {{{2 add_navbar_button("admin", "sidebar-nav", "forms", {{"fa", "wpforms", ["fab"]}, "Forms"}, {event, ?POSTBACK({?MODULE, forms, show}, ?MODULE)}), add_navbar_button("admin", "sidebar-nav", "languages", {{"fa", "globe", ["fab"]}, "Languages"}, {event, ?POSTBACK({?MODULE, languages, show}, ?MODULE)}) ] - }. install() -> % {{{2 @@ -145,16 +144,16 @@ add_navbar_button(PID, MenuBlock, ItemBlock, {Icon, Text}, {menu, SubMenuBlock}) #cms_mfa{id={PID, ItemBlock}, mfa={html5, link_url, - [ItemLinkBlock, ""]}}, + [ItemLinkBlock, "", [{toggle,"dropdown"}]]}}, #cms_mfa{id={PID, ItemBlock}, mfa={bootstrap, nav_items, - [SubMenuBlock, ["nav-second-level", "collapse"]]}} + [SubMenuBlock, ["dropdown-menu"]]}} ], LinkMFAs = [ #cms_mfa{ id={PID, ItemLinkBlock}, - mfa={common, icon, ["fa", "", ["arrow"]]}} + mfa={common, icon, ["fa", "", ["arrow-right"]]}} | link_body_funs(PID, ItemLinkBlock, Icon, Text)], db:fix_sort(ButtonMFAs ++ LinkMFAs); add_navbar_button(PID, MenuBlock, ItemBlock, {Icon, Text}, {event, Actions}) -> % {{{2 @@ -291,11 +290,11 @@ update_container(Header, ButtonText, ButtonPostBack, Body) -> % {{{2 #bs_row{ body=[ #bs_col{ - cols=[{lg, 10},{md, 9},{sm, 9}], - body=#h1{text=Header} + cols=[{lg, 10}, {md, 9},{sm, 9}], + body=#h2{text=Header} }, #bs_col{ - cols=[{lg, 2},{md, 3},{sm, 3}], + cols=[{lg, 2}, {md, 3},{sm, 3}], body=#button{ text=ButtonText, class=["btn", @@ -922,11 +921,11 @@ event({?MODULE, asset, show, Type}) -> % {{{2 #bs_row{ body=[ #bs_col{ - cols={lg, 8}, - body=#h1{text=wf:f("Static Assets: ~s", [Type])} + cols=[{lg, 8},{md, 6}, {sm, 6}], + body=#h2{text=wf:f("Static Assets: ~s", [Type])} }, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Refresh filesystem", class=["btn", @@ -936,7 +935,7 @@ event({?MODULE, asset, show, Type}) -> % {{{2 actions=?POSTBACK({?MODULE, asset, refresh, Type}, ?MODULE) }}, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Upload Asset", class=["btn", @@ -999,11 +998,11 @@ event({?MODULE, template, show}) -> % {{{2 #bs_row{ body=[ #bs_col{ - cols={lg, 8}, - body=#h1{text="Templates"} + cols=[{lg, 8},{md, 6}, {sm, 6}], + body=#h2{text="Templates"} }, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Refresh filesystem", class=["btn", @@ -1013,7 +1012,7 @@ event({?MODULE, template, show}) -> % {{{2 actions=?POSTBACK({?MODULE, template, refresh}, ?MODULE) }}, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Upload Template", class=["btn", @@ -1051,7 +1050,12 @@ event({?MODULE, forms, show}) -> % {{{2 delete => fun db:delete/1 } }, - wf:update(container, [ + wf:update(container, [#bs_row{ + body=#bs_col{ + cols=[{lg, 8},{md, 6}, {sm, 6}], + body=#h2{text="Forms"} + } + }, #bs_row{ body=#bs_col{ cols={lg, 12}, @@ -1088,11 +1092,11 @@ event({?MODULE, languages, show}) -> % {{{2 #bs_row{ body=[ #bs_col{ - cols={lg, 10}, + cols=[{lg, 10},{md, 9}, {sm, 9}], body=#h2{text="All languages"} }, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Add language", class=["btn", @@ -1135,11 +1139,11 @@ event({?MODULE, page, show}) -> % {{{2 #bs_row{ body=[ #bs_col{ - cols={lg, 10}, - body=#h1{text="All Pages"} + cols=[{lg, 10},{md, 9}, {sm, 9}], + body=#h2{text="All Pages"} }, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Add Page", class=["btn", @@ -1524,11 +1528,11 @@ event({?MODULE, user, show}) -> % {{{2 #bs_row{ body=[ #bs_col{ - cols={lg, 10}, - body=#h1{text="Users"} + cols=[{lg, 10},{md, 9}, {sm, 9}], + body=#h2{text="Users"} }, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Create User", class=["btn", @@ -1585,11 +1589,11 @@ event({?MODULE, role, show}) -> % {{{2 #bs_row{ body=[ #bs_col{ - cols={lg, 10}, - body=#h1{text="Roles"} + cols=[{lg, 10},{md, 9}, {sm, 9}], + body=#h2{text="Roles"} }, #bs_col{ - cols={lg, 2}, + cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Create Role", class=["btn", @@ -1720,4 +1724,14 @@ update_block_on_page([#cms_mfa{id={_,Block},mfa=MFA,sort=S}]) -> % {{{2 ["admin"] -> ""; _ -> wf:wire(#update{target=ChangedBlock, elements=NewText}) - end. \ No newline at end of file + end. + + +admin_logout_button()-> % {{{2 + #btn{ + body="", + class=["btn-logout"], + title="Logout", + postback={auth, logout}, + delegate=account + }. diff --git a/src/db.erl b/src/db.erl index b6ac5da..6638b4c 100644 --- a/src/db.erl +++ b/src/db.erl @@ -375,8 +375,39 @@ update("1.0.4"=VSN) -> admin:add_language("en","flag_en.png",false), admin:add_language("any","",false), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); -% update("1.0.5"=VSN) -> % -% mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); +update("1.0.5"=VSN) -> % update classes for admin elements + mnesia:transaction( + fun() -> + % 1) classes: nav-second-level","collapse" ++ "dropdown-menu + case mnesia:match_object(#cms_mfa{id={"admin",'_'}, + mfa={'_','_',['_',["nav-second-level","collapse"]]}, + _='_'}) of + []-> ok; + L when is_list(L), length(L) > 1 -> + lists:foreach(fun(#cms_mfa{mfa={M,F,[HtmlId,["nav-second-level","collapse"]=Classes]}}=MFA) -> + NewClasses=lists:append(Classes,["dropdown-menu"]), + New_mfa = MFA#cms_mfa{mfa={M, F, [HtmlId,NewClasses]}, + updated_at=calendar:universal_time()}, + mnesia:delete_object(MFA), + mnesia:write(New_mfa) + end, L) + end, + % 2) "arrow" class -> "arrow-right" + case mnesia:match_object(#cms_mfa{id={"admin",'_'}, + mfa={common,icon,['_','_',["arrow"]]}, + _='_'}) of + []-> ok; + L2 when is_list(L2), length(L2) > 1 -> + lists:foreach(fun(#cms_mfa{mfa={M,F,[Cl1,Cl2,["arrow"]]}}=MFA) -> + NewCl3=["arrow-right"], + New_mfa = MFA#cms_mfa{mfa={M, F, [Cl1,Cl2,NewCl3]}, + updated_at=calendar:universal_time()}, + mnesia:delete_object(MFA), + mnesia:write(New_mfa) + end, L2) + end + end), + mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("fix_sort") -> % {{{1 F = fun() -> FoldFun = diff --git a/src/index.erl b/src/index.erl index a0b8114..821f7fb 100644 --- a/src/index.erl +++ b/src/index.erl @@ -132,7 +132,11 @@ set_url_with_lang(URI,LangId) -> % {{{2 re:replace(URI,"lang=\\w+","lang="++LangId,[{return,list}]); _ -> case re:run(URI, "\\?\\w") of {match,[{_S,_L}]} -> wf:f("~s&lang=~s",[URI, LangId]); - nomatch -> wf:f("~s?lang=~s",[URI, LangId]) + nomatch -> + if (URI == []) or (URI == "") -> + "#"; + true -> wf:f("~s?lang=~s",[URI, LangId]) + end end end. diff --git a/src/nitrogen.app.src b/src/nitrogen.app.src index 431b6a6..d44304a 100644 --- a/src/nitrogen.app.src +++ b/src/nitrogen.app.src @@ -1,7 +1,7 @@ {application, nitrogen, [ {description, "My Nitrogen Web Project"}, - {vsn, "1.0.4"}, + {vsn, "1.0.5"}, {registered, []}, {applications, [kernel, stdlib]}, {mod, { nitrogen_app, []}}, diff --git a/static/css/admin.css b/static/css/admin.css index 09d7b27..f73169e 100644 --- a/static/css/admin.css +++ b/static/css/admin.css @@ -13,7 +13,7 @@ } .btn-upload { - margin-top: 20px; + margin-top: 10px; } .upload-content { @@ -81,4 +81,30 @@ position: absolute; margin-top: -35px; right: 5px; +} + +.btn-logout { + position: absolute; + right: 5px; + top: 8px; +} +ul#sidebar-nav { + margin-right: 40px; + display: inline-block; +} + +@media (max-width: 940px) and (min-width: 768px){ + ul#sidebar-nav > li > a { + padding: 15px 7px; + } + ul#sidebar-nav > li > a > i { + display: none; + } +} + +@media screen and (max-width: 768px){ + [class^='col-'] { + padding-bottom: 5px; + } + } \ No newline at end of file diff --git a/static/css/metisMenu.min.css b/static/css/metisMenu.min.css index a1d0ef3..3960ff2 100755 --- a/static/css/metisMenu.min.css +++ b/static/css/metisMenu.min.css @@ -1,10 +1,7 @@ -/* - * metismenu - v1.1.3 - * Easy menu jQuery plugin for Twitter Bootstrap 3 - * https://github.com/onokumus/metisMenu - * - * Made by Osman Nuri Okumus - * Under MIT License - */ - -.arrow{float:right;line-height:1.42857}.glyphicon.arrow:before{content:"\e079"}.active>a>.glyphicon.arrow:before{content:"\e114"}.fa.arrow:before{content:"\f104"}.active>a>.fa.arrow:before{content:"\f107"}.plus-times{float:right}.fa.plus-times:before{content:"\f067"}.active>a>.fa.plus-times{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.plus-minus{float:right}.fa.plus-minus:before{content:"\f067"}.active>a>.fa.plus-minus:before{content:"\f068"} \ No newline at end of file +.arrow,.arrow-right{padding-left:2px;float:right;line-height:1.42857}.glyphicon.arrow:before{content:"\e079"}.active>a>.glyphicon.arrow:before{content:"\e114"}.fa.arrow:before{content:" \f104"}.fa.arrow-right:before{content:"\f105"}.active>a>.fa.arrow:before,.active>a>.fa.arrow-right:before{content:"\f107"}.plus-times{float:right}.fa.plus-times:before{content:"\f067"}.active>a>.fa.plus-times{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.plus-minus{float:right}.fa.plus-minus:before{content:"\f067"}.active>a>.fa.plus-minus:before{content:"\f068"}/*! +* metismenu https://github.com/onokumus/metismenu#readme +* A jQuery menu plugin +* @version 3.0.3 +* @author Osman Nuri Okumus (https://github.com/onokumus); upd. by Daniil Yarushin +* @license: MIT +*/.metismenu .arrow{float:right;line-height:1.42857}[dir=rtl] .metismenu .arrow{float:left}.metismenu .glyphicon.arrow:before{content:"\e079"}.metismenu .mm-active>a>.glyphicon.arrow:before{content:"\e114"}.metismenu .fa.arrow:before{content:"\f104"}.metismenu .mm-active>a>.fa.arrow:before{content:"\f107"}.metismenu .ion.arrow:before{content:"\f3d2"}.metismenu .mm-active>a>.ion.arrow:before{content:"\f3d0"}.metismenu .plus-times{float:right}[dir=rtl] .metismenu .plus-times{float:left}.metismenu .fa.plus-times:before{content:"\f067"}.metismenu .mm-active>a>.fa.plus-times{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.metismenu .plus-minus{float:right}[dir=rtl] .metismenu .plus-minus{float:left}.metismenu .fa.plus-minus:before{content:"\f067"}.metismenu .mm-active>a>.fa.plus-minus:before{content:"\f068"}.metismenu .mm-collapse:not(.mm-show){display:none}.metismenu .mm-collapsing{position:relative;height:0;overflow:hidden;transition-timing-function:ease;transition-duration:.35s;transition-property:height,visibility}.metismenu .has-arrow{position:relative}.metismenu .has-arrow:after{position:absolute;content:"";width:.5em;height:.5em;border-width:1px 0 0 1px;border-style:solid;border-color:initial;right:1em;-webkit-transform:rotate(-45deg) translateY(-50%);transform:rotate(-45deg) translateY(-50%);-webkit-transform-origin:top;transform-origin:top;top:50%;transition:all .3s ease-out}[dir=rtl] .metismenu .has-arrow:after{right:auto;left:1em;-webkit-transform:rotate(135deg) translateY(-50%);transform:rotate(135deg) translateY(-50%)}.metismenu .has-arrow[aria-expanded=true]:after,.metismenu .mm-active>.has-arrow:after{-webkit-transform:rotate(-135deg) translateY(-50%);transform:rotate(-135deg) translateY(-50%)}[dir=rtl] .metismenu .has-arrow[aria-expanded=true]:after,[dir=rtl] .metismenu .mm-active>.has-arrow:after{-webkit-transform:rotate(225deg) translateY(-50%);transform:rotate(225deg) translateY(-50%)} \ No newline at end of file diff --git a/static/css/metisMenu.min.js b/static/css/metisMenu.min.js index 8a590e7..2183382 100755 --- a/static/css/metisMenu.min.js +++ b/static/css/metisMenu.min.js @@ -6,4 +6,31 @@ * Made by Osman Nuri Okumus * Under MIT License */ -!function(a,b,c){function d(b,c){this.element=a(b),this.settings=a.extend({},f,c),this._defaults=f,this._name=e,this.init()}var e="metisMenu",f={toggle:!0,doubleTapToGo:!1};d.prototype={init:function(){var b=this.element,d=this.settings.toggle,f=this;this.isIE()<=9?(b.find("li.active").has("ul").children("ul").collapse("show"),b.find("li").not(".active").has("ul").children("ul").collapse("hide")):(b.find("li.active").has("ul").children("ul").addClass("collapse in"),b.find("li").not(".active").has("ul").children("ul").addClass("collapse")),f.settings.doubleTapToGo&&b.find("li.active").has("ul").children("a").addClass("doubleTapToGo"),b.find("li").has("ul").children("a").on("click."+e,function(b){return b.preventDefault(),f.settings.doubleTapToGo&&f.doubleTapToGo(a(this))&&"#"!==a(this).attr("href")&&""!==a(this).attr("href")?(b.stopPropagation(),void(c.location=a(this).attr("href"))):(a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"),void(d&&a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide")))})},isIE:function(){for(var a,b=3,d=c.createElement("div"),e=d.getElementsByTagName("i");d.innerHTML="",e[0];)return b>4?b:a},doubleTapToGo:function(a){var b=this.element;return a.hasClass("doubleTapToGo")?(a.removeClass("doubleTapToGo"),!0):a.parent().children("ul").length?(b.find(".doubleTapToGo").removeClass("doubleTapToGo"),a.addClass("doubleTapToGo"),!1):void 0},remove:function(){this.element.off("."+e),this.element.removeData(e)}},a.fn[e]=function(b){return this.each(function(){var c=a(this);c.data(e)&&c.data(e).remove(),c.data(e,new d(this,b))}),this}}(jQuery,window,document); \ No newline at end of file +! function(a, b, c) { + function d(b, c) { this.element = a(b), this.settings = a.extend({}, f, c), this._defaults = f, this._name = e, this.init() } + function clickMenuBtnIfXs() {return $( "button.navbar-toggle" ).css("display") !=="none" ? $( "button.navbar-toggle" ).trigger( "click" ) : void 0} + var e = "metisMenu", + f = { toggle: !0, doubleTapToGo: !1 }; + d.prototype = { + init: function() { + var b = this.element, + d = this.settings.toggle, + f = this; + this.isIE() <= 9 ? (b.find("li.active").has("ul").children("ul").collapse("show"), b.find("li").not(".active").has("ul").children("ul").collapse("hide")) : (b.find("li.active").has("ul").children("ul").addClass("collapse in"), b.find("li").not(".active").has("ul").children("ul").addClass("collapse")), f.settings.doubleTapToGo && b.find("li.active").has("ul").children("a").addClass("doubleTapToGo"), + b.find("li").has("ul").children("a").on("click." + e, function(b) {return b.preventDefault(), f.settings.doubleTapToGo && f.doubleTapToGo(a(this)) && "#" !== a(this).attr("href") && "" !== a(this).attr("href") ? (b.stopPropagation(), void(c.location = a(this).attr("href"))) : (a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"), void(d && a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide"))) }), + b.find("li").not(":has(ul)").children("a").on("click." + e, function(b) {clickMenuBtnIfXs(), + void(a(this).parent("li").siblings().removeClass("active").parent("ul.in").collapse("hide"), + a(this).parent("li").siblings().children("ul").collapse("hide")), (a(this).parent("li").toggleClass("active")) + }) + + }, + isIE: function() { for (var a, b = 3, d = c.createElement("div"), e = d.getElementsByTagName("i"); d.innerHTML = "", e[0];) return b > 4 ? b : a }, + doubleTapToGo: function(a) { var b = this.element; return a.hasClass("doubleTapToGo") ? (a.removeClass("doubleTapToGo"), !0) : a.parent().children("ul").length ? (b.find(".doubleTapToGo").removeClass("doubleTapToGo"), a.addClass("doubleTapToGo"), !1) : void 0 }, + remove: function() { this.element.off("." + e), this.element.removeData(e) } + }, a.fn[e] = function(b) { + return this.each(function() { + var c = a(this); + c.data(e) && c.data(e).remove(), c.data(e, new d(this, b)) + }), this + } +}(jQuery, window, document); \ No newline at end of file diff --git a/static/css/sb-admin-2.css b/static/css/sb-admin-2.css index 377ff9c..5c06bf9 100755 --- a/static/css/sb-admin-2.css +++ b/static/css/sb-admin-2.css @@ -13,15 +13,9 @@ body { padding: 0 15px; min-height: 568px; background-color: white; + margin-top: 50px; } -@media (min-width: 768px) { - #page-wrapper { - position: inherit; - margin: 0 0 0 250px; - padding: 0 30px; - border-left: 1px solid #e7e7e7; - } -} + .flex-panel{ display: flow-root; } diff --git a/static/css/sb-admin-2.min.css b/static/css/sb-admin-2.min.css index a1d01f4..10399a1 100755 --- a/static/css/sb-admin-2.min.css +++ b/static/css/sb-admin-2.min.css @@ -2,4 +2,4 @@ * Start Bootstrap - SB Admin 2 v3.3.7+1 (http://startbootstrap.com/template-overviews/sb-admin-2) * Copyright 2013-2016 Start Bootstrap * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE) - */body{background-color:#f8f8f8}#wrapper{width:100%}#page-wrapper{padding:0 15px;min-height:568px;background-color:white}@media(min-width:768px){#page-wrapper{position:inherit;margin:0 0 0 250px;padding:0 30px;border-left:1px solid #e7e7e7}}.flex-panel{display:flow-root}.navbar-top-links{margin-right:0}.navbar-top-links li{display:inline-block}.navbar-top-links li:last-child{margin-right:15px}.navbar-top-links li a{padding:15px;min-height:50px}.navbar-top-links .dropdown-menu li{display:block}.navbar-top-links .dropdown-menu li:last-child{margin-right:0}.navbar-top-links .dropdown-menu li a{padding:3px 20px;min-height:0}.navbar-top-links .dropdown-menu li a div{white-space:normal}.navbar-top-links .dropdown-messages,.navbar-top-links .dropdown-tasks,.navbar-top-links .dropdown-alerts{width:310px;min-width:0}.navbar-top-links .dropdown-messages{margin-left:5px}.navbar-top-links .dropdown-tasks{margin-left:-59px}.navbar-top-links .dropdown-alerts{margin-left:-123px}.navbar-top-links .dropdown-user{right:0;left:auto}.sidebar .sidebar-nav.navbar-collapse{padding-left:0;padding-right:0}.sidebar .sidebar-search{padding:15px}.sidebar ul li{border-bottom:1px solid #e7e7e7}.sidebar ul li a.active{background-color:#eee}.sidebar .arrow{float:right}.sidebar .fa.arrow:before{content:"\f104"}.sidebar .active>a>.fa.arrow:before{content:"\f107"}.sidebar .nav-second-level li,.sidebar .nav-third-level li{border-bottom:none!important}.sidebar .nav-second-level li a{padding-left:37px}.sidebar .nav-third-level li a{padding-left:52px}@media(min-width:768px){.sidebar{z-index:1;position:absolute;width:250px;margin-top:51px}.navbar-top-links .dropdown-messages,.navbar-top-links .dropdown-tasks,.navbar-top-links .dropdown-alerts{margin-left:auto}}.btn-outline{color:inherit;background-color:transparent;transition:all .5s}.btn-primary.btn-outline{color:#428bca}.btn-success.btn-outline{color:#5cb85c}.btn-info.btn-outline{color:#5bc0de}.btn-warning.btn-outline{color:#f0ad4e}.btn-danger.btn-outline{color:#d9534f}.btn-primary.btn-outline:hover,.btn-success.btn-outline:hover,.btn-info.btn-outline:hover,.btn-warning.btn-outline:hover,.btn-danger.btn-outline:hover{color:white}.chat{margin:0;padding:0;list-style:none}.chat li{margin-bottom:10px;padding-bottom:5px;border-bottom:1px dotted #999}.chat li.left .chat-body{margin-left:60px}.chat li.right .chat-body{margin-right:60px}.chat li .chat-body p{margin:0}.panel .slidedown .glyphicon,.chat .glyphicon{margin-right:5px}.chat-panel .panel-body{height:350px;overflow-y:scroll}.login-panel{margin-top:25%}.flot-chart{display:block;height:400px}.flot-chart-content{width:100%;height:100%}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background:transparent}table.dataTable thead .sorting_asc:after{content:"\f0de";float:right;font-family:fontawesome}table.dataTable thead .sorting_desc:after{content:"\f0dd";float:right;font-family:fontawesome}table.dataTable thead .sorting:after{content:"\f0dc";float:right;font-family:fontawesome;color:rgba(50,50,50,0.5)}.btn-circle{width:30px;height:30px;padding:6px 0;border-radius:15px;text-align:center;font-size:12px;line-height:1.428571429}.btn-circle.btn-lg{width:50px;height:50px;padding:10px 16px;border-radius:25px;font-size:18px;line-height:1.33}.btn-circle.btn-xl{width:70px;height:70px;padding:10px 16px;border-radius:35px;font-size:24px;line-height:1.33}.show-grid [class^="col-"]{padding-top:10px;padding-bottom:10px;border:1px solid #ddd;background-color:#eee!important}.show-grid{margin:15px 0}.huge{font-size:40px}.panel-green{border-color:#5cb85c}.panel-green>.panel-heading{border-color:#5cb85c;color:white;background-color:#5cb85c}.panel-green>a{color:#5cb85c}.panel-green>a:hover{color:#3d8b3d}.panel-red{border-color:#d9534f}.panel-red>.panel-heading{border-color:#d9534f;color:white;background-color:#d9534f}.panel-red>a{color:#d9534f}.panel-red>a:hover{color:#b52b27}.panel-yellow{border-color:#f0ad4e}.panel-yellow>.panel-heading{border-color:#f0ad4e;color:white;background-color:#f0ad4e}.panel-yellow>a{color:#f0ad4e}.panel-yellow>a:hover{color:#df8a13}.timeline{position:relative;padding:20px 0 20px;list-style:none}.timeline:before{content:" ";position:absolute;top:0;bottom:0;left:50%;width:3px;margin-left:-1.5px;background-color:#eee}.timeline>li{position:relative;margin-bottom:20px}.timeline>li:before,.timeline>li:after{content:" ";display:table}.timeline>li:after{clear:both}.timeline>li:before,.timeline>li:after{content:" ";display:table}.timeline>li:after{clear:both}.timeline>li>.timeline-panel{float:left;position:relative;width:46%;padding:20px;border:1px solid #d4d4d4;border-radius:2px;-webkit-box-shadow:0 1px 6px rgba(0,0,0,0.175);box-shadow:0 1px 6px rgba(0,0,0,0.175)}.timeline>li>.timeline-panel:before{content:" ";display:inline-block;position:absolute;top:26px;right:-15px;border-top:15px solid transparent;border-right:0 solid #ccc;border-bottom:15px solid transparent;border-left:15px solid #ccc}.timeline>li>.timeline-panel:after{content:" ";display:inline-block;position:absolute;top:27px;right:-14px;border-top:14px solid transparent;border-right:0 solid #fff;border-bottom:14px solid transparent;border-left:14px solid #fff}.timeline>li>.timeline-badge{z-index:100;position:absolute;top:16px;left:50%;width:50px;height:50px;margin-left:-25px;border-radius:50% 50% 50% 50%;text-align:center;font-size:1.4em;line-height:50px;color:#fff;background-color:#999}.timeline>li.timeline-inverted>.timeline-panel{float:right}.timeline>li.timeline-inverted>.timeline-panel:before{right:auto;left:-15px;border-right-width:15px;border-left-width:0}.timeline>li.timeline-inverted>.timeline-panel:after{right:auto;left:-14px;border-right-width:14px;border-left-width:0}.timeline-badge.primary{background-color:#2e6da4!important}.timeline-badge.success{background-color:#3f903f!important}.timeline-badge.warning{background-color:#f0ad4e!important}.timeline-badge.danger{background-color:#d9534f!important}.timeline-badge.info{background-color:#5bc0de!important}.timeline-title{margin-top:0;color:inherit}.timeline-body>p,.timeline-body>ul{margin-bottom:0}.timeline-body>p+p{margin-top:5px}@media(max-width:767px){ul.timeline:before{left:40px}ul.timeline>li>.timeline-panel{width:calc(10%);width:-moz-calc(10%);width:-webkit-calc(10%)}ul.timeline>li>.timeline-badge{top:16px;left:15px;margin-left:0}ul.timeline>li>.timeline-panel{float:right}ul.timeline>li>.timeline-panel:before{right:auto;left:-15px;border-right-width:15px;border-left-width:0}ul.timeline>li>.timeline-panel:after{right:auto;left:-14px;border-right-width:14px;border-left-width:0}} \ No newline at end of file + */body{background-color:#f8f8f8}#wrapper{width:100%}#page-wrapper{padding:0 15px;min-height:568px;background-color:white;margin-top:50px}.flex-panel{display:flow-root}.navbar-top-links{margin-right:0}.navbar-top-links li{display:inline-block}.navbar-top-links li:last-child{margin-right:15px}.navbar-top-links li a{padding:15px;min-height:50px}.navbar-top-links .dropdown-menu li{display:block}.navbar-top-links .dropdown-menu li:last-child{margin-right:0}.navbar-top-links .dropdown-menu li a{padding:3px 20px;min-height:0}.navbar-top-links .dropdown-menu li a div{white-space:normal}.navbar-top-links .dropdown-messages,.navbar-top-links .dropdown-tasks,.navbar-top-links .dropdown-alerts{width:310px;min-width:0}.navbar-top-links .dropdown-messages{margin-left:5px}.navbar-top-links .dropdown-tasks{margin-left:-59px}.navbar-top-links .dropdown-alerts{margin-left:-123px}.navbar-top-links .dropdown-user{right:0;left:auto}.sidebar .sidebar-nav.navbar-collapse{padding-left:0;padding-right:0}.sidebar .sidebar-search{padding:15px}.sidebar ul li{border-bottom:1px solid #e7e7e7}.sidebar ul li a.active{background-color:#eee}.sidebar .arrow{float:right}.sidebar .fa.arrow:before{content:"\f104"}.sidebar .active>a>.fa.arrow:before{content:"\f107"}.sidebar .nav-second-level li,.sidebar .nav-third-level li{border-bottom:none!important}.sidebar .nav-second-level li a{padding-left:37px}.sidebar .nav-third-level li a{padding-left:52px}@media(min-width:768px){.sidebar{z-index:1;position:absolute;width:250px;margin-top:51px}.navbar-top-links .dropdown-messages,.navbar-top-links .dropdown-tasks,.navbar-top-links .dropdown-alerts{margin-left:auto}}.btn-outline{color:inherit;background-color:transparent;transition:all .5s}.btn-primary.btn-outline{color:#428bca}.btn-success.btn-outline{color:#5cb85c}.btn-info.btn-outline{color:#5bc0de}.btn-warning.btn-outline{color:#f0ad4e}.btn-danger.btn-outline{color:#d9534f}.btn-primary.btn-outline:hover,.btn-success.btn-outline:hover,.btn-info.btn-outline:hover,.btn-warning.btn-outline:hover,.btn-danger.btn-outline:hover{color:white}.chat{margin:0;padding:0;list-style:none}.chat li{margin-bottom:10px;padding-bottom:5px;border-bottom:1px dotted #999}.chat li.left .chat-body{margin-left:60px}.chat li.right .chat-body{margin-right:60px}.chat li .chat-body p{margin:0}.panel .slidedown .glyphicon,.chat .glyphicon{margin-right:5px}.chat-panel .panel-body{height:350px;overflow-y:scroll}.login-panel{margin-top:25%}.flot-chart{display:block;height:400px}.flot-chart-content{width:100%;height:100%}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background:transparent}table.dataTable thead .sorting_asc:after{content:"\f0de";float:right;font-family:fontawesome}table.dataTable thead .sorting_desc:after{content:"\f0dd";float:right;font-family:fontawesome}table.dataTable thead .sorting:after{content:"\f0dc";float:right;font-family:fontawesome;color:rgba(50,50,50,0.5)}.btn-circle{width:30px;height:30px;padding:6px 0;border-radius:15px;text-align:center;font-size:12px;line-height:1.428571429}.btn-circle.btn-lg{width:50px;height:50px;padding:10px 16px;border-radius:25px;font-size:18px;line-height:1.33}.btn-circle.btn-xl{width:70px;height:70px;padding:10px 16px;border-radius:35px;font-size:24px;line-height:1.33}.show-grid [class^="col-"]{padding-top:10px;padding-bottom:10px;border:1px solid #ddd;background-color:#eee!important}.show-grid{margin:15px 0}.huge{font-size:40px}.panel-green{border-color:#5cb85c}.panel-green>.panel-heading{border-color:#5cb85c;color:white;background-color:#5cb85c}.panel-green>a{color:#5cb85c}.panel-green>a:hover{color:#3d8b3d}.panel-red{border-color:#d9534f}.panel-red>.panel-heading{border-color:#d9534f;color:white;background-color:#d9534f}.panel-red>a{color:#d9534f}.panel-red>a:hover{color:#b52b27}.panel-yellow{border-color:#f0ad4e}.panel-yellow>.panel-heading{border-color:#f0ad4e;color:white;background-color:#f0ad4e}.panel-yellow>a{color:#f0ad4e}.panel-yellow>a:hover{color:#df8a13}.timeline{position:relative;padding:20px 0 20px;list-style:none}.timeline:before{content:" ";position:absolute;top:0;bottom:0;left:50%;width:3px;margin-left:-1.5px;background-color:#eee}.timeline>li{position:relative;margin-bottom:20px}.timeline>li:before,.timeline>li:after{content:" ";display:table}.timeline>li:after{clear:both}.timeline>li:before,.timeline>li:after{content:" ";display:table}.timeline>li:after{clear:both}.timeline>li>.timeline-panel{float:left;position:relative;width:46%;padding:20px;border:1px solid #d4d4d4;border-radius:2px;-webkit-box-shadow:0 1px 6px rgba(0,0,0,0.175);box-shadow:0 1px 6px rgba(0,0,0,0.175)}.timeline>li>.timeline-panel:before{content:" ";display:inline-block;position:absolute;top:26px;right:-15px;border-top:15px solid transparent;border-right:0 solid #ccc;border-bottom:15px solid transparent;border-left:15px solid #ccc}.timeline>li>.timeline-panel:after{content:" ";display:inline-block;position:absolute;top:27px;right:-14px;border-top:14px solid transparent;border-right:0 solid #fff;border-bottom:14px solid transparent;border-left:14px solid #fff}.timeline>li>.timeline-badge{z-index:100;position:absolute;top:16px;left:50%;width:50px;height:50px;margin-left:-25px;border-radius:50% 50% 50% 50%;text-align:center;font-size:1.4em;line-height:50px;color:#fff;background-color:#999}.timeline>li.timeline-inverted>.timeline-panel{float:right}.timeline>li.timeline-inverted>.timeline-panel:before{right:auto;left:-15px;border-right-width:15px;border-left-width:0}.timeline>li.timeline-inverted>.timeline-panel:after{right:auto;left:-14px;border-right-width:14px;border-left-width:0}.timeline-badge.primary{background-color:#2e6da4!important}.timeline-badge.success{background-color:#3f903f!important}.timeline-badge.warning{background-color:#f0ad4e!important}.timeline-badge.danger{background-color:#d9534f!important}.timeline-badge.info{background-color:#5bc0de!important}.timeline-title{margin-top:0;color:inherit}.timeline-body>p,.timeline-body>ul{margin-bottom:0}.timeline-body>p+p{margin-top:5px}@media(max-width:767px){ul.timeline:before{left:40px}ul.timeline>li>.timeline-panel{width:calc(10%);width:-moz-calc(10%);width:-webkit-calc(10%)}ul.timeline>li>.timeline-badge{top:16px;left:15px;margin-left:0}ul.timeline>li>.timeline-panel{float:right}ul.timeline>li>.timeline-panel:before{right:auto;left:-15px;border-right-width:15px;border-left-width:0}ul.timeline>li>.timeline-panel:after{right:auto;left:-14px;border-right-width:14px;border-left-width:0}} \ No newline at end of file diff --git a/templates/internal/admin.html b/templates/internal/admin.html index 351d16b..fc5a421 100755 --- a/templates/internal/admin.html +++ b/templates/internal/admin.html @@ -1,235 +1,22 @@
- From fc387ce59de9b55cfb2990c8634f08a2498c0f57 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 2 Nov 2018 15:05:21 +0500 Subject: [PATCH 39/91] fixed dublicates of metisMenu.min.js --- src/db.erl | 6 ++++++ static/css/metisMenu.min.js | 36 ------------------------------------ static/js/metisMenu.min.js | 29 ++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 37 deletions(-) delete mode 100755 static/css/metisMenu.min.js diff --git a/src/db.erl b/src/db.erl index 6638b4c..1492cdf 100644 --- a/src/db.erl +++ b/src/db.erl @@ -405,6 +405,12 @@ update("1.0.5"=VSN) -> % update classes for admin elements mnesia:delete_object(MFA), mnesia:write(New_mfa) end, L2) + end, + case mnesia:match_object(#cms_asset{id=["js","metisMenu"], + file="css/metisMenu.min.js", _='_'}) of + [] -> ok; + [I] when length([I]) == 1 -> + full_delete(I) end end), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); diff --git a/static/css/metisMenu.min.js b/static/css/metisMenu.min.js deleted file mode 100755 index 2183382..0000000 --- a/static/css/metisMenu.min.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * metismenu - v1.1.3 - * Easy menu jQuery plugin for Twitter Bootstrap 3 - * https://github.com/onokumus/metisMenu - * - * Made by Osman Nuri Okumus - * Under MIT License - */ -! function(a, b, c) { - function d(b, c) { this.element = a(b), this.settings = a.extend({}, f, c), this._defaults = f, this._name = e, this.init() } - function clickMenuBtnIfXs() {return $( "button.navbar-toggle" ).css("display") !=="none" ? $( "button.navbar-toggle" ).trigger( "click" ) : void 0} - var e = "metisMenu", - f = { toggle: !0, doubleTapToGo: !1 }; - d.prototype = { - init: function() { - var b = this.element, - d = this.settings.toggle, - f = this; - this.isIE() <= 9 ? (b.find("li.active").has("ul").children("ul").collapse("show"), b.find("li").not(".active").has("ul").children("ul").collapse("hide")) : (b.find("li.active").has("ul").children("ul").addClass("collapse in"), b.find("li").not(".active").has("ul").children("ul").addClass("collapse")), f.settings.doubleTapToGo && b.find("li.active").has("ul").children("a").addClass("doubleTapToGo"), - b.find("li").has("ul").children("a").on("click." + e, function(b) {return b.preventDefault(), f.settings.doubleTapToGo && f.doubleTapToGo(a(this)) && "#" !== a(this).attr("href") && "" !== a(this).attr("href") ? (b.stopPropagation(), void(c.location = a(this).attr("href"))) : (a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"), void(d && a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide"))) }), - b.find("li").not(":has(ul)").children("a").on("click." + e, function(b) {clickMenuBtnIfXs(), - void(a(this).parent("li").siblings().removeClass("active").parent("ul.in").collapse("hide"), - a(this).parent("li").siblings().children("ul").collapse("hide")), (a(this).parent("li").toggleClass("active")) - }) - - }, - isIE: function() { for (var a, b = 3, d = c.createElement("div"), e = d.getElementsByTagName("i"); d.innerHTML = "", e[0];) return b > 4 ? b : a }, - doubleTapToGo: function(a) { var b = this.element; return a.hasClass("doubleTapToGo") ? (a.removeClass("doubleTapToGo"), !0) : a.parent().children("ul").length ? (b.find(".doubleTapToGo").removeClass("doubleTapToGo"), a.addClass("doubleTapToGo"), !1) : void 0 }, - remove: function() { this.element.off("." + e), this.element.removeData(e) } - }, a.fn[e] = function(b) { - return this.each(function() { - var c = a(this); - c.data(e) && c.data(e).remove(), c.data(e, new d(this, b)) - }), this - } -}(jQuery, window, document); \ No newline at end of file diff --git a/static/js/metisMenu.min.js b/static/js/metisMenu.min.js index 8a590e7..2183382 100755 --- a/static/js/metisMenu.min.js +++ b/static/js/metisMenu.min.js @@ -6,4 +6,31 @@ * Made by Osman Nuri Okumus * Under MIT License */ -!function(a,b,c){function d(b,c){this.element=a(b),this.settings=a.extend({},f,c),this._defaults=f,this._name=e,this.init()}var e="metisMenu",f={toggle:!0,doubleTapToGo:!1};d.prototype={init:function(){var b=this.element,d=this.settings.toggle,f=this;this.isIE()<=9?(b.find("li.active").has("ul").children("ul").collapse("show"),b.find("li").not(".active").has("ul").children("ul").collapse("hide")):(b.find("li.active").has("ul").children("ul").addClass("collapse in"),b.find("li").not(".active").has("ul").children("ul").addClass("collapse")),f.settings.doubleTapToGo&&b.find("li.active").has("ul").children("a").addClass("doubleTapToGo"),b.find("li").has("ul").children("a").on("click."+e,function(b){return b.preventDefault(),f.settings.doubleTapToGo&&f.doubleTapToGo(a(this))&&"#"!==a(this).attr("href")&&""!==a(this).attr("href")?(b.stopPropagation(),void(c.location=a(this).attr("href"))):(a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"),void(d&&a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide")))})},isIE:function(){for(var a,b=3,d=c.createElement("div"),e=d.getElementsByTagName("i");d.innerHTML="",e[0];)return b>4?b:a},doubleTapToGo:function(a){var b=this.element;return a.hasClass("doubleTapToGo")?(a.removeClass("doubleTapToGo"),!0):a.parent().children("ul").length?(b.find(".doubleTapToGo").removeClass("doubleTapToGo"),a.addClass("doubleTapToGo"),!1):void 0},remove:function(){this.element.off("."+e),this.element.removeData(e)}},a.fn[e]=function(b){return this.each(function(){var c=a(this);c.data(e)&&c.data(e).remove(),c.data(e,new d(this,b))}),this}}(jQuery,window,document); \ No newline at end of file +! function(a, b, c) { + function d(b, c) { this.element = a(b), this.settings = a.extend({}, f, c), this._defaults = f, this._name = e, this.init() } + function clickMenuBtnIfXs() {return $( "button.navbar-toggle" ).css("display") !=="none" ? $( "button.navbar-toggle" ).trigger( "click" ) : void 0} + var e = "metisMenu", + f = { toggle: !0, doubleTapToGo: !1 }; + d.prototype = { + init: function() { + var b = this.element, + d = this.settings.toggle, + f = this; + this.isIE() <= 9 ? (b.find("li.active").has("ul").children("ul").collapse("show"), b.find("li").not(".active").has("ul").children("ul").collapse("hide")) : (b.find("li.active").has("ul").children("ul").addClass("collapse in"), b.find("li").not(".active").has("ul").children("ul").addClass("collapse")), f.settings.doubleTapToGo && b.find("li.active").has("ul").children("a").addClass("doubleTapToGo"), + b.find("li").has("ul").children("a").on("click." + e, function(b) {return b.preventDefault(), f.settings.doubleTapToGo && f.doubleTapToGo(a(this)) && "#" !== a(this).attr("href") && "" !== a(this).attr("href") ? (b.stopPropagation(), void(c.location = a(this).attr("href"))) : (a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"), void(d && a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide"))) }), + b.find("li").not(":has(ul)").children("a").on("click." + e, function(b) {clickMenuBtnIfXs(), + void(a(this).parent("li").siblings().removeClass("active").parent("ul.in").collapse("hide"), + a(this).parent("li").siblings().children("ul").collapse("hide")), (a(this).parent("li").toggleClass("active")) + }) + + }, + isIE: function() { for (var a, b = 3, d = c.createElement("div"), e = d.getElementsByTagName("i"); d.innerHTML = "", e[0];) return b > 4 ? b : a }, + doubleTapToGo: function(a) { var b = this.element; return a.hasClass("doubleTapToGo") ? (a.removeClass("doubleTapToGo"), !0) : a.parent().children("ul").length ? (b.find(".doubleTapToGo").removeClass("doubleTapToGo"), a.addClass("doubleTapToGo"), !1) : void 0 }, + remove: function() { this.element.off("." + e), this.element.removeData(e) } + }, a.fn[e] = function(b) { + return this.each(function() { + var c = a(this); + c.data(e) && c.data(e).remove(), c.data(e, new d(this, b)) + }), this + } +}(jQuery, window, document); \ No newline at end of file From 7f9241fd21c819baff344e44556b9e1dc0420f25 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 2 Nov 2018 15:38:02 +0500 Subject: [PATCH 40/91] hotfix --- src/cms_modules/admin.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 6de9e80..4a4c134 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -144,11 +144,11 @@ add_navbar_button(PID, MenuBlock, ItemBlock, {Icon, Text}, {menu, SubMenuBlock}) #cms_mfa{id={PID, ItemBlock}, mfa={html5, link_url, - [ItemLinkBlock, "", [{toggle,"dropdown"}]]}}, + [ItemLinkBlock, ""]}}, #cms_mfa{id={PID, ItemBlock}, mfa={bootstrap, nav_items, - [SubMenuBlock, ["dropdown-menu"]]}} + [SubMenuBlock, ["nav-second-level", "collapse","dropdown-menu"]]}} ], LinkMFAs = [ #cms_mfa{ From 50bfd6b8ba848aadbaca9186621ed944834665e1 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 6 Nov 2018 11:12:21 +0500 Subject: [PATCH 41/91] added google tags to Analytics --- src/collections/analytics.erl | 16 ++++++++++++++-- src/db.erl | 4 ++++ src/nitrogen.app.src | 2 +- templates/analytics/google_tags.html | 6 ++++++ 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 templates/analytics/google_tags.html diff --git a/src/collections/analytics.erl b/src/collections/analytics.erl index 8292803..f0ff892 100644 --- a/src/collections/analytics.erl +++ b/src/collections/analytics.erl @@ -26,7 +26,12 @@ default_data() -> % {{{2 file="templates/analytics/ya_analytics.html", bindings=[], description="Yandex Analytics", - name="templates/analytics/ya_analytics.html"} + name="templates/analytics/ya_analytics.html"}, + #cms_template{ + file="templates/analytics/google_tags.html", + bindings=[], + description="Google tags", + name="templates/analytics/google_tags.html"} ]}. %% CMS Module interface {{{1 @@ -34,7 +39,8 @@ functions() -> % {{{2 [ {metric_ga, "Google"}, {metric_ya, "Yandex"}, - {metric_hs, "Hubspot"} + {metric_hs, "Hubspot"}, + {metric_gtags, "Google tags"} ]. format_block(F, A) -> % {{{2 @@ -67,3 +73,9 @@ metric_ga(Page, AnalyticsId) -> % {{{2 "templates/analytics/ga_analytics.html", [ {'AnalyticsId', AnalyticsId} ] ). + +metric_gtags(Page, AnalyticsId) -> % {{{2 + common:template(Page, + "templates/analytics/google_tags.html", + [ {'AnalyticsId', AnalyticsId} ] + ). \ No newline at end of file diff --git a/src/db.erl b/src/db.erl index 1492cdf..7fa49f2 100644 --- a/src/db.erl +++ b/src/db.erl @@ -414,6 +414,10 @@ update("1.0.5"=VSN) -> % update classes for admin elements end end), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); +update("1.0.6"=VSN) -> % added google tags element + TemplatePath="templates/analytics/google_tags.html", + admin:add_template(TemplatePath, "Google tags", TemplatePath, []), + mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("fix_sort") -> % {{{1 F = fun() -> FoldFun = diff --git a/src/nitrogen.app.src b/src/nitrogen.app.src index d44304a..d40a561 100644 --- a/src/nitrogen.app.src +++ b/src/nitrogen.app.src @@ -1,7 +1,7 @@ {application, nitrogen, [ {description, "My Nitrogen Web Project"}, - {vsn, "1.0.5"}, + {vsn, "1.0.6"}, {registered, []}, {applications, [kernel, stdlib]}, {mod, { nitrogen_app, []}}, diff --git a/templates/analytics/google_tags.html b/templates/analytics/google_tags.html new file mode 100644 index 0000000..4e17feb --- /dev/null +++ b/templates/analytics/google_tags.html @@ -0,0 +1,6 @@ + + + \ No newline at end of file From 32c3c1ae3fa750c3c085a9a7e047f94b993fa960 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 7 Nov 2018 22:51:42 +0500 Subject: [PATCH 42/91] fixed db defragmentation --- src/db.erl | 96 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 32 deletions(-) diff --git a/src/db.erl b/src/db.erl index 7fa49f2..5193434 100644 --- a/src/db.erl +++ b/src/db.erl @@ -50,6 +50,7 @@ update([]) -> % {{{1 update(VSN) end; update("0.1.0"=VSN) -> % {{{1 + ?CREATE_TABLE(cms_settings, set, []), transaction(fun() -> A = mnesia:match_object(#cms_mfa{mfa={index, maybe_redirect_to_login, '_'}, _ = '_'}), B = mnesia:match_object(#cms_mfa{mfa={index, maybe_change_module, '_'}, _ = '_'}), @@ -66,12 +67,14 @@ update("0.1.0"=VSN) -> % {{{1 end, record_info(fields, cms_user)), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("0.1.1"=VSN) -> % {{{1 + ?CREATE_TABLE(cms_settings, set, []), mnesia:backup("mnesia.lcms"), mnesia:delete_table(cms_user), ?CREATE_TABLE(cms_user, set, []), mnesia:restore("mnesia.lcms", []), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("0.1.2"=VSN) -> % {{{1 + ?CREATE_TABLE(cms_settings, set, []), CT = calendar:universal_time(), mnesia:transform_table(cms_mfa, fun({cms_mfa, Id,Sort,M,S}) -> #cms_mfa{ @@ -558,36 +561,65 @@ get_all_blocks(PID) -> % {{{1 sets:to_list(sets:from_list(Blocks)). get_parent_block(PID, BID, DeleteBlock) -> % {{{1 %% @doc "Return parent BlockId if it exists; unactive block without parent" - transaction(fun() -> - P1=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_']}, active=true, _='_'}), - P2=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_']}, active=true, _='_'}), - P3=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_']}, active=true, _='_'}), - P4=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_','_']}, active=true, _='_'}), - P5=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_','_','_']}, active=true, _='_'}), - AB=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={html5,article,['_',BID,'_','_','_']}, active=true, _='_'}), - AF=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={html5,article,['_','_',BID,'_','_']}, active=true, _='_'}), - PB=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_',BID,'_','_','_','_','_','_','_','_']}, active=true, _='_'}), - PH=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,[BID,'_','_','_','_','_','_','_','_','_']}, active=true, _='_'}), - PA=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_','_',BID,'_','_','_','_','_','_','_']}, active=true, _='_'}), - PF=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_','_','_',BID,'_','_','_','_','_','_']}, active=true, _='_'}), - P1_5=lists:append([P1,P2,P3,P4,P5]), - Arts=lists:append(AF,AB), - Panels=lists:append([PB,PA,PH,PF]), - P=lists:append([P1_5,Arts,Panels]), - case P of - L when is_list(L), length(L) > 1 -> - length(L); - [I] -> - {_, ParentID}=I#cms_mfa.id, - ParentID; - - _ -> case DeleteBlock of - undefined -> undefined; - _Some -> delete(DeleteBlock) - end + transaction(fun() -> + P1=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_']}, active=true, _='_'}), + P = + case P1 of + [] -> + P2=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_']}, active=true, _='_'}), + case P2 of + [] -> P3=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_']}, active=true, _='_'}), + case P3 of + [] -> P4=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_','_']}, active=true, _='_'}), + case P4 of + [] -> P5=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_','_','_','_','_']}, active=true, _='_'}), + case P5 of + [] -> AB=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={html5,article,['_',BID,'_','_','_']}, active=true, _='_'}), + case AB of + [] -> AF=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={html5,article,['_','_',BID,'_','_']}, active=true, _='_'}), + case AF of + [] -> PB=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_',BID,'_','_','_','_','_','_','_','_']}, active=true, _='_'}), + case PB of + [] -> PH=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,[BID,'_','_','_','_','_','_','_','_','_']}, active=true, _='_'}), + case PH of + [] -> PA=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_','_',BID,'_','_','_','_','_','_','_']}, active=true, _='_'}), + case PA of + [] -> _PF=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={bootstrap,panel,['_','_','_',BID,'_','_','_','_','_','_']}, active=true, _='_'}); + _ -> PA + end; + _ -> PH + end; + _ -> PB + end; + _ -> AF + end; + _ -> AB + end; + _ -> P5 + end; + _ -> P4 + end; + _ -> P3 + end; + _ -> P2 + end; + _ -> P1 + end, + + case P of + L when is_list(L), length(L) > 1 -> + length(L); + [I] -> + {_, ParentID}=I#cms_mfa.id, + ParentID; + + _ -> case DeleteBlock of + undefined -> undefined; + _Some -> delete(DeleteBlock) + end - end - end). + end + end). get_users() -> % {{{1 transaction(fun() -> @@ -779,9 +811,9 @@ maybe_update(#cms_mfa{id={PID, Block}, sort=Sort}=B) -> % {{{1 delete(#{}=Map) -> % {{{1 delete(Map, fun fields/1); -delete(#cms_page{id=PID}=Record) -> % {{{1 +delete(#cms_page{id=PID}=Record) -> transaction(fun() -> - case mnesia:match_object(#cms_mfa{id={PID, '_'}, _='_'}) of + case mnesia:match_object(#cms_mfa{id={PID, _Block='_'}, _='_'}) of [] -> ok; L when is_list(L) -> @@ -1075,7 +1107,7 @@ remove_blocks_without_parent() -> % {{{1 %% @doc "Unactive all blocks if its havent parent" transaction( fun() -> - AllBlocks = mnesia:match_object(#cms_mfa{_ = '_'}), + AllBlocks = mnesia:match_object(#cms_mfa{_ = '_', active=true}), Exclude_blocks = [css,body,page,router,script], Exclude_pages = [admin,login,restore,register], lists:foreach(fun(#cms_mfa{id={PID,BID}}=Block) -> From a35f52a1107b1fc32529f8a799387a2c569300f9 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 7 Nov 2018 23:38:12 +0500 Subject: [PATCH 43/91] fixed page_selector for inernal navigation block --- src/collections/bootstrap.erl | 2 +- src/collections/html5.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collections/bootstrap.erl b/src/collections/bootstrap.erl index b89f66a..4efc9a9 100644 --- a/src/collections/bootstrap.erl +++ b/src/collections/bootstrap.erl @@ -79,7 +79,7 @@ form_data(col, A) -> % {{{2 form_data(panel, A) -> % {{{2 [_, HeaderBlock, Block, AddonsBlock, FooterBlock, HeaderCls, BodyCls, FooterCls, AddonCls, Classes0, DataAttr] = admin:maybe_empty(A, 11), [Classes, Context] = admin:maybe_empty(Classes0, 2), - PID = common:q(add_page_select, "index"), + PID = common:q(page_select, ""), {[ #panel{ body=[ diff --git a/src/collections/html5.erl b/src/collections/html5.erl index c100f9b..84de521 100644 --- a/src/collections/html5.erl +++ b/src/collections/html5.erl @@ -164,7 +164,7 @@ form_data(header, A) -> % {{{2 [], Block, Classes, DataAttr}; form_data(article, A) -> % {{{2 [_, HeaderBlock, Block, FooterBlock, Classes, DataAttr] = admin:maybe_empty(A, 6), - PID = common:q(add_page_select, "index"), + PID = common:q(page_select, ""), {[ #panel{ body=[ From 0beefa85a6d804a81fdbc06238be8e9d83395240 Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Fri, 9 Nov 2018 06:54:54 +0500 Subject: [PATCH 44/91] Folding markers added to db --- src/db.erl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/db.erl b/src/db.erl index 7fa49f2..153549d 100644 --- a/src/db.erl +++ b/src/db.erl @@ -317,7 +317,7 @@ update("1.0.2"=VSN) -> % {{{1 : add sitemap column for cms_page table } end, record_info(fields, cms_page)), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); -update("1.0.3"=VSN) -> % update submit button +update("1.0.3"=VSN) -> % {{{1 update submit button transaction( fun() -> ReplElements = mnesia:match_object(#cms_mfa{mfa={emailform,submit, ['_','_','_']}, _='_'}), @@ -330,7 +330,7 @@ update("1.0.3"=VSN) -> % update submit button ReplElements) end), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); -update("1.0.4"=VSN) -> +update("1.0.4"=VSN) -> % {{{1 %% update filter for Translation; create language table and fill it transaction( fun() -> @@ -375,7 +375,7 @@ update("1.0.4"=VSN) -> admin:add_language("en","flag_en.png",false), admin:add_language("any","",false), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); -update("1.0.5"=VSN) -> % update classes for admin elements +update("1.0.5"=VSN) -> % update classes for admin elements % {{{1 mnesia:transaction( fun() -> % 1) classes: nav-second-level","collapse" ++ "dropdown-menu @@ -414,7 +414,7 @@ update("1.0.5"=VSN) -> % update classes for admin elements end end), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); -update("1.0.6"=VSN) -> % added google tags element +update("1.0.6"=VSN) -> % added google tags element % {{{1 TemplatePath="templates/analytics/google_tags.html", admin:add_template(TemplatePath, "Google tags", TemplatePath, []), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); @@ -1094,4 +1094,4 @@ remove_blocks_without_parent() -> % {{{1 end, AllBlocks) end ), - wf:wire(#alert{ text="Database was defragmented!"}). \ No newline at end of file + wf:wire(#alert{ text="Database was defragmented!"}). From c87e0f7ce3b6c55d2ec35cdc419afeec791f9073 Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Wed, 14 Nov 2018 06:11:21 +0500 Subject: [PATCH 45/91] urlencode added for email in emailform apicall --- src/collections/emailform.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index c94a696..2a51972 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -233,9 +233,9 @@ event({submit, #cms_page{id=PID}=Page, Block, ToEmail, Smtp, Apicall}) -> % {{{2 end, ?LOG("Send email to ~p from ~p", [ToEmail, Email]); Url -> - UrlWithEmail = re:replace(Url,"{{email}}",Email, [{return, list}]), - UrlWithPhone = re:replace(UrlWithEmail,"{{phone}}",Phone, [{return, list}]), - UrlWithName = re:replace(UrlWithPhone,"{{name}}",wf:to_list(common:q(name, "")), [{return, list}]), + UrlWithEmail = re:replace(Url, "{{email}}", wf:url_encode(Email), [{return, list}]), + UrlWithPhone = re:replace(UrlWithEmail, "{{phone}}", Phone, [{return, list}]), + UrlWithName = re:replace(UrlWithPhone, "{{name}}", wf:to_list(common:q(name, "")), [{return, list}]), ?LOG("Apicall: ~p", [UrlWithName]), {ok, {{_Version, 200, ResultPhrase}, _Headers, _Body}} = httpc:request(get, {UrlWithName, []}, [], []), ?LOG("Result:~p",[ResultPhrase]) From 7de94871e946eda7685615ad92c173f091b16a5b Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Wed, 14 Nov 2018 06:55:18 +0500 Subject: [PATCH 46/91] Removed unnesessary form-control wrappers from emailform --- src/collections/emailform.erl | 36 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/collections/emailform.erl b/src/collections/emailform.erl index 2a51972..0040cb0 100644 --- a/src/collections/emailform.erl +++ b/src/collections/emailform.erl @@ -133,32 +133,26 @@ email_field(Page, Block, Required, Classes) -> % {{{2 _ -> ok end, - #panel{ - class="form-group", - body=#txtbx{ - id=email, - html_id=common:block_to_html_id(Block), - class=Classes, - placeholder=common:parallel_block(Page, Block)} + #txtbx{ + id=email, + html_id=common:block_to_html_id(Block), + class=Classes, + placeholder=common:parallel_block(Page, Block) }. phone_field(Page, Block, Classes) -> % {{{2 - #panel{ - class="form-group", - body=#txtbx{ - id=phone, - html_id=common:block_to_html_id(Block), - class=Classes, - placeholder=common:parallel_block(Page, Block)}}. + #txtbx{ + id=phone, + html_id=common:block_to_html_id(Block), + class=Classes, + placeholder=common:parallel_block(Page, Block)}. body_field(Page, Block, Classes) -> % {{{2 - #panel{ - class="form-group", - body=#txtarea{ - id=text, - html_id=common:block_to_html_id(Block), - class=Classes, - placeholder=common:parallel_block(Page, Block)}}. + #txtarea{ + id=text, + html_id=common:block_to_html_id(Block), + class=Classes, + placeholder=common:parallel_block(Page, Block)}. rating(_Page, Block, Min, Max, Step, Size, ShowCaption, ShowClear, _Classes) -> % {{{2 #textbox{id=common:block_to_html_id(Block), From a39a3f6af88d2c451146229eb497dc354dab6e6e Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 14 Nov 2018 10:23:06 +0500 Subject: [PATCH 47/91] fix close_modal --- src/cms_modules/admin.erl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 4a4c134..517be88 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -1205,7 +1205,6 @@ event({?MODULE, page, construct}) -> % {{{2 wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}); event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 - coldstrap:close_modal(), Pages = get_pages(), Blocks = [format_block(B#cms_mfa{id={PID, BID}}) || #cms_mfa{id={_, BID}}=B <- db:get_mfa(PID, Block)], From f2baa1d46d8507dd83b3ef6d1050bd4e9bcabea8 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 14 Nov 2018 11:18:24 +0500 Subject: [PATCH 48/91] admin: moved area title to top left; navbar-menu set right --- src/cms_modules/admin.erl | 70 ++++++++++------------------------- static/css/admin.css | 10 +++-- templates/internal/admin.html | 4 +- 3 files changed, 29 insertions(+), 55 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 517be88..1dcac6c 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -289,10 +289,6 @@ update_container(Header, ButtonText, ButtonPostBack, Body) -> % {{{2 wf:update(container, [ #bs_row{ body=[ - #bs_col{ - cols=[{lg, 10}, {md, 9},{sm, 9}], - body=#h2{text=Header} - }, #bs_col{ cols=[{lg, 2}, {md, 3},{sm, 3}], body=#button{ @@ -309,7 +305,8 @@ update_container(Header, ButtonText, ButtonPostBack, Body) -> % {{{2 cols={lg, 12}, body=Body } - }]). + }]), + wf:update(title, #panel{text=Header}). render_save_button({SavePostback, Delegate}) when is_tuple(SavePostback), % {{{2 is_atom(Delegate) -> @@ -920,10 +917,6 @@ event({?MODULE, asset, show, Type}) -> % {{{2 wf:update(container, [ #bs_row{ body=[ - #bs_col{ - cols=[{lg, 8},{md, 6}, {sm, 6}], - body=#h2{text=wf:f("Static Assets: ~s", [Type])} - }, #bs_col{ cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ @@ -950,7 +943,8 @@ event({?MODULE, asset, show, Type}) -> % {{{2 cols={lg, 12}, body=CRUD } - }]); + }]), + wf:update(title, #panel{text="Static Assets"}); event({?MODULE, template, new}) -> % {{{2 new_modal("Upload Template", {?MODULE, template, save}, @@ -997,10 +991,6 @@ event({?MODULE, template, show}) -> % {{{2 wf:update(container, [ #bs_row{ body=[ - #bs_col{ - cols=[{lg, 8},{md, 6}, {sm, 6}], - body=#h2{text="Templates"} - }, #bs_col{ cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ @@ -1027,7 +1017,8 @@ event({?MODULE, template, show}) -> % {{{2 cols={lg, 12}, body=CRUD } - }]); + }]), + wf:update(title, #panel{text="Templates"}); event({?MODULE, forms, show}) -> % {{{2 CRUD = #crud{ pagination_class=["btn", "btn-default"], @@ -1051,17 +1042,12 @@ event({?MODULE, forms, show}) -> % {{{2 } }, wf:update(container, [#bs_row{ - body=#bs_col{ - cols=[{lg, 8},{md, 6}, {sm, 6}], - body=#h2{text="Forms"} - } - }, - #bs_row{ body=#bs_col{ cols={lg, 12}, body=CRUD } - }]); + }]), + wf:update(title, #panel{text="Forms"}); event({?MODULE, languages, show}) -> % {{{2 AssetsDup = db:get_assets(image), GetName = fun(Id)-> @@ -1090,12 +1076,7 @@ event({?MODULE, languages, show}) -> % {{{2 }, wf:update(container, [ #bs_row{ - body=[ - #bs_col{ - cols=[{lg, 10},{md, 9}, {sm, 9}], - body=#h2{text="All languages"} - }, - #bs_col{ + body=[#bs_col{ cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Add language", @@ -1111,7 +1092,8 @@ event({?MODULE, languages, show}) -> % {{{2 cols={lg, 12}, body=CRUD } - }]); + }]), + wf:update(title, #panel{text="All languages"}); event({?MODULE, page, show}) -> % {{{2 CRUD = #crud{ pagination_class=["btn", "btn-default"], @@ -1137,12 +1119,7 @@ event({?MODULE, page, show}) -> % {{{2 }, wf:update(container, [ #bs_row{ - body=[ - #bs_col{ - cols=[{lg, 10},{md, 9}, {sm, 9}], - body=#h2{text="All Pages"} - }, - #bs_col{ + body=[#bs_col{ cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Add Page", @@ -1158,7 +1135,8 @@ event({?MODULE, page, show}) -> % {{{2 cols={lg, 12}, body=CRUD } - }]); + }]), + wf:update(title, #panel{text="All Pages"}); event({?MODULE, page, new}) -> % {{{2 new_modal("Create Page", {?MODULE, page, save}, @@ -1525,12 +1503,7 @@ event({?MODULE, user, show}) -> % {{{2 }, wf:update(container, [ #bs_row{ - body=[ - #bs_col{ - cols=[{lg, 10},{md, 9}, {sm, 9}], - body=#h2{text="Users"} - }, - #bs_col{ + body=[#bs_col{ cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Create User", @@ -1546,7 +1519,8 @@ event({?MODULE, user, show}) -> % {{{2 cols={lg, 12}, body=CRUD } - }]); + }]), + wf:update(title, #panel{text="Users"}); event({?MODULE, user, new}) -> % {{{2 Page = wf:state(page), new_modal("Create User", @@ -1586,12 +1560,7 @@ event({?MODULE, role, show}) -> % {{{2 }, wf:update(container, [ #bs_row{ - body=[ - #bs_col{ - cols=[{lg, 10},{md, 9}, {sm, 9}], - body=#h2{text="Roles"} - }, - #bs_col{ + body=[#bs_col{ cols=[{lg, 2},{md, 3}, {sm, 3}], body=#button{ text="Create Role", @@ -1607,7 +1576,8 @@ event({?MODULE, role, show}) -> % {{{2 cols={lg, 12}, body=CRUD } - }]); + }]), + wf:update(title, #panel{text="Roles"}); event({?MODULE, role, new}) -> % {{{2 new_modal("Create Role", {?MODULE, role, save}, diff --git a/static/css/admin.css b/static/css/admin.css index f73169e..680f1b3 100644 --- a/static/css/admin.css +++ b/static/css/admin.css @@ -89,7 +89,7 @@ top: 8px; } ul#sidebar-nav { - margin-right: 40px; + margin-right: 45px; display: inline-block; } @@ -97,8 +97,12 @@ ul#sidebar-nav { ul#sidebar-nav > li > a { padding: 15px 7px; } - ul#sidebar-nav > li > a > i { - display: none; + ul#sidebar-nav > li > a > i:last-child { + font-size: 10px; + /*display: none;*/ + } + .navbar-header{ + max-width: 190px; } } diff --git a/templates/internal/admin.html b/templates/internal/admin.html index fc5a421..b80a861 100755 --- a/templates/internal/admin.html +++ b/templates/internal/admin.html @@ -3,7 +3,7 @@ From 17d9238f7c430a40278a49bb5b58d595598aa2f9 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 14 Nov 2018 12:51:31 +0500 Subject: [PATCH 49/91] added sort edit to block --- src/cms_modules/admin.erl | 30 ++++++++++++++++++++++++------ static/css/admin.css | 2 +- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 1dcac6c..c5ab50f 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -1336,17 +1336,17 @@ event({?MODULE, block, add}) -> % {{{2 Block = common:q(block_select, "body"), B = #cms_mfa{ id={PID, Block}, - mfa={common, template, ["templates/internal/login.html"]}, + mfa={common, text, []}, sort=new}, event({?MODULE, block, edit, B}); event({?MODULE, block, add, Block}) -> % {{{2 PID = common:q(page_select, "index"), B = #cms_mfa{ id={PID, Block}, - mfa={common, template, ["templates/internal/login.html"]}, + mfa={common, text, []}, sort=new}, event({?MODULE, block, edit, B}); -event({?MODULE, block, edit, #cms_mfa{id={PID, Block}, mfa={M, F, A}}=B}) -> % {{{2 +event({?MODULE, block, edit, #cms_mfa{id={PID, Block}, mfa={M, F, A}, sort=S}=B}) -> % {{{2 Pages = get_pages(), [#{id := _P} | _] = Pages, [QSKey, QSVal, Role, Tr] = get_filters(B), @@ -1391,10 +1391,13 @@ event({?MODULE, block, edit, #cms_mfa{id={PID, Block}, mfa={M, F, A}}=B}) -> % { delegate=?MODULE, options=(M):functions() }, + #panel{ id=block_data, body=form_elements(M, F, [PID | A]) }, + #span{text="Sort"}, + #txtbx{id=sort, text=S}, #panel{ body=render_fields([{"Filters", [ @@ -1445,19 +1448,34 @@ event({?MODULE, block, move, Old}) -> % {{{2 event({?MODULE, block, copy, Old}) -> % {{{2 event({?MODULE, block, save, Old#cms_mfa{sort=new}}); event({?MODULE, block, save, #cms_mfa{id={PID, Block}, sort=S}=OldMFA}) -> % {{{2 + NewSort= + try + list_to_integer(wf:q(sort)) + catch error:badarg -> + S + end, mnesia:transaction( %% remove dublicating sort fun() -> - case mnesia:match_object(#cms_mfa{id={PID, Block}, sort=S, _='_'}) of + case mnesia:select(cms_mfa, + [{#cms_mfa{id={PID, Block}, active=true, sort=$1, _='_'}, + [ + {'or', {'==', '$1', S}, {'==', '$1', NewSort}} + ], + []} + ] + ) of L when is_list(L), length(L) > 0 -> [ mnesia:delete_object(Mfa) || Mfa<-L]; _ -> undefined end end), + + MFA=OldMFA#cms_mfa{sort=NewSort}, Saved= common:maybe_list(db:save( maybe_fix_sort( apply_element_transform( - rec_from_qs(OldMFA)), - OldMFA))), + rec_from_qs(MFA)), + MFA))), % [#cms_mfa{id={PID, Block}}]=Saved, case PID of diff --git a/static/css/admin.css b/static/css/admin.css index 680f1b3..45a96d3 100644 --- a/static/css/admin.css +++ b/static/css/admin.css @@ -36,7 +36,7 @@ #wysiwyg_editor { padding: 5px; - margin: 15px; + /*margin: 15px;*/ border-radius: 5px; overflow-y: auto; height: 300px; From 26a4946d023444ee5e2c55c9ac8722f10f398764 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 14 Nov 2018 21:44:31 +0500 Subject: [PATCH 50/91] moved db managing buttons to Page menu --- src/cms_modules/admin.erl | 52 +++------------------------------------ src/db.erl | 32 ++++++++++++++++++++++++ src/nitrogen.app.src | 2 +- 3 files changed, 37 insertions(+), 49 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index c5ab50f..9be364b 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -1222,7 +1222,8 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 #span{text=" / "}, #dropdown{ id=block_select, - options=lists:keysort(1, [{N, N} || N <- AllBlocks, not common:is_private_block(N) or ShowAll, (N /= "router") or (PID == "*")]), + options=lists:keysort(1, [{N, N} || N <- AllBlocks, + not common:is_private_block(N) or ShowAll, (N /= "router") or (PID == "*")]), value=Block, delegate=?MODULE, postback={?MODULE, page, construct} @@ -1239,53 +1240,8 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 text=" Parent: " }, ParentBody] - }, - #panel{ - class="right_manage_panel pull-right", - body=[ - #btn{ - body="", - title="Clear trash", - % text="", - class=["pull-right "], - style="margin-left: 5px;", - % type=warning, - actions=?POSTBACK({?MODULE, db, clean}, ?MODULE) - }, - #btn{ - body="", - class=["pull-right"], - title="Defragmentation db", - style="margin-left: 5px;", - % type=warning, - actions=?POSTBACK({?MODULE, db, defragment}, ?MODULE) - }, - #btn{ - text=" Export Pages", - class=["pull-right"], - body="", - style="margin-left: 5px;", - type=success, - actions=?POSTBACK({?MODULE, pages, export}, ?MODULE) - }, - #btn{ - body="", - text=" Merge Pages", - class=["pull-right"], - style="margin-left: 5px;", - type=info, - actions=?POSTBACK({?MODULE, pages, merge}, ?MODULE) - }, - #btn{ - text=" Import Pages", - class=["pull-right"], - body="", - type=warning, - actions=?POSTBACK({?MODULE, pages, import}, ?MODULE) - } - ] - } - ], + } + ], Sort = #sortblock{ tag={PID, Block}, class="panel-body", %"page-block-sort", diff --git a/src/db.erl b/src/db.erl index 6896fc6..da9aecb 100644 --- a/src/db.erl +++ b/src/db.erl @@ -421,6 +421,38 @@ update("1.0.6"=VSN) -> % added google tags element % {{{1 TemplatePath="templates/analytics/google_tags.html", admin:add_template(TemplatePath, "Google tags", TemplatePath, []), mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); +update("1.0.7"=VSN) -> % buttons managing db to Pages menu % {{{1 + ManageDbBtns = #{ + cms_mfa => [ + admin:add_navbar_button("admin", "pages-menu", "pages-import", + {{"fa", "upload", []}, "Import Pages"}, {event, ?POSTBACK({admin, pages, import}, admin)}), + admin:add_navbar_button("admin", "pages-menu", "pages-export", + {{"fa", "download", []}, "Export Pages"}, {event, ?POSTBACK({admin, pages, export}, admin)}), + admin:add_navbar_button("admin", "pages-menu", "pages-merge", + {{"fa", "code-fork", []}, "Merge Pages"}, {event, ?POSTBACK({admin, pages, merge}, admin)}), + admin:add_navbar_button("admin", "pages-menu", "db-defragment", + {{"fa", "th-large", []}, "Defragment db"}, {event, ?POSTBACK({admin, db, defragment}, admin)}), + admin:add_navbar_button("admin", "pages-menu", "db-clean", + {{"fa", "trash", []}, "Clear db trash"}, {event, ?POSTBACK({admin, db, clean}, admin)}) + ]}, + mnesia:transaction( + fun() -> + [maps:map( + fun(_K, V) -> + lists:foreach( + fun(#cms_mfa{}=R) -> + mnesia:write( + fix_sort( + update_timestamps(R))); + (R) -> + mnesia:write( + update_timestamps(R)) + end, + lists:flatten(V)) + end, + ManageDbBtns )] + end), + mnesia:dirty_write(#cms_settings{key=vsn, value=VSN}); update("fix_sort") -> % {{{1 F = fun() -> FoldFun = diff --git a/src/nitrogen.app.src b/src/nitrogen.app.src index d40a561..41dcaf1 100644 --- a/src/nitrogen.app.src +++ b/src/nitrogen.app.src @@ -1,7 +1,7 @@ {application, nitrogen, [ {description, "My Nitrogen Web Project"}, - {vsn, "1.0.6"}, + {vsn, "1.0.7"}, {registered, []}, {applications, [kernel, stdlib]}, {mod, { nitrogen_app, []}}, From 408e888b5b27a14268862384e6ef534b83c258d3 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 15 Nov 2018 13:38:47 +0500 Subject: [PATCH 51/91] fixed bag: showing block on pages if it unactive on * page --- src/collections/common.erl | 9 +++++---- src/db.erl | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/collections/common.erl b/src/collections/common.erl index 930203b..e914231 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -307,10 +307,11 @@ module_by_function(FunTuple) -> % {{{2 F <- M:module_info(exports), F == FunTuple]. -maybe_render_block(Page, #cms_mfa{settings=#{filters := Filters}}=MFA) -> % {{{2 - render_block(apply_filters(Filters), Page, MFA); -maybe_render_block(Page, MFA) -> % {{{2 - render_block(true, Page, MFA). +maybe_render_block(Page, #cms_mfa{active=A, settings=#{filters := Filters}}=MFA) -> % {{{2 + Check=apply_filters(Filters) and A, + render_block(Check, Page, MFA); +maybe_render_block(Page, #cms_mfa{active=A}=MFA) -> % {{{2 + render_block(A, Page, MFA). render_block(false, _, _) -> % {{{2 % ?PRINT("Dont't show"), diff --git a/src/db.erl b/src/db.erl index da9aecb..b227577 100644 --- a/src/db.erl +++ b/src/db.erl @@ -564,10 +564,11 @@ get_mfa(Page, Block) -> % {{{1 get_mfa(Page, Block, false). get_mfa(Page, Block, Replaced) -> % {{{1 Funs = transaction(fun() -> + % ?LOG("read:~p", [mnesia:match_object(#cms_mfa{id={"*", "body"},_='_'})]), G = mnesia:read(cms_mfa, {"*", Block}), T = mnesia:read(cms_mfa, {Page, Block}), - lists:filter(fun(#cms_mfa{sort=S}) -> - not lists:keymember(S, #cms_mfa.sort, T) + lists:filter(fun(#cms_mfa{sort=S, active=A}) -> + not lists:keymember(S, #cms_mfa.sort, T) and A==true end, G) ++ case Replaced of true -> From f42a53021e16840668431fe878e61ddb9ee15be8 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 15 Nov 2018 14:18:42 +0500 Subject: [PATCH 52/91] fixed db:fix_sort : change dublicating sort to max_sort --- src/db.erl | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/db.erl b/src/db.erl index b227577..19c2e3e 100644 --- a/src/db.erl +++ b/src/db.erl @@ -457,20 +457,18 @@ update("fix_sort") -> % {{{1 F = fun() -> FoldFun = fun(#cms_mfa{id=ID, sort=Sort, mfa=Mfa}, _Acc) -> - case mnesia:match_object(#cms_mfa{id=ID, sort=Sort, _='_'}) of - [] -> - ok; + case mnesia:match_object(#cms_mfa{id=ID, sort=Sort, active=true, _='_'}) of L when is_list(L), length(L) > 1 -> [ if Cur_mfa#cms_mfa.mfa /= Mfa -> - New_sort = Sort -1 + string:str(L, [Cur_mfa]), - New_mfa = update_record_field(Cur_mfa, sort, New_sort), + Max_sort=find_max_sort(ID), + New_mfa = update_record_field(Cur_mfa, sort, Max_sort+1), mnesia:delete_object(Cur_mfa), mnesia:write(New_mfa); true -> ok - end - || Cur_mfa <- L, Cur_mfa#cms_mfa.sort == Sort, Cur_mfa#cms_mfa.id == ID]; - _Else -> ok + end + || Cur_mfa <- L]; % , Cur_mfa#cms_mfa.sort == Sort, Cur_mfa#cms_mfa.id == ID + _ -> ok end, ok end, @@ -564,7 +562,6 @@ get_mfa(Page, Block) -> % {{{1 get_mfa(Page, Block, false). get_mfa(Page, Block, Replaced) -> % {{{1 Funs = transaction(fun() -> - % ?LOG("read:~p", [mnesia:match_object(#cms_mfa{id={"*", "body"},_='_'})]), G = mnesia:read(cms_mfa, {"*", Block}), T = mnesia:read(cms_mfa, {Page, Block}), lists:filter(fun(#cms_mfa{sort=S, active=A}) -> @@ -1160,3 +1157,13 @@ remove_blocks_without_parent() -> % {{{1 end ), wf:wire(#alert{ text="Database was defragmented!"}). + +find_max_sort({PID,Block}) -> % {{{1 +%% @doc "return max sort among choosen mfa id" + transaction( + fun() -> + Blocks=mnesia:match_object(#cms_mfa{id={PID,Block},active=true, _='_'}), + Sorts=[S || #cms_mfa{sort=S} <-Blocks], + _Max_sort = lists:max(Sorts) + end + ). \ No newline at end of file From f1454a310ce712c21fd3e2086a513728482dbee5 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 15 Nov 2018 19:45:22 +0500 Subject: [PATCH 53/91] change children parent_name if parent_id rename --- src/cms_modules/admin.erl | 16 ++++++++-------- src/db.erl | 32 +++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 9be364b..61219a6 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -1427,13 +1427,13 @@ event({?MODULE, block, save, #cms_mfa{id={PID, Block}, sort=S}=OldMFA}) -> % {{{ end), MFA=OldMFA#cms_mfa{sort=NewSort}, - Saved= common:maybe_list(db:save( - maybe_fix_sort( - apply_element_transform( - rec_from_qs(MFA)), - MFA))), - - % [#cms_mfa{id={PID, Block}}]=Saved, + Saved=db:save(maybe_fix_sort( + apply_element_transform( + rec_from_qs(MFA)), + MFA)), + NewMFABlock = common:q(block, undefined), + OldMFABlock = db:extract_mfa_block_name(OldMFA), + db:update_children(PID, NewMFABlock, OldMFABlock), case PID of "*" -> Pages=db:get_indexed_pages(), @@ -1656,7 +1656,7 @@ collections() -> % {{{2 Modules = common:module_by_function({functions, 0}), lists:map(fun(M) -> {M, M:description()} end, Modules). -update_block_on_page([#cms_mfa{id={_,Block},mfa=MFA,sort=S}]) -> % {{{2 +update_block_on_page(#cms_mfa{id={_,Block},mfa=MFA,sort=S}) -> % {{{2 PageQs=wf:qs(page), NewText=case MFA of {common, text, Text} -> Text; diff --git a/src/db.erl b/src/db.erl index 19c2e3e..319dce1 100644 --- a/src/db.erl +++ b/src/db.erl @@ -1166,4 +1166,34 @@ find_max_sort({PID,Block}) -> % {{{1 Sorts=[S || #cms_mfa{sort=S} <-Blocks], _Max_sort = lists:max(Sorts) end - ). \ No newline at end of file + ). + +update_children(PID, NewBlockId, OldBlockId) -> % {{{1 +%% @doc "update children of Block by old Block Id" + if (NewBlockId/=undefined) and (OldBlockId/=undefined) -> + transaction( + fun() -> + OldChldrenBlocks=mnesia:match_object(#cms_mfa{id={PID,OldBlockId},active=true, _='_'}), + lists:foreach( + fun(Block) -> + NewBlock=Block#cms_mfa{id={PID, NewBlockId}, + updated_at=calendar:universal_time()}, + full_delete(Block), + mnesia:write(NewBlock) + end, + OldChldrenBlocks) + end + ); + true->ok + end. + +extract_mfa_block_name(#cms_mfa{mfa={_M,F,Args}}) -> % {{{1 +%% @doc "extract block name from mfa if possible" + Exclude_functions=[text,template], + HasBlockName = is_list(Args) and (length(Args) > 0) and not lists:member(wf:to_atom(F), Exclude_functions), + case HasBlockName of + true -> + [H|_]=Args, + H; + _ -> undefined + end. \ No newline at end of file From 8c5d2bf711e495eca6394f24dab46e3f0d0ab2e6 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 16 Nov 2018 16:35:07 +0500 Subject: [PATCH 54/91] show session history of wathing blocks at Construct Page --- src/cms_modules/admin.erl | 57 ++++++++++++++++++++++++++++++++++---- src/collections/common.erl | 1 + static/css/admin.css | 13 +++++++++ 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 61219a6..380f983 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -473,7 +473,7 @@ format_subblock(#cms_mfa{ id={PID, Name}}=B) -> % {{{2 class="btn btn-link", body=common:icon("fa", "arrow-right", []), % show_if=(Sub /= undefined), - actions=?POSTBACK({?MODULE, page, construct, PID, [Name]}, ?MODULE) + actions=?POSTBACK({?MODULE, page, close_and_construct, PID, [Name]}, ?MODULE) } ]} ]}. @@ -895,6 +895,7 @@ event({?MODULE, asset, save}) -> % {{{2 coldstrap:close_modal(), wf:wire(#event{postback={?MODULE, asset, show, Type}, delegate=?MODULE}); event({?MODULE, asset, show, Type}) -> % {{{2 + wf:session(history, undefined), CRUD = #crud{ pagination_class=["btn", "btn-default"], button_class=["btn", "btn-link"], @@ -970,6 +971,7 @@ event({?MODULE, template, save}) -> % {{{2 coldstrap:close_modal(), wf:wire(#event{postback={template, show}}); event({?MODULE, template, show}) -> % {{{2 + wf:session(history, undefined), CRUD = #crud{ pagination_class=["btn", "btn-default"], button_class=["btn", "btn-link"], @@ -1020,6 +1022,7 @@ event({?MODULE, template, show}) -> % {{{2 }]), wf:update(title, #panel{text="Templates"}); event({?MODULE, forms, show}) -> % {{{2 + wf:session(history, undefined), CRUD = #crud{ pagination_class=["btn", "btn-default"], button_class=["btn", "btn-link"], @@ -1049,6 +1052,7 @@ event({?MODULE, forms, show}) -> % {{{2 }]), wf:update(title, #panel{text="Forms"}); event({?MODULE, languages, show}) -> % {{{2 + wf:session(history, undefined), AssetsDup = db:get_assets(image), GetName = fun(Id)-> string:join(lists:reverse(Id),".") @@ -1095,6 +1099,7 @@ event({?MODULE, languages, show}) -> % {{{2 }]), wf:update(title, #panel{text="All languages"}); event({?MODULE, page, show}) -> % {{{2 + wf:session(history, undefined), CRUD = #crud{ pagination_class=["btn", "btn-default"], button_class=["btn", "btn-link"], @@ -1192,7 +1197,7 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 S when is_list(S) -> #button{ text=S, - class=["btn"], + class=["btn btn-link"], actions=?POSTBACK({?MODULE, page, construct, PID, [ParentBlock]}, ?MODULE) }; undefined -> @@ -1207,6 +1212,18 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 end, ShowAll = (common:q(show_all, "false") /= "false"), + Session=case Blocks of + [] -> wf:clear_session(), + []; + _ -> + update_session_history(Block) + end, + ViewSession = [ + #button{ + text=B, + class=["btn btn-link session-btn"], + actions=?POSTBACK({?MODULE, page, construct, PID, [B]}, ?MODULE) + } || B <- Session], PageSelect = [ #panel{id=left_manage_panel, class="col-md-6", @@ -1228,7 +1245,7 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 delegate=?MODULE, postback={?MODULE, page, construct} }, - #span{text=" Show All "}, + #span{text="Show All ", class="cs-label"}, #checkbox{ text="", id=show_all, @@ -1237,9 +1254,19 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 postback={?MODULE, page, construct} }, #span{ - text=" Parent: " + text="Parent:", class="cs-label" }, - ParentBody] + ParentBody, + case ViewSession of + [] -> []; + _ -> + [#span{ + text="History:" , + class="cs-label" + }, + ViewSession] + end + ] } ], Sort = #sortblock{ @@ -1459,6 +1486,7 @@ event({?MODULE, block, remove_block, B}) -> % {{{2 wf:wire(#event{postback={?MODULE, page, construct, PID, [Block]}, delegate=?MODULE}), coldstrap:close_modal(); event({?MODULE, user, show}) -> % {{{2 + wf:session(history, undefined), CRUD = #crud{ pagination_class=["btn", "btn-default"], button_class=["btn", "btn-link"], @@ -1516,6 +1544,7 @@ event({?MODULE, user, save}) -> % {{{2 coldstrap:close_modal(), wf:wire(#event{postback={?MODULE, user, show}, delegate=?MODULE}); event({?MODULE, role, show}) -> % {{{2 + wf:session(history, undefined), CRUD = #crud{ pagination_class=["btn", "btn-default"], button_class=["btn", "btn-link"], @@ -1595,6 +1624,9 @@ event({?MODULE, db, clean}) -> % {{{2 db:remove_old_unused_blocks(); event({?MODULE, auth, call_restore_password}) -> % {{{2 account:call_restore_password(); +event({?MODULE, page, close_and_construct, PID, [Block]}) -> % {{{2 + coldstrap:close_modal(), + event({?MODULE, page, construct, PID, [Block]}); event(Ev) -> % {{{2 ?LOG("~p event ~p", [?MODULE, Ev]), "". @@ -1678,3 +1710,18 @@ admin_logout_button()-> % {{{2 postback={auth, logout}, delegate=account }. + +update_session_history(Block) -> % {{{2 +%% @doc "maybe update session history" + [LastHistory,Tail]= + case wf:session(history) of + undefined -> [[],undefined]; + BL when length(BL)>7 -> + [lists:sublist(BL,2,7), lists:last(BL)]; + SL -> [SL, lists:last(SL)] + end, + if Tail/=Block -> + wf:session(history, lists:append(LastHistory, [Block])); + true -> ok + end, + LastHistory. \ No newline at end of file diff --git a/src/collections/common.erl b/src/collections/common.erl index e914231..927c163 100644 --- a/src/collections/common.erl +++ b/src/collections/common.erl @@ -185,6 +185,7 @@ parallel_block(#cms_page{id = PID} = Page, Block) -> % {{{2 waterfall(#cms_page{id = PID} = Page, Block) -> % {{{2 Functions = db:get_mfa(PID, Block), + wf:session(history, undefined), lists:foldl(fun(#cms_mfa{mfa={M, F, Args}}, #cms_page{}=P) -> apply(M, F, [P | Args]); (#cms_mfa{mfa=Fun}, #cms_page{}=P) when is_function(Fun) -> diff --git a/static/css/admin.css b/static/css/admin.css index 45a96d3..4b06998 100644 --- a/static/css/admin.css +++ b/static/css/admin.css @@ -111,4 +111,17 @@ ul#sidebar-nav { padding-bottom: 5px; } +} + +.session-btn { + max-width: 150px; + overflow: hidden; + text-overflow: ellipsis; +} +.session-btn:hover{ + max-width:unset; + display: inline-block; +} +.cs-label{ + margin-left: 5px; } \ No newline at end of file From f797d275a27f25ebf2288b604b30d1adb5b8edb3 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 16 Nov 2018 17:09:49 +0500 Subject: [PATCH 55/91] dont show arrow-right on block if it hasnt children --- src/cms_modules/admin.erl | 4 ++-- src/db.erl | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 380f983..5451720 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -421,7 +421,7 @@ format_block(#cms_mfa{ % {{{2$ catch _:_ -> {wf:f("~p, ~p(~p)", [Name, F, A]), undefined} end, - + Children=db:get_children(PID,Sub), #sortitem{ tag={block, PID, B}, class="well", @@ -440,7 +440,7 @@ format_block(#cms_mfa{ % {{{2$ #link{ class="btn btn-link", body=common:icon("fa", "arrow-right", []), - show_if=(Sub /= undefined), + show_if=((Sub /= undefined) and (length(Children)>0)), actions=?POSTBACK({?MODULE, page, construct, PID, [Sub]}, ?MODULE) }, #link{ diff --git a/src/db.erl b/src/db.erl index 319dce1..871b224 100644 --- a/src/db.erl +++ b/src/db.erl @@ -1159,7 +1159,7 @@ remove_blocks_without_parent() -> % {{{1 wf:wire(#alert{ text="Database was defragmented!"}). find_max_sort({PID,Block}) -> % {{{1 -%% @doc "return max sort among choosen mfa id" +%% @doc "return max sort among choosen id of cms_mfa" transaction( fun() -> Blocks=mnesia:match_object(#cms_mfa{id={PID,Block},active=true, _='_'}), @@ -1196,4 +1196,14 @@ extract_mfa_block_name(#cms_mfa{mfa={_M,F,Args}}) -> % {{{1 [H|_]=Args, H; _ -> undefined + end. + +get_children(PID, Block) -> % {{{1 +%% @doc "return children list of Block" + case Block of + undefined -> []; + _ -> transaction( + fun() -> + mnesia:match_object(#cms_mfa{id={PID,Block},active=true, _='_'}) + end) end. \ No newline at end of file From 2a98f68dae87c7459a9a4dc3d1d25f4b5c5c2f1f Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 16 Nov 2018 17:55:17 +0500 Subject: [PATCH 56/91] fix clear db trash --- src/db.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/db.erl b/src/db.erl index 871b224..7badb5e 100644 --- a/src/db.erl +++ b/src/db.erl @@ -1108,7 +1108,7 @@ remove_old_unused_blocks() -> % {{{1 transaction( fun() -> Unactive = mnesia:match_object(#cms_mfa{active=false, _='_'}), - lists:foreach(fun(#cms_mfa{id=Id,mfa={M, F, A}}=MbDelete) -> + lists:foreach(fun(#cms_mfa{id=Id,mfa={_M, _F, A}}=MbDelete) -> Args = case A of [BlockId] -> [BlockId]; [BlockId, _A2] -> [BlockId, '_']; @@ -1122,10 +1122,10 @@ remove_old_unused_blocks() -> % {{{1 [BlockId, _A2, _A3, _A4, _A5, _A6, _A7, _A8, _A9, _A10] -> [BlockId, '_', '_', '_', '_', '_', '_', '_', '_', '_']; _ -> A end, - case mnesia:match_object(#cms_mfa{id=Id, active=true,mfa={M, F, Args}, _='_'}) of + case mnesia:match_object(#cms_mfa{id=Id, active=true,mfa={'_', '_', Args}, _='_'}) of [] -> undefined; - _L -> + _Item -> full_delete(MbDelete) end end, Unactive) From c7af363092559d168ab23a794548cd651e0b7b22 Mon Sep 17 00:00:00 2001 From: Shvein Anton Date: Wed, 21 Nov 2018 11:27:25 +0500 Subject: [PATCH 57/91] Fixed string:split -> string:words --- src/collections/bootstrap.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/collections/bootstrap.erl b/src/collections/bootstrap.erl index 4efc9a9..a4d1da8 100644 --- a/src/collections/bootstrap.erl +++ b/src/collections/bootstrap.erl @@ -568,7 +568,7 @@ tab_body(Page, Block, Classes, _DataAttr) -> % {{{2 languages_menu(Page, Block, ShowText, ShowFlag, Classes, DataAttr) -> % {{{2 Language = index:language(Page), [#cms_language{icon=LanguageIcon}]=db:get_language(Language), - AssetId=lists:reverse(string:split(LanguageIcon,".")), + AssetId=lists:reverse(string:words(LanguageIcon,".")), Current=#span{ text=case ShowText of on -> Language; From f30de7d90a1a7eb952581156c3a15ca9dbb38f38 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 23 Nov 2018 11:35:55 +0500 Subject: [PATCH 58/91] build html tree of mfa blocks in Construct Page --- src/cms_modules/admin.erl | 71 ++++++++++++++++++++++++++++++++++++++- src/db.erl | 71 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 138 insertions(+), 4 deletions(-) diff --git a/src/cms_modules/admin.erl b/src/cms_modules/admin.erl index 5451720..ea7fc26 100644 --- a/src/cms_modules/admin.erl +++ b/src/cms_modules/admin.erl @@ -1276,6 +1276,8 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 items=Blocks, group=blocks}, + Tree=build_html_tree_from_mfa(PID), + Body = #panel{ class=["panel", "panel-default"], body=[ @@ -1283,9 +1285,11 @@ event({?MODULE, page, construct, PID, [Block|_]}) -> % {{{2 class=["panel-heading flex-panel"], body=PageSelect }, + #panel{body=Tree}, Sort ]}, + update_container("Construct Page", "Add Block", {?MODULE, block, add}, Body); event({?MODULE, page, save}) -> % {{{2 onclick btn @@ -1724,4 +1728,69 @@ update_session_history(Block) -> % {{{2 wf:session(history, lists:append(LastHistory, [Block])); true -> ok end, - LastHistory. \ No newline at end of file + LastHistory. + + +build_html_tree_from_mfa(PID) -> % {{{2 +%% @doc "Function for building main html list from tree of cms_mfa table and calls function to deep building" + BlockWithoutParents=lists:sort(db:get_blocks_without_parent(PID)), + MbFilterBlocks=case PID of + "*" -> BlockWithoutParents; + _ -> lists:delete("router", BlockWithoutParents) + end, + ?LOG("BlockWithoutParents:~p",[MbFilterBlocks]), + lists:map( + fun(BlockId) -> + #list{body=#listitem{ + html_id=common:block_to_html_id(BlockId), + body=[#panel{text=BlockId}, + #panel{body=build_list(PID, BlockId)} + ], + class=[] + }, + class=[]} + end, MbFilterBlocks + ). + +build_list(PID, Block) -> % {{{2 +%% @doc "Recursive function for building html list from tree of cms_mfa table" + Exclude_functions=[text,template,asset,img], + case db:get_children(PID, Block, global) of + [] -> undefined; + L -> + SortedList=lists:keysort(#cms_mfa.sort, L), + lists:map( + fun(#cms_mfa{mfa={M,F,Args},sort=S}=B)-> + HasBlockName = (length(Args) > 0) and not lists:member(wf:to_atom(F), Exclude_functions), + ChildBlocks=case HasBlockName of + true -> + case F of + panel -> + [Ph,Pb,Pa,Pf|_]=Args, + [{Ph,B},{Pb,B},{Pa,B},{Pf,B}]; + article -> + [Ah,Ab,Af|_]=Args, + [{Ah,B},{Ab,B},{Af,B}]; + _ ->[H|_]=Args, + [{H,B}] + end; + _ -> [{wf:f("~s-~s-~p",[M,F,S]),B}] + end, + % ?LOG("ChildBlock ~p",[ChildBlock]), + Items=lists:map( + fun({ChildBlock,PBlock})-> + #listitem{ + html_id=common:block_to_html_id(ChildBlock), + body=[#link{text=ChildBlock, actions=?POSTBACK({?MODULE, block, edit, PBlock}, ?MODULE)}, + #panel{body=build_list(PID, ChildBlock)} + ], + class=[] + } + end, ChildBlocks + ), + #list{body=Items, + class=[]} + end, SortedList + ) + end. + diff --git a/src/db.erl b/src/db.erl index 7badb5e..f2b153f 100644 --- a/src/db.erl +++ b/src/db.erl @@ -589,7 +589,7 @@ get_all_blocks(PID) -> % {{{1 ) end), sets:to_list(sets:from_list(Blocks)). -get_parent_block(PID, BID, DeleteBlock) -> % {{{1 +get_parent_block(PID, BID, ActionOrBlock) -> % {{{1 %% @doc "Return parent BlockId if it exists; unactive block without parent" transaction(fun() -> P1=mnesia:match_object(#cms_mfa{id={PID,'_'},mfa={'_','_',[BID,'_']}, active=true, _='_'}), @@ -643,9 +643,10 @@ get_parent_block(PID, BID, DeleteBlock) -> % {{{1 {_, ParentID}=I#cms_mfa.id, ParentID; - _ -> case DeleteBlock of + _ -> case ActionOrBlock of undefined -> undefined; - _Some -> delete(DeleteBlock) + return_if_none -> {none, BID}; + _Some -> delete(ActionOrBlock) end end @@ -1158,6 +1159,51 @@ remove_blocks_without_parent() -> % {{{1 ), wf:wire(#alert{ text="Database was defragmented!"}). +get_blocks_without_parent(PID) -> % {{{1 +%% @doc "Return list of block names which havent parent" + AllBlocks = transaction( + fun() -> + PageBlocks=mnesia:match_object( + #cms_mfa{id={PID,'_'}, + active=true, + _='_'} + ), + case PID of + "*" -> PageBlocks; + _-> + GlobalBlocks=mnesia:match_object( + #cms_mfa{id={"*",'_'}, + active=true, + _='_'} + ), + + FGb=lists:filter( + fun(#cms_mfa{id={_,Bid}, sort=S}) -> + case mnesia:match_object(#cms_mfa{id={PID,Bid},sort=S,active=true,_='_'}) of + [] -> true; + _ -> ?LOG(" Replaced block: {\"*\",~p},sort=~p on Page:~p", [Bid,S,PID]), + false + end + end, GlobalBlocks), + FGb ++ PageBlocks + end + end + ), + ListBlocks=lists:filtermap( + fun(#cms_mfa{id={PID2,BID}}) -> + case get_parent_block(PID2,BID,return_if_none) of + {none, BID} -> {true,BID}; + _->false + end + end, AllBlocks), + ListWithBody= + case lists:member("body",[ListBlocks]) of + true -> ListBlocks; + false -> lists:append(["body"],ListBlocks) + end, + Set = sets:from_list(ListWithBody), + sets:to_list(Set). + find_max_sort({PID,Block}) -> % {{{1 %% @doc "return max sort among choosen id of cms_mfa" transaction( @@ -1206,4 +1252,23 @@ get_children(PID, Block) -> % {{{1 fun() -> mnesia:match_object(#cms_mfa{id={PID,Block},active=true, _='_'}) end) + end. + +get_children(PID, Block, global) -> % {{{1 +%% @doc "return children list of Block of choosed Page or Global" + case Block of + undefined -> []; + _ -> transaction( + fun() -> + PB=mnesia:match_object(#cms_mfa{id={PID,Block},active=true, _='_'}), + GB=mnesia:match_object(#cms_mfa{id={"*",Block},active=true, _='_'}), + FGb=lists:filter( + fun(#cms_mfa{id={_,Bid}, sort=S}) -> + case mnesia:match_object(#cms_mfa{id={PID,Bid},sort=S,active=true,_='_'}) of + [] -> true; + _ -> false + end + end, GB), + FGb ++ PB + end) end. \ No newline at end of file From 1a2f46ffa4b373dbfebe84b89c1fc9ae5a0e8a9e Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 23 Nov 2018 13:02:25 +0500 Subject: [PATCH 59/91] updated jquery: from v1.12.0 to v.3.3.1 --- static/js/jquery.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) mode change 100755 => 100644 static/js/jquery.js diff --git a/static/js/jquery.js b/static/js/jquery.js old mode 100755 new mode 100644 index 71b96ed..4d9b3a2 --- a/static/js/jquery.js +++ b/static/js/jquery.js @@ -1,5 +1,2 @@ -/*! jQuery v1.12.0 | (c) jQuery Foundation | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1; -return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="
a",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:l.htmlSerialize?[0,"",""]:[1,"X
","
"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?""!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("