From b41804e37c227c1c517edd05603eff3500d2160d Mon Sep 17 00:00:00 2001
From: enisn <iletisim@enisnecipoglu.com>
Date: Fri, 5 Mar 2021 13:36:32 +0300
Subject: [PATCH 1/3] CmsKit - Fix MediaDescriptor mismatching Id

---
 .../Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs
index 45774ca1f2..ab7d841cad 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminAppService.cs
@@ -35,12 +35,11 @@ namespace Volo.CmsKit.Admin.MediaDescriptors
 
             await CheckAnyOfPoliciesAsync(definition.CreatePolicies);
 
-            var newId = GuidGenerator.Create();
             using (var stream = inputStream.GetStream())
             {
                 var newEntity = await MediaDescriptorManager.CreateAsync(inputStream.EntityType, inputStream.Name, inputStream.ContentType, inputStream.ContentLength ?? 0);
 
-                await MediaContainer.SaveAsync(newId.ToString(), stream);
+                await MediaContainer.SaveAsync(newEntity.Id.ToString(), stream);
                 await MediaDescriptorRepository.InsertAsync(newEntity);
 
                 return ObjectMapper.Map<MediaDescriptor, MediaDescriptorDto>(newEntity);

From c177530c5ea46b35bedafc2c1d02f4ff4d86be77 Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <alper.ebicoglu@volosoft.com>
Date: Fri, 5 Mar 2021 13:37:11 +0300
Subject: [PATCH 2/3] Handle abbreviations like XYZ when converting to
 camel-case. issue #7951

---
 .../System/AbpStringExtensions.cs             | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs b/framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs
index f272484611..5fe47112ba 100644
--- a/framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs
+++ b/framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs
@@ -260,8 +260,9 @@ namespace System
         /// </summary>
         /// <param name="str">String to convert</param>
         /// <param name="useCurrentCulture">set true to use current culture. Otherwise, invariant culture will be used.</param>
+        /// <param name="handleAbbreviations">set true to if you want to convert 'XYZ' to 'xyz'.</param>
         /// <returns>camelCase of the string</returns>
-        public static string ToCamelCase(this string str, bool useCurrentCulture = false)
+        public static string ToCamelCase(this string str, bool useCurrentCulture = false, bool handleAbbreviations = false)
         {
             if (string.IsNullOrWhiteSpace(str))
             {
@@ -273,6 +274,11 @@ namespace System
                 return useCurrentCulture ? str.ToLower() : str.ToLowerInvariant();
             }
 
+            if (handleAbbreviations && IsAllUpperCase(str))
+            {
+                return useCurrentCulture ? str.ToLower() : str.ToLowerInvariant();
+            }
+
             return (useCurrentCulture ? char.ToLower(str[0]) : char.ToLowerInvariant(str[0])) + str.Substring(1);
         }
 
@@ -545,5 +551,18 @@ namespace System
 
             return encoding.GetBytes(str);
         }
+
+        private static bool IsAllUpperCase(string input)
+        {
+            for (int i = 0; i < input.Length; i++)
+            {
+                if (Char.IsLetter(input[i]) && !Char.IsUpper(input[i]))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
     }
 }

From a09a7ac659d08b50080b78e8743287aea01ee3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 5 Mar 2021 14:30:52 +0300
Subject: [PATCH 3/3] Revise title for blog and page.

---
 .../CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml    | 2 +-
 .../Pages/CmsKit/Shared/Components/Pages/Default.cshtml       | 4 +---
 .../Pages/Public/CmsKit/Blogs/BlogPost.cshtml                 | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml
index 0ed8987d72..f5c1bdc3a5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml
@@ -4,10 +4,10 @@
 
 @inject IStringLocalizer<CmsKitResource> L
 
+<h1>@Model.Title</h1>
 
 <abp-card>
     <abp-card-header>
-        <abp-card-title>@Model.Title</abp-card-title>
         <abp-card-subtitle>@Model.Author?.UserName</abp-card-subtitle>
     </abp-card-header>
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
index ae23d5757f..99d743aed9 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
@@ -3,9 +3,7 @@
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages.PageViewModel
 @inject IPageLayout PageLayout
 
-@{
-    PageLayout.Content.Title = Model.Title;
-}
+<h1>@Model.Title</h1>
 
 <abp-card>
     <abp-card-body>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
index abff0a475e..8ad6dd9ca3 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
@@ -13,10 +13,6 @@
 
 @model Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs.BlogPostModel
 
-@{
-    PageLayout.Content.Title = Model.BlogPost.Title;
-}
-
 @await Component.InvokeAsync(typeof(DefaultBlogPostViewComponent), new
 {
     Model.BlogSlug,