diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj index 8b19bde4a..15ee22e6b 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj @@ -103,7 +103,7 @@ - + diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/BlogPost/Summary.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/BlogPost/Summary.ascx new file mode 100644 index 000000000..7a70eee90 --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/BlogPost/Summary.ascx @@ -0,0 +1,24 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Models"%> +<%@ Import Namespace="Orchard.Blogs.Models"%> +<%@ Import Namespace="Orchard.Models.ViewModels"%> +<%@ Import Namespace="Orchard.Blogs.Extensions"%> +<%@ Import Namespace="Orchard.Blogs.ViewModels"%> + +<% BlogPost model = Model.Item.As(); %> +

<%=Html.Encode(model.Title) %>

+
+ <%=Html.PublishedState(model) %> + | ?? comments +
+
<%=model.Body ?? "

there's no content for this blog post

" %>
+<%--

+ + Edit Post + View Post<% + if (model.Published == null) { // todo: (heskew) be smart about this and maybe have other contextual actions - including view/preview for view up there ^^ %> + Publish Post Now + <% } %> + + Remove Post +

--%> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx index 2de6e2c51..0c0fcda61 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx +++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx @@ -4,8 +4,7 @@ <%@ Import Namespace="Orchard.Mvc.Html"%> <%-- todo: (heskew) make master-less when we get into theming --%> -

List of contents tagged with <%= Model.TagName %>

<% - foreach (var contentItem in Model.Contents) { %> - <%=Html.ItemDisplayLink(contentItem)%>  - <% } %> +

List of contents tagged with <%= Model.TagName %>

+ + <%=Html.UnorderedList(Model.Contents, (c, i) => Html.ItemDisplayTemplate(c, "Summary").ToHtmlString(), "posts")%>
\ No newline at end of file diff --git a/src/Orchard.Web/Views/Shared/Navigation.ascx b/src/Orchard.Web/Views/Shared/Navigation.ascx index ef8469a0a..08767c258 100644 --- a/src/Orchard.Web/Views/Shared/Navigation.ascx +++ b/src/Orchard.Web/Views/Shared/Navigation.ascx @@ -5,6 +5,6 @@
  • <%= Html.ActionLink("Home", "Index", "Home", new {Area = ""}, new {})%>
  • <%= Html.ActionLink("About", "About", "Home", new {Area = ""}, new {})%>
  • <%= Html.ActionLink("Blogs", "List", "Blog", new {Area = "Orchard.Blogs"}, new {})%>
  • -
  • <%= Html.ActionLink("Admin", "Index", new {Area = "Orchard.CMSPages", Controller = "Admin"})%>
  • +
  • <%= Html.ActionLink("Admin", "ListForAdmin", new {Area = "Orchard.Blogs", Controller = "Blog"})%>
  • \ No newline at end of file diff --git a/src/Orchard/Models/ViewModels/ItemDisplayViewModel.cs b/src/Orchard/Models/ViewModels/ItemDisplayViewModel.cs index 7cd45ca15..03ac56708 100644 --- a/src/Orchard/Models/ViewModels/ItemDisplayViewModel.cs +++ b/src/Orchard/Models/ViewModels/ItemDisplayViewModel.cs @@ -17,6 +17,10 @@ namespace Orchard.Models.ViewModels { Item = viewModel.Item; } + public ItemDisplayViewModel(ContentItem item) { + Item = item; + } + public ContentItem Item { get { return _item; } set { SetItem(value); } diff --git a/src/Orchard/Mvc/Html/ContentItemExtensions.cs b/src/Orchard/Mvc/Html/ContentItemExtensions.cs index db481cd90..e41b00bb9 100644 --- a/src/Orchard/Mvc/Html/ContentItemExtensions.cs +++ b/src/Orchard/Mvc/Html/ContentItemExtensions.cs @@ -2,6 +2,7 @@ using System.Web.Mvc; using System.Web.Mvc.Html; using Orchard.Models; +using Orchard.Models.ViewModels; namespace Orchard.Mvc.Html { public static class ContentItemExtensions { @@ -42,5 +43,9 @@ namespace Orchard.Mvc.Html { public static MvcHtmlString ItemEditLink(this HtmlHelper html, IContent content) { return ItemEditLink(html, null, content); } + + public static MvcHtmlString ItemDisplayTemplate(this HtmlHelper html, IContent content, string template) { + return html.Partial(string.Format("{0}/{1}", content.ContentItem.ContentType, template), new ItemDisplayViewModel(content.ContentItem)); + } } }