From 276531230463577349db902926f0c0345f14ec61 Mon Sep 17 00:00:00 2001 From: rxtur Date: Fri, 19 Feb 2016 19:01:38 -0600 Subject: [PATCH 001/146] Added Month list widget --- .../datastore/widgets/be_WIDGET_ZONE.xml | 1 + .../BlogEngine.NET/BlogEngine.NET.csproj | 2 + .../Custom/Widgets/MonthList/MonthList.cs | 59 +++++++++++++++++++ .../Custom/Widgets/MonthList/widget.cshtml | 30 ++++++++++ .../Custom/Widgets/TagCloud/edit.cshtml | 2 +- .../Custom/Widgets/TextBox/edit.cshtml | 2 +- .../admin/app/custom/widgets/widgetView.html | 7 ++- 7 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/MonthList.cs create mode 100644 BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/widget.cshtml diff --git a/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/be_WIDGET_ZONE.xml b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/be_WIDGET_ZONE.xml index 587b490f2..72981ebb8 100644 --- a/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/be_WIDGET_ZONE.xml +++ b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/be_WIDGET_ZONE.xml @@ -8,4 +8,5 @@ Newsletter CommentList LinkList + MonthList \ No newline at end of file diff --git a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj index cecbb8490..63a4cbd2f 100644 --- a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj +++ b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj @@ -724,6 +724,7 @@ + @@ -2120,6 +2121,7 @@ + default.aspx diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/MonthList.cs b/BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/MonthList.cs new file mode 100644 index 000000000..846c474e3 --- /dev/null +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/MonthList.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BlogEngine.Core; + +namespace BlogEngine.NET.Custom.Widgets +{ + public class MonthList + { + class DateComparer_Desc : IComparer + { + int IComparer.Compare(DateTime x, DateTime y) { return -x.CompareTo(y); } + } + class IntComparer_Desc : IComparer + { + int IComparer.Compare(int x, int y) { return -x.CompareTo(y); } + } + + private static readonly IComparer date_Desc = new DateComparer_Desc(); + private static readonly IComparer int_Desc = new IntComparer_Desc(); + + public MonthList() { } + + public SortedDictionary> GetList() + { + var months = new SortedDictionary(date_Desc); + var years = new SortedDictionary>(int_Desc); + + foreach (var month in Post.ApplicablePosts.Where(post => post.IsVisibleToPublic). + Select(post => new DateTime(post.DateCreated.Year, post.DateCreated.Month, 1))) + { + int count; + months.TryGetValue(month, out count); + ++count; + months[month] = count; + } + foreach (KeyValuePair aIt in months) + { + if (!years.Keys.Contains(aIt.Key.Year)) + { + years.Add(aIt.Key.Year, new List()); + } + var item = new MonthItem(); + item.Title = aIt.Key.ToString("MMMM"); + item.Url = string.Format("{0}{1}/{2}", Utils.RelativeOrAbsoluteWebRoot, aIt.Key.Year, aIt.Key.Month.ToString("00")); + item.Count = aIt.Value; + years[aIt.Key.Year].Add(item); + } + return years; + } + } + + public class MonthItem + { + public string Title { get; set; } + public string Url { get; set; } + public int Count { get; set; } + } +} \ No newline at end of file diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/widget.cshtml new file mode 100644 index 000000000..fa36c7666 --- /dev/null +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/widget.cshtml @@ -0,0 +1,30 @@ +@using BlogEngine.NET.Custom.Widgets +@{ + var title = Model.Title; + var mList = new MonthList(); + var years = mList.GetList(); + var cnt = 0; + var cls = "open"; +} +
+

@title

+
+
    + @foreach (KeyValuePair> y in years) + { + var yId = "year" + @y.Key; + var tgl = "BlogEngine.toggleMonth('" + yId + "')"; + cnt = cnt + 1; + cls = cnt > 1 ? "close" : "open"; +
  • @y.Key +
      + @foreach (var item in y.Value) + { +
    • @item.Title (@item.Count)
      • + } +
    +
    • + } +
