diff --git a/WebControls/ChangeLog b/WebControls/ChangeLog index 5d7ca6a4..3941f85b 100644 --- a/WebControls/ChangeLog +++ b/WebControls/ChangeLog @@ -1,3 +1,7 @@ +2015-08-22 Paul Schneider + + * InputCircle.cs: this class is about to be removed + 2015-08-20 Paul Schneider * InputCircle.cs: fixes the new CircleManager interface usage diff --git a/WebControls/InputCircle.cs b/WebControls/InputCircle.cs index efa68da0..82767fa5 100644 --- a/WebControls/InputCircle.cs +++ b/WebControls/InputCircle.cs @@ -163,15 +163,6 @@ namespace Yavsc.WebControls writer.AddAttribute ("value", ci.Id.ToString() ); writer.RenderBeginTag ("option"); writer.Write (ci.Title); - if (ci.Members.Length > 0) { - writer.RenderBeginTag ("br"); - writer.RenderEndTag (); - writer.RenderBeginTag ("i"); - writer.Write (ci.Members [0]); - for (int i=1; i + + * yavsc.js: factorize some javascript + + * BlogsController.cs: removes Html used as text + + * App.master: removes the bsd css class script + + * Circles.aspx: fixes the Javascript circle selection + + * Index.aspx: + * AssemblyInfo.aspx: `Indexe` is not a french word, sorry for + the trouble + + * Web.csproj: includes yavsc Javascript in the project + + * style.css: panels float left + 2015-08-20 Paul Schneider * CircleController.cs: * Authorize some Http methods diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index dbe50e51..c09aad1a 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -303,7 +303,7 @@ namespace Yavsc.Controllers ViewData ["AllowedCircles"] = CircleManager.DefaultProvider.List (Membership.GetUser ().UserName).Select (x => new SelectListItem { Value = x.Id.ToString(), - Text = YavscHelpers.FormatCircle(x).ToHtmlString(), + Text = x.Title, Selected = e.AllowedCircles.Contains (x.Id) }); return View (e); diff --git a/web/Models/App.master b/web/Models/App.master index 550d8bad..e9f130c3 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -3,7 +3,7 @@ <% -ViewState["orgtitle"] = T.GetString(Page.Title); +ViewState["orgtitle"] = Html.Translate(Page.Title); Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName; %> @@ -55,7 +55,8 @@ ViewState["orgtitle"] = T.GetString(Page.Title); <%= Html.ActionLink( "Deconnexion", "Logout", "Account", new { returnUrl=Request.Url.PathAndQuery }, null) %> <% } %>