rob/website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issue with blog preview when content under 1000 chars.

Browse source
This commit is contained in:
Robert Marshall 2019-08-26 15:04:32 +01:00
parent 3a8aedd653
commit 0f64014b30
6 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Website/ViewModels/BlogPostPreviewViewModel.cs
View file

@ -5,9 +5,6 @@ namespace Website.ViewModels
{
public class BlogPostPreviewViewModel:BlogPostViewModel
{
public BlogPostPreviewViewModel(BlogPost blogPost):base(blogPost)
{
Content = Markdown.ToHtml(blogPost.Content.Substring(0, 1000), GetPipeline()).Trim();
}
public BlogPostPreviewViewModel(BlogPost blogPost) : base(blogPost) => Content = Content.Length < 1000 ? Content : Content.Substring(0, 1000);
}
}

4
Website/ViewModels/BlogPostViewModel.cs
View file

@ -12,8 +12,7 @@ namespace Website.ViewModels
Title = blogPost.Title;
Timestamp = FormatTimestamp(blogPost.Timestamp);
Url = blogPost.Url;
Content = Markdown.ToHtml(blogPost.Content, GetPipeline()).Trim();
Content = blogPost.Content;
}
string GetDaySuffix(int day) {
@ -49,5 +48,6 @@ namespace Website.ViewModels
public string Content { get; protected set; }
public string Timestamp { get; private set; }
public string Url { get; private set; }
public object ContentHtml => Markdown.ToHtml(Content, GetPipeline()).Trim();
}
}

2
Website/Views/Blog/Entry.cshtml
View file

@ -4,6 +4,6 @@
ViewData["Title"] = Model.Title;
}
@Html.Raw(Model.Content)
@Html.Raw(Model.ContentHtml)
<small>Posted on @Model.Timestamp</small>

2
Website/Views/Blog/Page.cshtml
View file

@ -22,7 +22,7 @@
@foreach (var post in Model.Posts) {
<article>
<h2><a href="/blog/view/@post.Url">@post.Title</a></h2>
@Html.Raw(post.Content)
@Html.Raw(post.ContentHtml)
<small>Posted on @post.Timestamp</small>
<p><a href="/blog/view/@post.Url">Read more...</a></p>
</article>