Skip to content

Feature/464 #621

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.

Sign up for GitHub

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 2 commits into
base: master
Choose a base branch
from
Open

Feature/464 #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5e1403
preview option for pages and blog
markidox Feb 24, 2025
21ee555
merging with master
markidox Feb 24, 2025
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
10 changes: 9 additions & 1 deletion src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
var ckOptions = await editorOptionsResolver.GetCkeditorOptions();
var contentId = Model.Id;
if (string.IsNullOrWhiteSpace(contentId)) { contentId = "draft-post-" + DateTime.UtcNow.ToString("yyyy-MM-dd-hh"); }
var preview = Context.Request.Query["preview"];
}
@section Styles {
<partial name="EditStylesPartial" model="@Model" />
Expand Down Expand Up @@ -102,8 +103,8 @@
}

<button id="btnSaveDraft" name="SaveMode" value="@SaveMode.SaveDraft" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft"]'>@sr["Save Draft"]</button>
<button id="btnSaveDraftAndPreview" name="SaveMode" value="@SaveMode.SaveDraftAndPreview" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft & Preview"]'>@sr["Save Draft & Preview"]</button>
<button id="btnSavePublish" name="SaveMode" type="submit" value="@SaveMode.PublishNow" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Publish Now"]'>@sr["Publish Now"]</button>

</div>


Expand Down Expand Up @@ -196,5 +197,12 @@
</div>
</div>
@section Scripts {
@if (preview == "true")
{
<script>
window.open("https://localhost:44314" + "@Model.CurrentPostUrl" + "?showdraft=true");
</script>
}

<partial name="EditScriptsPartial" model="@Model" />
}
12 changes: 9 additions & 3 deletions src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Blog/EditWithTemplate.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
if (Model.Template != null)
{
legend = string.Format(legendFormat, Model.Template.Title);

}
var preview = Context.Request.Query["preview"];
}
@section Styles {
<partial name="EditWithTemplateStylesPartial" model="@Model" />
Expand Down Expand Up @@ -94,8 +94,8 @@
}

<button id="btnSaveDraft" name="SaveMode" value="@SaveMode.SaveDraft" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft"]'>@sr["Save Draft"]</button>
<button id="btnSaveDraftAndPreview" name="SaveMode" value="@SaveMode.SaveDraftAndPreview" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft & Preview"]'>@sr["Save Draft & Preview"]</button>
<button id="btnSavePublish" name="SaveMode" type="submit" value="@SaveMode.PublishNow" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Publish Now"]'>@sr["Publish Now"]</button>

</div>


Expand Down Expand Up @@ -188,5 +188,11 @@
</div>
</div>
@section Scripts {
@if (preview == "true")
{
<script>
window.open("https://localhost:44314" + "@Model.CurrentPostUrl" + "?showdraft=true");
</script>
}
<partial name="EditWithTemplateScriptsPartial" model="@Model" />
}
}
10 changes: 8 additions & 2 deletions src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
if (string.IsNullOrEmpty(Model.Id)) { showDev = false; }
var cancelSlug = Model.Slug;
if (Model.Slug == Model.ProjectDefaultSlug || Model.DidRestoreDeleted) { cancelSlug = string.Empty; }

var preview = Context.Request.Query["preview"];
}
@section Styles {
<partial name="EditStylesPartial" model="@Model" />
Expand Down Expand Up @@ -142,7 +142,7 @@
}

<button id="btnSaveDraft" name="SaveMode" value="@SaveMode.SaveDraft" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft"]'>@sr["Save Draft"]</button>

<button id="btnSaveDraftAndPreview" name="SaveMode" value="@SaveMode.SaveDraftAndPreview" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft & Preview"]'>@sr["Save Draft & Preview"]</button>
<button id="btnSavePublish" name="SaveMode" type="submit" value="@SaveMode.PublishNow" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Publish Now"]'>@sr["Publish Now"]</button>

</div>
Expand Down Expand Up @@ -241,5 +241,11 @@
</div>

@section Scripts {
@if (preview == "true")
{
<script>
window.open("https://localhost:44314/" + "@Model.Slug" + "?showdraft=true");
</script>
}
<partial name="EditScriptsPartial" model="@Model" />
}
9 changes: 8 additions & 1 deletion src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Page/EditWithTemplate.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
var cancelSlug = Model.Slug;
if (Model.Slug == Model.ProjectDefaultSlug || Model.DidRestoreDeleted) { cancelSlug = string.Empty; }

var preview = Context.Request.Query["preview"];
}
@section Styles {
<partial name="EditWithTemplateStylesPartial" model="@Model" />
Expand Down Expand Up @@ -128,6 +128,7 @@
}

