diff --git a/web/ChangeLog b/web/ChangeLog index 7b5abf2a..baaec05e 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,29 @@ +2015-09-27 Paul Schneider + + * jquery.htmlClean.min.js: * in order to paste from any(?) + document + + * rangy-selectionsaverestore.js: required by hallo html + cleanup + + * App.master: * A link to awesome fonts + * a hint, to engage to invoice :-) + + * rangy-core.js: using the bower installed one + + * to-markdown.js: using the new code, came from the `npm + start` process + + * Edit.aspx: fixes copy/paste from LibreOffice writter colored + text. + + * Web.csproj: using new javascript references to: + rangy-core, rangy-selectionsaverestore jquery.htmlClean + + * mdd_help.htm: + * mdd_styles.css: + * rangyinputs-jquery-1.1.2.js: obsolete + 2015-09-25 Paul Schneider * BlogsController.cs: Fixes the Markdown usage of the uploaded diff --git a/web/Models/App.master b/web/Models/App.master index d6ff15b1..64bf7d5b 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -2,8 +2,8 @@ -<% -ViewState["orgtitle"] = Html.Translate(Page.Title); + +<% ViewState["orgtitle"] = Html.Translate(Page.Title); Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName; %> @@ -11,6 +11,7 @@ ViewState["orgtitle"] = Html.Translate(Page.Title); +" /> @@ -38,7 +39,7 @@ var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>'; <% if (Membership.GetUser()==null) { %>
<%= Html.ActionLink("Authentification", "Login", "Account", new { returnUrl=Request.Url.PathAndQuery },null) %> -
Pour pouvoir publier
+
Pour pouvoir publier, facturer
<% } else { %>
diff --git a/web/Scripts/jquery.htmlClean.min.js b/web/Scripts/jquery.htmlClean.min.js new file mode 100644 index 00000000..ed7b7f0b --- /dev/null +++ b/web/Scripts/jquery.htmlClean.min.js @@ -0,0 +1 @@ +(function($){$.fn.htmlClean=function(options){return this.each(function(){if(this.value){this.value=$.htmlClean(this.value,options)}else{this.innerHTML=$.htmlClean(this.innerHTML,options)}})};$.htmlClean=function(html,options){options=$.extend({},$.htmlClean.defaults,options);options.allowEmpty=tagAllowEmpty.concat(options.allowEmpty);var tagsRE=/(<(\/)?(\w+:)?([\w]+)([^>]*)>)|