+
+
\ No newline at end of file diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/TagCloud/edit.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/TagCloud/edit.cshtml index 1418311eb..c9f5008cf 100644 --- a/BlogEngine/BlogEngine.NET/Custom/Widgets/TagCloud/edit.cshtml +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/TagCloud/edit.cshtml @@ -60,7 +60,7 @@ @Html.DropDownList("ddCloudSize", cloudSizeOptions, new { @class = "form-control" })
-
diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/TextBox/edit.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/TextBox/edit.cshtml index f594a4cfb..4a77eb3f0 100644 --- a/BlogEngine/BlogEngine.NET/Custom/Widgets/TextBox/edit.cshtml +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/TextBox/edit.cshtml @@ -44,7 +44,7 @@
-
diff --git a/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html b/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html index a7e82d442..c76dac93e 100644 --- a/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html +++ b/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html @@ -1,6 +1,8 @@ 
+ + + + +
+
+ +
+
+
+ + + @Html.ValidationMessage("txtTitle") +
+
+ + + @Html.ValidationMessage("txtWebsite") +
+
+
+
+
+
+ + + @Html.ValidationMessage("txtDesc") +
+
+ + + @Html.ValidationMessage("txtUrl") +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@Html.CheckBox("cblXfn_0", br.Xfn.contact)@Html.CheckBox("cblXfn_1", br.Xfn.acquaintance)@Html.CheckBox("cblXfn_2", br.Xfn.friend)@Html.CheckBox("cblXfn_3", br.Xfn.met)@Html.CheckBox("cblXfn_4", br.Xfn.coworker)@Html.CheckBox("cblXfn_5", br.Xfn.colleague)
@Html.CheckBox("cblXfn_6", br.Xfn.coresident)@Html.CheckBox("cblXfn_7", br.Xfn.neighbor)@Html.CheckBox("cblXfn_8", br.Xfn.child)@Html.CheckBox("cblXfn_9", br.Xfn.parent)@Html.CheckBox("cblXfn_10", br.Xfn.sibling)@Html.CheckBox("cblXfn_11", br.Xfn.spouse)
@Html.CheckBox("cblXfn_12", br.Xfn.kin)@Html.CheckBox("cblXfn_13", br.Xfn.muse)@Html.CheckBox("cblXfn_14", br.Xfn.crush)@Html.CheckBox("cblXfn_15", br.Xfn.date)@Html.CheckBox("cblXfn_16", br.Xfn.sweetheart)@Html.CheckBox("cblXfn_17", br.Xfn.me)
+
+ +
+
+ @if (!string.IsNullOrEmpty(Request.Form["hdnId"])) + { + + + + } + else + { + + } +
+
+ +
+
+ + + + + + + + + + + @foreach (var roll in rolls) + { + + + + + + } + @if (rolls == null || rolls.Count == 0) + { + + } + +
@Resources.labels.title@Resources.labels.descriptionXFN
+ @roll.Title + + @roll.Description@roll.Xfn
@Resources.labels.empty
+ + + + + \ No newline at end of file diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/widget.cshtml new file mode 100644 index 000000000..6a239af5b --- /dev/null +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/widget.cshtml @@ -0,0 +1,43 @@ +@using BlogEngine.NET.Custom.Widgets +@using BlogEngine.Core +@{ + var title = Model.Title; + var rolls = BlogRollItem.BlogRolls; + var br = new BlogRoll(); + var imgPath = Utils.ApplicationRelativeWebRoot + "Content/images/blog"; + var opmlPath = Utils.ApplicationRelativeWebRoot + "opml.axd"; +} +
+

@title

+
+ @if (rolls != null) + { +
    + @foreach (var roll in rolls) + { +
  • + + @roll.Description + + @roll.Title + @if (br.GetFeeds(roll.FeedUrl.ToString()).Count > 0) + { + + } +
    • + } +
+ } + + @Resources.labels.downloadOPML + OPML + +
+
\ No newline at end of file diff --git a/BlogEngine/BlogEngine.NET/admin/app/content/blogs/blogView.html b/BlogEngine/BlogEngine.NET/admin/app/content/blogs/blogView.html index b587db510..eee9f54e0 100644 --- a/BlogEngine/BlogEngine.NET/admin/app/content/blogs/blogView.html +++ b/BlogEngine/BlogEngine.NET/admin/app/content/blogs/blogView.html @@ -109,9 +109,9 @@

{{modalTitle}}

{{lbl.blogs}}