<button id="btnSaveDraft" name="SaveMode" value="@SaveMode.SaveDraft" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft"]'>@sr["Save Draft"]</button>
<button id="btnSaveDraftAndPreview" name="SaveMode" value="@SaveMode.SaveDraftAndPreview" type="submit" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Save Draft & Preview"]'>@sr["Save Draft & Preview"]</button>
<button id="btnSavePublish" name="SaveMode" type="submit" value="@SaveMode.PublishNow" class="btn btn-primary" data-disabled-text='@sr["Working..."]' data-enabled-text='@sr["Publish Now"]'>@sr["Publish Now"]</button>

</div>
Expand Down Expand Up @@ -228,6 +229,12 @@
</div>

@section Scripts {
@if (preview == "true")
{
<script>
window.open("https://localhost:44314/" + "@Model.Slug" + "?showdraft=true");
</script>
}
<partial name="EditWithTemplateScriptsPartial" model="@Model" />
}

1 change: 1 addition & 0 deletions src/cloudscribe.SimpleContent.Models/Versioning/SaveMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ public static class SaveMode
public const string PublishNow = "PublishNow";
public const string UnPublish = "UnPublish";
public const string DeleteCurrentDraft = "DeleteCurrentDraft";
public const string SaveDraftAndPreview = "Preview";
}
}
39 changes: 30 additions & 9 deletions src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ public virtual async Task<IActionResult> EditWithTemplate(
DidReplaceDraft = didReplaceDraft,
DidRestoreDeleted = didRestoreDeleted,
HasDraft = postResult.Post.HasDraftVersion()
};
};

