From 23c6cf44a173df787fb359dd968163e6c0a6ea44 Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Thu, 12 Dec 2024 08:51:51 +0000 Subject: [PATCH 01/14] #549 altering the list links render to use bootstrap 5 styling and components --- .../Views/Shared/LinksRenderPartial.cshtml | 48 +++++++++++-------- .../Design/IconCssClasses.cs | 35 +------------- src/sourceDev.WebApp/appsettings.json | 20 ++++---- .../page/list-of-links.json | 1 + .../17595de8-d27a-4304-bded-76b61a16ad19.json | 2 +- 5 files changed, 42 insertions(+), 64 deletions(-) create mode 100644 src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/list-of-links.json diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/Views/Shared/LinksRenderPartial.cshtml b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/Views/Shared/LinksRenderPartial.cshtml index 09f82a5ac..f28c71940 100644 --- a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/Views/Shared/LinksRenderPartial.cshtml +++ b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/Views/Shared/LinksRenderPartial.cshtml @@ -4,38 +4,48 @@ @using cloudscribe.SimpleContent.ContentTemplates.ViewModels @inject IStringLocalizer sr @inject ILinkListOptionsProvider optionsProvider +@inject IOptions iconClassesAccessor + @{ - + var icons = iconClassesAccessor.Value; var sorted = Model.Items.OrderBy(x => x.Sort).ToList(); var options = await optionsProvider.ResolveLinkListOptions(Context.Request.Host.Host, Context.Request.Path); var imageStyle = "height:" + options.ImageRenderMaxHeight.ToString() + "px;"; } @functions { -public string GetTarget(ListItemModel item) -{ - if (item.OpensInNewWindow) { return "_blank"; } - return null; -} + public string GetTarget(ListItemModel item) + { + if (item.OpensInNewWindow) { return "_blank"; } + return null; + } }
@Html.Raw(Model.ContentAbove)
-
+
    @for (int i = 0; i < Model.Items.Count; i++) { -
    -

    @sorted[i].Title

    - - @if (!string.IsNullOrWhiteSpace(sorted[i].ResizedUrl)) - { - - @sorted[i].AltText - - } -

    @sorted[i].Description

    -
    +
  • +
    +

    @sorted[i].Title + @if (GetTarget(sorted[i]) == "_blank") + { + + } +

    +
    +
    + @if (!string.IsNullOrWhiteSpace(sorted[i].ResizedUrl)) + { + + @sorted[i].AltText + + } +

    @sorted[i].Description

    +
    +
    • } -
+
@Html.Raw(Model.ContentBelow)
\ No newline at end of file diff --git a/src/cloudscribe.SimpleContent.Web/Design/IconCssClasses.cs b/src/cloudscribe.SimpleContent.Web/Design/IconCssClasses.cs index 2af4d401c..f7d7a2b57 100644 --- a/src/cloudscribe.SimpleContent.Web/Design/IconCssClasses.cs +++ b/src/cloudscribe.SimpleContent.Web/Design/IconCssClasses.cs @@ -25,8 +25,6 @@ public class IconCssClasses public string Home { get; set; } = "glyphicons glyphicons-home"; - //public string HideEditToolbar { get; set; } = "glyphicon glyphicon-chevron-right"; - public string ShowEditToolbar { get; set; } = "glyphicon glyphicon-pencil"; public string NewItem { get; set; } = "glyphicon glyphicon-plus"; @@ -44,37 +42,6 @@ public class IconCssClasses public string Unpublish { get; set; } = "glyphicon glyphicon-eye-close"; public string RelatedPosts { get; set; } = "far fa-hand-point-right"; //"fas fa-asterisk"; - - // - - - - // public string JustifyLeft { get; set; } = "glyphicon glyphicon-align-left"; - - //public string JustifyCenter { get; set; } = "glyphicon glyphicon-align-center"; - - //public string JustifyRight { get; set; } = "glyphicon glyphicon-align-right"; - - //public string JustifyFull { get; set; } = "glyphicon glyphicon-align-justify"; - - //public string UnorderedList { get; set; } = "glyphicon glyphicon-list"; - - //public string OrderedList { get; set; } = "glyphicon glyphicon-th-list"; - - //public string Outdent { get; set; } = "glyphicon glyphicon-indent-left"; - - //public string Indent { get; set; } = "glyphicon glyphicon-indent-right"; - - //public string Hyperlink { get; set; } = "glyphicon glyphicon-globe"; - - //public string RemoveHyperlink { get; set; } = "glyphicon glyphicon-remove"; - - //public string InsertImage { get; set; } = "glyphicon glyphicon-picture"; - - //public string ToggleSource { get; set; } = "glyphicon glyphicon-eye-open"; - - //public string ClearAllFormatting { get; set; } = "glyphicon glyphicon-fire"; - - + public string OpenInNewWindow { get; set; } = "fas fa-external-link-alt"; } } diff --git a/src/sourceDev.WebApp/appsettings.json b/src/sourceDev.WebApp/appsettings.json index c7401db26..e5c13752d 100644 --- a/src/sourceDev.WebApp/appsettings.json +++ b/src/sourceDev.WebApp/appsettings.json @@ -165,7 +165,7 @@ "SimpleContentIconConfig": { "DefaultSetId": "fontawesome5x", "IconSets": [ - { + { "SetId": "fontawesome4x", "Previous": "fa fa-backward", "Next": "fa fa-forward", @@ -185,10 +185,10 @@ "SortAlpha": "fa fa-sort-alpha-asc", "Edit": "fa-pencil-square-o", "View": "fa fa-eye", - "Delete": "fa fa-trash-o" - - }, - { + "Delete": "fa fa-trash-o", + "OpenInNewWindow": "fa fa-external-link" + }, + { "SetId": "fontawesome5x", "Previous": "fas fa-backward", "Next": "fas fa-forward", @@ -209,9 +209,9 @@ "Edit": "fas fa-pencil-alt", "View": "fas fa-eye", "Delete": "far fa-trash-alt", - "Unpublish": "far fa-eye-slash" - - }, + "Unpublish": "far fa-eye-slash", + "OpenInNewWindow": "fas fa-external-link-alt" + }, { "SetId": "glyphicons", "Previous": "glyphicon glyphicon-backward", @@ -233,8 +233,8 @@ "Edit": "glyphicon glyphicon-edit", "View": "glyphicon glyphicon-eye-open", "Delete": "glyphicon glyphicon-trash", - "Unpublish": "glyphicon glyphicon-eye-close" - + "Unpublish": "glyphicon glyphicon-eye-close", + "OpenInNewWindow": "glyphicon glyphicon-square-new-window" } ] diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/list-of-links.json b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/list-of-links.json new file mode 100644 index 000000000..be998f7f6 --- /dev/null +++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/list-of-links.json @@ -0,0 +1 @@ +{"Id":"list-of-links","ProjectId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","ParentId":"0","ParentSlug":"","PageOrder":3,"Title":"list of links","Author":"Admin","Slug":"list-of-links","ExternalUrl":"","CorrelationKey":null,"MetaDescription":null,"MetaJson":null,"MetaHtml":null,"Content":"\r\n
\r\n \r\n
\r\n
    \r\n
  • \r\n
    \r\n

    link 1 \r\n \r\n

    \r\n
    \r\n
    \r\n \r\n \r\n \r\n

    google.com

    \r\n
    \r\n
    • \r\n
  • \r\n
    \r\n

    link 2 \r\n

    \r\n
    \r\n
    \r\n

    bbc

    \r\n
    \r\n
    • \r\n
