Skip to content

Commit e9220bd

Browse files
JimKerslakeJimKerslake
authored
Merge pull request #638 from cloudscribe/feature/summernote
jk merging in Feature/summernote at v8.2
2 parents 1f73bcf + 49b567d commit e9220bd

29 files changed

+350
-320
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.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.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/Edit.cshtml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
22
@inject IStringLocalizer<SimpleContent> sr
3-
@inject ICkeditorOptionsResolver editorOptionsResolver
43
@inject IBlogRoutes blogRoutes
54
@{
6-
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
75
var contentId = Model.Id;
86
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
97
}
108
@section Styles {
119
<partial name="EditStylesPartial" model="@Model" />
10+
<link href="/cr/css/summernote-bs5.min.css" rel="stylesheet">
1211
}
1312
<h2>@ViewBag.Title</h2>
1413
@if (!string.IsNullOrEmpty(Model.Id))

‎src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditContentHtmlPartial.cshtml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
2+
@inject ISummernoteOptionsResolver summernoteOptionsResolver
23
@inject ICkeditorOptionsResolver editorOptionsResolver
34
@{
5+
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
46
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
57
}
6-
<textarea asp-for="Content" class="form-control" rows="10" cols="70"
7-
data-ckeditor-unobtrusive=""
8-
data-ckeditor-config-url="@ckOptions.CustomConfigPath"
9-
data-ckeditor-config-language="@ckOptions.LanguageCode"
10-
data-ckeditor-config-dropfileuploadurl="@ckOptions.DropFileUrl"
11-
data-ckeditor-config-filebrowserurl="@ckOptions.FileBrowseUrl"
12-
data-ckeditor-config-imagebrowseurl="@ckOptions.ImageBrowseUrl"></textarea>
13-
8+
<textarea asp-for="Content" rows="10" cols="70" class="form-control"
9+
data-summernote-unobtrusive=""
10+
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
11+
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
12+
data-summernote-config-language="@summernoteOptions.LanguageCode"
13+
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
14+
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
15+
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
16+
</textarea>

‎src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditContentMarkdownPartial.cshtml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
2+
@inject ISummernoteOptionsResolver summernoteOptionsResolver
23
@inject ICkeditorOptionsResolver editorOptionsResolver
34
@inject IStringLocalizer<SimpleContent> sr
45
@{
6+
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
57
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
68
var contentId = Model.Id;
79
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
810
}
9-
<textarea asp-for="Content" class="form-control" rows="10" cols="70"
10-
data-markdown-unobtrusive=""
11-
data-markdown-autosave="true"
12-
data-markdown-contentid="@contentId"
13-
data-markdown-forceSync="true"
14-
data-markdown-indentWithTabs="true"
15-
data-markdown-spellChecker="true"
16-
data-markdown-filemodalid="#fileBrowseDialog"
17-
data-markdown-filebrowseurl="@ckOptions.ImageBrowseUrl"
18-
data-markdown-dropfileuploadurl="@ckOptions.DropFileUrl"></textarea>
11+
<textarea asp-for="Content" rows="10" cols="70" class="form-control"
12+
data-summernote-unobtrusive=""
13+
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
14+
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
15+
data-summernote-config-language="@summernoteOptions.LanguageCode"
16+
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
17+
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
18+
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
19+
</textarea>
1920
<div id="fileBrowseDialog" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
2021
<div class="modal-dialog modal-lg" style="height:99%;width:99%;">
2122
<div class="modal-content">

‎src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditScriptsPartial.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ else
1919
<script src="~/cr/js/bootstrap4-datetimepicker.min.js"></script>
2020
<script src="~/cr/js/cloudscribe-datepicker-bootstrap4-unobtrusive.min.js"></script>
2121
<script src="/csscsr/js/edit-script.js"></script>
22+
<partial name="SummernoteScripts" />
2223
@*<script>
2324
$(function () {
2425
$('[data-bs-toggle="tooltip"]').tooltip()

‎src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditTeaserHtmlPartial.cshtml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
2+
@inject ISummernoteOptionsResolver summernoteOptionsResolver
23
@inject ICkeditorOptionsResolver editorOptionsResolver
34
@inject IStringLocalizer<SimpleContent> sr
45
@{
6+
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
57
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
68
}
79
<div class="mb-3">
810
<label asp-for="TeaserOverride">@sr["Teaser Override"]</label>
911
<textarea asp-for="TeaserOverride" class="form-control" rows="10" cols="70"
10-
data-ckeditor-unobtrusive=""
11-
data-ckeditor-config-url="@ckOptions.CustomConfigPath"
12-
data-ckeditor-config-language="@ckOptions.LanguageCode"
13-
data-ckeditor-config-dropfileuploadurl="@ckOptions.DropFileUrl"
14-
data-ckeditor-config-filebrowserurl="@ckOptions.FileBrowseUrl"
15-
data-ckeditor-config-imagebrowseurl="@ckOptions.ImageBrowseUrl"></textarea>
12+
data-summernote-unobtrusive=""
13+
data-summernote-config-url="@summernoteOptions.CustomConfigPath"
14+
data-summernote-toolbar-config-url="@summernoteOptions.CustomToolbarConfigPath"
15+
data-summernote-config-language="@summernoteOptions.LanguageCode"
16+
data-summernote-config-dropfileuploadurl="@summernoteOptions.DropFileUrl"
17+
data-summernote-config-filebrowserurl="@summernoteOptions.FileBrowseUrl"
18+
data-summernote-config-imagebrowseurl="@summernoteOptions.ImageBrowseUrl">
19+
</textarea>
1620
</div>
1721
<div class="mb-3">
1822
<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."]'>

‎src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditTeaserMarkdownPartial.cshtml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditViewModel
2+
@inject ISummernoteOptionsResolver summernoteOptionsResolver
23
@inject ICkeditorOptionsResolver editorOptionsResolver
34
@inject IStringLocalizer<SimpleContent> sr
45
@{
6+
var summernoteOptions = await summernoteOptionsResolver.GetSummernoteOptions();
57
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
68
var contentId = Model.Id + "-teaser";
79
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-teaser-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
@@ -17,7 +19,7 @@
1719
data-markdown-spellChecker="true"
1820
data-markdown-filemodalid="#fileBrowseDialog"
1921
data-markdown-filebrowseurl="/filemanager/filedialog"
20-
data-markdown-dropfileuploadurl="@ckOptions.DropFileUrl"></textarea>
22+
data-markdown-dropfileuploadurl="@summernoteOptions.DropFileUrl"></textarea>
2123
</div>
2224
<div class="mb-3">
2325
<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."]'>

‎src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditWithTemplate.cshtml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
@model cloudscribe.SimpleContent.Web.ViewModels.PostEditWithTemplateViewModel
22
@inject IStringLocalizer<SimpleContent> sr
3-
@inject ICkeditorOptionsResolver editorOptionsResolver
43
@inject IBlogRoutes blogRoutes
54
@{
6-
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
75
var contentId = Model.Id;
86
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
97
var legend = sr["Template Fields"].ToString();

0 commit comments

Comments
 (0)