- -
- +
+ +
diff --git a/BlogEngine/BlogEngine.NET/admin/themes/standard/sidebar.cshtml b/BlogEngine/BlogEngine.NET/admin/themes/standard/sidebar.cshtml index 4434f0f0c..03373c275 100644 --- a/BlogEngine/BlogEngine.NET/admin/themes/standard/sidebar.cshtml +++ b/BlogEngine/BlogEngine.NET/admin/themes/standard/sidebar.cshtml @@ -24,7 +24,7 @@
    • -
    • +
    • diff --git a/BlogEngine/BlogEngine.NET/setup/SQLServer/Setup.sql b/BlogEngine/BlogEngine.NET/setup/SQLServer/Setup.sql index d069fdcc8863b5794092262d3126c692ba555b74..2cedf401f15769aebf30ff486cbb2330ed6a564e 100644 GIT binary patch delta 78 zcmaE|iSO1Xz720CGdfRxJJ}jYYEPLj7{HLvP|Q%mpuph6kO^WufSDec1%mM%~9vBz^ delta 92 zcmcb$iSNlKz720CGbT@dJK369fgyRa=9KxOK@6!3$v~XPP{I(vkk3#Iq>CrpPt?UB YV>m^<*=}mP-Bd;(X4-Bym05-b0G~}9d;kCd From ff84d025c01370dc8a81cf948a8226eb9d3fd527 Mon Sep 17 00:00:00 2001 From: Sami Kuhmonen Date: Tue, 8 Mar 2016 21:41:58 +0200 Subject: [PATCH 003/146] Use invariant culture for post serialization --- BlogEngine/BlogEngine.Core/Data/Services/Json.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/BlogEngine/BlogEngine.Core/Data/Services/Json.cs b/BlogEngine/BlogEngine.Core/Data/Services/Json.cs index b9228db11..c89006bee 100644 --- a/BlogEngine/BlogEngine.Core/Data/Services/Json.cs +++ b/BlogEngine/BlogEngine.Core/Data/Services/Json.cs @@ -1,6 +1,7 @@ using BlogEngine.Core.Data.Models; using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; namespace BlogEngine.Core.Data.Services @@ -24,7 +25,7 @@ public static PostItem GetPost(Post post) Title = post.Title, Slug = post.Slug, RelativeLink = post.RelativeLink, - DateCreated = post.DateCreated.ToString("yyyy-MM-dd HH:mm"), + DateCreated = post.DateCreated.ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture), Categories = GetCategories(post.Categories), Tags = GetTags(post.Tags), Comments = GetComments(post), @@ -47,7 +48,7 @@ public static PostDetail GetPostDetail(Post post) Description = post.Description, RelativeLink = post.RelativeLink, Content = post.Content, - DateCreated = post.DateCreated.ToString("yyyy-MM-dd HH:mm"), + DateCreated = post.DateCreated.ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture), Categories = GetCategories(post.Categories), Tags = GetTags(post.Tags), Comments = GetComments(post), @@ -81,7 +82,7 @@ public static PageItem GetPage(Page page) Slug = page.Slug, Parent = parentOption, Keywords = page.Keywords, - DateCreated = page.DateCreated.ToString("yyyy-MM-dd HH:mm"), + DateCreated = page.DateCreated.ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture), HasChildren = page.HasChildPages, IsPublished = page.IsPublished, IsFrontPage = page.IsFrontPage, @@ -114,7 +115,7 @@ public static PageDetail GetPageDetail(Page page) Parent = parentOption, Description = page.Description, Keywords = page.Keywords, - DateCreated = page.DateCreated.ToString("yyyy-MM-dd HH:mm"), + DateCreated = page.DateCreated.ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture), HasChildren = page.HasChildPages, IsPublished = page.IsPublished, IsFrontPage = page.IsFrontPage, @@ -138,7 +139,7 @@ public static CommentItem GetComment(Comment c, List postComments) jc.Email = c.Email == "trackback" ? "pingback" : c.Email; jc.Author = c.Author; jc.Title = c.Teaser.Length < 80 ? c.Teaser : c.Teaser.Substring(0, 80) + "..."; - jc.DateCreated = c.DateCreated.ToString("yyyy-MM-dd HH:mm"); + jc.DateCreated = c.DateCreated.ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture); jc.RelativeLink = c.RelativeLink; jc.HasChildren = postComments.Where(pc => pc.ParentId == c.Id).FirstOrDefault() != null; jc.Avatar = Gravatar(c); From e5608864e56885f358c40c83f51ecff44dc2657a Mon Sep 17 00:00:00 2001 From: Sami Kuhmonen Date: Tue, 8 Mar 2016 21:49:11 +0200 Subject: [PATCH 004/146] Use hashcode for extensionType like in other places --- .../BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs b/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs index f0a2a1f09..dbaca9fd0 100644 --- a/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs @@ -2139,7 +2139,7 @@ public override void RemoveFromDataStore(ExtensionType extensionType, string ext var p = cmd.Parameters; p.Add(conn.CreateParameter(FormatParamName("blogid"), Blog.CurrentInstance.Id.ToString())); - p.Add(conn.CreateParameter(FormatParamName("type"), extensionType)); + p.Add(conn.CreateParameter(FormatParamName("type"), extensionType.GetHashCode())); p.Add(conn.CreateParameter(FormatParamName("id"), extensionId)); cmd.ExecuteNonQuery(); From a6242f240951a651a809431a346f70bc3bb58319 Mon Sep 17 00:00:00 2001 From: rxtur Date: Wed, 9 Mar 2016 13:24:19 -0600 Subject: [PATCH 005/146] SQL scripts updated with widget changes --- .../BlogEngine.NET/setup/MySQL/Setup.sql | 3 +-- .../BlogEngine.NET/setup/SQLServer/Setup.sql | Bin 235866 -> 235864 bytes .../setup/SQL_CE/BlogEngine.sdf | Bin 720896 -> 851968 bytes .../setup/SQLite/BlogEngine.s3db | Bin 166912 -> 166912 bytes 4 files changed, 1 insertion(+), 2 deletions(-) diff --git a/BlogEngine/BlogEngine.NET/setup/MySQL/Setup.sql b/BlogEngine/BlogEngine.NET/setup/MySQL/Setup.sql index d5bd3a59b..b1d2212a8 100644 --- a/BlogEngine/BlogEngine.NET/setup/MySQL/Setup.sql +++ b/BlogEngine/BlogEngine.NET/setup/MySQL/Setup.sql @@ -524,8 +524,7 @@ INSERT INTO be_Roles (BlogID, Role) VALUES ('27604F05-86AD-47EF-9E05-950BB762570 INSERT INTO be_UserRoles (BlogID, UserName, Role) VALUES ('27604F05-86AD-47EF-9E05-950BB762570C', 'Admin', 'Administrators'); INSERT INTO be_DataStoreSettings (BlogId, ExtensionType, ExtensionId, Settings) -VALUES ('27604F05-86AD-47EF-9E05-950BB762570C', 1, 'be_WIDGET_ZONE', '<widgets><widget id="d9ada63d-3462-4c72-908e-9d35f0acce40" title="TextBox" showTitle="True">TextBox</widget><widget id="19baa5f6-49d4-4828-8f7f-018535c35f94" title="Administration" showTitle="True">Administration</widget><widget id="d81c5ae3-e57e-4374-a539-5cdee45e639f" title="Search" showTitle="True">Search</widget><widget id="77142800-6dff-4016-99ca-69b5c5ebac93" title="Tag cloud" showTitle="True">Tag cloud</widget><widget id="4ce68ae7-c0c8-4bf8-b50f-a67b582b0d2e" title="RecentPosts" showTitle="True">RecentPosts</widget></widgets>'); - +VALUES ('27604F05-86AD-47EF-9E05-950BB762570C', 1, 'be_WIDGET_ZONE', '<widgets><widget id="d9ada63d-3462-4c72-908e-9d35f0acce40" title="TextBox" showTitle="True">TextBox</widget><widget id="19baa5f6-49d4-4828-8f7f-018535c35f94" title="Administration" showTitle="True">Administration</widget><widget id="d81c5ae3-e57e-4374-a539-5cdee45e639f" title="Search" showTitle="True">Search</widget><widget id="77142800-6dff-4016-99ca-69b5c5ebac93" title="Tag Cloud" showTitle="True">TagCloud</widget><widget id="4ce68ae7-c0c8-4bf8-b50f-a67b582b0d2e" title="Post List" showTitle="True">PostList</widget></widgets>'); -- -- be_Pages SortOrder -- diff --git a/BlogEngine/BlogEngine.NET/setup/SQLServer/Setup.sql b/BlogEngine/BlogEngine.NET/setup/SQLServer/Setup.sql index 2cedf401f15769aebf30ff486cbb2330ed6a564e..800c9be702ba0fbb1d36e70a4f132f8ef6ae69c2 100644 GIT binary patch delta 26 gcmcb$iSNcHz72d+n+2w}3ruAMVy5i^Q<=S30GZGUwg3PC delta 28 icmcbyiSO1Xz72d+85Np&r?&G>WdvfT?YvW&y;%UHstL>h diff --git a/BlogEngine/BlogEngine.NET/setup/SQL_CE/BlogEngine.sdf b/BlogEngine/BlogEngine.NET/setup/SQL_CE/BlogEngine.sdf index d470f37cb1c56f68bef4ccb3533286526c92f3ea..53d0d1ca6e9cbaf6805ac52106ba5f411f435919 100644 GIT binary patch delta 6300 zcmeHL4R91i7Jl8+yE{Ee_9rof4J4Tj1R@Z~l7xVUuptS8B5Y1juu9y81Qn1Z1O$~M z8}-2R55kHgC=g;2QNhcyaHIIcdZz_mse}?Ne^6HZAaOZ~ zYNmU-zkdDR>o@Pcok%w-}JWL%>d4A%&8~V(DqA6 zfrkUEN1R^(aO3!t2!$u71FW5A%+uQYO#mZtYyx(T!aLYlkz~HU7NAj7{e&(Rds z6|o$#acg)*MlJKe36n5H~cpeN#O%I1$b$_8Su zyhho{p?Gkzn(^RaP{QOgC}mK_yk#(f!38W(29p?E$lA+bGJ}g*v<#*)@G`j^ zE@3d8`O4uk1~b^2a=4tqI_8_yLsGAja>s+VNfUcIOL}Tz)WNBa97i0sCA^dHwrh2` zw)Kdh-cn0Ddv;^otSQo9)S(3HBoxygRHm*uw-QhVMXd9$_|qHDky+4 zsE`84hq+ki;5`bjx!B5wLR3^Gwnn457^7oQg?advkH$3`XU)Y8@ME2c)EA>_7wcO! z7T-&;U)!*&a9b9^^*BBm$Lp|9!`8vo*uPYHQ(&%?God{|WrV=SUZ8O|201FkwMOIW zIk>VLdC1o})VOwIOG8xQiaCfFg?BFYjzUxcwkq*isNBg|KT@hZ#Mt?~6uGQMlc>~} zxMr?CNfWRDiD-o9U~Pz=j|4_zTT?xMZNPy|F!U_o;Kopzl5#|J;fFSl+xNc5sK3fgzq;E@XMVdd|Gj$ zW9%(Dx=e8;u@q&DojFp=%*N25GePAspou-8!DoUdd=GM7_+ylm2B*+RDYUaBKDn2W z^2}3Y2+F*Lv$gLERCz3em9cxW7;Wyb%ibNA{^dIKqgL$$k15)>t`+6nfTcPyv8xoy z1AyOGPvZj3MHkw#?P9>vW%ijnOtmJ5Da0z+Nug123kPT|bNl0N@$rNS_4(RynOj;zPaWxY)&pU$-52a%1< z*4uEVPC=g+hXdo4kIIDp#HzSF!XU|fQ$qg)At5y(Qwfy{PQ~XD1`_+($5xaG$!48S z!r1{k$0K3e*~dnf37M)?F1#)U1FhfY_==kfJ#H8(4|HTU$d2@qejz7GaU?e+hHMUN zNxTPbqkF)0dZ4-Y%s}J&O#@AD^eO4t+@5U?PIbAJfLmbvN25%em&j7e;cKNq|Bp1k zAkxhL?IX?UFsuB`Sn~>R3lKTwXv!y5KsLZbGJDt$nbCvQzpob*OJEbVU3;`4uL2K8^9Lm zB3gpzfLsZ-0Fu)+F(Vc<_9RN=N z41*4e>9JBT^WmCW0QW&I zheUwKazT!VdjakNdpz6;a2GNLdjOt>jyQNy%aYp(>;TvfH4?M{Y*y??#B8;O5S!Jx zNf!{{(S$k3j2%B?qsUr3J!Wf+i1O#p&(tHb{g*}LiAF@u`dJZKJvD*~vh%K-h;D6d zzp1rl|4eIxHXpUu?>~6eP|es-iF*0%jLkzJMO)(R#+Lf)j7_HhVPo^sA2T+xN&UK> zTI_t@#q)Jz8>x&qL6g;VkNI`Y(pEOnwkE;O`yc=7`DW&U3xhl`n0yy@2VP?2+Z}%> zrsN;tajUMSu}DUFVmF~VP%A^jF?tN%qt_7l@YNm!tK(_SLEC3(Q{3Y zIlTw3+J3Es8DB8WBiiZxncma8`Lfp^Zbk63L`mr%$CVoN=~Zxk0h&@__4urlEHJ+F}r$oAz4Ai zkBt6vwEih-(Rt)q6MsKrwka8DWU0J{)SJW;2ByzxdDSkC>YgtQ?G*_Ev@vhbb@#zSdzKhc;PCC_UPG=JFeS<04U<#Sd zq~u*yPM}fBXZL-?x(L^K?R%!axNTIYj7+VLWy*z2@lEzt^A-fR#BPndqBA@I7quwd zO9zv8RJWHt#>i3i!)bIT6W=x#&oUNYHj}={#5aw;Y`ssjGO* zBiaWa7`P?VA(Qk_|1GJtnEtzy8_o>yaIbTI(H$ttpfegW}4 zTffSWw^eRL#PnDMda^+^lXms9AmGT1Ta)ic!0%!K?UP_)6iGC3MDz)K`M`aM_(t=9 zy`=^b5k#z^h}e=JdU^vQro_^SPJ%oSE@DQ&;kGYcQxNcS?{uy1m;~kRNWzPYr0mW6 zr0?B`csCY-QlvDI4{SppeLg3f;i#i`0grJwG$VRU`OdT4k6B+iFy*C7cxuq%?@#Uv4)jkTN^rjaJibvM z6w7PZc`d1mH_j}EJN&uU`om*f=Vj|dtNljB@`H3E_=_{zfaTwo vWIX;eGTPnXi~F%8!@1Fr3dXd5r6(DgJ@3yN8Eq)yA(}If+J4=$(I@^Bd9=0E delta 1740 zcmb7FeQZ-z6hHUA*VlJ%yS4jh3oEc!zQ&NnR$*k!!2ri*2v`JTM$i-#0S99XMhPzN z1!ozsK)X2}Utwj!Ca`L;85aqJ5=B5^lqf>Lg(g54${&;HA1W|!`x@n6Pjc@)J?H#> zzn=5@ZdG-%s!l4pU$ycyaC0TMq>(Z}{J4ozpHhA*ECTEe7B!-bqv3^U$~#5?Kd-A0 zbm-wYf=eEN{(VU>r2O7=?g$Tc^VJqykRuH&0hlL8_b0y0Al0MY`8lE+eq_Xp)*+I| zfp)$`R(}=U6WHok(I=G5*iapD@+vzcab9J};1wpe>MHt`S6t;4!&>@-xy52R%$0eH zTaH*aUMznevw?IF;k(rEyL%VaMty z(0m-HC4$0ORvi#JEb{Mh0Ux;{;7+ggnOz^e_k}3>ph?#Pp=oByllXpOXlRJKXTfcL zju%0zQ_PdvUzR3ljc&6n_<6)_l5AScZ8m7NW=Yn1+~#S<8a~7UNf~_JUyB8RerXHa`7M|3BuLa-zCj7=o35R zR#Fw2J=@G#?rX$K3s5`rSm|PncCwai%Judzvz-naP$_%tq}Q>$Z)hkfXVuPxX^|Go zriwN(pZ?T2=q3}d-8^gMDkYjHVH_0=)f2?r9vaUir`9el$>JJKjHt8~qy22}M!HFq z59nk$I$6j;t!(8c`XQFP^+awmF`vD#g??io+1nr3vN`=5Ptz~u^j%)0kl?${Z*5#+ z3?l*BXpj%<4EF!NC+lygyRjVB6OL4Z_3WgJj9n^H9LTvd|C=`S)8q64xV)mfZ6{o}u=tGn_L#qu#dK0;@2I6})Xy1`C_=^We@L*)eT zJKs8r^Sr{yAYD$-n{4f$v>M4Pbey8&INxZDYMAnvCNRnTW6VH4Z(P-WD>m8rT(kIG z&m`yi_r@s$3eRkNI+JDMBXMJe?6_W!#&9h`BW_axTFX3c({T~4W4}x`Rg3aTU2>c* zxxU17Nt93Pu?c!x$*0S9PdB}dx_sD5w1c^Q5mEinCOog{4vQNGx}q4SBzL~9WP$KTgLmTNM8ZDVjW;+iwU;?P@(cmNJu+oNIO}qG%lRA&?k<|4_0zS18J+Do)MlZ!?tu$idDZbWv`)Td zAunAhtihl_sYVpyaaaLL0UV$r7!HsJUII=4tSwMTWv&3_0Mh`9As|Bwz%Gartw$lX zmIQ$gfEtKNup1zx6}rgGY%7IkfKCX>uod7_D5tE!MVd0Rst;Y`|0`Cms@p-9rAqfK RM`PuPDXNsP{J;IY{> z@|^QI=lMS8oMUJF$IkfQi*39`2w8NExkgV7<>A)y!HXE+a2vrdkzpCPIX&I|$SFKW zoU~WvpwFJ^8UWrt+4VG_^G(4mWU*;8`hCC-hW?RAeSyt0EEaTQ!6_%nWoH}RTFeuUv( zOo3LOtJbTg)zqv;)8y@&M>8&Ym*DUC3%2pDOWsBgj{rRHw2w!+U1>`Mzr`gtasllv z%R}~MC*|B{yl?H3ryqPW&lOX4{DVaJU+<*3VvNOQ7<5i9z8dg_$vuKg__`guDA?&g zO?!uL|KFwWr<`5OpHk?%vcj$SC`l5Mgda|g#WuX1qh3-BB^Ownhr!l-9o~gjvIa4_ z@G^KjZ31nQbit1AI<(sJ5T!ghPsn*Y<9px#hSt|fPrWl`-$*~ko~*(I`{^7c*x?A3 zTX(7ug(sxEtSHkNMbz|CT9nj$Nz`*{Nz5v0UX!!gyq?y!3Rcys8KYarHOr_pnn#2Q zx1H?s8HfbdT&tc#Gq5F_Q4~ch74l+U$|<5$kfz0gE|tY>T9u@9F0U$jcD>?0ts;yw zaTYeiIGdP-0XeP9dO^vE8CBCoDKlLV)v_*&(|XB}bDEk}bZI?%vSC^ewD>yLRUOx7 zVYJ0rfOmLsw_~vtc!B~Q*L?4Y=-5oMf`Y&?q z!vy;(MC1Ld61G?8w2EPFuQe)-;Y0Pxu8=pnxtL;O0h(h6j?=}D57HmO7w(KY{^o8r zwg(daJ;rNh&9E$^$>z_wtz8@Yh;J>zZXAI)`#wU42KO5EvMCsITD4{hRzs+-Cky5) rx>;&gb)#vrp0D9q_Ewbc=X1lk;WUfaA-?blc({Ko+@}BS!l{1&`T2g+ delta 687 zcmZ8eOH30{6n*#I>4#~Nib{z@DO4yJ2Z!mj(MMoEy3 zCMcQc!^F6-xFu<)$;7xo*kIfl5?Hu!!@`YCOk5aOJ}?^MOYTeVc_-)I^Ul<~I5jUm zZK_=+gcNx(UO3mG!BXkQ0{RiN1V13dEFQ6U2bvKQw(Lm?P;cGxg+Z`peW!ui>%OkN zUceQCEBKJ}CJ~RPf^7Ucv{|8ZF1r%$Z}isU5*H^g=EnAO%1g9XPAL8XfkW4jUss`g zQaHvZt`Yo(UvLfIbDE8TJ$iN|U&tHggl>*b7=pF-pqtaG1b^WVtm0Qr`;6!o1iL!j z5a4@k5Zu5;4!^-aJFLGuT%H%af9*WmVaF=5w*M!{LaK?i#Gu`tE#CEu^>A=o5NE7i z3(c0|{cbI?4!f`PmI9P3Ld6XbAP}&-y>1X^M!-W-b)An4>yvzleH?=`EMI^t&e%8v zAwHN+s9H3pOXEobC(Hk#1>sa(iqas{)0)G&>09p6r1 z)qox^B@seTk;q(clM@++Rbcls)XmC6aJJ@gly3QnJZCK~Xm>8%geM@@^1uM91ghNh zCOFj*2vWyo0^M{`{`T7OU#34JB4U_e1#e@Rr?C$`eRZDTfmA2!_0uRDn5M<8_=}EU j(t<}+C0Uc?XsBCd_a Date: Sun, 13 Mar 2016 16:09:47 -0500 Subject: [PATCH 006/146] Some fixes, mostly in BlogRoll widget (3.2.1.5) --- .../Properties/AssemblyInfo.cs | 2 +- .../Providers/CacheProvider/CacheBase.cs | 5 ++++ .../Providers/CacheProvider/CacheProvider.cs | 24 +++++++++++++++++ .../Providers/XmlProvider/BlogRoll.cs | 6 ++++- .../AppCode/Api/SettingsController.cs | 4 +++ .../App_GlobalResources/labels.ru.resx | 4 +-- .../Custom/Widgets/BlogRoll/BlogRoll.cs | 9 ++++--- .../Custom/Widgets/BlogRoll/edit.cshtml | 27 ++++++++++--------- .../Custom/Widgets/LinkList/edit.cshtml | 2 +- .../Custom/Widgets/LinkList/widget.cshtml | 2 +- .../app/custom/widgets/widgetController.js | 4 +-- .../admin/app/settings/advancedView.html | 4 +++ .../admin/app/settings/settingController.js | 13 +++++++++ 13 files changed, 83 insertions(+), 23 deletions(-) diff --git a/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs b/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs index 60a2173a2..eb84c7302 100644 --- a/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs +++ b/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs @@ -19,5 +19,5 @@ [assembly: CLSCompliant(false)] [assembly: ComVisible(false)] [assembly: AllowPartiallyTrustedCallers] -[assembly: AssemblyVersion("3.2.1.4")] +[assembly: AssemblyVersion("3.2.1.5")] [assembly: SecurityRules(SecurityRuleSet.Level1)] diff --git a/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheBase.cs b/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheBase.cs index e36f83570..566352cad 100644 --- a/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheBase.cs +++ b/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheBase.cs @@ -79,6 +79,11 @@ public abstract class CacheBase : IEnumerable /// public abstract object Remove(string key); + /// + /// Reset cache provider + /// + public abstract void Reset(); + IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); diff --git a/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheProvider.cs b/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheProvider.cs index 80f41aa6b..3edd2abec 100644 --- a/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheProvider.cs +++ b/BlogEngine/BlogEngine.Core/Providers/CacheProvider/CacheProvider.cs @@ -154,5 +154,29 @@ public override object Remove(string key) { return _cache.Remove(_keyPrefix + key); } + + /// + /// Reset cache provider + /// + public override void Reset() + { + var keys = new System.Collections.Specialized.StringCollection(); + foreach (var item in _cache) + { + var x = (DictionaryEntry)item; + keys.Add(x.Key.ToString()); + } + if (keys.Count > 0) + { + foreach (var key in keys) + { + if (key.StartsWith(_keyPrefix)) + { + // Utils.Log(key); + _cache.Remove(key); + } + } + } + } } } diff --git a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/BlogRoll.cs b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/BlogRoll.cs index 68feebf02..7c1493b78 100644 --- a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/BlogRoll.cs +++ b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/BlogRoll.cs @@ -101,9 +101,13 @@ public override List FillBlogRoll() public override void InsertBlogRollItem(BlogRollItem blogRollItem) { var blogRolls = BlogRollItem.BlogRolls; + if(blogRolls == null) + { + blogRolls = new List(); + } blogRolls.Add(blogRollItem); - this.WriteBlogRollFile(blogRolls); + WriteBlogRollFile(blogRolls); } /// diff --git a/BlogEngine/BlogEngine.NET/AppCode/Api/SettingsController.cs b/BlogEngine/BlogEngine.NET/AppCode/Api/SettingsController.cs index 6e72115d0..f0d733a80 100644 --- a/BlogEngine/BlogEngine.NET/AppCode/Api/SettingsController.cs +++ b/BlogEngine/BlogEngine.NET/AppCode/Api/SettingsController.cs @@ -38,6 +38,10 @@ public HttpResponseMessage Put([FromBody]Settings settings, string action = "") return Request.CreateResponse(HttpStatusCode.OK, retMsg); } } + else if(action == "clearCache") + { + BlogEngine.Core.Blog.CurrentInstance.Cache.Reset(); + } else { repository.Update(settings); diff --git a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.ru.resx b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.ru.resx index 2515ad442..3c0c88b72 100644 --- a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.ru.resx +++ b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.ru.resx @@ -1607,10 +1607,10 @@ Разрешить - Все запили + Все записи - Все запили отмеченные как + Все записи отмеченные как Пожалуйста выберите другой email адрес diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/BlogRoll.cs b/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/BlogRoll.cs index 9fe635235..86780f4d5 100644 --- a/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/BlogRoll.cs +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/BlogRoll.cs @@ -128,11 +128,14 @@ public void Add(NameValueCollection form) br.Xfn = GetXfnString(form); int largestSortIndex = -1; - foreach (BlogRollItem brExisting in BlogRollItem.BlogRolls) + if(BlogRollItem.BlogRolls != null && BlogRollItem.BlogRolls.Count > 0) { - if (brExisting.SortIndex > largestSortIndex) + foreach (BlogRollItem brExisting in BlogRollItem.BlogRolls) { - largestSortIndex = brExisting.SortIndex; + if (brExisting.SortIndex > largestSortIndex) + { + largestSortIndex = brExisting.SortIndex; + } } } br.SortIndex = largestSortIndex + 1; diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/edit.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/edit.cshtml index e66e39163..609671c6b 100644 --- a/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/edit.cshtml +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/edit.cshtml @@ -173,22 +173,25 @@ XFN - - @foreach (var roll in rolls) - { - - - @roll.Title - - - @roll.Description - @roll.Xfn - - } + @if (rolls == null || rolls.Count == 0) { @Resources.labels.empty } + else + { + foreach (var roll in rolls) + { + + + @roll.Title + + + @roll.Description + @roll.Xfn + + } + } diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/edit.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/edit.cshtml index 8236c3506..6c3467153 100644 --- a/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/edit.cshtml +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/edit.cshtml @@ -10,7 +10,7 @@ var hdnId = ""; var widgetId = Request.QueryString["id"]; - var updateLink = BlogEngine.Core.Utils.RelativeOrAbsoluteWebRoot + + var updateLink = BlogEngine.Core.Utils.RelativeWebRoot + "Custom/Widgets/LinkList/edit.cshtml?id=" + widgetId; var settings = Common.GetSettings(widgetId); var linkList = new LinkList(widgetId); diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/widget.cshtml b/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/widget.cshtml index 42bd4bfa4..d5c738c55 100644 --- a/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/widget.cshtml +++ b/BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/widget.cshtml @@ -6,7 +6,7 @@

    @Model.Title

    -
      +
    +
    +

    Clear blog cache

    + +
    diff --git a/BlogEngine/BlogEngine.NET/admin/app/settings/settingController.js b/BlogEngine/BlogEngine.NET/admin/app/settings/settingController.js index 2ee198ef1..3f659c93d 100644 --- a/BlogEngine/BlogEngine.NET/admin/app/settings/settingController.js +++ b/BlogEngine/BlogEngine.NET/admin/app/settings/settingController.js @@ -105,6 +105,19 @@ .error(function () { toastr.error($rootScope.lbl.failed); }); } + $scope.clearCache = function () { + dataService.updateItem("/api/settings?action=clearCache", $scope.settings) + .success(function (data) { + if (data) { + toastr.error(data); + } + else { + toastr.success($rootScope.lbl.completed); + } + }) + .error(function () { toastr.error($rootScope.lbl.failed); }); + } + $scope.loadTheme = function () { var theme = $("#selDesktopTheme option:selected").text(); window.location.assign("#/shared/package?id=" + theme); From d37be24ab87096173d2018ebdadc24e8560d4f53 Mon Sep 17 00:00:00 2001 From: Farzin Seyfolahi Date: Mon, 14 Mar 2016 18:37:37 -0700 Subject: [PATCH 007/146] Toggle arrow in sidebar removed and toolbar is open by default and Widgets improved. --- .../admin/app/custom/widgets/widgetView.html | 207 ++++++++---------- .../admin/themes/standard/css/styles.css | 2 +- .../admin/themes/standard/css/styles.css.map | 4 +- .../themes/standard/sass/layout/_header.scss | 16 +- .../themes/standard/sass/layout/_sidebar.scss | 25 --- .../standard/sass/pages/custom/_widgets.scss | 71 ++++++ .../admin/themes/standard/sass/styles.scss | 5 +- .../admin/themes/standard/sidebar.cshtml | 3 +- 8 files changed, 181 insertions(+), 152 deletions(-) create mode 100644 BlogEngine/BlogEngine.NET/admin/themes/standard/sass/pages/custom/_widgets.scss diff --git a/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html b/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html index c76dac93e..fbb6346a1 100644 --- a/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html +++ b/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html @@ -1,151 +1,134 @@ -
    - +
    +

    {{lbl.widgets}}

    - +
    - -