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.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..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 @@ -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,77 @@ 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, - "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) 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 b6fb5f5aea..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 @@ -194,23 +194,21 @@ "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 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", + "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 that allows adding/removing application menus dynamically.", + "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 that allows users to rate entities such as BlogPost.", + "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 that allows tagging entities such as BlogPost." } } \ 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 e143332425..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 @@ -194,23 +194,21 @@ "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 yorum sistemi", + "Feature:GlobalResourceEnable": "Global kaynaklar", + "Feature:GlobalResourceEnableDescription": "Cmskit global kaynaklar sistemi", + "Feature:MenuEnable": "Menü", + "Feature:MenuEnableDescription": "Cmskit dinamik menü sistemi", + "Feature:PageEnable": "Sayfa", + "Feature:PageEnableDescription": "Cmskit sayfa sistemi", + "Feature:RatingEnable": "Oylama", + "Feature:RatingEnableDescription": "Cmskit oylama sistemi", + "Feature:ReactionEnable": "Reaksiyon", + "Feature:ReactionEnableDescription": "Cmskit reaksiyon sistemi", + "Feature:TagEnable": "Etkiket", + "Feature:TagEnableDescription": "Cmskit etiket sistemi" } } 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 }}

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" } }