From 6f0cbd7794da409ed06a9cc1e42c2733d5ae3bdf Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Wed, 3 Nov 2010 00:04:31 -0700
Subject: [PATCH] Updating the comment management UI.

- Rearranged the display and added action links.

* haven't done anything with the item-specic comment view (Detail action) yet - it might not be necessary now especially since there is no path to it

--HG--
branch : dev
---
 .../Controllers/AdminController.cs            | 86 +++++++++++++++++--
 .../Orchard.Comments/Orchard.Comments.csproj  |  2 +
 .../Services/CommentService.cs                |  6 +-
 .../Services/ICommentService.cs               |  3 +-
 .../Modules/Orchard.Comments/Styles/admin.css |  3 +
 .../ViewModels/CommentsDetailsViewModel.cs    |  2 +-
 .../ViewModels/CommentsIndexViewModel.cs      |  5 +-
 .../Orchard.Comments/Views/Admin/Index.cshtml | 47 +++++-----
 .../Themes/TheAdmin/Styles/site.css           |  6 +-
 src/Orchard/Mvc/Html/ContentItemExtensions.cs | 20 +++++
 src/Orchard/Mvc/Html/HtmlHelperExtensions.cs  | 14 ++-
 11 files changed, 157 insertions(+), 37 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Comments/Styles/admin.css

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
index 57dbf21fd..a7971abaf 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
@@ -6,7 +6,6 @@ using System.Web.Mvc;
 using JetBrains.Annotations;
 using Orchard.Comments.Models;
 using Orchard.ContentManagement;
-using Orchard.ContentManagement.Records;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
 using Orchard.Logging;
@@ -64,7 +63,11 @@ namespace Orchard.Comments.Controllers {
                 }
 
                 var pagerShape = Shape.Pager(pager).TotalItemCount(comments.Count());
-                var entries = comments.Slice(pager.GetStartIndex(), pager.PageSize).ToList().Select(comment => CreateCommentEntry(comment.Record));
+                var entries = comments
+                    .OrderByDescending<CommentPartRecord, DateTime?>(cpr => cpr.CommentDateUtc)
+                    .Slice(pager.GetStartIndex(), pager.PageSize)
+                    .ToList()
+                    .Select(comment => CreateCommentEntry(comment.Record));
 
                 var model = new CommentsIndexViewModel {
                     Comments = entries.ToList(),
@@ -98,12 +101,12 @@ namespace Orchard.Comments.Controllers {
                             _commentService.MarkCommentAsSpam(entry.Comment.Id);
                         }
                         break;
-                    case CommentIndexBulkAction.Pend:
+                    case CommentIndexBulkAction.Unapprove:
                         if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't moderate comment")))
                             return new HttpUnauthorizedResult();
                         //TODO: Transaction
                         foreach (CommentEntry entry in checkedEntries) {
-                            _commentService.PendComment(entry.Comment.Id);
+                            _commentService.UnapproveComment(entry.Comment.Id);
                         }
                         break;
                     case CommentIndexBulkAction.Approve:
@@ -194,12 +197,12 @@ namespace Orchard.Comments.Controllers {
                             _commentService.MarkCommentAsSpam(entry.Comment.Id);
                         }
                         break;
-                    case CommentDetailsBulkAction.Pend:
+                    case CommentDetailsBulkAction.Unapprove:
                         if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't moderate comment")))
                             return new HttpUnauthorizedResult();
 
                         foreach (CommentEntry entry in checkedEntries) {
-                            _commentService.PendComment(entry.Comment.Id);
+                            _commentService.UnapproveComment(entry.Comment.Id);
                         }
                         break;
                     case CommentDetailsBulkAction.Approve:
@@ -308,6 +311,75 @@ namespace Orchard.Comments.Controllers {
             }
         }
 
