diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 21d3458e02..6cd4f61b89 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -4396,7 +4396,8 @@ - + + web.config diff --git a/OurUmbraco.Site/Views/Partials/Community/Blogs.cshtml b/OurUmbraco.Site/Views/Partials/Community/Blogs.cshtml index 5bb3774381..eef939d615 100644 --- a/OurUmbraco.Site/Views/Partials/Community/Blogs.cshtml +++ b/OurUmbraco.Site/Views/Partials/Community/Blogs.cshtml @@ -4,9 +4,13 @@ @inherits OurUmbraco.Our.Models.OurUmbracoTemplatePage @{ - var service = new BlogPostsService(); - var items = service.GetCachedBlogPosts(60, 4).ToArray(); + var cache = new BlogPostsCache(); + + var blogs = cache.GetBlogs(); + ViewBag.Blogs = blogs; + + var items = cache.GetCachedBlogPosts(60, 4).ToArray(); if (items.Length == 0) { diff --git a/OurUmbraco.Site/Views/Partials/Search/BlogItem.cshtml b/OurUmbraco.Site/Views/Partials/Search/BlogItem.cshtml new file mode 100644 index 0000000000..c9193759d3 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Search/BlogItem.cshtml @@ -0,0 +1,32 @@ +@using OurUmbraco.Community.BlogPosts +@using Skybrud.Essentials.Strings +@inherits UmbracoViewPage + +@{ + + if (Model.Blog == null) + { + return; + } + +} + +
  • + +
    + +
    +
    +
    + @Model.Item.Title + (via @Model.Blog.Title) +
    + Published: @Model.Item.PublishedDate.ToString("MMMM dd, yyyy") + @if (Model.Item.HasDescription) + { + var description = StringUtils.StripHtml(Model.Item.Description); +
    @Umbraco.Truncate(description, 300)
    + } +
    +
    +
  • \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Partials/SearchResults.cshtml b/OurUmbraco.Site/Views/Partials/SearchResults.cshtml index 872a6e62fa..82a8a8a01a 100644 --- a/OurUmbraco.Site/Views/Partials/SearchResults.cshtml +++ b/OurUmbraco.Site/Views/Partials/SearchResults.cshtml @@ -1,6 +1,15 @@ -@using OurUmbraco.Our +@using OurUmbraco.Community.BlogPosts +@using OurUmbraco.Our +@using OurUmbraco.Search +@using Skybrud.Essentials.Json @model OurUmbraco.Our.Models.SearchResultContentModel +@{ + + BlogPostsService blogs = null; + +} +
    @@ -69,7 +78,24 @@ }