From c7f81699a45a93b56332637020aec03795e33f10 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 20 Dec 2014 02:11:51 +0100 Subject: [PATCH] * avatar, username, city from Google profile * refactoring --- ITContentProvider/ITContentProvider.csproj | 1 + Makefile | 2 +- NpgsqlBlogProvider/NpgsqlBlogProvider.csproj | 1 + .../NpgsqlMembershipProvider.cs | 11 +- SalesCatalog/SalesCatalog.csproj | 6 +- WebControls/WebControls.csproj | 5 +- WorkFlowProvider/NpgsqlWorkflow.csproj | 3 +- plugins/fortune/MyClass.cs | 57 ++++--- plugins/fortune/fortune.csproj | 2 + web/Controllers/AccountController.cs | 30 +++- web/Controllers/BasketController.cs | 8 +- web/Controllers/BlogsController.cs | 20 ++- web/Controllers/FrontOfficeApiController.cs | 14 +- web/Controllers/FrontOfficeController.cs | 21 ++- web/Controllers/GoogleController.cs | 156 ++++++++++++++---- web/Controllers/ModuleController.cs | 27 +++ web/Controllers/WorkFlowController.cs | 15 +- web/Global.asax.cs | 4 +- web/Models/App.master | 4 + web/{js => Scripts}/jquery.metadata.js | 0 web/{js => Scripts}/jquery.tablesorter.js | 0 web/{js => Scripts}/jquery.tablesorter.min.js | 0 .../rangyinputs-jquery-1.1.2.js | 0 web/Settings/ModuleConfigurationElement.cs | 50 ++++++ .../ModuleConfigurationElementCollection.cs | 47 ++++++ web/Settings/ModulesConfigurationSection.cs | 33 ++++ web/Thanks/ThanksConfigurationCollection.cs | 22 --- web/Thanks/ThanksConfigurationElement.cs | 48 ------ web/Thanks/ThanksConfigurationSection.cs | 39 ----- web/Thanks/ThanksHelper.cs | 43 ----- web/Views/Account/Index.aspx | 2 +- web/Views/Account/Login.aspx | 2 +- web/Views/Account/OpenIDLogOn.aspx | 10 -- web/Views/Account/Profile.aspx | 16 +- web/Views/Account/Unregister.aspx | 11 ++ web/Views/Blogs/Post.aspx | 4 +- web/Views/FrontOffice/Estimate.aspx | 8 +- web/Web.config | 18 +- web/Web.csproj | 40 +++-- web/images/sign-in-with-google.png | Bin 0 -> 4311 bytes web/instdbws.sql | 20 ++- web/js/jquery-latest.js | 4 - web/uninstdb.sql | 6 - yavscModel/Google/AuthToken.cs | 64 +++++++ yavscModel/Google/People.cs | 70 ++++++++ yavscModel/Google/SignIn.cs | 35 ++++ yavscModel/IModule.cs | 19 +-- yavscModel/LocalizedText.Designer.cs | 6 + yavscModel/LocalizedText.fr.resx | 1 + yavscModel/LocalizedText.resx | 1 + yavscModel/RolesAndMemebers/Profile.cs | 9 + .../RolesAndMemebers/RegisterViewModel.cs | 1 - yavscModel/WorkFlow/WorkFlowManager.cs | 33 ++-- yavscModel/YavscModel.csproj | 7 +- yavscclient/YavscClient.csproj | 1 - 55 files changed, 706 insertions(+), 351 deletions(-) create mode 100644 web/Controllers/ModuleController.cs rename web/{js => Scripts}/jquery.metadata.js (100%) rename web/{js => Scripts}/jquery.tablesorter.js (100%) rename web/{js => Scripts}/jquery.tablesorter.min.js (100%) rename web/{js => Scripts}/rangyinputs-jquery-1.1.2.js (100%) create mode 100644 web/Settings/ModuleConfigurationElement.cs create mode 100644 web/Settings/ModuleConfigurationElementCollection.cs create mode 100644 web/Settings/ModulesConfigurationSection.cs delete mode 100644 web/Thanks/ThanksConfigurationCollection.cs delete mode 100644 web/Thanks/ThanksConfigurationElement.cs delete mode 100644 web/Thanks/ThanksConfigurationSection.cs delete mode 100644 web/Thanks/ThanksHelper.cs delete mode 100644 web/Views/Account/OpenIDLogOn.aspx create mode 100644 web/Views/Account/Unregister.aspx create mode 100644 web/images/sign-in-with-google.png delete mode 100644 web/js/jquery-latest.js delete mode 100644 web/uninstdb.sql create mode 100644 yavscModel/Google/AuthToken.cs create mode 100644 yavscModel/Google/People.cs create mode 100644 yavscModel/Google/SignIn.cs diff --git a/ITContentProvider/ITContentProvider.csproj b/ITContentProvider/ITContentProvider.csproj index 7375fca4..57cbb8a9 100644 --- a/ITContentProvider/ITContentProvider.csproj +++ b/ITContentProvider/ITContentProvider.csproj @@ -9,6 +9,7 @@ Library ITContentProvider ITContentProvider + v4.5 true diff --git a/Makefile b/Makefile index 734d5f0a..ca040be3 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ clean: rm -rf $(DESTDIR) rsync-preprod: deploy - rsync -ravu build/web/$(CONFIG)/ root@lavieille.localdomain:/srv/httpd/luapre + rsync -ravu build/web/$(CONFIG)/ root@lua.localdomain:/srv/httpd/luapre rsync-local: rsync -ravu build/web/$(CONFIG)/ root@localhost:/srv/www/yavsc diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj index 6992eeee..71270ca4 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj @@ -9,6 +9,7 @@ Library Npgsql.Web.Blog NpgsqlBlogProvider + v4.5 true diff --git a/NpgsqlMRPProviders/NpgsqlMembershipProvider.cs b/NpgsqlMRPProviders/NpgsqlMembershipProvider.cs index d3601fed..4cc00c12 100644 --- a/NpgsqlMRPProviders/NpgsqlMembershipProvider.cs +++ b/NpgsqlMRPProviders/NpgsqlMembershipProvider.cs @@ -1172,10 +1172,13 @@ namespace Npgsql.Web { MembershipUserCollection users = new MembershipUserCollection (); using (NpgsqlConnection conn = new NpgsqlConnection (connectionString)) { + conn.Open (); using (NpgsqlCommand cmd = new NpgsqlCommand ("SELECT count(*) " + " FROM Users " + - " WHERE Email LIKE @EmailSearch AND ApplicationName = @ApplicationName ", conn)) { - totalRecords = (int)cmd.ExecuteScalar (); + " WHERE Email LIKE @EmailSearch AND ApplicationName = @appname ", conn)) { + cmd.Parameters.Add ("@EmailSearch", emailToMatch); + cmd.Parameters.Add ("@appname", this.ApplicationName); + totalRecords = (int)(long)cmd.ExecuteScalar (); } using (NpgsqlCommand cmd = new NpgsqlCommand ("SELECT PKID, Username, Email, PasswordQuestion," + @@ -1186,7 +1189,6 @@ namespace Npgsql.Web " ORDER BY Username Asc", conn)) { cmd.Parameters.Add ("@EmailSearch", NpgsqlDbType.Varchar, 255).Value = emailToMatch; cmd.Parameters.Add ("@ApplicationName", NpgsqlDbType.Varchar, 255).Value = ApplicationName; - conn.Open (); using (NpgsqlDataReader reader = cmd.ExecuteReader ()) { int counter = 0; int startIndex = pageSize * pageIndex; @@ -1204,8 +1206,9 @@ namespace Npgsql.Web } reader.Close (); } - conn.Close (); + } + conn.Close (); } return users; } diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj index ed2eb8bd..a2e9aaa8 100644 --- a/SalesCatalog/SalesCatalog.csproj +++ b/SalesCatalog/SalesCatalog.csproj @@ -9,6 +9,7 @@ Library SalesCatalog SalesCatalog + v4.5 true @@ -31,12 +32,9 @@ - - nunit - - + diff --git a/WebControls/WebControls.csproj b/WebControls/WebControls.csproj index 80ea0d58..ae57a4b9 100644 --- a/WebControls/WebControls.csproj +++ b/WebControls/WebControls.csproj @@ -9,6 +9,7 @@ Library WebControls Yavsc.WebControls + v4.5 true @@ -30,12 +31,12 @@ - - + + diff --git a/WorkFlowProvider/NpgsqlWorkflow.csproj b/WorkFlowProvider/NpgsqlWorkflow.csproj index c8f6968e..b81f8814 100644 --- a/WorkFlowProvider/NpgsqlWorkflow.csproj +++ b/WorkFlowProvider/NpgsqlWorkflow.csproj @@ -9,6 +9,7 @@ Library WorkFlowProvider WorkFlowProvider + v4.5 true @@ -33,7 +34,7 @@ - + diff --git a/plugins/fortune/MyClass.cs b/plugins/fortune/MyClass.cs index 61064ad0..19e85300 100644 --- a/plugins/fortune/MyClass.cs +++ b/plugins/fortune/MyClass.cs @@ -1,9 +1,18 @@ using System; using Yavsc.Model; using System.Configuration; +using System.Text; +using System.Web.Mvc; +using System.Collections.Generic; namespace fortune { + public class Entry { + public string Message{ get; set; } + public string Author{ get; set; } + public string Body{ get; set; } + } + public class MyClass : IModule { public MyClass () @@ -11,45 +20,47 @@ namespace fortune } #region IModule implementation - + string tblname = "fortune"; public void Install (System.Data.IDbConnection cnx) { - throw new NotImplementedException (); + using (var cmd = cnx.CreateCommand()) + { + StringBuilder strb = new StringBuilder (string.Format("create table {0} ",tblname)); + strb.Append ( "( author character varying (1024) not null, \n"); + strb.Append ( "body character varying (65536) not null," + + "CONSTRAINT uniqueid PRIMARY KEY (uniqueid)," + + "uniqueid bigserial NOT NULL ) WITH (\n OIDS=FALSE\n);" + +string.Format("CREATE INDEX fki_cst{0}ref\n ON wrtags\n USING btree\n (tagid);", + tblname)); + cmd.CommandText = strb.ToString (); + cmd.ExecuteNonQuery (); + } } public void Uninstall (System.Data.IDbConnection cnx, bool removeConfig) { - throw new NotImplementedException (); + using (var cmd = cnx.CreateCommand ()) { + cmd.CommandText = string.Format ("drop table {0};", tblname); + cmd.ExecuteNonQuery (); + } } - public ConfigurationSection DefaultConfig (string appName, string cnxStr) - { - throw new NotImplementedException (); - } public void Initialize (string name, System.Collections.Specialized.NameValueCollection config) { - throw new NotImplementedException (); + } - - public bool Active { - get { - throw new NotImplementedException (); - } - set { - throw new NotImplementedException (); - } + /* + public class Discovery { + IServiceProvider[] Provider; + ISettingsProviderService[] SettingsBase; } - public string ApplicationName { - get { - throw new NotImplementedException (); - } - set { - throw new NotImplementedException (); - } + public Discovery GetServices() { + throw new NotImplementedException (); } + */ #endregion } } diff --git a/plugins/fortune/fortune.csproj b/plugins/fortune/fortune.csproj index f46171b0..bcfb1a6e 100644 --- a/plugins/fortune/fortune.csproj +++ b/plugins/fortune/fortune.csproj @@ -9,6 +9,7 @@ Library fortune fortune + v4.5 true @@ -32,6 +33,7 @@ + diff --git a/web/Controllers/AccountController.cs b/web/Controllers/AccountController.cs index c54c62b3..46618769 100644 --- a/web/Controllers/AccountController.cs +++ b/web/Controllers/AccountController.cs @@ -21,7 +21,13 @@ namespace Yavsc.Controllers WebConfigurationManager.AppSettings ["RegistrationMessage"]; string avatarDir = "~/avatars"; - + /// + /// Gets or sets the avatar dir. + /// This value is past to Server.MapPath, + /// it should start with ~/, and we assume it + /// to be relative to the application path. + /// + /// The avatar dir. public string AvatarDir { get { return avatarDir; } set { avatarDir = value; } @@ -159,6 +165,17 @@ namespace Yavsc.Controllers return View(); } + [Authorize] + public ActionResult Unregister(bool confirmed=false) + { + if (!confirmed) + return View (); + + Membership.DeleteUser ( + Membership.GetUser ().UserName); + return RedirectToAction ("Index","Home"); + } + [Authorize] [HttpPost] public ActionResult ChangePassword (ChangePasswordModel model) @@ -173,6 +190,7 @@ namespace Yavsc.Controllers if (users.Count > 0) { MembershipUser user = Membership.GetUser (model.Username,true); + changePasswordSucceeded = user.ChangePassword (model.OldPassword, model.NewPassword); } else { changePasswordSucceeded = false; @@ -213,13 +231,15 @@ namespace Yavsc.Controllers if (AvatarFile != null) { if (AvatarFile.ContentType == "image/png") { - // byte[] img = new byte[AvatarFile.ContentLength]; - // AvatarFile.InputStream.Read (img, 0, AvatarFile.ContentLength); - // model.Avatar = img; - string avdir=Server.MapPath (AvatarDir); string avpath=Path.Combine(avdir,username+".png"); AvatarFile.SaveAs (avpath); + string avuri = avpath.Substring( + AppDomain.CurrentDomain.BaseDirectory.Length); + avuri = avuri.Replace (" ", "+"); + avuri = Request.Url.Scheme + "://" + Request.Url.Authority + "/" + avuri; + HttpContext.Profile.SetPropertyValue ("avatar", avuri ); + HttpContext.Profile.Save (); } else ModelState.AddModelError ("Avatar", string.Format ("Image type {0} is not supported (suported formats : {1})", diff --git a/web/Controllers/BasketController.cs b/web/Controllers/BasketController.cs index 2b74b7a7..57e9503a 100644 --- a/web/Controllers/BasketController.cs +++ b/web/Controllers/BasketController.cs @@ -11,6 +11,12 @@ namespace Yavsc.ApiControllers // TODO should mostly be an API Controller public class BasketController : ApiController { + protected WorkFlowManager wfmgr = null; + protected override void Initialize (System.Web.Http.Controllers.HttpControllerContext controllerContext) + { + base.Initialize (controllerContext); + wfmgr = new WorkFlowManager (); + } /// /// Validates the order. /// @@ -42,7 +48,7 @@ namespace Yavsc.ApiControllers [Authorize] public Estimate[] YourEstimates() { - return WorkFlowManager.GetEstimates ( + return wfmgr.GetEstimates ( Membership.GetUser().UserName); } diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index 1fb77c45..4ae6969a 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -18,6 +18,7 @@ using Yavsc.Model; using Yavsc.Model.Blogs; using Yavsc.ApiControllers; using Yavsc.Model.RolesAndMembers; +using System.Net; namespace Yavsc.Controllers { @@ -234,12 +235,19 @@ namespace Yavsc.Controllers [AcceptVerbs (HttpVerbs.Get)] public ActionResult Avatar (string user) { - string avpath = Path.Combine ( - Server.MapPath (AvatarDir), user + ".png"); - FileInfo fia = new FileInfo (avpath); - if (!fia.Exists) - fia = new FileInfo (Server.MapPath (defaultAvatar)); - return File (fia.OpenRead (), defaultAvatarMimetype); + ProfileBase pr = ProfileBase.Create (user); + + string avpath = (string) pr.GetPropertyValue ("avatar"); + if (avpath == null) { + FileInfo fia = new FileInfo (Server.MapPath (defaultAvatar)); + return File (fia.OpenRead (), defaultAvatarMimetype); + } + WebRequest wr = WebRequest.Create(avpath); + using (WebResponse resp = wr.GetResponse ()) { + using (Stream str = resp.GetResponseStream ()) { + return File (str, resp.ContentType); + } + } } /// diff --git a/web/Controllers/FrontOfficeApiController.cs b/web/Controllers/FrontOfficeApiController.cs index 1f4ca08d..732ec7a0 100644 --- a/web/Controllers/FrontOfficeApiController.cs +++ b/web/Controllers/FrontOfficeApiController.cs @@ -29,6 +29,14 @@ namespace Yavsc.ApiControllers public class FrontOfficeController : ApiController { + protected WorkFlowManager wfmgr = null; + + protected override void Initialize (System.Web.Http.Controllers.HttpControllerContext controllerContext) + { + base.Initialize (controllerContext); + wfmgr = new WorkFlowManager (); + } + [AcceptVerbs("GET")] public Catalog Catalog () { @@ -87,7 +95,7 @@ namespace Yavsc.ApiControllers /// Estid. public Estimate GetEstimate (long Id) { - Estimate est = WorkFlowManager.ContentProvider.GetEstimate (Id); + Estimate est = wfmgr.ContentProvider.GetEstimate (Id); return est; } @@ -107,7 +115,7 @@ namespace Yavsc.ApiControllers private string getEstimTex(long estimid) { Yavsc.templates.Estim tmpe = new Yavsc.templates.Estim(); - Estimate e = WorkFlowManager.GetEstimate (estimid); + Estimate e = wfmgr.GetEstimate (estimid); tmpe.Session = new Dictionary(); tmpe.Session.Add ("estim", e); @@ -132,7 +140,7 @@ namespace Yavsc.ApiControllers /// Estimid. public HttpResponseMessage GetEstimPdf(long estimid) { - Estimate estim = WorkFlowManager.GetEstimate (estimid); + Estimate estim = wfmgr.GetEstimate (estimid); //TODO better with pro.IsBankable && cli.IsBillable return new HttpResponseMessage () { diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index a17a7e92..e366e11d 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -8,6 +8,7 @@ using System.Text.RegularExpressions; using System.IO; using Yavsc.Controllers; using System.Collections.Generic; +using Yavsc.Model; using Yavsc.Model.WorkFlow; using WorkFlowProvider; using System.Web.Security; @@ -21,14 +22,20 @@ namespace Yavsc.Controllers /// public class FrontOfficeController : Controller { - /* + protected WorkFlowManager wfmgr = null; + + protected override void Initialize (System.Web.Routing.RequestContext requestContext) + { + base.Initialize (requestContext); + wfmgr = new WorkFlowManager (); + } -*/ [Authorize] public ActionResult Estimates () { string username = Membership.GetUser ().UserName; - return View(WorkFlowManager.GetEstimates (username)); + + return View(wfmgr.GetEstimates (username)); } [Authorize] @@ -38,7 +45,7 @@ namespace Yavsc.Controllers ViewData ["WABASEWF"] = ViewData ["WebApiBase"] + "/WorkFlow"; if (submit == null) { if (model.Id > 0) { - Estimate f = WorkFlowManager.GetEstimate (model.Id); + Estimate f = wfmgr.GetEstimate (model.Id); if (f == null) { ModelState.AddModelError ("Id", "Wrong Id"); return View (model); @@ -64,12 +71,12 @@ namespace Yavsc.Controllers throw new UnauthorizedAccessException ("You're not allowed to modify this estimate"); if (model.Id == 0) - model = WorkFlowManager.CreateEstimate ( + model = wfmgr.CreateEstimate ( username, model.Client, model.Title, model.Description); else { - WorkFlowManager.UpdateEstimate (model); - model = WorkFlowManager.GetEstimate (model.Id); + wfmgr.UpdateEstimate (model); + model = wfmgr.GetEstimate (model.Id); } } } diff --git a/web/Controllers/GoogleController.cs b/web/Controllers/GoogleController.cs index 95bc49e7..94476329 100644 --- a/web/Controllers/GoogleController.cs +++ b/web/Controllers/GoogleController.cs @@ -12,27 +12,27 @@ using System.Net; using System.IO; using Yavsc.Model; using Newtonsoft.Json; +using Yavsc.Model.Google; +using Yavsc.Model.RolesAndMembers; +using System.Web.Security; +using System.Web.Profile; namespace Yavsc.Controllers { - public class TokenResult { - public string access_token { get; set; } - public string id_token { get; set; } - public int expires_in { get; set; } - public string token_type { get; set ; } - public string refresh_token { get; set; } - } public class GoogleController : Controller { - private string API_KEY="AIzaSyBV_LQHb22nGgjNvFzZwnQHjao3Q7IewRw"; + // private string API_KEY="AIzaSyBV_LQHb22nGgjNvFzZwnQHjao3Q7IewRw"; + + private string getPeopleUri = "https://www.googleapis.com/plus/v1/people"; private string CLIENT_ID="325408689282-6bekh7p3guj4k0f3301a6frf025cnrk1.apps.googleusercontent.com"; private string CLIENT_SECRET="MaxYcvJJCs2gDGvaELZbzwfL"; string [] SCOPES = { + "openid" , "profile", "email" } ; @@ -40,43 +40,37 @@ namespace Yavsc.Controllers string tokenUri = "https://accounts.google.com/o/oauth2/token"; string authUri = "https://accounts.google.com/o/oauth2/auth"; - public void Login() + public void Login(string returnUrl) { + if (string.IsNullOrWhiteSpace (returnUrl)) + returnUrl = "/"; Random rand = new Random (); string state = "security_token"+rand.Next (100000).ToString()+rand.Next (100000).ToString(); Session ["state"] = state; + Session ["returnUrl"] = returnUrl; string redirectUri = Request.Url.Scheme + "://" + Request.Url.Authority + "/Google/Auth"; - string prms = String.Format("response_type=code&" + - "client_id={0}&" + - "redirect_uri={1}&" + - "scope={2}&" + - "state={3}&" + - "access_type=offline&" + - "include_granted_scopes=false", - CLIENT_ID, - redirectUri, - string.Join("%20",SCOPES), - state - ); + string prms = String.Format("response_type=code&client_id={0}&redirect_uri={1}&scope={2}&state={3}&access_type=offline&include_granted_scopes=false", + CLIENT_ID, redirectUri, string.Join("%20",SCOPES), state); WebRequest wr = WebRequest.Create(authUri+"?"+prms); - wr.Method = "GET"; // Get the response. - try { + WebResponse response = wr.GetResponse(); string resQuery = response.ResponseUri.Query; string cont = HttpUtility.ParseQueryString(resQuery)["continue"]; Response.Redirect (cont); - } - catch (WebException we) { - Response.Redirect(we.Response.ResponseUri.AbsoluteUri); - } + } - public void Auth() { + + [HttpGet] + public ActionResult Auth() + { + + string returnUrl = (string) Session ["returnUrl"]; string redirectUri = Request.Url.Scheme + "://" + Request.Url.Authority + "/Google/Auth"; string code = Request.Params ["code"]; string error = Request.Params ["error"]; @@ -84,13 +78,13 @@ namespace Yavsc.Controllers ViewData ["Message"] = string.Format(LocalizedText.Google_error, LocalizedText.ResourceManager.GetString(error)); - return; + return View(); } string state = Request.Params ["state"]; if (state!=null && string.Compare((string)Session ["state"],state)!=0) { ViewData ["Message"] = LocalizedText.ResourceManager.GetString("invalid request state"); - return; + return View(); } string postdata = @@ -112,17 +106,113 @@ namespace Yavsc.Controllers }; using (WebResponse response = webreq.GetResponse ()) { - using (Stream responseStream = response.GetResponseStream ()) { - using (StreamReader readStream = new StreamReader (responseStream, Encoding.ASCII)) { + using (StreamReader readStream = new StreamReader (responseStream, Encoding.UTF8)) { string responseStr = readStream.ReadToEnd (); - TokenResult res = JsonConvert.DeserializeObject(responseStr); + AuthToken gat = JsonConvert.DeserializeObject(responseStr); + Session ["GoogleAuthToken"] = gat; + SignIn regmod = new SignIn (); + HttpWebRequest webreppro = WebRequest.CreateHttp (getPeopleUri+"/me"); + webreppro.ContentType = "application/http"; + webreppro.Headers.Add (HttpRequestHeader.Authorization, gat.token_type + " " + gat.access_token); + webreppro.Method = "GET"; + using (WebResponse proresp = webreppro.GetResponse ()) { + using (Stream prresponseStream = proresp.GetResponseStream ()) { + using (StreamReader readproresp = new StreamReader (prresponseStream, Encoding.UTF8)) { + string prresponseStr = readproresp.ReadToEnd (); + People me = JsonConvert.DeserializeObject (prresponseStr); + // TODO use me.id to retreive an existing user + string accEmail = me.emails.Where (x => x.type == "account").First().value; + MembershipUserCollection mbrs = Membership.FindUsersByEmail (accEmail); + if (mbrs.Count == 1) { + // TODO check the google id + // just set this user as logged on + FormsAuthentication.SetAuthCookie (me.displayName, true); + Session ["returnUrl"] = null; + return Redirect (returnUrl); + } + // else create the account + regmod.Email = accEmail; + regmod.UserName = me.displayName; + Session ["me"] = me; + return Auth(regmod); + } + } + } + } + } + } + } + /// + /// Creates an account using the Google authentification. + /// + /// Regmod. + [HttpPost] + public ActionResult Auth(SignIn regmod) + { + if (ModelState.IsValid) { + if (Membership.GetUser (regmod.UserName) != null) { + ModelState.AddModelError ("UserName", "This user name already is in use"); + return View (); + } + string returnUrl = (string)Session ["returnUrl"]; + AuthToken gat = (AuthToken)Session ["GoogleAuthToken"]; + People me = (People)Session ["me"]; + if (gat == null || me == null) + throw new InvalidDataException (); + + Random rand = new Random (); + string passwd = rand.Next (100000).ToString () + rand.Next (100000).ToString (); + + MembershipCreateStatus mcs; + Membership.CreateUser ( + regmod.UserName, + passwd, + regmod.Email, + null, + null, + true, + out mcs); + switch (mcs) { + case MembershipCreateStatus.DuplicateEmail: + ModelState.AddModelError ("Email", "Cette adresse e-mail correspond " + + "à un compte utilisateur existant"); + return View (regmod); + case MembershipCreateStatus.DuplicateUserName: + ModelState.AddModelError ("UserName", "Ce nom d'utilisateur est " + + "déjà enregistré"); + return View (regmod); + case MembershipCreateStatus.Success: + Membership.ValidateUser (regmod.UserName, passwd); + FormsAuthentication.SetAuthCookie (regmod.UserName, true); + + HttpContext.Profile.Initialize (regmod.UserName, true); + HttpContext.Profile.SetPropertyValue ("gtoken", gat.access_token); + HttpContext.Profile.SetPropertyValue ("Name", me.displayName); + // TODO use image + if (me.image != null) { + HttpContext.Profile.SetPropertyValue ("avatar", me.image.url); + } + if (me.placesLived != null) { + People.Place pplace = me.placesLived.Where (x => x.primary).First (); + if (pplace != null) + HttpContext.Profile.SetPropertyValue ("Address", pplace.value); } + if (me.url != null) + HttpContext.Profile.SetPropertyValue ("WebSite", me.url); + HttpContext.Profile.Save (); + return Redirect (returnUrl); } + ViewData ["returnUrl"] = returnUrl; } + return View (regmod); } + public void ChooseCalendar() + { + throw new NotImplementedException(); + } } } diff --git a/web/Controllers/ModuleController.cs b/web/Controllers/ModuleController.cs new file mode 100644 index 00000000..4149508d --- /dev/null +++ b/web/Controllers/ModuleController.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using Yavsc.Model; +using System.Configuration; + +namespace Yavsc.Controllers +{ + public class ModuleController : Controller + { + protected override void Initialize (System.Web.Routing.RequestContext requestContext) + { + base.Initialize (requestContext); + ConfigurationManager.GetSection ("ymodules"); + + } + + // List modules = new List (); + + public ActionResult Index() + { + return View (); + } + } +} diff --git a/web/Controllers/WorkFlowController.cs b/web/Controllers/WorkFlowController.cs index 60f9e7da..b2fe7dee 100644 --- a/web/Controllers/WorkFlowController.cs +++ b/web/Controllers/WorkFlowController.cs @@ -15,7 +15,7 @@ namespace Yavsc.ApiControllers public class WorkFlowController : ApiController { string adminRoleName="Admin"; - + protected WorkFlowManager wfmgr = null; protected override void Initialize (HttpControllerContext controllerContext) { // TODO move it in a module initialization @@ -23,13 +23,14 @@ namespace Yavsc.ApiControllers if (!Roles.RoleExists (adminRoleName)) { Roles.CreateRole (adminRoleName); } + wfmgr = new WorkFlowManager (); } [HttpGet] [Authorize] public Estimate CreateEstimate (string title,string client,string description) { - return WorkFlowManager.CreateEstimate ( + return wfmgr.CreateEstimate ( Membership.GetUser().UserName,client,title,description); } @@ -37,7 +38,7 @@ namespace Yavsc.ApiControllers [Authorize] public void DropWritting(long wrid) { - WorkFlowManager.DropWritting (wrid); + wfmgr.DropWritting (wrid); } @@ -46,13 +47,13 @@ namespace Yavsc.ApiControllers [Authorize] public void DropEstimate(long estid) { - WorkFlowManager.DropEstimate (estid); + wfmgr.DropEstimate (estid); } [HttpGet] [Authorize] public object Index() - { + { // TODO inform user on its roles and alerts string username = Membership.GetUser ().UserName; return new { test=string.Format("Hello {0}!",username) }; @@ -75,7 +76,7 @@ namespace Yavsc.ApiControllers [ValidateAjax] public HttpResponseMessage UpdateWritting([FromBody] Writting wr) { - WorkFlowManager.UpdateWritting (wr); + wfmgr.UpdateWritting (wr); return Request.CreateResponse (System.Net.HttpStatusCode.OK); } @@ -95,7 +96,7 @@ namespace Yavsc.ApiControllers } try { return Request.CreateResponse(System.Net.HttpStatusCode.OK, - WorkFlowManager.Write(estid, wr.Description, + wfmgr.Write(estid, wr.Description, wr.UnitaryCost, wr.Count, wr.ProductReference)); } catch (Exception ex) { diff --git a/web/Global.asax.cs b/web/Global.asax.cs index a47881b3..bacbe529 100644 --- a/web/Global.asax.cs +++ b/web/Global.asax.cs @@ -17,9 +17,8 @@ namespace Yavsc { routes.IgnoreRoute ("{resource}.axd/{*pathInfo}"); - routes.IgnoreRoute ("js/{*pathInfo}"); + routes.IgnoreRoute ("Scripts/{*pathInfo}"); routes.IgnoreRoute ("Theme/{*pathInfo}"); - routes.IgnoreRoute ("css/{*pathInfo}"); routes.IgnoreRoute ("images/{*pathInfo}"); routes.MapRoute ( @@ -44,7 +43,6 @@ namespace Yavsc protected void Application_Start () { AreaRegistration.RegisterAllAreas (); - // add formatters : GlobalConfiguration.Configuration.Formatters.Add (new ZeroFormatter ()); GlobalConfiguration.Configuration.Routes.MapHttpRoute( name: "DefaultApi", routeTemplate: "api/{controller}/{action}/{*id}", diff --git a/web/Models/App.master b/web/Models/App.master index 8a1a2f6d..0b23262f 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -43,6 +43,10 @@ Page d'accueil <%= Html.ActionLink("Login", "Login", "Account", new { returnUrl=Request.Url.PathAndQuery }, new { @class="actionlink" } ) %> Pour pouvoir poster ou commenter + ?returnUrl=<%=ViewData["returnUrl"]%>" class="actionlink"> + Google sign in + + S'authentifier avec son compte Google+ <% } else { %> <%= Html.ActionLink(HttpContext.Current.User.Identity.Name, "Profile", "Account", null, new { @class="actionlink" }) %> Édition de votre profile diff --git a/web/js/jquery.metadata.js b/web/Scripts/jquery.metadata.js similarity index 100% rename from web/js/jquery.metadata.js rename to web/Scripts/jquery.metadata.js diff --git a/web/js/jquery.tablesorter.js b/web/Scripts/jquery.tablesorter.js similarity index 100% rename from web/js/jquery.tablesorter.js rename to web/Scripts/jquery.tablesorter.js diff --git a/web/js/jquery.tablesorter.min.js b/web/Scripts/jquery.tablesorter.min.js similarity index 100% rename from web/js/jquery.tablesorter.min.js rename to web/Scripts/jquery.tablesorter.min.js diff --git a/web/js/rangyinputs-jquery-1.1.2.js b/web/Scripts/rangyinputs-jquery-1.1.2.js similarity index 100% rename from web/js/rangyinputs-jquery-1.1.2.js rename to web/Scripts/rangyinputs-jquery-1.1.2.js diff --git a/web/Settings/ModuleConfigurationElement.cs b/web/Settings/ModuleConfigurationElement.cs new file mode 100644 index 00000000..0d9f8a40 --- /dev/null +++ b/web/Settings/ModuleConfigurationElement.cs @@ -0,0 +1,50 @@ +// +// ModuleConfigurationElement.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2014 Paul Schneider +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System; +using System.Configuration; + +namespace Yavsc.Settings +{ + public class ModuleConfigurationElement : ConfigurationElement + { + public ModuleConfigurationElement () + { + } + + [ConfigurationProperty("name", IsKey=true, IsRequired=true)] + public string Name { + get { + return (string) base ["name"]; + } + set { base ["name"] = value; } + } + + [ConfigurationProperty("name", IsKey=true, IsRequired=true)] + public string ClassName { + get { + return (string) base ["classname"]; + } + set { base ["classname"] = value; } + } + + } +} + diff --git a/web/Settings/ModuleConfigurationElementCollection.cs b/web/Settings/ModuleConfigurationElementCollection.cs new file mode 100644 index 00000000..b880a002 --- /dev/null +++ b/web/Settings/ModuleConfigurationElementCollection.cs @@ -0,0 +1,47 @@ +// +// ModuleConfigurationElementCollection.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2014 Paul Schneider +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System; +using System.Configuration; + +namespace Yavsc.Settings +{ + public class ModuleConfigurationElementCollection : ConfigurationElementCollection + { + public ModuleConfigurationElementCollection () + { + } + + #region implemented abstract members of ConfigurationElementCollection + + protected override ConfigurationElement CreateNewElement () + { + throw new NotImplementedException (); + } + + protected override object GetElementKey (ConfigurationElement element) + { + throw new NotImplementedException (); + } + + #endregion + } +} + diff --git a/web/Settings/ModulesConfigurationSection.cs b/web/Settings/ModulesConfigurationSection.cs new file mode 100644 index 00000000..f4b9af45 --- /dev/null +++ b/web/Settings/ModulesConfigurationSection.cs @@ -0,0 +1,33 @@ +// +// ModulesConfigurationSection.cs +// +// Author: +// Paul Schneider +// +// Copyright (c) 2014 Paul Schneider +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +using System; +using System.Configuration; + +namespace Yavsc.Settings +{ + public class ModulesConfigurationSection : ConfigurationSection + { + public ModulesConfigurationSection () + { + } + } +} + diff --git a/web/Thanks/ThanksConfigurationCollection.cs b/web/Thanks/ThanksConfigurationCollection.cs deleted file mode 100644 index d97460a7..00000000 --- a/web/Thanks/ThanksConfigurationCollection.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Configuration; - -namespace Yavsc -{ - public class ThanksConfigurationCollection : ConfigurationElementCollection - { - protected override object GetElementKey (ConfigurationElement element) - { - return ((ThanksConfigurationElement) element).Name; - } - protected override ConfigurationElement CreateNewElement () - { - return new ThanksConfigurationElement(); - } - public ThanksConfigurationElement GetElement (string name) - { - return this.BaseGet(name) as ThanksConfigurationElement; - } - } -} - diff --git a/web/Thanks/ThanksConfigurationElement.cs b/web/Thanks/ThanksConfigurationElement.cs deleted file mode 100644 index a4b71f14..00000000 --- a/web/Thanks/ThanksConfigurationElement.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Configuration; - -namespace Yavsc -{ - public class ThanksConfigurationElement : ConfigurationElement - { - [ConfigurationProperty("name", IsKey=true, IsRequired=true)] - public string Name { - get { - return (string) base ["name"]; - } - set { base ["name"] = value; } - } - - [ConfigurationProperty("url")] - public string Url { - get { - return (string) base ["url"]; - } - set { base ["url"] = value; } - } - - [ConfigurationProperty("image")] - public string Image { - get { - return (string) base ["image"]; - } - set { base ["image"] = value; } - } - - /// - /// Gets or sets the display. - /// - /// - /// The displaied text when no image is provided and we - /// don't want use the name attribute. - /// - [ConfigurationProperty("display")] - public string Display { - get { - return (string) base ["display"]; - } - set { base ["display"] = value; } - } - } -} - diff --git a/web/Thanks/ThanksConfigurationSection.cs b/web/Thanks/ThanksConfigurationSection.cs deleted file mode 100644 index c86382ea..00000000 --- a/web/Thanks/ThanksConfigurationSection.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Configuration; - -namespace Yavsc -{ - public class ThanksConfigurationSection : ConfigurationSection - { - [ConfigurationProperty("to")] - public ThanksConfigurationCollection To { - get { - return (ThanksConfigurationCollection) this["to"]; - } - set { - this ["to"] = value; - } - } - - [ConfigurationProperty("html_class")] - public string HtmlClass { - get { - return (string)this ["html_class"]; - } - set { - this ["html_class"] = value; - } - } - - [ConfigurationProperty("title_format")] - public string TitleFormat { - get { - return (string)this ["title_format"]; - } - set { - this ["title_format"] = value; - } - } - } -} - diff --git a/web/Thanks/ThanksHelper.cs b/web/Thanks/ThanksHelper.cs deleted file mode 100644 index 7d76b66d..00000000 --- a/web/Thanks/ThanksHelper.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Configuration; -using System.Collections.Generic; - -namespace Yavsc -{ - public static class ThanksHelper { - static private ThanksConfigurationSection configurationSection=null; - static public ThanksConfigurationSection ConfigurationSection { - get { - if (configurationSection==null) - configurationSection = (ThanksConfigurationSection) ConfigurationManager.GetSection ("system.web/thanks"); - return configurationSection; - } - } - - public static string[] Links () - { - List result = new List() ; - if (ConfigurationSection == null) return result.ToArray(); - if (ConfigurationSection.To == null) return result.ToArray(); - foreach (ThanksConfigurationElement e in ConfigurationSection.To) { - string link = ""; - if (!string.IsNullOrEmpty(e.Url)) - link = string.Format("",e.Url); - string dsp = (string.IsNullOrEmpty(e.Display))?e.Name:e.Display; - if (!string.IsNullOrEmpty(e.Image)) { - string ttl = (string.IsNullOrEmpty(ConfigurationSection.TitleFormat))?"Go and see the website ({0})":ConfigurationSection.TitleFormat; - ttl = string.Format(ttl,dsp); - link += string.Format( - "\"{0}\"", - dsp,e.Image,ttl); - } - else link += dsp; - if (e.Url!=null) - link += " "; - result.Add (link); - } - return result.ToArray(); - } - } - -} diff --git a/web/Views/Account/Index.aspx b/web/Views/Account/Index.aspx index cb848e27..9212aa60 100644 --- a/web/Views/Account/Index.aspx +++ b/web/Views/Account/Index.aspx @@ -3,4 +3,4 @@

Comptes utilisteur

- + \ No newline at end of file diff --git a/web/Views/Account/Login.aspx b/web/Views/Account/Login.aspx index 331c9a48..dc8a5804 100644 --- a/web/Views/Account/Login.aspx +++ b/web/Views/Account/Login.aspx @@ -19,5 +19,5 @@ <% } %> -<%= Html.ActionLink("S'enregistrer","Register",new {returnUrl=ViewData["returnUrl"]}) %> +<%= Html.ActionLink("S'enregistrer","Register",new {returnUrl=ViewData["returnUrl"]}, new { @class="actionlink" }) %> diff --git a/web/Views/Account/OpenIDLogOn.aspx b/web/Views/Account/OpenIDLogOn.aspx deleted file mode 100644 index 5fd05460..00000000 --- a/web/Views/Account/OpenIDLogOn.aspx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Page Title="Login" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> - -<%= Html.ValidationSummary("Ouverture de session avec OpenID") %> -<% using(Html.BeginForm("OpenIDLogOn", "Account")) %> -<% { %> - diff --git a/web/Views/Account/Profile.aspx b/web/Views/Account/Profile.aspx index f8c2e433..3f8cd52f 100644 --- a/web/Views/Account/Profile.aspx +++ b/web/Views/Account/Profile.aspx @@ -52,10 +52,16 @@ <%= Html.TextBox("BlogTitle") %> <%= Html.ValidationMessage("BlogTitle", "*") %> -Avatar " alt=""/> +Avatar <%= Html.ValidationMessage("AvatarFile", "*") %> + + <%= Html.LabelFor(model => model.GoogleCalendar) %> + + + +

Informations de facturation

@@ -132,8 +138,6 @@ Avatar , Billable:<%=Model.IsBillable%> <% } %> - <%= Html.ActionLink("Changer de mot de passe","ChangePassword", "Account")%> - - - - + <%= Html.ActionLink("Changer de mot de passe","ChangePassword", "Account",null, new { @class="actionlink" })%> + <%= Html.ActionLink("Désincription","Unregister", "Account",null, new { @class="actionlink" })%> + diff --git a/web/Views/Account/Unregister.aspx b/web/Views/Account/Unregister.aspx new file mode 100644 index 00000000..313e527e --- /dev/null +++ b/web/Views/Account/Unregister.aspx @@ -0,0 +1,11 @@ + +<%@ Page Title="Unregister" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> + + +Warning: This will delete all of your data here, your profile, your posts and other data. +<% using(Html.BeginForm("Unregister", "Account")) { %> + + <%=Html.CheckBox("confirmed")%> + + <% } %> + diff --git a/web/Views/Blogs/Post.aspx b/web/Views/Blogs/Post.aspx index ed3dfab4..260d9eab 100644 --- a/web/Views/Blogs/Post.aspx +++ b/web/Views/Blogs/Post.aspx @@ -1,7 +1,7 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%> - - + +