\r\n
\r\n \r\n
\r\n\r\n","PubDate":"2024-12-11T14:21:11.7769023Z","LastModified":"2024-12-11T15:56:20.243055Z","IsPublished":true,"MenuOnly":false,"ShowMenu":false,"ViewRoles":null,"Categories":[],"Comments":[],"ShowHeading":true,"ShowPubDate":false,"ShowLastModified":false,"ShowCategories":false,"ShowComments":false,"MenuFilters":null,"DisableEditor":false,"Resources":[],"ContentType":"html","CreatedUtc":"2024-12-11T14:19:46.3814172Z","CreatedByUser":"admin","LastModifiedByUser":"admin","DraftContent":null,"DraftAuthor":null,"DraftPubDate":null,"TemplateKey":"sct-ListOfLinks","SerializedModel":"{\"ContentAbove\":null,\"ContentBelow\":null,\"Items\":[{\"FullSizeUrl\":null,\"ResizedUrl\":\"/media/images/img_1150-ws.jpg\",\"ThumbnailUrl\":null,\"LinkUrl\":\"https://www.google.com\",\"Title\":\"link 1\",\"Description\":\"google.com\",\"AltText\":null,\"Sort\":1,\"OpensInNewWindow\":true},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"https://www.bbc.co.cuk\",\"Title\":\"link 2\",\"Description\":\"bbc\",\"AltText\":null,\"Sort\":3,\"OpensInNewWindow\":false}]}","DraftSerializedModel":null,"Serializer":"Json","ShowCreatedBy":null,"ShowCreatedDate":null,"ShowLastModifiedBy":null,"ShowLastModifiedDate":null} \ No newline at end of file diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json index 0a4d1b660..8c27f5968 100644 --- a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json +++ b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json @@ -1 +1 @@ -{"AuthorBio":"","Comment":"","NormalizedEmail":"ADMIN@ADMIN.COM","NormalizedUserName":"ADMIN","EmailConfirmed":true,"EmailConfirmSentUtc":null,"AgreementAcceptedUtc":null,"LockoutEndDateUtc":null,"NewEmail":"","NewEmailApproved":false,"LastPasswordChangeUtc":"2024-06-03T14:17:55.2771124Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAEGVnALS6pFN3EERYv0nYhCQ4jy0t3WB+uYVRUM40L55rqYdKv3yw1MmjWvEYd6x2Pw==","CanAutoLockout":true,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"S7ZJ6RCVYLDHBWTECX2S2GQXJKWUXNSL","Signature":"","TwoFactorEnabled":false,"BrowserKey":"fb4ead8f-7afd-4cd9-84b0-3718d71fa575","Id":"17595de8-d27a-4304-bded-76b61a16ad19","SiteId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","Email":"admin@admin.com","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2016-08-04T12:03:50.2175089Z","LastModifiedUtc":"2016-08-04T12:03:50.2175089Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2024-11-27T08:52:25.2785938Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""} \ No newline at end of file +{"AuthorBio":"","Comment":"","NormalizedEmail":"ADMIN@ADMIN.COM","NormalizedUserName":"ADMIN","EmailConfirmed":true,"EmailConfirmSentUtc":null,"AgreementAcceptedUtc":null,"LockoutEndDateUtc":null,"NewEmail":"","NewEmailApproved":false,"LastPasswordChangeUtc":"2024-06-03T14:17:55.2771124Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAEGVnALS6pFN3EERYv0nYhCQ4jy0t3WB+uYVRUM40L55rqYdKv3yw1MmjWvEYd6x2Pw==","CanAutoLockout":true,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"S7ZJ6RCVYLDHBWTECX2S2GQXJKWUXNSL","Signature":"","TwoFactorEnabled":false,"BrowserKey":"a1490bf5-7bc0-4c51-8781-50e43a7f2698","Id":"17595de8-d27a-4304-bded-76b61a16ad19","SiteId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","Email":"admin@admin.com","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2016-08-04T12:03:50.2175089Z","LastModifiedUtc":"2016-08-04T12:03:50.2175089Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2024-12-11T14:19:23.5104068Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""} \ No newline at end of file From 72e0a8814f3c1fb588e17979a709bad690ee3550 Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Wed, 19 Feb 2025 15:26:09 +0000 Subject: [PATCH 02/14] #487 Moving page 'created by' options --- .../Views/Page/Edit.cshtml | 2 +- .../Views/Page/EditWithTemplate.cshtml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml index 0f08313bb..79028c517 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml @@ -55,7 +55,6 @@ -
@@ -105,6 +104,7 @@
+
diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml index 8925190f8..d197bf4c8 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml @@ -64,7 +64,6 @@ @legend -
@@ -91,7 +90,7 @@
- +
From 87d919c679a38896811e6a6de6183173d1f431fb Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Wed, 19 Feb 2025 15:37:58 +0000 Subject: [PATCH 03/14] bumping numbers --- .../cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj | 2 +- .../cloudscribe.SimpleContent.Web.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj index ecbcb66de..57f6b05e5 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj @@ -2,7 +2,7 @@ Bootstrap 5 pre-compiled views for cloudscribe.SimpleContent.Web - 8.0.6 + 8.0.7 net8.0 Joe Audette true diff --git a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj index 55565635e..abeb47f7f 100644 --- a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj +++ b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj @@ -2,7 +2,7 @@ A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database - 8.0.5 + 8.0.6 net8.0 Joe Audette cloudscribe;blog,content From 143be727750d6ed8039f4d3085c9c0febbf29598 Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Wed, 5 Mar 2025 09:37:15 +0000 Subject: [PATCH 04/14] #998 ensuring translatable strings are in place --- .../Views/Shared/CommentFormPartial.cshtml | 14 +++++++------- .../Views/Shared/CommentPartial.cshtml | 6 ++++-- .../RssChannelProvider.cs | 12 +++++++----- .../Controllers/BlogController.cs | 4 ++-- .../Controllers/PageController.cs | 4 ++-- .../Services/Page/PageService.cs | 8 ++++---- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentFormPartial.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentFormPartial.cshtml index 98a90fb00..0527287e8 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentFormPartial.cshtml +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentFormPartial.cshtml @@ -1,7 +1,7 @@ @model cloudscribe.SimpleContent.Web.ViewModels.BlogViewModel @using cloudscribe.SimpleContent.Models @using cloudscribe.SimpleContent.Web - +@inject IStringLocalizer sr @{ var path = Url.Action("AjaxPostComment", "Blog"); @@ -10,28 +10,28 @@ }
- Post comment + @sr["Post comment"]
- +
- +
- +
- +
@@ -49,7 +49,7 @@
- +
diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentPartial.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentPartial.cshtml index ca0d5ac2a..0455015d4 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentPartial.cshtml +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentPartial.cshtml @@ -2,6 +2,8 @@ @using cloudscribe.SimpleContent.Web @addTagHelper "*, cloudscribe.Web.Common" @model cloudscribe.SimpleContent.Web.ViewModels.BlogViewModel +@inject IStringLocalizer sr +
Comment by @Model.TmpComment.Author
@@ -17,7 +19,7 @@ } @if (Model.CanEdit) { - + @if (Model.ProjectSettings.ModerateComments && !Model.TmpComment.IsApproved) { @@ -26,6 +28,6 @@
@if (Model.ProjectSettings.ModerateComments && !Model.TmpComment.IsApproved && !Model.CanEdit) { -
! The comment will not be visible until a moderator approves it !
+
@sr["! The comment will not be visible until a moderator approves it !"]
}
diff --git a/src/cloudscribe.SimpleContent.Syndication/RssChannelProvider.cs b/src/cloudscribe.SimpleContent.Syndication/RssChannelProvider.cs index 10c9f43e7..17f426e83 100644 --- a/src/cloudscribe.SimpleContent.Syndication/RssChannelProvider.cs +++ b/src/cloudscribe.SimpleContent.Syndication/RssChannelProvider.cs @@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Routing; +using Microsoft.Extensions.Localization; using System; using System.Collections.Generic; using System.Globalization; @@ -30,7 +31,8 @@ public RssChannelProvider( IHttpContextAccessor contextAccessor, IUrlHelperFactory urlHelperFactory, IActionContextAccessor actionContextAccesor, - IContentProcessor contentProcessor + IContentProcessor contentProcessor, + IStringLocalizer localizer ) { ProjectService = projectService; @@ -41,6 +43,7 @@ IContentProcessor contentProcessor ActionContextAccesor = actionContextAccesor; ContentProcessor = contentProcessor; BlogRoutes = blogRoutes; + sr = localizer; } protected IUrlHelperFactory UrlHelperFactory { get; private set; } @@ -51,7 +54,7 @@ IContentProcessor contentProcessor protected IBlogRoutes BlogRoutes { get; private set; } protected IContentProcessor ContentProcessor { get; private set; } protected IBlogUrlResolver BlogUrlResolver { get; private set; } - + protected IStringLocalizer sr { get; private set; } public string Name { get; } = "cloudscribe.SimpleContent.Syndication.RssChannelProvider"; @@ -87,7 +90,7 @@ IContentProcessor contentProcessor else { // prevent error, channel desc cannot be empty - channel.Description = "Welcome to my blog"; + channel.Description = sr["Welcome to my blog"]; } if(!string.IsNullOrEmpty(project.ChannelCategoriesCsv)) @@ -199,8 +202,7 @@ IContentProcessor contentProcessor rssItem.Description = filteredResult.FilteredContent; if(!filteredResult.IsFullContent) { - //TODO: localize - var readMore = " ...read more"; + var readMore = " " + sr["...read more"] + ""; rssItem.Description += readMore; } diff --git a/src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs b/src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs index 8b9bea78e..5fb94b8d6 100644 --- a/src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs +++ b/src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs @@ -1308,7 +1308,7 @@ public virtual async Task AjaxPostComment(CommentViewModel model) Log.LogDebug("returning 403 because no content was posted"); Response.StatusCode = 403; //await Response.WriteAsync("Please enter a valid content"); - return Content("Please enter a valid content"); + return Content(StringLocalizer["Please enter valid content"]); } var blogPost = await BlogService.GetPost(model.PostId); @@ -1329,7 +1329,7 @@ public virtual async Task AjaxPostComment(CommentViewModel model) Log.LogDebug("returning 403 captcha validation failed"); Response.StatusCode = 403; //await Response.WriteAsync("captcha validation failed"); - return Content("captcha validation failed"); + return Content(StringLocalizer["captcha validation failed"]); } } } diff --git a/src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs b/src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs index 533df83a3..e18b33aad 100644 --- a/src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs +++ b/src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs @@ -123,12 +123,12 @@ public virtual async Task Index( if (HttpContext.Request.Path == "/") { ViewData["Title"] = StringLocalizer["Home"]; - page.Title = "No pages found, please click the plus icon to create the home page"; + page.Title = StringLocalizer["No pages found, please click the plus icon to create the home page"]; } else { ViewData["Title"] = StringLocalizer["No Pages Found"]; - page.Title = "No pages found, please click the plus icon to create the first page"; + page.Title = StringLocalizer["No pages found, please click the plus icon to create the first page"]; } } else diff --git a/src/cloudscribe.SimpleContent.Web/Services/Page/PageService.cs b/src/cloudscribe.SimpleContent.Web/Services/Page/PageService.cs index 3e10ff083..044c73032 100644 --- a/src/cloudscribe.SimpleContent.Web/Services/Page/PageService.cs +++ b/src/cloudscribe.SimpleContent.Web/Services/Page/PageService.cs @@ -227,7 +227,7 @@ public async Task Move(PageMoveModel model) if (string.IsNullOrEmpty(model.MovedNode) || string.IsNullOrEmpty(model.TargetNode) || (model.MovedNode == "-1") || (model.TargetNode == "-1") || (string.IsNullOrEmpty(model.Position))) { - result = new PageActionResult(false, "bad request, failed to move page"); + result = new PageActionResult(false, _sr["bad request, failed to move page"]); return result; } @@ -236,7 +236,7 @@ public async Task Move(PageMoveModel model) if ((movedNode == null) || (targetNode == null)) { - result = new PageActionResult(false, "bad request, page or target page not found"); + result = new PageActionResult(false, _sr["bad request, page or target page not found"]); return result; } @@ -308,7 +308,7 @@ public async Task Move(PageMoveModel model) //ClearNavigationCache(); - result = new PageActionResult(true, "operation succeeded"); + result = new PageActionResult(true, _sr["operation succeeded"]); await _eventHandlers.HandleMoved(_settings.Id, movedNode, targetNode, model.Position).ConfigureAwait(false); @@ -340,7 +340,7 @@ public async Task SortChildPagesAlpha(string pageId) } //ClearNavigationCache(); - return new PageActionResult(true, "operation succeeded"); + return new PageActionResult(true, _sr["operation succeeded"]); } From ab99a60e13c4a76b64a168d04836744a30890577 Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Tue, 18 Mar 2025 16:13:29 +0000 Subject: [PATCH 05/14] #762 changing appropriate h2 tags to h1 --- .../Views/Blog/PostDetailPartial.cshtml | 2 +- src/sourceDev.WebApp/Views/Home/About.cshtml | 2 +- src/sourceDev.WebApp/Views/Home/Contact.cshtml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/PostDetailPartial.cshtml b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/PostDetailPartial.cshtml index 324037ac1..6e7633064 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/PostDetailPartial.cshtml +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/PostDetailPartial.cshtml @@ -29,7 +29,7 @@
@if (Model.ProjectSettings.ShowTitle) { -

@Model.CurrentPost.Title

+

@Model.CurrentPost.Title

} else { diff --git a/src/sourceDev.WebApp/Views/Home/About.cshtml b/src/sourceDev.WebApp/Views/Home/About.cshtml index 50476d1fb..680d4b51b 100644 --- a/src/sourceDev.WebApp/Views/Home/About.cshtml +++ b/src/sourceDev.WebApp/Views/Home/About.cshtml @@ -1,7 +1,7 @@ @{ ViewData["Title"] = "About"; } -

@ViewData["Title"].

+

@ViewData["Title"].

@ViewData["Message"]

Use this area to provide additional information.

diff --git a/src/sourceDev.WebApp/Views/Home/Contact.cshtml b/src/sourceDev.WebApp/Views/Home/Contact.cshtml index 15c12c6d1..b06a159fc 100644 --- a/src/sourceDev.WebApp/Views/Home/Contact.cshtml +++ b/src/sourceDev.WebApp/Views/Home/Contact.cshtml @@ -1,7 +1,7 @@ @{ ViewData["Title"] = "Contact"; } -

@ViewData["Title"].

+

@ViewData["Title"].

@ViewData["Message"]

From a851550dbb97990de784ff7d802dccd4140f5992 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Fri, 28 Mar 2025 16:17:16 +0000 Subject: [PATCH 06/14] version 8.1 --- .../cloudscribe.ContentUtils.csproj | 4 +- ...pleContent.CompiledViews.Bootstrap3.csproj | 4 +- ...pleContent.CompiledViews.Bootstrap4.csproj | 4 +- ...pleContent.CompiledViews.Bootstrap5.csproj | 2 +- .../cloudscribe.Core.SimpleContent.csproj | 20 ++++----- .../cloudscribe.MetaWeblog.csproj | 4 +- ...pleContent.CompiledViews.Bootstrap3.csproj | 4 +- ...pleContent.CompiledViews.Bootstrap4.csproj | 4 +- ...pleContent.CompiledViews.Bootstrap5.csproj | 4 +- ...Content.ContentTemplates.Bootstrap4.csproj | 4 +- ...Content.ContentTemplates.Bootstrap5.csproj | 4 +- ...loudscribe.SimpleContent.MetaWeblog.csproj | 10 ++--- .../cloudscribe.SimpleContent.Models.csproj | 6 +-- ...e.SimpleContent.Security.SimpleAuth.csproj | 2 +- ...SimpleContent.Storage.EFCore.Common.csproj | 4 +- ....SimpleContent.Storage.EFCore.MSSQL.csproj | 4 +- ....SimpleContent.Storage.EFCore.MySQL.csproj | 4 +- ...leContent.Storage.EFCore.PostgreSql.csproj | 6 +-- ...SimpleContent.Storage.EFCore.SQLite.csproj | 4 +- ....SimpleContent.Storage.EFCore.pgsql.csproj | 4 +- ...udscribe.SimpleContent.Storage.NoDb.csproj | 4 +- ...oudscribe.SimpleContent.Syndication.csproj | 8 ++-- .../cloudscribe.SimpleContent.Web.csproj | 18 ++++---- src/sourceDev.WebApp/sourceDev.WebApp.csproj | 32 +++++++------- update_version.ps1 | 43 +++++++++++++++++++ 25 files changed, 125 insertions(+), 82 deletions(-) create mode 100644 update_version.ps1 diff --git a/src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj b/src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj index 9d53e0703..1932af430 100644 --- a/src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj +++ b/src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj @@ -1,8 +1,8 @@ - + Content utilities for html and markdown - 8.0.0 + 8.1.0 net8.0 Joe Audette cloudscribe;blog,content diff --git a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3.csproj b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3.csproj index be528cafe..787711749 100644 --- a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3.csproj +++ b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3.csproj @@ -1,8 +1,8 @@ - + Bootstrap 3 pre-compiled views for cloudscribe Core and SimpleContent integration - 8.0.0 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj index 1d4f1777f..fe8f65dff 100644 --- a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj +++ b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj @@ -1,8 +1,8 @@ - + Bootstrap 4 pre-compiled views for cloudscribe Core and SimpleContent integration - 8.0.0 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj index 2fe067349..df630024d 100644 --- a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj +++ b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj @@ -2,7 +2,7 @@ Bootstrap 5 pre-compiled views for cloudscribe Core and SimpleContent integration - 8.0.3 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj index f33ab7aca..94a65a132 100644 --- a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj +++ b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj @@ -1,8 +1,8 @@ - + integration library for integrating cloudscribe SimpleContent with cloudscribe Core multi-tenant web app foundation - 8.0.2 + 8.1.0 net8.0 Joe Audette cloudscribe;blog @@ -28,17 +28,17 @@ - - - - - - + + + + + + - - + + diff --git a/src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj b/src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj index 2fd0c45cc..c83e61b77 100644 --- a/src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj +++ b/src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj @@ -1,8 +1,8 @@ - + a re-useable implementation of the metaweblog api for asp.net core - 8.0.0 + 8.1.0 net8.0 Joe Audette cloudscribe;metaweblog;api;asp.net core diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.SimpleContent.CompiledViews.Bootstrap3.csproj b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.SimpleContent.CompiledViews.Bootstrap3.csproj index 2ff593289..56ab96ce4 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.SimpleContent.CompiledViews.Bootstrap3.csproj +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.SimpleContent.CompiledViews.Bootstrap3.csproj @@ -1,8 +1,8 @@ - + Bootstrap 3 pre-compiled views for cloudscribe.SimpleContent.Web - 8.0.0 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.SimpleContent.CompiledViews.Bootstrap4.csproj b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.SimpleContent.CompiledViews.Bootstrap4.csproj index 8e76cb193..3fee77882 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.SimpleContent.CompiledViews.Bootstrap4.csproj +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.SimpleContent.CompiledViews.Bootstrap4.csproj @@ -1,8 +1,8 @@ - + Bootstrap 4 pre-compiled views for cloudscribe.SimpleContent.Web - 8.0.0 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj index ecbcb66de..58d6c1197 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj @@ -1,8 +1,8 @@ - + Bootstrap 5 pre-compiled views for cloudscribe.SimpleContent.Web - 8.0.6 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4.csproj b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4.csproj index e71dc754b..9e519064f 100644 --- a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4.csproj +++ b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4.csproj @@ -1,8 +1,8 @@ - + A set of Content Templates for cloudscribe.SimpleContent using Bootstrap 4 - 8.0.0 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj index f73f0a302..fca110e54 100644 --- a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj +++ b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj @@ -1,8 +1,8 @@ - + A set of Content Templates for cloudscribe.SimpleContent using Bootstrap 5 - 8.0.0 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.SimpleContent.MetaWeblog/cloudscribe.SimpleContent.MetaWeblog.csproj b/src/cloudscribe.SimpleContent.MetaWeblog/cloudscribe.SimpleContent.MetaWeblog.csproj index b744cf160..93960ee35 100644 --- a/src/cloudscribe.SimpleContent.MetaWeblog/cloudscribe.SimpleContent.MetaWeblog.csproj +++ b/src/cloudscribe.SimpleContent.MetaWeblog/cloudscribe.SimpleContent.MetaWeblog.csproj @@ -1,8 +1,8 @@ - + cloudscribe.SimpleContent.MetaWeblog Class Library - 8.0.0 + 8.1.0 net8.0 Joe Audette cloudscribe;metaweblog;blog;cms @@ -25,9 +25,9 @@ - - - + + + diff --git a/src/cloudscribe.SimpleContent.Models/cloudscribe.SimpleContent.Models.csproj b/src/cloudscribe.SimpleContent.Models/cloudscribe.SimpleContent.Models.csproj index 564b5e149..cc03a6670 100644 --- a/src/cloudscribe.SimpleContent.Models/cloudscribe.SimpleContent.Models.csproj +++ b/src/cloudscribe.SimpleContent.Models/cloudscribe.SimpleContent.Models.csproj @@ -1,8 +1,8 @@ - + cloudscribe.SimpleContent.Models Class Library - 8.0.2 + 8.1.0 net8.0 Joe Audette cloudscribe;blog;cms @@ -24,7 +24,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/cloudscribe.SimpleContent.Security.SimpleAuth/cloudscribe.SimpleContent.Security.SimpleAuth.csproj b/src/cloudscribe.SimpleContent.Security.SimpleAuth/cloudscribe.SimpleContent.Security.SimpleAuth.csproj index 0ca9776e7..19c95ddcb 100644 --- a/src/cloudscribe.SimpleContent.Security.SimpleAuth/cloudscribe.SimpleContent.Security.SimpleAuth.csproj +++ b/src/cloudscribe.SimpleContent.Security.SimpleAuth/cloudscribe.SimpleContent.Security.SimpleAuth.csproj @@ -1,4 +1,4 @@ - + cloudscribe.SimpleContent.Security.SimpleAuth Class Library diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.Common/cloudscribe.SimpleContent.Storage.EFCore.Common.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.Common/cloudscribe.SimpleContent.Storage.EFCore.Common.csproj index 1f3734072..791b4638d 100644 --- a/src/cloudscribe.SimpleContent.Storage.EFCore.Common/cloudscribe.SimpleContent.Storage.EFCore.Common.csproj +++ b/src/cloudscribe.SimpleContent.Storage.EFCore.Common/cloudscribe.SimpleContent.Storage.EFCore.Common.csproj @@ -1,8 +1,8 @@ - + base package - Entity Framework Core implementation of cloudscribe SimpleContent commands and queries - 8.0.4 + 8.1.0 net8.0 Joe Audette cloudscribe;commands;queries;ef diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/cloudscribe.SimpleContent.Storage.EFCore.MSSQL.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/cloudscribe.SimpleContent.Storage.EFCore.MSSQL.csproj index c496dd957..6c7d51003 100644 --- a/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/cloudscribe.SimpleContent.Storage.EFCore.MSSQL.csproj +++ b/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/cloudscribe.SimpleContent.Storage.EFCore.MSSQL.csproj @@ -1,8 +1,8 @@ - + MSSQL Entity Framework Core implementation of cloudscribe SimpleContent commands and queries - 8.0.5 + 8.1.0 net8.0 Joe Audette cloudscribe;commands;queries;ef diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.MySQL/cloudscribe.SimpleContent.Storage.EFCore.MySQL.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.MySQL/cloudscribe.SimpleContent.Storage.EFCore.MySQL.csproj index 7552f8dfd..d156f63b0 100644 --- a/src/cloudscribe.SimpleContent.Storage.EFCore.MySQL/cloudscribe.SimpleContent.Storage.EFCore.MySQL.csproj +++ b/src/cloudscribe.SimpleContent.Storage.EFCore.MySQL/cloudscribe.SimpleContent.Storage.EFCore.MySQL.csproj @@ -1,8 +1,8 @@ - + MySQL Entity Framework Core implementation of cloudscribe SimpleContent commands and queries - 8.0.5 + 8.1.0 net8.0 Joe Audette cloudscribe;commands;queries;ef diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql.csproj index ba84f1371..f0256006b 100644 --- a/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql.csproj +++ b/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql.csproj @@ -1,8 +1,8 @@ - + PostgreSql Entity Framework Core implementation of cloudscribe SimpleContent commands and queries - 8.0.4 + 8.1.0 net8.0 Joe Audette cloudscribe;commands;queries;ef @@ -27,7 +27,7 @@ - + diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.SQLite/cloudscribe.SimpleContent.Storage.EFCore.SQLite.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.SQLite/cloudscribe.SimpleContent.Storage.EFCore.SQLite.csproj index b8adeba69..939421f98 100644 --- a/src/cloudscribe.SimpleContent.Storage.EFCore.SQLite/cloudscribe.SimpleContent.Storage.EFCore.SQLite.csproj +++ b/src/cloudscribe.SimpleContent.Storage.EFCore.SQLite/cloudscribe.SimpleContent.Storage.EFCore.SQLite.csproj @@ -1,8 +1,8 @@ - + SQLite Entity Framework Core implementation of cloudscribe SimpleContent commands and queries - 8.0.4 + 8.1.0 net8.0 Joe Audette cloudscribe;commands;queries;ef diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.pgsql/cloudscribe.SimpleContent.Storage.EFCore.pgsql.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.pgsql/cloudscribe.SimpleContent.Storage.EFCore.pgsql.csproj index 26fdd0ec5..f95e6d8c5 100644 --- a/src/cloudscribe.SimpleContent.Storage.EFCore.pgsql/cloudscribe.SimpleContent.Storage.EFCore.pgsql.csproj +++ b/src/cloudscribe.SimpleContent.Storage.EFCore.pgsql/cloudscribe.SimpleContent.Storage.EFCore.pgsql.csproj @@ -1,8 +1,8 @@ - + PostgreSql Entity Framework Core implementation of cloudscribe SimpleContent commands and queries - 8.0.0 + 8.1.0 net8.0 Joe Audette cloudscribe;commands;queries;ef diff --git a/src/cloudscribe.SimpleContent.Storage.NoDb/cloudscribe.SimpleContent.Storage.NoDb.csproj b/src/cloudscribe.SimpleContent.Storage.NoDb/cloudscribe.SimpleContent.Storage.NoDb.csproj index eeccc7deb..8fd41fc22 100644 --- a/src/cloudscribe.SimpleContent.Storage.NoDb/cloudscribe.SimpleContent.Storage.NoDb.csproj +++ b/src/cloudscribe.SimpleContent.Storage.NoDb/cloudscribe.SimpleContent.Storage.NoDb.csproj @@ -1,8 +1,8 @@ - + cloudscribe.SimpleContent.Storage implemented with NoDb file system storage - 8.0.1 + 8.1.0 net8.0 Joe Audette cloudscribe;blog;json diff --git a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj index dba9d0e3e..dfeb913af 100644 --- a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj +++ b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj @@ -1,8 +1,8 @@ - + cloudscribe.SimpleContent.Syndication Class Library - 8.0.0 + 8.1.0 net8.0 Joe Audette syndication;rss;atom;cloudscribe @@ -27,9 +27,9 @@ - + - + diff --git a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj index 55565635e..27a32e138 100644 --- a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj +++ b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj @@ -1,8 +1,8 @@ - + A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database - 8.0.5 + 8.1.0 net8.0 Joe Audette cloudscribe;blog,content @@ -39,13 +39,13 @@ - - - - - - - + + + + + + + diff --git a/src/sourceDev.WebApp/sourceDev.WebApp.csproj b/src/sourceDev.WebApp/sourceDev.WebApp.csproj index 1b665ea53..f7b793dbe 100644 --- a/src/sourceDev.WebApp/sourceDev.WebApp.csproj +++ b/src/sourceDev.WebApp/sourceDev.WebApp.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -50,25 +50,25 @@ - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + diff --git a/update_version.ps1 b/update_version.ps1 new file mode 100644 index 000000000..644cf4663 --- /dev/null +++ b/update_version.ps1 @@ -0,0 +1,43 @@ +################### +## PS script to implement a semantic versioning change from (say) 8.0.x to 8.1 +## across all interdependent cs packages + +## Wherever we have 8.0.n replace it to 8.1.0 where n >= 0 + +## Wherever we have replace it to + +## Wherever we have replace it to where n >= 0 + +## Exclude cloudscribe.HtmlAgilityPack and DbHelpers because those ones are ancient and frozen +################### + + +# Define the directory containing the .csproj files +$directory = "src" + +# Define the new version +$newVersion = "8.1.0" +$newWildcardVersion = "8.1.*" + +# Get all .csproj files in the directory and subdirectories +$csprojFiles = Get-ChildItem -Path $directory -Recurse -Filter *.csproj + +foreach ($file in $csprojFiles) { + # Read the content of the .csproj file + $content = Get-Content -Path $file.FullName + + # Update the version of cloudscribe package references, except for cloudscribe.HtmlAgilityPack and cloudscribe.DbHelpers + $updatedContent = $content -replace '(?<=$newVersion" + + # Write the updated content back to the .csproj file + Set-Content -Path $file.FullName -Value $updatedContent + + Write-Host "Updated $file.FullName" +} + +Write-Host "All cloudscribe package references (except cloudscribe.HtmlAgilityPack and cloudscribe.DbHelpers) and elements have been updated to version $newVersion or $newWildcardVersion as appropriate." + From 02f7e3042e55636269db3eac87295c037b632513 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:43:00 +0100 Subject: [PATCH 07/14] bump to 8.1.1 - jk --- .../cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj | 3 +-- .../cloudscribe.SimpleContent.Web.csproj | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj index 04b0e096c..cdf496135 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj @@ -2,8 +2,7 @@ Bootstrap 5 pre-compiled views for cloudscribe.SimpleContent.Web - 8.0.7 - 8.1.0 + 8.1.1 net8.0 Joe Audette true diff --git a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj index b934ce7d6..9429cff36 100644 --- a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj +++ b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj @@ -2,8 +2,7 @@ A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database - 8.0.6 - 8.1.0 + 8.1.1 net8.0 Joe Audette cloudscribe;blog,content From 92a78a0559d6ced2635e0aaa208b0ae1ac4ad8e6 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Mon, 14 Apr 2025 15:28:13 +0100 Subject: [PATCH 08/14] bump version of content templates views - jk --- ...cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj index fca110e54..2c711586e 100644 --- a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj +++ b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj @@ -2,7 +2,7 @@ A set of Content Templates for cloudscribe.SimpleContent using Bootstrap 5 - 8.1.0 + 8.1.1 net8.0 Joe Audette true From e8a11c9e296edde9902f8e27e26464b77cdaadb7 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Wed, 16 Apr 2025 16:40:56 +0100 Subject: [PATCH 09/14] Update cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj --- .../cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj index cdf496135..aa589c5d4 100644 --- a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj +++ b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj @@ -2,7 +2,7 @@ Bootstrap 5 pre-compiled views for cloudscribe.SimpleContent.Web - 8.1.1 + 8.1.2 net8.0 Joe Audette true From a870db142fb245f25cddd8d47965e97d6c4b3ca7 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Wed, 30 Apr 2025 13:28:49 +0100 Subject: [PATCH 10/14] Update update_version.ps1 --- update_version.ps1 | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/update_version.ps1 b/update_version.ps1 index 644cf4663..1e4919a64 100644 --- a/update_version.ps1 +++ b/update_version.ps1 @@ -15,9 +15,11 @@ # Define the directory containing the .csproj files $directory = "src" -# Define the new version -$newVersion = "8.1.0" -$newWildcardVersion = "8.1.*" +# Define the old & new versions +$oldVersion = '8\.1' # slash needed ! +$newVersion = "8.2.0" +$newWildcardVersion = "8.2.*" + # Get all .csproj files in the directory and subdirectories $csprojFiles = Get-ChildItem -Path $directory -Recurse -Filter *.csproj @@ -27,11 +29,18 @@ foreach ($file in $csprojFiles) { $content = Get-Content -Path $file.FullName # Update the version of cloudscribe package references, except for cloudscribe.HtmlAgilityPack and cloudscribe.DbHelpers - $updatedContent = $content -replace '(?<=$newVersion" + $updatedContent = $updatedContent -replace $versionPattern, $replacement - # Update the element if it matches the 8.0.* pattern - $updatedContent = $updatedContent -replace '8\.0\.\d+', "$newVersion" # Write the updated content back to the .csproj file Set-Content -Path $file.FullName -Value $updatedContent From 6bbeff6049f16d799a265c0973a435e608406ccb Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Wed, 30 Apr 2025 14:04:34 +0100 Subject: [PATCH 11/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd15d90ea..930b45d97 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # cloudscribe SimpleContent -A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database. This project has borrowed significantly from [Mads Kristensen's MiniBlog](https://github.com/madskristensen/MiniBlog) both for ideas and code but re-implemented and extended in the newer ASP.NET Core framework. Get the big picture at [cloudscribe.com](https://www.cloudscribe.com/docs/introduction) +A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database. This project has borrowed significantly from [Mads Kristensen's MiniBlog](https://github.com/madskristensen/MiniBlog) both for ideas and code but re-implemented and extended in the newer ASP.NET Core framework. Get the big picture at [cloudscribe.com](https://www.cloudscribe.com/docs/introduction) [Documentation](https://www.cloudscribe.com/docs/cloudscribe-simplecontent) - in progress so check back often. Also note that cloudscribe SimpleContent is being used to make the documentation on [cloudscribe.com](https://www.cloudscribe.com) From 428ee33f62e6dba65f1b1129045a006bb0dbd6af Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Wed, 30 Apr 2025 14:19:20 +0100 Subject: [PATCH 12/14] Update cloudscribe.Core.SimpleContent.csproj --- .../cloudscribe.Core.SimpleContent.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj index 94a65a132..48decf3ed 100644 --- a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj +++ b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj @@ -32,7 +32,7 @@ - + From d1eae48114b58621058a6f4090e819335c73b214 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Wed, 30 Apr 2025 14:21:51 +0100 Subject: [PATCH 13/14] cloudscribe.Core.Web reference update --- .../cloudscribe.Core.SimpleContent.csproj | 2 +- src/sourceDev.WebApp/sourceDev.WebApp.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj index 48decf3ed..a3f9e96f7 100644 --- a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj +++ b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/sourceDev.WebApp/sourceDev.WebApp.csproj b/src/sourceDev.WebApp/sourceDev.WebApp.csproj index f7b793dbe..c20eef8ff 100644 --- a/src/sourceDev.WebApp/sourceDev.WebApp.csproj +++ b/src/sourceDev.WebApp/sourceDev.WebApp.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -50,7 +50,7 @@ - + From bb8f2e25ea8dd9e8164792bc8605d29064225437 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Wed, 30 Apr 2025 14:44:09 +0100 Subject: [PATCH 14/14] Update cloudscribe.Core.SimpleContent.csproj --- .../cloudscribe.Core.SimpleContent.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj index a3f9e96f7..bb11d309d 100644 --- a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj +++ b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj @@ -2,7 +2,7 @@ integration library for integrating cloudscribe SimpleContent with cloudscribe Core multi-tenant web app foundation - 8.1.0 + 8.1.1 net8.0 Joe Audette cloudscribe;blog