Skip to content

Feature/summernote #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NuGet.Config
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
</configuration>
4 changes: 2 additions & 2 deletions src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Content utilities for html and markdown</Description>
<Version>8.0.0</Version>
<Version>8.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageTags>cloudscribe;blog,content</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Description>Bootstrap 3 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
<Version>8.0.0</Version>
<Version>8.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Description>Bootstrap 4 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
<Version>8.0.0</Version>
<Version>8.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@inject ICoreThemeHelper themeHelper
@inject IStringLocalizer<SimpleContent> sr
@inject IOptions<ContentSettingsUIConfig> uiOptionsAccessor
@inject ICkeditorOptionsResolver editorOptionsResolver
@{
var uiOptions = uiOptionsAccessor.Value;
var themeSettings = themeHelper.GetThemeSettings();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
@inject ICoreThemeHelper themeHelper
@inject IStringLocalizer<SimpleContent> sr
@inject IOptions<ContentSettingsUIConfig> uiOptionsAccessor
@inject ISummernoteOptionsResolver summernoteOptionsResolver
@inject ICkeditorOptionsResolver editorOptionsResolver
@{
var uiOptions = uiOptionsAccessor.Value;
var themeSettings = themeHelper.GetThemeSettings();
if (themeSettings.AdminSideNavExpanded) { ViewData["SideNavToggle"] = "show"; }
ViewData["SideNavVisible"] = true;
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
if (string.IsNullOrWhiteSpace(Model.AboutHeading))
{
Expand Down Expand Up @@ -43,13 +45,15 @@
</div>
<div class="mb-3">
<label asp-for="AboutContent">@sr["About Content"]</label>
<textarea asp-for="AboutContent" class="form-control"
data-ckeditor-unobtrusive=""
data-ckeditor-config-url="@ckOptions.CustomConfigPath"
data-ckeditor-config-language="@ckOptions.LanguageCode"
data-ckeditor-config-dropfileuploadurl="@ckOptions.DropFileUrl"
data-ckeditor-config-filebrowserurl="@ckOptions.FileBrowseUrl"
data-ckeditor-config-imagebrowseurl="@ckOptions.ImageBrowseUrl"></textarea>
<textarea asp-for="AboutContent" rows="5"
data-summernote-unobtrusive=""
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
data-summernote-config-language="@summernoteOptions.LanguageCode"
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
</textarea>
</div>
<div class="mb-3">
<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."]'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Bootstrap 5 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
<Version>8.0.3</Version>
<Version>8.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>integration library for integrating cloudscribe SimpleContent with cloudscribe Core multi-tenant web app foundation</Description>
<Version>8.0.2</Version>
<Version>8.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageTags>cloudscribe;blog</PackageTags>
Expand All @@ -28,17 +28,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Core.Models" Version="8.0.0" />
<PackageReference Include="cloudscribe.Core.Identity" Version="8.0.0" />
<PackageReference Include="cloudscribe.Core.Web" Version="8.0.0" />
<PackageReference Include="cloudscribe.Web.Common" Version="8.0.0" />
<PackageReference Include="cloudscribe.FileManager.Web" Version="8.0.0" />
<PackageReference Include="cloudscribe.Syndication.Web" Version="8.0.0" />
<PackageReference Include="cloudscribe.Core.Models" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Identity" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Web" Version="8.1.0" />
<PackageReference Include="cloudscribe.Web.Common" Version="8.1.0" />
<PackageReference Include="cloudscribe.FileManager.Web" Version="8.1.0" />
<PackageReference Include="cloudscribe.Syndication.Web" Version="8.1.0" />

<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>a re-useable implementation of the metaweblog api for asp.net core</Description>
<Version>8.0.0</Version>
<Version>8.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageTags>cloudscribe;metaweblog;api;asp.net core</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Description>Bootstrap 3 pre-compiled views for cloudscribe.SimpleContent.Web</Description>
<Version>8.0.0</Version>
<Version>8.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Description>Bootstrap 4 pre-compiled views for cloudscribe.SimpleContent.Web</Description>
<Version>8.0.0</Version>
<Version>8.1.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
@inject IStringLocalizer<SimpleContent> sr
@inject ICkeditorOptionsResolver editorOptionsResolver
@inject IBlogRoutes blogRoutes
@{
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
var contentId = Model.Id;
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
}
@section Styles {
<partial name="EditStylesPartial" model="@Model" />
<link href="/cr/css/summernote-bs5.min.css" rel="stylesheet">
}
<h2>@ViewBag.Title</h2>
@if (!string.IsNullOrEmpty(Model.Id))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
@inject ISummernoteOptionsResolver summernoteOptionsResolver
@inject ICkeditorOptionsResolver editorOptionsResolver
@{
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
}
<textarea asp-for="Content" class="form-control" rows="10" cols="70"
data-ckeditor-unobtrusive=""
data-ckeditor-config-url="@ckOptions.CustomConfigPath"
data-ckeditor-config-language="@ckOptions.LanguageCode"
data-ckeditor-config-dropfileuploadurl="@ckOptions.DropFileUrl"
data-ckeditor-config-filebrowserurl="@ckOptions.FileBrowseUrl"
data-ckeditor-config-imagebrowseurl="@ckOptions.ImageBrowseUrl"></textarea>

<textarea asp-for="Content" rows="10" cols="70" class="form-control"
data-summernote-unobtrusive=""
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
data-summernote-config-language="@summernoteOptions.LanguageCode"
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
</textarea>
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
@inject ISummernoteOptionsResolver summernoteOptionsResolver
@inject ICkeditorOptionsResolver editorOptionsResolver
@inject IStringLocalizer<SimpleContent> sr
@{
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
var contentId = Model.Id;
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
}
<textarea asp-for="Content" class="form-control" rows="10" cols="70"
data-markdown-unobtrusive=""
data-markdown-autosave="true"
data-markdown-contentid="@contentId"
data-markdown-forceSync="true"
data-markdown-indentWithTabs="true"
data-markdown-spellChecker="true"
data-markdown-filemodalid="#fileBrowseDialog"
data-markdown-filebrowseurl="@ckOptions.ImageBrowseUrl"
data-markdown-dropfileuploadurl="@ckOptions.DropFileUrl"></textarea>
<textarea asp-for="Content" rows="10" cols="70" class="form-control"
data-summernote-unobtrusive=""
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
data-summernote-config-language="@summernoteOptions.LanguageCode"
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
</textarea>
<div id="fileBrowseDialog" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg" style="height:99%;width:99%;">
<div class="modal-content">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ else
<script src="~/cr/js/bootstrap4-datetimepicker.min.js"></script>
<script src="~/cr/js/cloudscribe-datepicker-bootstrap4-unobtrusive.min.js"></script>
<script src="/csscsr/js/edit-script.js"></script>
<partial name="SummernoteScripts" />
@*<script>
$(function () {
$('[data-bs-toggle="tooltip"]').tooltip()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
@inject ISummernoteOptionsResolver summernoteOptionsResolver
@inject ICkeditorOptionsResolver editorOptionsResolver
@inject IStringLocalizer<SimpleContent> sr
@{
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
}
<div class="mb-3">
<label asp-for="TeaserOverride">@sr["Teaser Override"]</label>
<textarea asp-for="TeaserOverride" class="form-control" rows="10" cols="70"
data-ckeditor-unobtrusive=""
data-ckeditor-config-url="@ckOptions.CustomConfigPath"
data-ckeditor-config-language="@ckOptions.LanguageCode"
data-ckeditor-config-dropfileuploadurl="@ckOptions.DropFileUrl"
data-ckeditor-config-filebrowserurl="@ckOptions.FileBrowseUrl"
data-ckeditor-config-imagebrowseurl="@ckOptions.ImageBrowseUrl"></textarea>
data-summernote-unobtrusive=""
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
data-summernote-config-language="@summernoteOptions.LanguageCode"
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
</textarea>
</div>
<div class="mb-3">
<div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["If checked, then show entire blog post on index/listing pages regardless of teaser settings."]'>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
@inject ISummernoteOptionsResolver summernoteOptionsResolver
@inject ICkeditorOptionsResolver editorOptionsResolver
@inject IStringLocalizer<SimpleContent> sr
@{
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
var contentId = Model.Id + "-teaser";
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-teaser-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
Expand All @@ -17,7 +19,7 @@
data-markdown-spellChecker="true"
data-markdown-filemodalid="#fileBrowseDialog"
data-markdown-filebrowseurl="/filemanager/filedialog"
data-markdown-dropfileuploadurl="@ckOptions.DropFileUrl"></textarea>
data-markdown-dropfileuploadurl="@summernoteOptions.DropFileUrl"></textarea>
</div>
<div class="mb-3">
<div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["If checked, then show entire blog post on index/listing pages regardless of teaser settings."]'>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditWithTemplateViewModel
@inject IStringLocalizer<SimpleContent> sr
@inject ICkeditorOptionsResolver editorOptionsResolver
@inject IBlogRoutes blogRoutes
@{
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
var contentId = Model.Id;
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
var legend = sr["Template Fields"].ToString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,4 @@
}
</environment>
<script src="/csscsr/js/edit-script.js"></script>
@*<script>
$(function () {
$('[data-bs-toggle="tooltip"]').tooltip()
});
$(document).ready(function () {
$('#SaveMode').click(function () {
var newDateVal = $('#NewPubDate').val();
if (newDateVal.length == 0) {
$('#dateRequired').modal('show')
$('#SaveMode').html($('#SaveMode').data("enabled-text"));
return false;
}
});
});
</script>*@
<partial name="SummernoteScripts" />
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditWithTemplateViewModel
@inject ISummernoteOptionsResolver summernoteOptionsResolver
@inject ICkeditorOptionsResolver editorOptionsResolver
@inject IStringLocalizer<SimpleContent> sr
@{
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
}
<div class="mb-3">
<label asp-for="TeaserOverride">@sr["Teaser Override"]</label>
<textarea asp-for="TeaserOverride" class="form-control" rows="10" cols="70"
data-ckeditor-unobtrusive=""
data-ckeditor-config-url="@ckOptions.CustomConfigPath"
data-ckeditor-config-language="@ckOptions.LanguageCode"
data-ckeditor-config-dropfileuploadurl="@ckOptions.DropFileUrl"
data-ckeditor-config-filebrowserurl="@ckOptions.FileBrowseUrl"
data-ckeditor-config-imagebrowseurl="@ckOptions.ImageBrowseUrl"></textarea>
data-summernote-unobtrusive=""
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
data-summernote-config-language="@summernoteOptions.LanguageCode"
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
</textarea>
</div>
<div class="mb-3">
<div class="form-check" data-bs-toggle="tooltip" data-placement="left" title='@sr["If checked, then show entire blog post on index/listing pages regardless of teaser settings."]'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
}
@section Styles {
<partial name="EditStylesPartial" model="@Model" />
<link href="/cr/css/summernote-bs5.min.css" rel="stylesheet">
}
<h2>
@ViewBag.Title
Expand Down Expand Up @@ -55,7 +56,6 @@
<input asp-for="Author" class="form-control" />
<span asp-validation-for="Author" class="invalid-feedback"></span>
</div>
<partial name="EditorialShowHidePartial" model="@Model" />
</div>
<div class="tab-pane" id="tabSettings" role="tabpanel" aria-labelledby="tab2">
<div class="mb-3 mt-2">
Expand Down Expand Up @@ -105,6 +105,7 @@
<label asp-for="MenuOnly" class="form-check-label">@sr["No Content Only Show Child Menu"]</label>
</div>
</div>
<partial name="EditorialShowHidePartial" model="@Model" />
<partial name="EditCommentsEnabledPartial" model="Model" />
<div class="mb-3">
<label asp-for="PageOrder">@sr["Page Order"]</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,4 @@ else
}
}
<script src="/csscsr/js/edit-script.js"></script>
@*<script>
$(function () {
$('[data-bs-toggle="tooltip"]').tooltip()
});
$(document).ready(function () {
$('#SaveMode').click(function () {
var newDateVal = $('#NewPubDate').val();
if (newDateVal.length == 0) {
$('#dateRequired').modal('show')
$('#SaveMode').html($('#SaveMode').data("enabled-text"));
return false;
}
});
});
</script>*@
<partial name="SummernoteScripts" />
Loading