+        [HttpPost]
+        public ActionResult Approve(int id, string returnUrl) {
+            try {
+                if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't approve comment")))
+                    return new HttpUnauthorizedResult();
+
+                int commentedOn = _commentService.GetComment(id).Record.CommentedOn;
+                _commentService.ApproveComment(id);
+
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Details", new { id = commentedOn });
+            }
+            catch (Exception exception) {
+                Services.Notifier.Error(T("Approving comment failed: " + exception.Message));
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Index");
+            }
+        }
+
+        [HttpPost]
+        public ActionResult Unapprove(int id, string returnUrl) {
+            try {
+                if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't unapprove comment")))
+                    return new HttpUnauthorizedResult();
+
+                int commentedOn = _commentService.GetComment(id).Record.CommentedOn;
+                _commentService.UnapproveComment(id);
+
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Details", new { id = commentedOn });
+            }
+            catch (Exception exception) {
+                Services.Notifier.Error(T("Unapproving comment failed: " + exception.Message));
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Index");
+            }
+        }
+
+        [HttpPost]
+        public ActionResult MarkAsSpam(int id, string returnUrl) {
+            try {
+                if (!Services.Authorizer.Authorize(Permissions.ManageComments, T("Couldn't mark comment as spam")))
+                    return new HttpUnauthorizedResult();
+
+                int commentedOn = _commentService.GetComment(id).Record.CommentedOn;
+                _commentService.MarkCommentAsSpam(id);
+
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Details", new { id = commentedOn });
+            }
+            catch (Exception exception) {
+                Services.Notifier.Error(T("Marking comment as spam failed: " + exception.Message));
+                if (!String.IsNullOrEmpty(returnUrl)) {
+                    return Redirect(returnUrl);
+                }
+                return RedirectToAction("Index");
+            }
+        }
+
         [HttpPost]
         public ActionResult Delete(int id, string returnUrl) {
             try {
@@ -334,7 +406,7 @@ namespace Orchard.Comments.Controllers {
         private CommentEntry CreateCommentEntry(CommentPartRecord commentPart) {
             return new CommentEntry {
                 Comment = commentPart,
-                CommentedOn = _commentService.GetDisplayForCommentedContent(commentPart.CommentedOn).DisplayText,
+                CommentedOn = _commentService.GetCommentedContent(commentPart.CommentedOn),
                 IsChecked = false,
             };
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
index 9a1af481e..161d2c21c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
@@ -110,6 +110,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
+    <Content Include="Styles\admin.css" />
     <Content Include="Views\Admin\Details.cshtml" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
@@ -139,6 +140,7 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs b/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
index 7f7bd70f1..8be39387c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
@@ -65,6 +65,10 @@ namespace Orchard.Comments.Services {
             return _contentManager.GetItemMetadata(content);
         }
 
+        public ContentItem GetCommentedContent(int id) {
+            return _contentManager.Get(id);
+        }
+
         public CommentPart CreateComment(CreateCommentContext context, bool moderateComments) {
             var comment = _contentManager.Create<CommentPart>("Comment");
 
@@ -104,7 +108,7 @@ namespace Orchard.Comments.Services {
             commentPart.Record.Status = CommentStatus.Approved;
         }
 
-        public void PendComment(int commentId) {
+        public void UnapproveComment(int commentId) {
             CommentPart commentPart = GetComment(commentId);
             commentPart.Record.Status = CommentStatus.Pending;
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs b/src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs
index 101908a27..ef87afa0c 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Services/ICommentService.cs
@@ -9,10 +9,11 @@ namespace Orchard.Comments.Services {
         IContentQuery<CommentPart, CommentPartRecord> GetCommentsForCommentedContent(int id, CommentStatus status);
         CommentPart GetComment(int id);
         ContentItemMetadata GetDisplayForCommentedContent(int id);
+        ContentItem GetCommentedContent(int id);
         CommentPart CreateComment(CreateCommentContext commentRecord, bool moderateComments);
         void UpdateComment(int id, string name, string email, string siteName, string commentText, CommentStatus status);
         void ApproveComment(int commentId);
-        void PendComment(int commentId);
+        void UnapproveComment(int commentId);
         void MarkCommentAsSpam(int commentId);
         void DeleteComment(int commentId);
         bool CommentsClosedForCommentedContent(int id);
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Comments/Styles/admin.css
new file mode 100644
index 000000000..2247cdf70
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Styles/admin.css
@@ -0,0 +1,3 @@
+table.items .actions {
+    white-space:nowrap;   
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsDetailsViewModel.cs b/src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsDetailsViewModel.cs
index abc8628ea..05ac8e28b 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsDetailsViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsDetailsViewModel.cs
@@ -16,7 +16,7 @@ namespace Orchard.Comments.ViewModels {
 
     public enum CommentDetailsBulkAction {
         None,
-        Pend,
+        Unapprove,
         Approve,
         MarkAsSpam,
         Delete,
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsIndexViewModel.cs b/src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsIndexViewModel.cs
index a4ec034cc..677041c58 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsIndexViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/ViewModels/CommentsIndexViewModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Orchard.Comments.Models;
+using Orchard.ContentManagement;
 
 namespace Orchard.Comments.ViewModels {
     public class CommentsIndexViewModel {
@@ -10,7 +11,7 @@ namespace Orchard.Comments.ViewModels {
 
     public class CommentEntry {
         public CommentPartRecord Comment { get; set; }
-        public string CommentedOn { get; set; }
+        public ContentItem CommentedOn { get; set; }
         public bool IsChecked { get; set; }
     }
 
@@ -21,7 +22,7 @@ namespace Orchard.Comments.ViewModels {
 
     public enum CommentIndexBulkAction {
         None,
-        Pend,
+        Unapprove,
         Approve,
         MarkAsSpam,
         Delete
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
index 74dfb26f1..2878c480f 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
@@ -1,7 +1,12 @@
 @model Orchard.Comments.ViewModels.CommentsIndexViewModel
 @using Orchard.Comments.Models;
 @using Orchard.Comments.ViewModels;
-
+@using Orchard.Mvc.Html;
+@using Orchard.Utility.Extensions;
+@{
+    Style.Include("admin.css");
+    Script.Require("ShapesBase");
+}
 <h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1>
 @using(Html.BeginFormAntiForgeryPost()) { 
 	@Html.ValidationSummary() 
@@ -10,7 +15,7 @@
         <select id="publishActions" name="@Html.NameOf(m => m.Options.BulkAction)">
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, T("Choose action...").ToString())
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Approve, T("Approve").ToString()) 
-            @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Pend, T("Pend").ToString())
+            @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Unapprove, T("Unapprove").ToString())
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, T("Mark as Spam").ToString())
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, T("Remove").ToString())
         </select>
@@ -35,7 +40,6 @@
 			    <col id="Col4" />
 			    <col id="Col5" />
 			    <col id="Col6" />
-			    <col id="Col7" />
 		    </colgroup>
 		    <thead>
 			    <tr>
@@ -43,39 +47,38 @@
 				    <th scope="col">@T("Status")</th>
 				    <th scope="col">@T("Author")</th>
 				    <th scope="col">@T("Comment")</th>
-				    <th scope="col">@T("Date")</th>
 				    <th scope="col">@T("Commented On")</th>
-			        <th scope="col"></th>
+			        <th scope="col">@T("Actions")</th>
 			    </tr>
 		    </thead>
             @{var commentIndex = 0;}
             @foreach (var commentEntry in Model.Comments) {
-            <tr>
+            <tr itemscope="itemscope" itemid="@Model.Comments[commentIndex].Comment.Id" itemtype="http://orchardproject.net/data/Comment">
                 <td>
                     <input type="hidden" value="@Model.Comments[commentIndex].Comment.Id" name="@Html.NameOf(m => m.Comments[commentIndex].Comment.Id)"/>
                     <input type="checkbox" value="true" name="@Html.NameOf(m => m.Comments[commentIndex].IsChecked)"/>
                 </td>
                 <td>
-                @if (commentEntry.Comment.Status == CommentStatus.Spam) { T("Spam"); } 
-                       else if (commentEntry.Comment.Status == CommentStatus.Pending) { T("Pending"); } 
-                       else { T("Approved"); }</td>
+                    @if (commentEntry.Comment.Status == CommentStatus.Spam) { @T("Spam") } 
+                    else if (commentEntry.Comment.Status == CommentStatus.Pending) { @T("Pending") } 
+                    else { @T("Approved") }
+                </td>
                 <td>@commentEntry.Comment.UserName</td>
                 <td>
-                @if (commentEntry.Comment.CommentText != null) {
-                    var text = commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : (commentEntry.Comment.CommentText + T(" ..."));
-                    @text
-                } 
+                    @* would ideally have permalinks for individual comments *@
+                    <p><a href="@Url.ItemDisplayUrl(commentEntry.CommentedOn)#comments"><time>@Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault())</time></a></p>
+                    @if (commentEntry.Comment.CommentText != null) {
+                        var ellipsized = Html.Ellipsize(commentEntry.Comment.CommentText, 500);
+                        var paragraphed = new HtmlString(ellipsized.ToHtmlString().Replace("\r\n", "</p><p>"));
+                        <p>@paragraphed</p>
+                    }
+                    else {
+                        @T("[Empty]")
+                    }
                 </td>
-                <td>@Html.DateTime(commentEntry.Comment.CommentDateUtc.GetValueOrDefault())</td>
-                <td>@Html.ActionLink(commentEntry.CommentedOn, "Details", new { id = commentEntry.Comment.CommentedOn })</td>
+                <td>@Html.ItemDisplayLink(commentEntry.CommentedOn)</td>
                 <td>
-                    <ul class="actions">
-                        <li class="construct">
-                            <a href="@Url.Action("Edit", new {commentEntry.Comment.Id})" title="@T("Edit")">@T("Edit")</a>
-                        </li>
-                        <li class="destruct"></li>
-                    </ul>
-                </td>
+                    <div class="actions">
                        @if (commentEntry.Comment.Status != CommentStatus.Spam) {
                            <a href="@Url.Action("MarkAsSpam", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Spam")</a>@T(" | ")
                        }
                        @if (commentEntry.Comment.Status != CommentStatus.Approved) {
                            <a href="@Url.Action("Approve", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="ApproveUrl UnsafeUrl">@T("Approve")</a>@T(" | ")
                        }
                        else {
                            <a href="@Url.Action("Unapprove", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="UnapproveUrl UnsafeUrl">@("Unapprove")</a>@T(" | ")
                        }
                        <a href="@Url.Action("Edit", new {commentEntry.Comment.Id})" title="@T("Edit")">@T("Edit")</a>@T(" | ")
                        <a href="@Url.Action("Delete", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Remove")</a>
                    </div>
                </td>
             </tr>
             commentIndex = commentIndex + 1;
             } 
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index d6e0eb925..8ae765e65 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -689,6 +689,7 @@ table.items thead, table.items th {
 	font-weight:700;
 	overflow:hidden;
 	text-align:left;
+	white-space:nowrap;
 }
 /* todo: (heskew) hook back up */
 table.items tr.hover {
@@ -703,6 +704,10 @@ table.items th, table.items td {
 	padding:8px 12px;
 	vertical-align:middle;
 }
+table.items td 
+{
+    vertical-align:top;
+}
 /* todo: Find a better way to do this. These are a fix for buttons and label fonts becomming too large in a table.*/
 table label {
     font-size:1em;
@@ -711,7 +716,6 @@ table .button {
     font-size:1em;
 }
 
-
 /* Content item lists
 ----------------------------------------------------------*/
 .contentItems {
diff --git a/src/Orchard/Mvc/Html/ContentItemExtensions.cs b/src/Orchard/Mvc/Html/ContentItemExtensions.cs
index 999a7911f..772d26682 100644
--- a/src/Orchard/Mvc/Html/ContentItemExtensions.cs
+++ b/src/Orchard/Mvc/Html/ContentItemExtensions.cs
@@ -48,6 +48,26 @@ namespace Orchard.Mvc.Html {
                 metadata.EditorRouteValues.Merge(additionalRouteValues));
         }
 
+        public static string ItemDisplayUrl(this UrlHelper urlHelper, IContent content) {
+            var metadata = content.ContentItem.ContentManager.GetItemMetadata(content);
+            if (metadata.DisplayRouteValues == null)
+                return null;
+
+            return urlHelper.Action(
+                Convert.ToString(metadata.DisplayRouteValues["action"]),
+                metadata.DisplayRouteValues);
+        }
+
+        public static string ItemEditUrl(this UrlHelper urlHelper, IContent content) {
+            var metadata = content.ContentItem.ContentManager.GetItemMetadata(content);
+            if (metadata.DisplayRouteValues == null)
+                return null;
+
+            return urlHelper.Action(
+                Convert.ToString(metadata.EditorRouteValues["action"]),
+                metadata.EditorRouteValues);
+        }
+
         private static string NonNullOrEmpty(params string[] values) {
             foreach (var value in values) {
                 if (!string.IsNullOrEmpty(value))
diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
index 3a571f6a3..1e4c33459 100644
--- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
+++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
@@ -9,7 +8,6 @@ using System.Web.Mvc.Html;
 using System.Web.Routing;
 using Orchard.Collections;
 using Orchard.Localization;
-using Orchard.Services;
 using Orchard.Settings;
 using Orchard.Utility;
 using Orchard.Utility.Extensions;
@@ -195,6 +193,18 @@ namespace Orchard.Mvc.Html {
 
         #endregion
 
+        #region Ellipsize
+
+        public static IHtmlString Ellipsize(this HtmlHelper htmlHelper, string text, int characterCount) {
+            return new HtmlString(htmlHelper.Encode(text).Ellipsize(characterCount));
+        }
+
+        public static IHtmlString Ellipsize(this HtmlHelper htmlHelper, string text, int characterCount, string ellipsis) {
+            return new HtmlString(htmlHelper.Encode(text).Ellipsize(characterCount, ellipsis));
+        }
+
+        #endregion
+
         #region Excerpt
 
         public static MvcHtmlString Excerpt(this HtmlHelper html, string markup, int length) {