From 5e02e92e033fc36b4a780526d840ee89825fec34 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 21 Nov 2022 11:47:46 +0300 Subject: [PATCH 01/15] Made features depend on the related global features --- .../Menus/CmsKitAdminMenuContributor.cs | 5 +- .../CmsKitFeatureDefinitionProvider.cs | 47 +++++++++++++++---- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs index 8762373383..3621e5d564 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs @@ -27,7 +27,7 @@ public class CmsKitAdminMenuContributor : IMenuContributor await AddCmsMenuAsync(context); } - private async Task AddCmsMenuAsync(MenuConfigurationContext context) + private Task AddCmsMenuAsync(MenuConfigurationContext context) { var l = context.GetLocalizer(); @@ -121,7 +121,8 @@ public class CmsKitAdminMenuContributor : IMenuContributor { cmsMenu.AddItem(menu); } - + } + return Task.CompletedTask; } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs index 597e5240e8..b4ac1ed9d6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs @@ -1,6 +1,8 @@ using Volo.Abp.Features; +using Volo.Abp.GlobalFeatures; using Volo.Abp.Localization; using Volo.Abp.Validation.StringValues; +using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.Localization; namespace Volo.CmsKit.Features; @@ -11,59 +13,86 @@ public class CmsKitFeatureDefinitionProvider : FeatureDefinitionProvider var group = context.AddGroup(CmsKitFeatures.GroupName, L("Feature:CmsKitGroup")); - group.AddFeature(CmsKitFeatures.BlogEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.BlogEnable, "true", L("Feature:BlogEnable"), L("Feature:BlogEnableDescription"), new ToggleStringValueType()); + } - group.AddFeature(CmsKitFeatures.CommentEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.CommentEnable, "true", L("Feature:CommentEnable"), L("Feature:CommentEnableDescription"), new ToggleStringValueType()); + } - group.AddFeature(CmsKitFeatures.GlobalResourceEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.GlobalResourceEnable, "true", L("Feature:GlobalResourceEnable"), L("Feature:GlobalResourceEnableDescription"), new ToggleStringValueType()); + } - group.AddFeature(CmsKitFeatures.MediaEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.MediaEnable, "true", L("Feature:MediaEnable"), L("Feature:MediaEnableDescription"), new ToggleStringValueType()); + } - group.AddFeature(CmsKitFeatures.MenuEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.MenuEnable, "true", L("Feature:MenuEnable"), L("Feature:MenuEnableDescription"), new ToggleStringValueType()); + } - group.AddFeature(CmsKitFeatures.PageEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.PageEnable, "true", L("Feature:PageEnable"), L("Feature:PageEnableDescription"), new ToggleStringValueType()); + } - group.AddFeature(CmsKitFeatures.RatingEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.RatingEnable, "true", L("Feature:RatingEnable"), L("Feature:RatingEnableDescription"), new ToggleStringValueType()); + } - group.AddFeature(CmsKitFeatures.ReactionEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.ReactionEnable, "true", L("Feature:ReactionEnable"), L("Feature:ReactionEnableDescription"), new ToggleStringValueType()); + } - group.AddFeature(CmsKitFeatures.TagEnable, + if (GlobalFeatureManager.Instance.IsEnabled()) + { + group.AddFeature(CmsKitFeatures.TagEnable, "true", L("Feature:TagEnable"), L("Feature:TagEnableDescription"), new ToggleStringValueType()); + } } private static LocalizableString L(string name) From 2134338f88e8755a1406cee909070e4d0edb0e42 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 21 Nov 2022 12:02:35 +0300 Subject: [PATCH 02/15] Refactored naming for title and description --- .../CmsKit/Localization/Resources/en.json | 36 +++++++++---------- .../CmsKit/Localization/Resources/tr.json | 36 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index b6fb5f5aea..b92c4f3575 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -194,23 +194,23 @@ "IsHomePage": "Is Home Page", "RemovedSettingAsHomePage": "Removed setting the home page", "Feature:CmsKitGroup": "Cms Kit", - "Feature:BlogEnable": "Enabled blog page", - "Feature:BlogEnableDescription": "Enable blog page in the application.", - "Feature:CommentEnable": "Enabled commenting", - "Feature:CommentEnableDescription": "Enable comment in the application.", - "Feature:GlobalResourceEnable": "Enabled global resourcing", - "Feature:GlobalResourceEnableDescription": "Enable global resource in the application.", - "Feature:MediaEnable": "Enabled media", - "Feature:MediaEnableDescription": "Enable media in the application.", - "Feature:MenuEnable": "Enabled menu", - "Feature:MenuEnableDescription": "Enable menu in the application.", - "Feature:PageEnable": "Enabled paging page", - "Feature:PageEnableDescription": "Enable paging page in the application.", - "Feature:RatingEnable": "Enabled rating", - "Feature:RatingEnableDescription": "Enable rating in the application.", - "Feature:ReactionEnable": "Enabled reaction", - "Feature:ReactionEnableDescription": "Enable reaction in the application.", - "Feature:TagEnable": "Enabled taging", - "Feature:TagEnableDescription": "Enable taging in the application." + "Feature:BlogEnable": "Blogpost", + "Feature:BlogEnableDescription": "CMS Kit's dynamic blogpost system", + "Feature:CommentEnable": "Commenting", + "Feature:CommentEnableDescription": "CMS Kit's dynamic comment system", + "Feature:GlobalResourceEnable": "Global resourcing", + "Feature:GlobalResourceEnableDescription": "CMS Kit's dynamic globa resoruce system", + "Feature:MediaEnable": "Media", + "Feature:MediaEnableDescription": "CMS Kit's dynamic media system", + "Feature:MenuEnable": "Menu", + "Feature:MenuEnableDescription": "CMS Kit's dynamic menu system", + "Feature:PageEnable": "Paging", + "Feature:PageEnableDescription": "CMS Kit's dynamic page system", + "Feature:RatingEnable": "Rating", + "Feature:RatingEnableDescription": "CMS Kit's dynamic rating system", + "Feature:ReactionEnable": "Reaction", + "Feature:ReactionEnableDescription": "CMS Kit's dynamic reaction system", + "Feature:TagEnable": "Taging", + "Feature:TagEnableDescription": "CMS Kit's dynamic tag system" } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json index e143332425..9f6417c903 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json @@ -194,23 +194,23 @@ "RemovedSettingAsHomePage": "Ana sayfa ayarı kaldırıldı", "Permission:GlobalResources": "Global Kaynaklar", "Feature:CmsKitGroup": "Cms Kit", - "Feature:BlogEnable": "Blog sayfasını etkinleştirin", - "Feature:BlogEnableDescription": "Uygulamınızdaki blog sayfasını etkinleştirir.", - "Feature:CommentEnable": "Yorum özelliğini etkinleştirin", - "Feature:CommentEnableDescription": "Uygulamınızdaki yorum özelliğini etkinleştirir.", - "Feature:GlobalResourceEnable": "Blog global kaynakları etkinleştirin", - "Feature:GlobalResourceEnableDescription": "Uygulamınızdaki global kaynakları etkinleştirir.", - "Feature:MediaEnable": "Medyayı etkinleştirin", - "Feature:MediaEnableDescription": "Uygulamınızdaki medyayı etkinleştirir.", - "Feature:MenuEnable": "Menüyü etkinleştirin", - "Feature:MenuEnableDescription": "Uygulamınızdaki menüyü etkinleştirir.", - "Feature:PageEnable": "Sayfa özelliğini etkinleştirin", - "Feature:PageEnableDescription": "Uygulamınızdaki sayfa özelliğini etkinleştirir.", - "Feature:RatingEnable": "Oylamayı etkinleştirin", - "Feature:RatingEnableDescription": "Uygulamınızdaki oylamayı etkinleştirir.", - "Feature:ReactionEnable": "Reaksiyonları etkinleştirin", - "Feature:ReactionEnableDescription": "Uygulamınızdaki reaksiyonları etkinleştirir.", - "Feature:TagEnable": "Etkiketleri etkinleştirin", - "Feature:TagEnableDescription": "Uygulamınızdaki etiketleri etkinleştirir." + "Feature:BlogEnable": "Blogpost", + "Feature:BlogEnableDescription": "Cmskit blogpost sistemi", + "Feature:CommentEnable": "Yorum", + "Feature:CommentEnableDescription": "Cmskit dinamik yorum sistemi", + "Feature:GlobalResourceEnable": "Global kaynaklar", + "Feature:GlobalResourceEnableDescription": "Cmskit dinamik global kaynaklar sistemi", + "Feature:MediaEnable": "Medya", + "Feature:MediaEnableDescription": "Cmskit dinamik medya sistemi", + "Feature:MenuEnable": "Menü", + "Feature:MenuEnableDescription": "Cmskit dinamik menü sistemi", + "Feature:PageEnable": "Sayfa", + "Feature:PageEnableDescription": "Cmskit dinamik sayfa sistemi", + "Feature:RatingEnable": "Oylama", + "Feature:RatingEnableDescription": "Cmskit dinamik oylama sistemi", + "Feature:ReactionEnable": "Reaksiyon", + "Feature:ReactionEnableDescription": "Cmskit dinamik reaksiyon sistemi", + "Feature:TagEnable": "Etkiket", + "Feature:TagEnableDescription": "Cmskit dinamik etiket sistemi" } } From a8857af7827e8dff7b29984e4e1acc6a302db80b Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 21 Nov 2022 15:00:37 +0300 Subject: [PATCH 03/15] Removed the media feature --- .../MediaDescriptorAdminAppService.cs | 3 --- .../MediaDescriptorAdminController.cs | 3 --- .../Features/CmsKitFeatureDefinitionProvider.cs | 9 --------- .../Volo/CmsKit/Features/CmsKitFeatures.cs | 1 - .../Volo/CmsKit/Localization/Resources/en.json | 14 ++++++-------- .../Volo/CmsKit/Localization/Resources/hu.json | 2 -- .../Volo/CmsKit/Localization/Resources/pt-BR.json | 2 -- .../Volo/CmsKit/Localization/Resources/tr.json | 14 ++++++-------- 8 files changed, 12 insertions(+), 36 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 af347bcc55..cc785adac0 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 @@ -1,15 +1,12 @@ using System; using System.Threading.Tasks; using Volo.Abp.BlobStoring; -using Volo.Abp.Features; using Volo.Abp.GlobalFeatures; -using Volo.CmsKit.Features; using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.MediaDescriptors; namespace Volo.CmsKit.Admin.MediaDescriptors; -[RequiresFeature(CmsKitFeatures.MediaEnable)] [RequiresGlobalFeature(typeof(MediaFeature))] public class MediaDescriptorAdminAppService : CmsKitAdminAppServiceBase, IMediaDescriptorAdminAppService { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs index c304c5c684..b171af7d7a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs @@ -2,14 +2,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp; -using Volo.Abp.Features; using Volo.Abp.GlobalFeatures; -using Volo.CmsKit.Features; using Volo.CmsKit.GlobalFeatures; namespace Volo.CmsKit.Admin.MediaDescriptors; -[RequiresFeature(CmsKitFeatures.MediaEnable)] [RequiresGlobalFeature(typeof(MediaFeature))] [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)] [Area(CmsKitAdminRemoteServiceConsts.ModuleName)] diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs index b4ac1ed9d6..914fcff166 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatureDefinitionProvider.cs @@ -40,15 +40,6 @@ public class CmsKitFeatureDefinitionProvider : FeatureDefinitionProvider new ToggleStringValueType()); } - if (GlobalFeatureManager.Instance.IsEnabled()) - { - group.AddFeature(CmsKitFeatures.MediaEnable, - "true", - L("Feature:MediaEnable"), - L("Feature:MediaEnableDescription"), - new ToggleStringValueType()); - } - if (GlobalFeatureManager.Instance.IsEnabled()) { group.AddFeature(CmsKitFeatures.MenuEnable, diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatures.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatures.cs index 1dbf642755..d23a998d0d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatures.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Features/CmsKitFeatures.cs @@ -6,7 +6,6 @@ public static class CmsKitFeatures public const string BlogEnable = GroupName + ".BlogEnable"; public const string CommentEnable = GroupName + ".CommentEnable"; public const string GlobalResourceEnable = GroupName + ".GlobalResourceEnable"; - public const string MediaEnable = GroupName + ".MediaEnable"; public const string MenuEnable = GroupName + ".MenuEnable"; public const string PageEnable = GroupName + ".PageEnable"; public const string RatingEnable = GroupName + ".RatingEnable"; diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index b92c4f3575..b966edea32 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -195,22 +195,20 @@ "RemovedSettingAsHomePage": "Removed setting the home page", "Feature:CmsKitGroup": "Cms Kit", "Feature:BlogEnable": "Blogpost", - "Feature:BlogEnableDescription": "CMS Kit's dynamic blogpost system", + "Feature:BlogEnableDescription": "CMS Kit's blogpost system", "Feature:CommentEnable": "Commenting", - "Feature:CommentEnableDescription": "CMS Kit's dynamic comment system", + "Feature:CommentEnableDescription": "CMS Kit's comment system", "Feature:GlobalResourceEnable": "Global resourcing", "Feature:GlobalResourceEnableDescription": "CMS Kit's dynamic globa resoruce system", - "Feature:MediaEnable": "Media", - "Feature:MediaEnableDescription": "CMS Kit's dynamic media system", "Feature:MenuEnable": "Menu", "Feature:MenuEnableDescription": "CMS Kit's dynamic menu system", "Feature:PageEnable": "Paging", - "Feature:PageEnableDescription": "CMS Kit's dynamic page system", + "Feature:PageEnableDescription": "CMS Kit's page system", "Feature:RatingEnable": "Rating", - "Feature:RatingEnableDescription": "CMS Kit's dynamic rating system", + "Feature:RatingEnableDescription": "CMS Kit's rating system", "Feature:ReactionEnable": "Reaction", - "Feature:ReactionEnableDescription": "CMS Kit's dynamic reaction system", + "Feature:ReactionEnableDescription": "CMS Kit's reaction system", "Feature:TagEnable": "Taging", - "Feature:TagEnableDescription": "CMS Kit's dynamic tag system" + "Feature:TagEnableDescription": "CMS Kit's tag system" } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/hu.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/hu.json index 18f34ebd71..5497c9ec98 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/hu.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/hu.json @@ -195,8 +195,6 @@ "Feature:CommentEnableDescription": "Megjegyzés engedélyezése az alkalmazásban.", "Feature:GlobalResourceEnable": "Globális erőforrás-kihelyezés engedélyezve", "Feature:GlobalResourceEnableDescription": "Globális erőforrás engedélyezése az alkalmazásban.", - "Feature:MediaEnable": "Engedélyezett média", - "Feature:MediaEnableDescription": "Média engedélyezése az alkalmazásban.", "Feature:MenuEnable": "Engedélyezett menü", "Feature:MenuEnableDescription": "Menü engedélyezése az alkalmazásban.", "Feature:PageEnable": "Lapozási oldal engedélyezve", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/pt-BR.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/pt-BR.json index fff05fefdd..be7cbe0775 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/pt-BR.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/pt-BR.json @@ -195,8 +195,6 @@ "Feature:CommentEnableDescription": "Habilitar comentários no aplicativo.", "Feature:GlobalResourceEnable": "Recursos globais ativados", "Feature:GlobalResourceEnableDescription": "Habilitar recurso global no aplicativo.", - "Feature:MediaEnable": "Mídia ativada", - "Feature:MediaEnableDescription": "Mídia ativada no aplicativo.", "Feature:MenuEnable": "Menu habilitado", "Feature:MenuEnableDescription": "Menu habilitado no aplicativo.", "Feature:PageEnable": "Página de paginação ativada", diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json index 9f6417c903..a93e8b3f1c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json @@ -197,20 +197,18 @@ "Feature:BlogEnable": "Blogpost", "Feature:BlogEnableDescription": "Cmskit blogpost sistemi", "Feature:CommentEnable": "Yorum", - "Feature:CommentEnableDescription": "Cmskit dinamik yorum sistemi", + "Feature:CommentEnableDescription": "Cmskit yorum sistemi", "Feature:GlobalResourceEnable": "Global kaynaklar", - "Feature:GlobalResourceEnableDescription": "Cmskit dinamik global kaynaklar sistemi", - "Feature:MediaEnable": "Medya", - "Feature:MediaEnableDescription": "Cmskit dinamik medya sistemi", + "Feature:GlobalResourceEnableDescription": "Cmskit global kaynaklar sistemi", "Feature:MenuEnable": "Menü", "Feature:MenuEnableDescription": "Cmskit dinamik menü sistemi", "Feature:PageEnable": "Sayfa", - "Feature:PageEnableDescription": "Cmskit dinamik sayfa sistemi", + "Feature:PageEnableDescription": "Cmskit sayfa sistemi", "Feature:RatingEnable": "Oylama", - "Feature:RatingEnableDescription": "Cmskit dinamik oylama sistemi", + "Feature:RatingEnableDescription": "Cmskit oylama sistemi", "Feature:ReactionEnable": "Reaksiyon", - "Feature:ReactionEnableDescription": "Cmskit dinamik reaksiyon sistemi", + "Feature:ReactionEnableDescription": "Cmskit reaksiyon sistemi", "Feature:TagEnable": "Etkiket", - "Feature:TagEnableDescription": "Cmskit dinamik etiket sistemi" + "Feature:TagEnableDescription": "Cmskit etiket sistemi" } } From bf05c67a81231cad2236c08116541017b9cfa83f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Mon, 21 Nov 2022 17:19:42 +0300 Subject: [PATCH 04/15] changed scroll type. --- .../src/lib/components/permission-management.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html index 5a9fa0dd5a..74cc7b4617 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html @@ -24,7 +24,7 @@
-
+
-
+