if (history != null)
{
Expand Down Expand Up @@ -779,11 +779,22 @@ public virtual async Task<IActionResult> EditWithTemplate(PostEditWithTemplateVi
if (response.Succeeded)
{
if (model.SaveMode == SaveMode.DeleteCurrentDraft)
{
this.AlertSuccess(StringLocalizer["The current draft of this post has been deleted."], true);
}
else
{
this.AlertSuccess(StringLocalizer["The post was updated successfully."], true);
}

return RedirectToRoute(BlogRoutes.PostWithoutDateRouteName, new { slug = response.Value.Slug });
if (model.SaveMode == SaveMode.SaveDraftAndPreview)
{
return RedirectToRoute(BlogRoutes.PostEditWithTemplateRouteName, new { slug = response.Value.Slug, preview = "true" });
}
else
{
return RedirectToRoute(BlogRoutes.PostWithoutDateRouteName, new { slug = response.Value.Slug });
}
}
else
{
Expand All @@ -794,8 +805,6 @@ public virtual async Task<IActionResult> EditWithTemplate(PostEditWithTemplateVi

}



[HttpGet]
[AllowAnonymous]
public virtual async Task<IActionResult> Edit(
Expand Down Expand Up @@ -955,7 +964,7 @@ public virtual async Task<IActionResult> Edit(
model.DraftPubDate = TimeZoneHelper.ConvertToLocalTime(postResult.Post.DraftPubDate.Value, tzId);
}
}

return View(model);
}

Expand Down Expand Up @@ -1048,22 +1057,34 @@ public virtual async Task<IActionResult> Edit(PostEditViewModel model)
pubDate = DateTime.UtcNow;
}

return RedirectToRoute(BlogRoutes.PostWithDateRouteName,
if (model.SaveMode == SaveMode.SaveDraftAndPreview)
{
return RedirectToRoute(BlogRoutes.PostEditRouteName, new { slug = response.Value.Slug, preview = "true" });
}
else
{
return RedirectToRoute(BlogRoutes.PostWithDateRouteName,
new
{
year = pubDate.Value.Year,
month = pubDate.Value.Month.ToString("00"),
day = pubDate.Value.Day.ToString("00"),
slug = response.Value.Slug
});
}
}
else
{
return RedirectToRoute(BlogRoutes.PostWithoutDateRouteName,
if (model.SaveMode == SaveMode.SaveDraftAndPreview)
{
return RedirectToRoute(BlogRoutes.PostEditRouteName, new { slug = response.Value.Slug, preview = "true" });
}
else
{
return RedirectToRoute(BlogRoutes.PostWithoutDateRouteName,
new { slug = response.Value.Slug });
}
}


}

[HttpPost]
Expand Down
21 changes: 18 additions & 3 deletions src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,15 @@ public virtual async Task<IActionResult> EditWithTemplate(PageEditWithTemplateVi
{
return RedirectToRoute(PageRoutes.PageRouteName, new { slug = "" });
}
return RedirectToRoute(PageRoutes.PageRouteName, new { slug = response.Value.Slug });

if (model.SaveMode == SaveMode.SaveDraftAndPreview)
{
return RedirectToRoute(PageRoutes.PageEditRouteName, new { slug = response.Value.Slug, preview = "true" });
}
else
{
return RedirectToRoute(PageRoutes.PageRouteName, new { slug = response.Value.Slug });
}
}
else
{
Expand Down Expand Up @@ -790,8 +798,15 @@ public virtual async Task<IActionResult> Edit(PageEditViewModel model)
{
return RedirectToRoute(PageRoutes.PageRouteName, new { slug = "" });
}

return RedirectToRoute(PageRoutes.PageRouteName, new { slug = response.Value.Slug });

if (model.SaveMode == SaveMode.SaveDraftAndPreview)
{
return RedirectToRoute(PageRoutes.PageEditRouteName, new { slug = response.Value.Slug, preview = "true" });
}
else
{
return RedirectToRoute(PageRoutes.PageRouteName, new { slug = response.Value.Slug });
}
}
else
{
Expand Down
1 change: 1 addition & 0 deletions src/cloudscribe.SimpleContent.Web/Services/Blog/CreateOrUpdatePostHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ ILogger<CreateOrUpdatePostHandler> logger
switch (saveMode)
{
case SaveMode.SaveDraft:
case SaveMode.SaveDraftAndPreview:

post.DraftContent = request.ViewModel.Content;
post.DraftAuthor = request.ViewModel.Author;
Expand Down
1 change: 1 addition & 0 deletions src/cloudscribe.SimpleContent.Web/Services/Blog/UpdateTemplatedPostHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ private IValidateTemplateModel GetValidator(string name)
switch (saveMode)
{
case SaveMode.SaveDraft:
case SaveMode.SaveDraftAndPreview:

post.DraftSerializedModel = modelString;
post.DraftContent = renderedModel;
Expand Down
2 changes: 1 addition & 1 deletion src/cloudscribe.SimpleContent.Web/Services/Page/CreateOrUpdatePageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ ILogger<CreateOrUpdatePageHandler> logger
// break;

case SaveMode.SaveDraft:
case SaveMode.SaveDraftAndPreview:
page.DraftContent = request.ViewModel.Content;
page.DraftAuthor = request.ViewModel.Author;
// should we clear the draft pub date if save draft clicked?
Expand Down
2 changes: 1 addition & 1 deletion src/cloudscribe.SimpleContent.Web/Services/Page/UpdateTemplatedPageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private IValidateTemplateModel GetValidator(string name)
switch (saveMode)
{
case SaveMode.SaveDraft:

case SaveMode.SaveDraftAndPreview:
page.DraftSerializedModel = modelString;
page.DraftContent = renderedModel;
page.DraftAuthor = request.ViewModel.Author;
Expand Down
2 changes: 1 addition & 1 deletion ...urceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/page/links.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Id":"links","ProjectId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","ParentId":"ac4051c3-064a-4e7b-a2a3-c34f4c6ca7a6","ParentSlug":"more-docs","PageOrder":14,"Title":"Links","Author":"Admin","Slug":"links","ExternalUrl":"","CorrelationKey":null,"MetaDescription":null,"MetaJson":null,"MetaHtml":null,"Content":"<div class=\"content-top\">\r\n \r\n</div>\r\n<div class=\"links-wrap\">\r\n <div class=\"clearfix linklist-item\">\r\n <h2 class=\"h4\"><a href=\"/more-docs\">Docs</a></h2>\r\n <a class=\"\" href=\"/more-docs\">\r\n </a>\r\n <p class=\"\"></p>\r\n </div>\r\n <div class=\"clearfix linklist-item\">\r\n <h2 class=\"h4\"><a href=\"/blog\">Blog</a></h2>\r\n <a class=\"\" href=\"/blog\">\r\n </a>\r\n <p class=\"\"></p>\r\n </div>\r\n <div class=\"clearfix linklist-item\">\r\n <h2 class=\"h4\"><a href=\"/contact\">Contact</a></h2>\r\n <a class=\"\" href=\"/contact\">\r\n </a>\r\n <p class=\"\"></p>\r\n </div>\r\n <div class=\"clearfix linklist-item\">\r\n <h2 class=\"h4\"><a href=\"https://www.cloudscribe.com\" target=\"_blank\">cloudscribe</a></h2>\r\n <a class=\"\" target=\"_blank\" href=\"https://www.cloudscribe.com\">\r\n </a>\r\n <p class=\"\"></p>\r\n </div>\r\n</div>\r\n<div class=\"mt-3 content-bottom\">\r\n \r\n</div>\r\n\r\n","PubDate":"2019-01-08T16:14:51.303396Z","LastModified":"2019-01-08T16:14:51.3363236Z","IsPublished":true,"MenuOnly":false,"ShowMenu":false,"ViewRoles":null,"Categories":[],"Comments":[],"ShowHeading":true,"ShowPubDate":false,"ShowLastModified":false,"ShowCategories":false,"ShowComments":false,"MenuFilters":null,"DisableEditor":false,"Resources":[],"ContentType":"html","CreatedUtc":"2019-01-04T11:11:17.5409433Z","CreatedByUser":"admin","LastModifiedByUser":"admin","DraftContent":null,"DraftAuthor":null,"DraftPubDate":null,"TemplateKey":"sct-ListOfLinks","SerializedModel":"{\"ContentAbove\":null,\"ContentBelow\":null,\"Items\":[{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/more-docs\",\"Title\":\"Docs\",\"Description\":null,\"Sort\":1,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/blog\",\"Title\":\"Blog\",\"Description\":null,\"Sort\":3,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/contact\",\"Title\":\"Contact\",\"Description\":null,\"Sort\":5,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"https://www.cloudscribe.com\",\"Title\":\"cloudscribe\",\"Description\":null,\"Sort\":7,\"OpensInNewWindow\":true}]}","DraftSerializedModel":null,"Serializer":"Json"}
{"Id":"links","ProjectId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","ParentId":"ac4051c3-064a-4e7b-a2a3-c34f4c6ca7a6","ParentSlug":"more-docs","PageOrder":14,"Title":"Links","Author":"Admin","Slug":"links","ExternalUrl":"","CorrelationKey":null,"MetaDescription":null,"MetaJson":null,"MetaHtml":null,"Content":"<div class=\"content-top\">\r\n \r\n</div>\r\n<div class=\"links-wrap\">\r\n <div class=\"clearfix linklist-item\">\r\n <h2 class=\"h4\"><a href=\"/more-docs\">Docs</a></h2>\r\n <a class=\"\" href=\"/more-docs\">\r\n </a>\r\n <p class=\"\"></p>\r\n </div>\r\n <div class=\"clearfix linklist-item\">\r\n <h2 class=\"h4\"><a href=\"/blog\">Blog</a></h2>\r\n <a class=\"\" href=\"/blog\">\r\n </a>\r\n <p class=\"\"></p>\r\n </div>\r\n <div class=\"clearfix linklist-item\">\r\n <h2 class=\"h4\"><a href=\"/contact\">Contact</a></h2>\r\n <a class=\"\" href=\"/contact\">\r\n </a>\r\n <p class=\"\"></p>\r\n </div>\r\n <div class=\"clearfix linklist-item\">\r\n <h2 class=\"h4\"><a href=\"https://www.cloudscribe.com\" target=\"_blank\">cloudscribe</a></h2>\r\n <a class=\"\" target=\"_blank\" href=\"https://www.cloudscribe.com\">\r\n </a>\r\n <p class=\"\"></p>\r\n </div>\r\n</div>\r\n<div class=\"mt-3 content-bottom\">\r\n \r\n</div>\r\n\r\n","PubDate":"2019-01-08T16:14:51.303396Z","LastModified":"2025-02-24T09:56:34.939081Z","IsPublished":true,"MenuOnly":false,"ShowMenu":false,"ViewRoles":null,"Categories":[],"Comments":[],"ShowHeading":true,"ShowPubDate":false,"ShowLastModified":false,"ShowCategories":false,"ShowComments":false,"MenuFilters":null,"DisableEditor":false,"Resources":[],"ContentType":"html","CreatedUtc":"2019-01-04T11:11:17.5409433Z","CreatedByUser":"admin","LastModifiedByUser":"admin","DraftContent":null,"DraftAuthor":null,"DraftPubDate":null,"TemplateKey":"sct-ListOfLinks","SerializedModel":"{\"ContentAbove\":null,\"ContentBelow\":null,\"Items\":[{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/more-docs\",\"Title\":\"Docs\",\"Description\":null,\"Sort\":1,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/blog\",\"Title\":\"Blog\",\"Description\":null,\"Sort\":3,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"/contact\",\"Title\":\"Contact\",\"Description\":null,\"Sort\":5,\"OpensInNewWindow\":false},{\"FullSizeUrl\":null,\"ResizedUrl\":null,\"ThumbnailUrl\":null,\"LinkUrl\":\"https://www.cloudscribe.com\",\"Title\":\"cloudscribe\",\"Description\":null,\"Sort\":7,\"OpensInNewWindow\":true}]}","DraftSerializedModel":null,"Serializer":"Json","ShowCreatedBy":null,"ShowCreatedDate":null,"ShowLastModifiedBy":null,"ShowLastModifiedDate":null}
Loading