diff --git a/web/Views/FrontOffice/Estimate.aspx b/web/Views/FrontOffice/Estimate.aspx index 9ffeac78..76f33247 100644 --- a/web/Views/FrontOffice/Estimate.aspx +++ b/web/Views/FrontOffice/Estimate.aspx @@ -1,10 +1,10 @@ <%@ Page Title="Devis" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master" %> - - - - + + + + " type="text/css" media="print, projection, screen" /> diff --git a/web/Web.config b/web/Web.config index d91b6713..dd7fab0b 100644 --- a/web/Web.config +++ b/web/Web.config @@ -79,21 +79,22 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - - - - - - + + + + + + + @@ -173,6 +174,11 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx + + + + + diff --git a/web/Web.csproj b/web/Web.csproj index fb6a1ce1..237d381e 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -9,7 +9,7 @@ {349C5851-65DF-11DA-9384-00065B846F21};{603C0E0B-DB56-11DC-BE95-000D561079B0};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Yavsc - v4.5.1 + v4.5 true @@ -78,12 +78,6 @@ - - ..\..\..\..\..\usr\lib\mono\4.5\System.Web.Http.WebHost.dll - - - ..\..\..\..\..\usr\lib\mono\4.5\System.Net.Http.Formatting.dll - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll @@ -92,15 +86,16 @@ + + + - - @@ -112,7 +107,6 @@ - @@ -122,6 +116,7 @@ + @@ -129,10 +124,6 @@ Global.asax - - - - @@ -165,6 +156,14 @@ + + + + + + + + @@ -223,10 +222,6 @@ - - - - @@ -243,19 +238,23 @@ - - + + + + + + @@ -272,7 +271,6 @@ - TextTemplatingFilePreprocessor diff --git a/web/images/sign-in-with-google.png b/web/images/sign-in-with-google.png new file mode 100644 index 0000000000000000000000000000000000000000..52045b648c6b008f584c3db2ee52bbee525995c5 GIT binary patch literal 4311 zcmYk9c|25m*uW`nmTOiGa$eJZW$e!KMn6b^+Wn@=m z$z(9ytT8ig)|kONa^KJU{_~vY{Lb$@+wVD_^L!JmEsZ$X0Bj5l3>+rL`nC)Vj3l}a zW%+|HtH{s)WMJSfG||_!e=mn*Z!ghVthTHiGGRUpbHjZx`3Re z3*1SJCu@;t#{brCGeN>Kmo-!+rSh#97(~9k#>cuIy%O>g%=+qd51kyf+P;lM*?)6k zV7PWGI)3&NXF*yOdRY9SXAUwy=){zoq_Wmk9*B72yEHYr{m3VHhvf_t7V1??<&#^d zmdmV=fW;3|PzHt*cL=2mB5_+K3&O@HGy z{&%GR=`6x0S>XOS-TYfGtUc?~cE5IwIxIf%*se_|)8+IQp8eW{#12U~Qjhsf@waOl@=ksm% zLJb9k1DA++>-`9X)3zWiym?dmdJn4ot@Eg6f^6VPbWP}u#)Zj${nl$fC`M(;1|D`G z&yU#LQPFWsYpHu(x;d*_^P`7e^cYb&CGVoQY-A-Mj!dO?bVf|WsT|ez=smBMLbur8 z-utKAwJ_A^wSlJ-aqlCDunpVM<)4)DB%YI^ker2_kIf(Z1=m&0DCZ0N3QL2pf2B5@ zgHy%3cOg(?o>@d58+)t?%E zr7nw|90UU-z8p3PT-IJ8x{LdSQBf@)8dTa~gHtDM!yW9x6S!jGXgGgw>eqt~5N$C2 z)EU}X^>IE=u*`FEZ<7OLh4@71w;Rqo>+KoHyP2UqrT*A;jKLRj3I!i^>SZn9XvzwC zSM(VLvC4I3%c_o@sslc?HrCSuRrDbrqA?Y_#kyu0zfO->(>?~?oB9rym0;%!Dk~ie zecwFy9LOa_`on86I;5tyiRO~pANcJ{Zw3Xt?^^0oc_S4SGNmK@Jr|}Wxr6i9SkEgQ zzPF2PmitmSXY1>F?5x6~>E^sV>Y$~VRnzS_?Wo{>4)Laq0!l<9zS&8VcA0gmp6&ko z6QJv2sL%+W;H#P6oWMzJc4gy}*sae^ z?1}=h(KHv-N)KElidLIeizWVK7Wiq;ra1&xKpL3PT0N+#RD4!_l)co$X1B7a;Mdfpjf5x zmIf{^j(fM?X1BD^3ISOW*yuP;S!2TJ>54ivN@T$e@IQ@|bW6PLf~0k}WQ_23lF&m~ z*}#T5^4395`Hyfzyfqe=)r9T`@6No`x>DS_;lc|ATNpX+xo4YJuTa2u363!ZwCuSr zG)11rvn#~Oi;6sH$QFkPi_}7Bm(}<7md|`8=3S#D=!G@gF`3IqZOopjYO`2ud`Cso z#h$50TsI?7A#$OQ)eLwrZQwGuw%U3{Xbx$SwqfrNRq@$Vc3*CJ39l5bG@PGb1OOaf z0Kc$=`Noj5St)&oUR=3B_sm4niGzNvOtYD(N4eMHXLy$v!&7X9m=O#XTpF98ihCe$ zaX+5d;UZ6mUnuK`Modj(+dCxsz5N_81{iv=T0x6V^1P~K)O7G-)7!m9C?R-c)0$g< z{*#v9ntFPewcA$M-)ZrXj-$tNPY$&BnFTP=(a9zWs+gw^Pq1l>Ys=?|XK@NaqT96k z6ljHd6W$$J0FD-AJ18C40ECnB(Q)WX&W^iSHMKr9PJ&9Hv0Fys)hhIoYI}WL zxfGisSsu4LjOHR-t|>aJ6>6F)b?6piRA$0XSU(ujU{hp1RE-MiebN;9WXV6q!X+bY zSamFr+(2&L@$P+0*XCoCFu?|e`3inO? z%G1}}T5kwSPCIi4M@l}4V>9ZUg_IUc;5co4o&dEgI?cOyG45)K=pHd6CzBsGt>I!j zvUd+R=F%-}@is;m%y-7>(9{Q}X#P6pw5I9kIE0!6=}=@boCDSlDx_6VV#s5GKU#e6 zA2w9u348}}fN*j-Ug~~~mX-|$%*4yc6uP#{he13_HysK63#~T2&kEM=M_7A-D;~ro z07_U0KDI$Ay^TeX+`b*Zk|Hy$+>q;`d9|@^nUbc=;*DH{7VrGg2G`Ud{FqtxgZ&J6 z&@SjxZ0Bf279&_Hzny+69=;t{wcg*{2$YRS0P*#rcASwgRIU{5-LBs>5?ynET`4Nr zb%&YA_-2KZD1-pCN--#bGajEu+Xl?ex-!>gn7V z#8-P%a!;Zm%ClqFD)r1)Q^$`6-W6XO%Z4);Q{5_;&CIZUv?e5r2Qq8_wVl9$V+ZqI-gjR`-f6EZycf zb&VX~h>6XmJ$vQZ>P$sPi=f23yqiGnkXTp1AXti&V5(m@xso2Ft~PMq>3p2~qr@U~ zwEjgCR!ws$S6f_d(P#<1>ljmUCLR&4r_lT za&VvPuuu>GQkJCGeXukT5Go3}Zat|akgRk?DH$E@FvCKaeNEa-bS5>^1A( z!3sWaec}1n-Cn-|k2m3u;Su>^S3cEIASu}&8vbN!!xPA%-7qVZ9-bral5XEzOgwr) z05h-f&pX3%qi2-(OWq0~R27mZR&;rbTOIc)AB{BeuD#m$&;HP5Ulz@|tru<5e5fmx z6+Y%22Sc=&2Y!kA_~meD8j9*&8QU{gskG9g^l&2i?;TmFogge9XK9wv{6IL69ZWgj zby2JSgRnUsxn+sj^Jp9TRk#OS50#T7z2?2fC}(W2DhKT-O4cUL^s#G}T(J;Ze>{6) z<$D%U!DZ)FkYG?X(K!|wu~DDPSm*;`hbtcOSA`nLI{I||3W{+(2Qv)&s4t){3`99? zvyEMA|DcjMnu~tmvA9#=55CuR$+r4BB#)xhB{YHKgyp6{Ty@3uw`~~djd0vSZ1JdQ z_=7umof$Uy+<+ap0ms%n?{{>_{je1P{nuO@b{^!`;L&|6rr@f1X56#l^6w81Dwo{% zHAtSKx(b4O$-XwSmOeocg6BIqTFxdr6x46y-S=pIL9IgL5+qN|C7(L^RlFs2QEb!f zrs^PGOQn-0?Dd_0@7b)boaGg*7tL~viGJVtC*-+893w><^3CKtL?F{SXfBs91mGFP zL~Xv^EVIwhLx@l7%C)MS;g8gDmZ7gj8&^NyeuXfJHisvmJNiBH4qPoh)?fsXQ6fdt zq!3-f;}>AO?(!_BD$^AuyNnsxZq^KL!M({c8x$9=@GiuxD~OU1Z(oO+zB`*RG@ets z(Tg0Oe~5|`?`krD;BA&sQqYKT{0^Fm-RV7NAmTc`kw~`uI!P*swQ7yzY1RyqmFBTP{yGVjF?W^*R`ho;%a7 z+QWfyb4BtiregKmaO1m8R}Y^wbaDo}va}ti31s%(+`hMQl({!8SXUI14j^<)$PI<_ zL87mW|C^i7EaA7x`Vf*W7yAeI?)#nywLL2(cfrx_qNnCENwc|;>gh&!A%k3ijPIDV zklk^a&+7TxrCMb}A$muTb@GRfEm-5jJ;sW=W0cIiOfMp{X<*?6RK9!IpaMCi2rdrs ze&yT%W30bvDm{Fs_NpT3XI4jse~fM2+mn&?*hJoFCN^~@`8u&%SefofdgL#`+#`vk z1`cPi%vMiM!PRRGxU8R3eR5c?5ZPefi*+CETQ{0nA>Mx?9@65nja6@?sd-+)?Fs{y z)oyVBobWxU&iigv3%yMVg)BMO3{(oRZt-YUu?J>eOA>IHKKCnNz7X>qk@ae`sxma^ z*9ZGYR$A%Miqhh*l^)&uzvo*FD`A#+N9AH$RMN#p;7(5J%WC?Fb^7Sao#|Jig+byN ziHV%nB-#jC`DEnBbS`%1+u(Uav7dBg>iBF{Deovi8SM(6Ge$47!{`1Nd{dallRnEew zM$ag(f0f2MwTEr<&}2MYBla#_qM4dy?%(A*?e2{ccq3}DtGX@B8k=H&no)fpps_?_1x zl|DNLHkF^9KD@Pao{c{EOOPhn!1w7K27rguB(@FMmz}L~tcJr>>Ba-pw!wL7*whE( zqXp3T&_H8J?{jV7{Qw(j!n}P;HFiDQpqvIV*TWw4M@OKu5_}`^em-tPP zr#jB?Hv%&L#*|Z?NB!i;S_OA6oMPxRQh_Q=J{Yo52%o%nO0U1Tv3<%UQMrg6h5x^> z?@pt6?~N3;MDr!n(|a2{WC=H#1+<}uz4|s$@E^lVT=-83Ctj>G-i5rd>qVNdfQSAe z9^$;U9XbC&&1+GsuzR0!G)5AP=$p9ZyP-~Wv=+!tw3~~13C0)Q*k&xEV`JoiNcaFE zft4EZaluO)xXfaCliq?7DK{2B2`#+{OLxlPRgcvxww8Z=fgM+2Ezi#;qe#z*A@WCT p2A%K!kMd6{LGM4h;C^#_CVa+t@MFK15dD_H#K2O&R`2hq{{dTOL-GIs literal 0 HcmV?d00001 diff --git a/web/instdbws.sql b/web/instdbws.sql index 169f9771..9cad342c 100644 --- a/web/instdbws.sql +++ b/web/instdbws.sql @@ -249,8 +249,13 @@ CREATE TABLE profiledata wicketcode character varying(5), iban character varying(33), bic character varying(15), - gcode character varying(512), - CONSTRAINT fkprofiles2 FOREIGN KEY (uniqueid) + gtoken character varying(512), + grefreshtoken character varying(512), -- Google refresh token + gtokentype character varying(256), -- Google access token type + gcalid character varying(255), + gtokenexpir timestamp with time zone, -- Google access token expiration date + avatar character varying(512), -- url for an avatar + CONSTRAINT fkprofiles2 FOREIGN KEY (uniqueid) REFERENCES profiles (uniqueid) MATCH SIMPLE ON UPDATE CASCADE ON DELETE CASCADE ) @@ -264,9 +269,14 @@ COMMENT ON COLUMN profiledata.hasavatar IS 'True when user has specified an imag COMMENT ON COLUMN profiledata.accountnumber IS 'Numero de compte'; COMMENT ON COLUMN profiledata.bankedkey IS 'clé RIB'; COMMENT ON COLUMN profiledata.bankcode IS 'Code banque'; - - --- Index: fki_fkprofiles2 +COMMENT ON COLUMN profiledata.gtoken IS 'Google authentification token'; +COMMENT ON COLUMN profiledata.gcalid IS 'Google calendar identifier'; +COMMENT ON COLUMN profiledata.gtokentype IS 'Google access token type'; +COMMENT ON COLUMN profiledata.grefreshtoken IS 'Google refresh token'; +COMMENT ON COLUMN profiledata.gtokenexpir IS 'Google access token expiration date'; +COMMENT ON COLUMN profiledata.avatar IS 'url for an avatar'; + + -- Index: fki_fkprofiles2 -- DROP INDEX fki_fkprofiles2; diff --git a/web/js/jquery-latest.js b/web/js/jquery-latest.js deleted file mode 100644 index ab28a247..00000000 --- a/web/js/jquery-latest.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | 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=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.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(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.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||m.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&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.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,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=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)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(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 ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(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 typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.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===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||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 fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.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},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.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=fb.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=fb.selectors={cacheLength:50,createPseudo:hb,match:X,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(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===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]||fb.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]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.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(cb,db).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("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.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+" ").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;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(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),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).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 Z.test(a.nodeName)},input:function(a){return Y.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:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(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=[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(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(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 tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(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 vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(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?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(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 vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.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(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.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(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(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&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.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=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.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()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.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=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.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 m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.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},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.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?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!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&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:k.htmlSerialize?[0,"",""]:[1,"X
","
"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._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++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.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)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.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 m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("