{{ selectedGroup?.displayName }}

From 492d003be12e1284f0974b8cde7a37fefb007776 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 22 Nov 2022 13:10:18 +0300 Subject: [PATCH 05/15] Update modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json Co-authored-by: Enis Necipoglu --- .../Volo/CmsKit/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index b966edea32..57b530217b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -199,7 +199,7 @@ "Feature:CommentEnable": "Commenting", "Feature:CommentEnableDescription": "CMS Kit's comment system", "Feature:GlobalResourceEnable": "Global resourcing", - "Feature:GlobalResourceEnableDescription": "CMS Kit's dynamic globa resoruce system", + "Feature:GlobalResourceEnableDescription": "CMS Kit's global resoruces feature that allows managing global styles & scripts.", "Feature:MenuEnable": "Menu", "Feature:MenuEnableDescription": "CMS Kit's dynamic menu system", "Feature:PageEnable": "Paging", From 6fcda47e9096676e2f5f070535806a7523756b3f Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 22 Nov 2022 13:10:24 +0300 Subject: [PATCH 06/15] Update modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json Co-authored-by: Enis Necipoglu --- .../Volo/CmsKit/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 57b530217b..1cc7b72a83 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -197,7 +197,7 @@ "Feature:BlogEnable": "Blogpost", "Feature:BlogEnableDescription": "CMS Kit's blogpost system", "Feature:CommentEnable": "Commenting", - "Feature:CommentEnableDescription": "CMS Kit's comment system", + "Feature:CommentEnableDescription": "CMS Kit's comment system allows commenting on entities such as BlogPost.", "Feature:GlobalResourceEnable": "Global resourcing", "Feature:GlobalResourceEnableDescription": "CMS Kit's global resoruces feature that allows managing global styles & scripts.", "Feature:MenuEnable": "Menu", From a9e0eb0814db37302cce8987d52c978c7a949c47 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 22 Nov 2022 13:10:29 +0300 Subject: [PATCH 07/15] Update modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json Co-authored-by: Enis Necipoglu --- .../Volo/CmsKit/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 1cc7b72a83..1bec7777f9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -201,7 +201,7 @@ "Feature:GlobalResourceEnable": "Global resourcing", "Feature:GlobalResourceEnableDescription": "CMS Kit's global resoruces feature that allows managing global styles & scripts.", "Feature:MenuEnable": "Menu", - "Feature:MenuEnableDescription": "CMS Kit's dynamic menu system", + "Feature:MenuEnableDescription": "CMS Kit's dynamic menu system that allows adding/removing application menus dynamically.", "Feature:PageEnable": "Paging", "Feature:PageEnableDescription": "CMS Kit's page system", "Feature:RatingEnable": "Rating", From 2f69112291dc77cfc69aa40164ae543c44685de9 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 22 Nov 2022 13:10:34 +0300 Subject: [PATCH 08/15] Update modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json Co-authored-by: Enis Necipoglu --- .../Volo/CmsKit/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 1bec7777f9..056674d4cd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -203,7 +203,7 @@ "Feature:MenuEnable": "Menu", "Feature:MenuEnableDescription": "CMS Kit's dynamic menu system that allows adding/removing application menus dynamically.", "Feature:PageEnable": "Paging", - "Feature:PageEnableDescription": "CMS Kit's page system", + "Feature:PageEnableDescription": "CMS Kit's page system that allows creating static pages with specific URL.", "Feature:RatingEnable": "Rating", "Feature:RatingEnableDescription": "CMS Kit's rating system", "Feature:ReactionEnable": "Reaction", From 27cb60ce1f9e803f584bff8773853a359ba1f81c Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 22 Nov 2022 13:10:39 +0300 Subject: [PATCH 09/15] Update modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json Co-authored-by: Enis Necipoglu --- .../Volo/CmsKit/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 056674d4cd..dd6f3e58c2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -205,7 +205,7 @@ "Feature:PageEnable": "Paging", "Feature:PageEnableDescription": "CMS Kit's page system that allows creating static pages with specific URL.", "Feature:RatingEnable": "Rating", - "Feature:RatingEnableDescription": "CMS Kit's rating system", + "Feature:RatingEnableDescription": "CMS Kit's rating system that allows users to rate entities such as BlogPost.", "Feature:ReactionEnable": "Reaction", "Feature:ReactionEnableDescription": "CMS Kit's reaction system", "Feature:TagEnable": "Taging", From 19e893f4db6ca4f65acadb38d9fd525bc4b80d03 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 22 Nov 2022 13:10:50 +0300 Subject: [PATCH 10/15] Update modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json Co-authored-by: Enis Necipoglu --- .../Volo/CmsKit/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index dd6f3e58c2..25783210c2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -207,7 +207,7 @@ "Feature:RatingEnable": "Rating", "Feature:RatingEnableDescription": "CMS Kit's rating system that allows users to rate entities such as BlogPost.", "Feature:ReactionEnable": "Reaction", - "Feature:ReactionEnableDescription": "CMS Kit's reaction system", + "Feature:ReactionEnableDescription": "CMS Kit's reaction system that allows users to send reactions to entities such as BlogPost, Comments, etc.", "Feature:TagEnable": "Taging", "Feature:TagEnableDescription": "CMS Kit's tag system" } From b1639ffddd731571519b59db2ebf67376d9c5707 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 22 Nov 2022 13:10:56 +0300 Subject: [PATCH 11/15] Update modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json Co-authored-by: Enis Necipoglu --- .../Volo/CmsKit/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 25783210c2..5b36ba5846 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -209,6 +209,6 @@ "Feature:ReactionEnable": "Reaction", "Feature:ReactionEnableDescription": "CMS Kit's reaction system that allows users to send reactions to entities such as BlogPost, Comments, etc.", "Feature:TagEnable": "Taging", - "Feature:TagEnableDescription": "CMS Kit's tag system" + "Feature:TagEnableDescription": "CMS Kit's tag system that allows tagging entities such as BlogPost." } } \ No newline at end of file From 44e20724daf596b083741b1345deb9822eb63427 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 22 Nov 2022 13:11:03 +0300 Subject: [PATCH 12/15] Update modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json Co-authored-by: Enis Necipoglu --- .../Volo/CmsKit/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 5b36ba5846..19e5de70af 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -195,7 +195,7 @@ "RemovedSettingAsHomePage": "Removed setting the home page", "Feature:CmsKitGroup": "Cms Kit", "Feature:BlogEnable": "Blogpost", - "Feature:BlogEnableDescription": "CMS Kit's blogpost system", + "Feature:BlogEnableDescription": "CMS Kit's blogpost system that allows create blogs and posts dynamically in the application.", "Feature:CommentEnable": "Commenting", "Feature:CommentEnableDescription": "CMS Kit's comment system allows commenting on entities such as BlogPost.", "Feature:GlobalResourceEnable": "Global resourcing", From 54d417d1717b2767c2ab71756af2c90c40d197f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 22 Nov 2022 13:52:45 +0300 Subject: [PATCH 13/15] Resolves #14676 --- .../package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index ec6c84402f..93c3de608d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,6 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-rc.1" + "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-rc.1", + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1" } } From 067118f3d1f2ccee5fc6ea7d27f7c73adb7b4322 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Tue, 22 Nov 2022 13:56:09 +0300 Subject: [PATCH 14/15] Update package.json --- .../package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 079120d89e..320f29816b 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,6 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "~1.0.0" + "@abp/aspnetcore.components.server.leptonxlitetheme": "~1.0.0", + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0" } } From 693cb403efbff8a9ddfcd2d8286e053feada4e8d Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Tue, 22 Nov 2022 14:06:06 +0300 Subject: [PATCH 15/15] Update package.json --- .../package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 50fd60561a..93c3de608d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,8 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "~1.0.0", - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0" "@abp/aspnetcore.components.server.leptonxlitetheme": "~2.0.0-rc.1", "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.0.0-rc.1" }