From 5eba2f1062a8dd4e76b44adda1dd717647639f02 Mon Sep 17 00:00:00 2001 From: enisn Date: Mon, 15 Mar 2021 16:05:01 +0300 Subject: [PATCH] CmsKit - Implement Style & Script to UI --- .../Pages/CmsKit/Pages/Create.cshtml | 50 ++++++++++------- .../Pages/CmsKit/Pages/Create.cshtml.cs | 11 +++- .../Pages/CmsKit/Pages/Update.cshtml | 54 ++++++++++++------- .../Pages/CmsKit/Pages/Update.cshtml.cs | 8 +++ .../CmsKit/Localization/Resources/en.json | 3 ++ .../CmsKit/Localization/Resources/tr.json | 3 ++ .../Pages/Public/CmsKit/Pages/Index.cshtml | 10 ++++ 7 files changed, 101 insertions(+), 38 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml index b4896a7449..d31066348a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml @@ -18,18 +18,18 @@ } @section scripts { - - - - - - + + + + + + } @section styles { - - - + + + } @@ -37,16 +37,30 @@
- - - + + + - -
-
+ + + + +
+
+
+ + + + + + + + + +
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml.cs index 430c516ce3..5be3d9b9ee 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; using Volo.Abp.Validation; using Volo.CmsKit.Admin.Pages; using Volo.CmsKit.Pages; @@ -39,10 +40,18 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages [Required] [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))] public string Slug { get; set; } - + [HiddenInput] [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))] public string Content { get; set; } + + [TextArea(Rows = 6)] + [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))] + public string Script { get; set; } + + [TextArea(Rows = 6)] + [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))] + public string Style { get; set; } } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml index 1b35e6c913..9ed463b3fd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml @@ -19,37 +19,53 @@ @section scripts { - - - - - - + + + + + + } @section styles { - - - + + + }
- - - + - + - + + + + + + + + +
+
+
+ + + + + + + + + +
-
-
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml.cs index c21f8f587c..8f7fae6b11 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml.cs @@ -57,6 +57,14 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages [HiddenInput] [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))] public string Content { get; set; } + + [TextArea(Rows = 6)] + [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxScriptLength))] + public string Script { get; set; } + + [TextArea(Rows = 6)] + [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxStyleLength))] + public string Style { get; set; } } } } 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 a6d7fc0b57..32900b41a3 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 @@ -27,6 +27,7 @@ "CommentAuthorizationExceptionMessage": "Those comments are not allowed for public display.", "CommentDeletionConfirmationMessage": "This comment and all replies will be deleted!", "Comments": "Comments", + "Content": "Content", "ContentDeletionConfirmationMessage": "Are you sure to delete this content?", "Contents": "Contents", "CoverImage": "Cover Image", @@ -93,6 +94,7 @@ "ReplyTo": "Reply to", "SamplePageMessage": "A sample page for the Pro module", "SaveChanges": "Save Changes", + "Script": "Script", "SelectAll": "Select All", "Send": "Send", "SendMessage": "Send Message", @@ -102,6 +104,7 @@ "SourceUrl": "Source Url", "Star": "Star", "StartDate": "Start Date", + "Style": "Style", "Subject": "Subject", "SubjectPlaceholder": "Please type a subject", "Submit": "Submit", 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 720399dc91..17fd56f0ec 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 @@ -9,6 +9,9 @@ "Blogs": "Bloglar", "ChoosePreference": "Tercih seçiniz...", "Cms": "Cms", + "Content": "İçerik", + "Script": "Script Kodları", + "Style": "Stil Kodları", "CmsKit.Comments": "Yorumlar", "CmsKit.Ratings": "Puanlama", "CmsKit.Reactions": "Tepkiler", diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml index 7503bcfaa4..5fc0511dc5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml @@ -7,7 +7,17 @@ @section styles{ + } + +@section scripts{ + +} + @await Component.InvokeAsync(typeof(DefaultPageViewComponent), new {