diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs index 9dd4b2df2..30724ae32 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs @@ -1,5 +1,7 @@ using System.Web.Mvc; using Orchard.Blogs.Models; +using Orchard.ContentManagement; +using Orchard.ContentManagement.Aspects; using Orchard.Mvc.Html; namespace Orchard.Blogs.Extensions { @@ -9,7 +11,7 @@ namespace Orchard.Blogs.Extensions { } public static string PublishedState(this HtmlHelper htmlHelper, BlogPost blogPost) { - return htmlHelper.DateTime(blogPost.PublishedUtc, "Draft"); + return htmlHelper.DateTime(blogPost.As().VersionPublishedUtc, "Draft"); } public static string PublishedWhen(this HtmlHelper htmlHelper) { @@ -17,7 +19,7 @@ namespace Orchard.Blogs.Extensions { } public static string PublishedWhen(this HtmlHelper htmlHelper, BlogPost blogPost) { - return htmlHelper.DateTimeRelative(blogPost.PublishedUtc, "as a Draft"); + return htmlHelper.DateTimeRelative(blogPost.As().VersionPublishedUtc, "as a Draft"); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPost.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPost.cs index 5f53fb84e..addb28127 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPost.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPost.cs @@ -60,10 +60,6 @@ namespace Orchard.Blogs.Models { get { return this.As().CreatedUtc; } } - public DateTime? PublishedUtc { - get { return this.As().VersionPublishedUtc; } - } - public DateTime? ScheduledPublishUtc { get; set; } private string _scheduledPublishUtcDate; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx index ff39a50b6..17b5b16b2 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx @@ -1,4 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Import Namespace="Orchard.ContentManagement.Aspects"%> <%@ Import Namespace="Orchard.ContentManagement"%> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> @@ -30,20 +31,20 @@ <%=Html.DateTime(Model.Item.ScheduledPublishUtc.Value, "M/d/yyyy h:mm tt")%><% } else if (Model.Item.IsPublished) { %> - <%=_Encoded("Published: ") + Html.PublishedWhen(Model.Item) %><% + <%=_Encoded("Published: ") + Html.DateTimeRelative(Model.Item.As().VersionPublishedUtc.Value)%><% } else { %> - <%=_Encoded("Last modified: ") + Html.DateTimeRelative(Model.Item.As().ModifiedUtc.Value) %><% + <%=_Encoded("Last modified: ") + Html.DateTimeRelative(Model.Item.As().ModifiedUtc.Value) %><% } %> |  -
  • <%=_Encoded("By {0}", Model.Item.Creator == null ? String.Empty : Model.Item.Creator.UserName)%>
    • +
  • <%=_Encoded("By {0}", Model.Item.Creator.UserName)%>
    • <% if (Model.Item.HasPublished){ %> "><%=_Encoded("View")%><%=_Encoded(" | ")%><% if (Model.Item.HasDraft) { %> - "><%=_Encoded("Publish Draft")%><%=_Encoded(" | ")%><% + "><%=_Encoded("Publish Draft")%><%=_Encoded(" | ")%><% } %> "><%=_Encoded("Unpublish")%><%=_Encoded(" | ")%><% } @@ -51,7 +52,7 @@ "><%=_Encoded("Publish")%><%=_Encoded(" | ")%><% } %> "><%=_Encoded("Edit")%><%=_Encoded(" | ")%> - "><%=_Encoded("Delete")%> + "><%=_Encoded("Delete")%>
    <%Html.Zone("meta");%>
    diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs index b693610d9..af560d976 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs @@ -6,6 +6,7 @@ using System.Web.Mvc; using JetBrains.Annotations; using Orchard.Localization; using Orchard.ContentManagement; +using Orchard.Mvc.AntiForgery; using Orchard.Mvc.Results; using Orchard.Pages.Models; using Orchard.Pages.Services; @@ -210,7 +211,6 @@ namespace Orchard.Pages.Controllers { return RedirectToAction("Edit", "Admin", new { id = model.Page.Item.ContentItem.Id }); } - public ActionResult DiscardDraft(int id) { // get the current draft version var draft = Services.ContentManager.Get(id, VersionOptions.Draft); @@ -239,9 +239,41 @@ namespace Orchard.Pages.Controllers { return RedirectToAction("Edit", new { draft.Id }); } - [HttpPost] + [ValidateAntiForgeryTokenOrchard] + public ActionResult Publish(int id) { + if (!Services.Authorizer.Authorize(Permissions.PublishPages, T("Couldn't publish page"))) + return new HttpUnauthorizedResult(); + + var page = _pageService.GetLatest(id); + if (page == null) + return new NotFoundResult(); + + _pageService.Publish(page); + Services.ContentManager.Flush(); + Services.Notifier.Information(T("Page successfully published.")); + + return RedirectToAction("List"); + } + + [ValidateAntiForgeryTokenOrchard] + public ActionResult Unpublish(int id) { + if (!Services.Authorizer.Authorize(Permissions.PublishPages, T("Couldn't unpublish page"))) + return new HttpUnauthorizedResult(); + + var page = _pageService.GetLatest(id); + if (page == null) + return new NotFoundResult(); + + _pageService.Unpublish(page); + Services.ContentManager.Flush(); + Services.Notifier.Information(T("Page successfully unpublished.")); + + return RedirectToAction("List"); + } + + [ValidateAntiForgeryTokenOrchard] public ActionResult Delete(int id) { - Page page = _pageService.Get(id); + var page = _pageService.GetLatest(id); if (page == null) return new NotFoundResult(); @@ -249,7 +281,7 @@ namespace Orchard.Pages.Controllers { return new HttpUnauthorizedResult(); _pageService.Delete(page); - Services.Notifier.Information(T("Page was successfully deleted")); + Services.Notifier.Information(T("Page successfully deleted")); return RedirectToAction("List"); } diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs b/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs index 178bccf7c..e65129069 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs @@ -1,6 +1,7 @@ using System; using System.Web.Mvc; using Orchard.ContentManagement; +using Orchard.ContentManagement.Aspects; using Orchard.Core.Common.Models; using Orchard.Security; diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx index 692ee6faa..d9626c7ba 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx +++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx @@ -1,11 +1,13 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.ContentManagement.Aspects"%> +<%@ Import Namespace="Orchard.ContentManagement"%> +<%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Pages.ViewModels"%>

    <%=Html.TitleForPage(T("Manage Pages").ToString())%>

    <%-- todo: Add helper text here when ready.

    <%=_Encoded("Possible text about setting up a page goes here.")%>

    --%> -
    <%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button primaryAction" })%>
    -<% using (Html.BeginFormAntiForgeryPost()) - { %> +
    <%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button primaryAction" })%>
    <% +using (Html.BeginFormAntiForgeryPost()) { %> <%=Html.ValidationSummary()%>
    @@ -27,85 +29,70 @@ "/>
    - - -
      - <% -int pageIndex = 0; -foreach (var pageEntry in Model.PageEntries) -{ - var pi = pageIndex; %> -
    • - -
      -
      - - - -

      <%=Html.ActionLink(pageEntry.Page.Title, "Edit", new { id = pageEntry.PageId })%>

      - -
        -
      • <%--Published or not--%> - <% if (pageEntry.Page.HasPublished) - { %> - " alt="<%=_Encoded("Online") %>" title="<%=_Encoded("The page is currently online") %>" /><%=_Encoded("Published") %> |  - <% } - else - { %> - " alt="<%=_Encoded("Offline") %>" title="<%=_Encoded("The page is currently offline") %>" /><%=_Encoded("Not Published")%> |  - <% } %> -
        • - - -
      • <%--Does the page have a draft--%> - <% if (pageEntry.Page.HasDraft) - { %> - " alt="<%=_Encoded("Draft") %>" title="<%=_Encoded("The page has a draft") %>" /><%=_Encoded("Draft")%> |  - <% } - else - { %> - <%=_Encoded("No Draft")%> |  - <% } %> -<%--Scheduled--%> - <% if (!pageEntry.Page.IsPublished) - { %> - <%if (pageEntry.Page.ScheduledPublishUtc != null) { %> - " alt="<%=_Encoded("Scheduled") %>" title="<%=_Encoded("The page is scheduled for publishing") %>" /><%=string.Format("Scheduled: {0:d}", pageEntry.Page.ScheduledPublishUtc.Value) %> |  - <% }%> - <% } %> -
        • - +
          <% + var pageIndex = 0; + foreach (var pageEntry in Model.PageEntries) { + var pi = pageIndex; %>
        • - <%--Author--%> - <%=_Encoded("By {0}", pageEntry.Page.Creator.UserName)%> -
          • +
          +
          + + +

          <%=Html.ActionLink(pageEntry.Page.Title, "Edit", new { id = pageEntry.PageId })%>

          +
            +
          • <% + // Published or not + if (pageEntry.Page.HasPublished) { %> + " alt="<%=_Encoded("Online") %>" title="<%=_Encoded("The page is currently online") %>" /><%=_Encoded("Published") %> | <% + } + else { %> + " alt="<%=_Encoded("Offline") %>" title="<%=_Encoded("The page is currently offline") %>" /><%=_Encoded("Not Published")%> | <% + } %> +
            • +
          • <% + // Does the page have a draft + if (pageEntry.Page.HasDraft) { %> + " alt="<%=_Encoded("Draft") %>" title="<%=_Encoded("The page has a draft") %>" /><%=_Encoded("Draft")%> | <% + } + else { %> + <%=_Encoded("No Draft")%> | <% + } %> +
            • +
          • <% + if (pageEntry.Page.ScheduledPublishUtc.HasValue && pageEntry.Page.ScheduledPublishUtc.Value > DateTime.UtcNow) { %> + " alt="<%=_Encoded("Scheduled") %>" title="<%=_Encoded("The page is scheduled for publishing") %>" /><%=_Encoded("Scheduled")%> + <%=Html.DateTime(pageEntry.Page.ScheduledPublishUtc.Value, "M/d/yyyy h:mm tt")%><% + } + else if (pageEntry.Page.IsPublished) { %> + <%=_Encoded("Published: ") + Html.DateTimeRelative(pageEntry.Page.As().VersionPublishedUtc.Value) %><% + } + else { %> + <%=_Encoded("Last modified: ") + Html.DateTimeRelative(pageEntry.Page.As().ModifiedUtc.Value) %><% + } %> |  +
            • +
          • <%=_Encoded("By {0}", pageEntry.Page.Creator.UserName)%>
            • +
          +
          +
          <% + if (pageEntry.Page.HasPublished) { %> + <%=Html.ActionLink("View", "Item", new { controller = "Page", slug = pageEntry.Page.PublishedSlug }, new {title = _Encoded("View Page")})%><%=_Encoded(" | ")%><% + if (pageEntry.Page.HasDraft) { %> + " title="<%=_Encoded("Publish Draft")%>"><%=_Encoded("Publish Draft")%><%=_Encoded(" | ")%><% + } %> + " title="<%=_Encoded("Unpublish Page")%>"><%=_Encoded("Unpublish")%><%=_Encoded(" | ")%><% + } + else { %> + " title="<%=_Encoded("Publish Page")%>"><%=_Encoded("Publish")%><%=_Encoded(" | ")%><% + } %> + <%=Html.ActionLink(_Encoded("Edit").ToString(), "Edit", new {id = pageEntry.Page.Id}, new {title = _Encoded("Edit Page")})%><%=_Encoded(" | ")%> + " title="<%=_Encoded("Delete Page")%>"><%=_Encoded("Delete")%> +
          +
          +
          + <% + pageIndex++; + } %>
        -
      - -
      - - <% if (pageEntry.Page.HasPublished) - { %> - <%=Html.ActionLink("View", "Item", new { controller = "Page", slug = pageEntry.Page.PublishedSlug })%> - <%=_Encoded("|")%> - <% } - else - {%> - <%=""%> - <% } %> - - -<%=Html.ActionLink(T("Edit").ToString(), "Edit", new { id = pageEntry.PageId })%> -
      - -
      -
      -
      • - <% -pageIndex++; +
    <% } %> - - -<% } %> -
    <%=Html.ActionLink(T("Add a page").ToString(), "Create", new { }, new { @class = "button primaryAction" })%>