Skip to content

Commit 1296d77

Browse files
JimKerslakeJimKerslake
authored
Merge pull request #642 from cloudscribe/develop
v8.2
2 parents 2fb2520 + e9220bd commit 1296d77

File tree

52 files changed

+408
-378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+408
-378
lines changed

‎NuGet.Config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
</configuration>

‎src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Content utilities for html and markdown</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;blog,content</PackageTags>

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Bootstrap 3 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Bootstrap 4 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/Views/ContentCloning/Index.cshtml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@inject ICoreThemeHelper themeHelper
44
@inject IStringLocalizer<SimpleContent> sr
55
@inject IOptions<ContentSettingsUIConfig> uiOptionsAccessor
6-
@inject ICkeditorOptionsResolver editorOptionsResolver
76
@{
87
var uiOptions = uiOptionsAccessor.Value;
98
var themeSettings = themeHelper.GetThemeSettings();

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/Views/ContentSettings/Index.cshtml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
@inject ICoreThemeHelper themeHelper
33
@inject IStringLocalizer<SimpleContent> sr
44
@inject IOptions<ContentSettingsUIConfig> uiOptionsAccessor
5+
@inject ISummernoteOptionsResolver summernoteOptionsResolver
56
@inject ICkeditorOptionsResolver editorOptionsResolver
67
@{
78
var uiOptions = uiOptionsAccessor.Value;
89
var themeSettings = themeHelper.GetThemeSettings();
910
if (themeSettings.AdminSideNavExpanded) { ViewData["SideNavToggle"] = "show"; }
1011
ViewData["SideNavVisible"] = true;
12+
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
1113
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
1214
if (string.IsNullOrWhiteSpace(Model.AboutHeading))
1315
{
@@ -43,13 +45,15 @@
4345
</div>
4446
<div class="mb-3">
4547
<label asp-for="AboutContent">@sr["About Content"]</label>
46-
<textarea asp-for="AboutContent" class="form-control"
47-
data-ckeditor-unobtrusive=""
48-
data-ckeditor-config-url="@ckOptions.CustomConfigPath"
49-
data-ckeditor-config-language="@ckOptions.LanguageCode"
50-
data-ckeditor-config-dropfileuploadurl="@ckOptions.DropFileUrl"
51-
data-ckeditor-config-filebrowserurl="@ckOptions.FileBrowseUrl"
52-
data-ckeditor-config-imagebrowseurl="@ckOptions.ImageBrowseUrl"></textarea>
48+
<textarea asp-for="AboutContent" rows="5"
49+
data-summernote-unobtrusive=""
50+
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
51+
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
52+
data-summernote-config-language="@summernoteOptions.LanguageCode"
53+
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
54+
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
55+
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
56+
</textarea>
5357
</div>
5458
<div class="mb-3">
5559
<div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["If checked will show the blog title and description at the top of the post list."]'>

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Bootstrap 5 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

‎src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>integration library for integrating cloudscribe SimpleContent with cloudscribe Core multi-tenant web app foundation</Description>
5-
<Version>8.1.1</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;blog</PackageTags>
@@ -28,12 +28,12 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="cloudscribe.Core.Models" Version="8.1.0" />
32-
<PackageReference Include="cloudscribe.Core.Identity" Version="8.1.0" />
33-
<PackageReference Include="cloudscribe.Core.Web" Version="8.1.1" />
34-
<PackageReference Include="cloudscribe.Web.Common" Version="8.1.0" />
35-
<PackageReference Include="cloudscribe.FileManager.Web" Version="8.1.2" />
36-
<PackageReference Include="cloudscribe.Syndication.Web" Version="8.1.0" />
31+
<PackageReference Include="cloudscribe.Core.Models" Version="8.2.0" />
32+
<PackageReference Include="cloudscribe.Core.Identity" Version="8.2.0" />
33+
<PackageReference Include="cloudscribe.Core.Web" Version="8.2.0" />
34+
<PackageReference Include="cloudscribe.Web.Common" Version="8.2.0" />
35+
<PackageReference Include="cloudscribe.FileManager.Web" Version="8.2.0" />
36+
<PackageReference Include="cloudscribe.Syndication.Web" Version="8.2.0" />
3737

3838
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
3939
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />

‎src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>a re-useable implementation of the metaweblog api for asp.net core</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;metaweblog;api;asp.net core</PackageTags>

‎src/cloudscribe.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.SimpleContent.CompiledViews.Bootstrap3.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Bootstrap 3 pre-compiled views for cloudscribe.SimpleContent.Web</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

0 commit comments

Comments
 (0)