Bump OCC.Html to 1.4.0

src/OrchardCoreContrib.Html/Constants.cs

@@ -0,0 +1,12 @@
+namespace OrchardCoreContrib.Html;
+
+/// <summary>
+/// Defines constants used in the Html module.
+/// </summary>
+public class Constants
+{
+    /// <summary>
+    /// Represents the name of the editor used by the GrapesJS feature.
+    /// </summary>
+    public const string Editor = "GrapesJS";
+}

src/OrchardCoreContrib.Html/Controllers/AdminController.cs

@@ -1,12 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore.Modules;
 
-namespace OrchardCoreContrib.Html.Controllers
+namespace OrchardCoreContrib.Html.Controllers;
+
+[Feature("OrchardCoreContrib.Html.GrapesJS")]
+public class AdminController : Controller
 {
-    [Feature("OrchardCoreContrib.Html.GrapesJS")]
-    public class AdminController : Controller
-    {
-        [HttpGet]
-        public ActionResult Index() => View();
-    }
+    public ActionResult Index() => View();
 }

src/OrchardCoreContrib.Html/Manifest.cs

@@ -5,7 +5,7 @@
     Name = "Html",
     Author = ManifestConstants.Author,
     Website = ManifestConstants.Website,
-    Version = "1.2.1"
+    Version = "1.4.0"
 )]
 
 [assembly: Feature(

src/OrchardCoreContrib.Html/OrchardCoreContrib.Html.csproj

@@ -2,9 +2,10 @@
 
 	<PropertyGroup>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-		<VersionPrefix>1.3.0</VersionPrefix>
+		<VersionPrefix>1.4.0</VersionPrefix>
 		<Authors>The Orchard Core Contrib Team</Authors>
 		<Company />
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<Description>The Html module enables content items to have rich content using Grapes JS.</Description>
 		<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/OrchardCoreContrib/OrchardCoreContrib.Modules/tree/main/src/OrchardCoreContrib.Html/README.md</PackageProjectUrl>
@@ -26,6 +27,7 @@
 
 	<ItemGroup>
 		<None Include="../../images/icon.png" Pack="true" PackagePath="icon.png" />
+		<None Include="README.md" Pack="true" PackagePath="\"/>
 	</ItemGroup>
 
 	<ItemGroup>

src/OrchardCoreContrib.Html/README.md

@@ -4,7 +4,7 @@ This module enables content items to have rich content using Grapes JS.
 
 ## Version
 
-1.2.1
+1.4.0
 
 ## Category
 
@@ -28,6 +28,7 @@ Content Management
 
 | Name                                                                                            | Version     |
 |-------------------------------------------------------------------------------------------------|-------------|
+| [`OrchardCoreContrib.Html`](https://www.nuget.org/packages/OrchardCoreContrib.Html/1.4.0)       | 1.4.0       |
 | [`OrchardCoreContrib.Html`](https://www.nuget.org/packages/OrchardCoreContrib.Html/1.3.0)       | 1.3.0       |
 | [`OrchardCoreContrib.Html`](https://www.nuget.org/packages/OrchardCoreContrib.Html/1.2.1)       | 1.2.1       |
 | [`OrchardCoreContrib.Html`](https://www.nuget.org/packages/OrchardCoreContrib.Html/1.2.0)       | 1.2.0       |

src/OrchardCoreContrib.Html/ResourceManagementOptionsConfiguration.cs

@@ -0,0 +1,53 @@
+using Microsoft.Extensions.Options;
+using OrchardCore.ResourceManagement;
+
+namespace OrchardCoreContrib.Html;
+
+/// <summary>
+/// Configure the resources that will be used in the module.
+/// </summary>
+public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+{
+    private static readonly ResourceManifest _manifest;
+
+    static ResourceManagementOptionsConfiguration()
+    {
+        _manifest = new ResourceManifest();
+
+        _manifest
+            .DefineScript("grapes")
+            .SetUrl("~/OrchardCoreContrib.Html/Scripts/grapes.min.js")
+            .SetVersion("1.0.0");
+
+        _manifest
+            .DefineScript("grapes-preset")
+            .SetUrl("~/OrchardCoreContrib.Html/Scripts/grapesjs-preset-webpage.min.js")
+            .SetVersion("1.0.0");
+
+        _manifest
+            .DefineScript("grapes-editor")
+            .SetUrl("~/OrchardCoreContrib.Html/Scripts/grapes-editor.js")
+            .SetVersion("1.0.0");
+
+        _manifest
+            .DefineStyle("grapes")
+            .SetUrl("~/OrchardCoreContrib.Html/Styles/grapes.min.css")
+            .SetVersion("1.0.0");
+
+        _manifest
+            .DefineStyle("grapes-preset")
+            .SetUrl("~/OrchardCoreContrib.Html/Styles/grapesjs-preset-webpage.min.css")
+            .SetVersion("1.0.0");
+
+        _manifest
+            .DefineStyle("grapes-editor")
+            .SetUrl("~/OrchardCoreContrib.Html/Styles/grapes-editor.css")
+            .SetVersion("1.0.0");
+    }
+
+    /// <inheritdoc/>
+    public void Configure(ResourceManagementOptions options)
+    {
+        options.ResourceManifests.Add(_manifest);
+    }
+}

src/OrchardCoreContrib.Html/Startup.cs

@@ -1,23 +1,35 @@
-using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using OrchardCore.Modules;
 using OrchardCore.Mvc.Core.Utilities;
+using OrchardCore.ResourceManagement;
 using OrchardCoreContrib.Html.Controllers;
 
-namespace OrchardCoreContrib.Html
+namespace OrchardCoreContrib.Html;
+
+[Feature("OrchardCoreContrib.Html.GrapesJS")]
+public class Startup : StartupBase
 {
-    [Feature("OrchardCoreContrib.Html.GrapesJS")]
-    public class Startup : StartupBase
+    /// <inheritdoc/>
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddTransient<IConfigureOptions<ResourceManagementOptions>, ResourceManagementOptionsConfiguration>();
+    }
+
+    /// <inheritdoc/>
+    public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
-        public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        {
-            routes.MapAreaControllerRoute(
-                name: "GrapesJSEditor",
-                areaName: "OrchardCoreContrib.Html",
-                pattern: "GrapesJSEditor",
-                defaults: new { controller = typeof(AdminController).ControllerName(), action = nameof(AdminController.Index) }
-            );
-        }
+        routes.MapAreaControllerRoute(
+            name: "GrapesJSEditor",
+            areaName: "OrchardCoreContrib.Html",
+            pattern: "GrapesJSEditor",
+            defaults: new
+            {
+                controller = typeof(AdminController).ControllerName(),
+                action = nameof(AdminController.Index)
+            }
+        );
     }
 }

src/OrchardCoreContrib.Html/Views/Admin/Index.cshtml

@@ -2,17 +2,27 @@
     Layout = null;
 }
 
-<link href="/OrchardCoreContrib.Html/Styles/grapes.min.css" rel="stylesheet" type="text/css" />
-<link href="/OrchardCoreContrib.Html/Styles/grapesjs-preset-webpage.min.css" rel="stylesheet" type="text/css" />
-<link href="/OrchardCoreContrib.Html/Styles/grapes-editor.css" rel="stylesheet" type="text/css" />
-<div>    
-    <div id="editor" class="grapes-editor"></div>
+<!DOCTYPE html>
+<html lang="@Orchard.CultureName()" dir="@Orchard.CultureDir()">
+<head>
 
-    <script src="/OrchardCoreContrib.Html/Scripts/grapes.min.js"></script>
-    <script src="/OrchardCoreContrib.Html/Scripts/grapesjs-preset-webpage.min.js"></script>
-    <script src="/OrchardCoreContrib.Html/Scripts/grapes-editor.js"></script>
+    <style asp-name="grapes" at="Head" version="1.0.0"></style>
+    <style asp-name="grapes-preset" at="Head" version="1.0.0"></style>
+    <style asp-name="grapes-editor" at="Head" version="1.0.0"></style>
+    <script asp-name="grapes" at="Head" version="1.0.0"></script>
+    <script asp-name="grapes-preset" at="Head" version="1.0.0"></script>
+    <script asp-name="grapes-editor" at="Head" version="1.0.0"></script>
+    <resources type="Header" />
+</head>
+<body>
+    <div>
+        <div id="editor" class="grapes-editor"></div>
 
-    <script>
-        initGrapesJs('HtmlBodyPart_Html');
-    </script>
-</div>
+        <script at="Foot">
+            initGrapesJs('HtmlBodyPart_Html');
+        </script>
+    </div>
+
+    <resources type="Footer" />
+</body>
+</html>

src/OrchardCoreContrib.Html/Views/HtmlBodyPart-GrapeJS.Edit.cshtml

@@ -3,8 +3,6 @@
 <div class="form-group">
     <label asp-for="Html">@Model.TypePartDefinition.DisplayName()</label>
     <input asp-for="Html" type="hidden" class="form-control" />
-
-    <iframe src="~/GrapesJSEditor" style="width: 100%; height: 900px;">
-    </iframe>
+    <iframe class="d-block" src="~/GrapesJSEditor" style="width: 100%; height: 500px;"></iframe>
     <span class="hint">@T["The body of the content item."]</span>
 </div>

src/OrchardCoreContrib.Html/Views/HtmlBodyPart-GrapeJS.Option.cshtml

@@ -1,4 +1,4 @@
 @{
     string currentEditor = Model.Editor;
 }
-<option value="GrapeJS" selected="@(currentEditor == "GrapeJS")">@T["GrapeJS editor"]</option>
+<option value="@Constants.Editor" selected="@(currentEditor == Constants.Editor)">@T["GrapesJS editor"]</option>

src/OrchardCoreContrib.Html/Views/_ViewImports.cshtml

@@ -5,3 +5,4 @@
 @using OrchardCore.ContentManagement.Metadata.Models
 @using OrchardCore.DisplayManagement
 @using OrchardCore.Html.ViewModels
+@using OrchardCoreContrib.Html