Fix remaining issues with DateTimeRelative, etc. shapes

--HG--
branch : dev

src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Web;
-using System.Web.Mvc;
-using Orchard.DisplayManagement;
-using Orchard.Localization;
-using Orchard.Mvc.Html;
-
-namespace Orchard.Core.Common.Extensions {
-    public class Shapes {
-        public Shapes() {
-            T = NullLocalizer.Instance;
-        }
-
-        public Localizer T { get; set; }
-
-        [Shape]
-        public IHtmlString PublishedState(HtmlHelper Html, DateTime? versionPublishedUtc) {
-            return Html.DateTime(versionPublishedUtc, T("Draft"));
-        }
-
-        [Shape]
-        public IHtmlString PublishedWhen(dynamic Display, HtmlHelper Html, DateTime? versionPublishedUtc) {
-            return Display.DateTimeRelative(dateTime: versionPublishedUtc, defaultIfNull: T("as a Draft"));
-        }
-    }
-}

src/Orchard.Web/Core/Common/Shapes.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Web;
+using System.Web.Mvc;
+using Orchard.DisplayManagement;
+using Orchard.Localization;
+using Orchard.Mvc.Html;
+
+namespace Orchard.Core.Common {
+    public class Shapes : IDependency {
+        public Shapes() {
+            T = NullLocalizer.Instance;
+        }
+
+        public Localizer T { get; set; }
+
+        [Shape]
+        public IHtmlString PublishedState(HtmlHelper Html, DateTime? dateTimeUtc) {
+            return Html.DateTime(dateTimeUtc, T("Draft"));
+        }
+
+        [Shape]
+        public IHtmlString PublishedWhen(dynamic Display, DateTime? dateTimeUtc) {
+            if (dateTimeUtc == null) {
+                return T("as a Draft");
+            }
+            else {
+                return Display.DateTimeRelative(dateTimeUtc: dateTimeUtc);
+            }
+        }
+    }
+}

src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.Summary.cshtml

@@ -1,2 +1 @@
-@using Orchard.Core.Common.Extensions;
+<div class="published">@Display.PublishedState(dateTimeUtc: Model.ContentPart.VersionPublishedUtc)</div>
-<div class="published">@Display.PublishedState(versionPublishedUtc: (DateTime?)Model.ContentPart.VersionPublishedUtc)</div>

src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.SummaryAdmin.cshtml

@@ -9,7 +9,7 @@
 }
 <ul class="pageStatus">
     <li>@if (modifiedUtc.HasValue) {
-        @T("Last modified: {0}", Display.DateTimeRelative(dateTime: modifiedUtc.Value))}&nbsp;&#124;&nbsp;
+        @T("Last modified: {0}", Display.DateTimeRelative(dateTimeUtc: modifiedUtc.Value))}&nbsp;&#124;&nbsp;
     </li>
     <li>@T("By {0}", owner.UserName)</li>
     </ul>

src/Orchard.Web/Core/Common/Views/Parts/Common.Metadata.cshtml

@@ -1,2 +1 @@
-@using Orchard.Core.Common.Extensions;
+<div class="published">@Display.PublishedState(dateTimeUtc: Model.ContentPart.VersionPublishedUtc)</div>
-<div class="published">@Display.PublishedState(versionPublishedUtc: (DateTime?)Model.ContentPart.VersionPublishedUtc)</div>

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -70,7 +70,7 @@
     <Compile Include="Common\Drivers\BodyPartDriver.cs" />
     <Compile Include="Common\Drivers\CommonPartDriver.cs" />
     <Compile Include="Common\Drivers\TextFieldDriver.cs" />
-    <Compile Include="Common\Extensions\HtmlHelperExtensions.cs" />
+    <Compile Include="Common\Shapes.cs" />
     <Compile Include="Common\Fields\TextField.cs" />
     <Compile Include="Contents\Security\AuthorizationEventHandler.cs" />
     <Compile Include="Common\Services\BbcodeFilter.cs" />
@@ -231,6 +231,7 @@
     <Compile Include="Settings\ViewModels\SiteSettingsPartViewModel.cs" />
     <Compile Include="Shapes\ResourceManifest.cs" />
     <Compile Include="Shapes\CoreShapes.cs" />
+    <Compile Include="Shapes\DateTimeShapes.cs" />
     <Compile Include="XmlRpc\Controllers\HomeController.cs" />
     <Compile Include="XmlRpc\Controllers\LiveWriterController.cs" />
     <Compile Include="XmlRpc\IXmlRpcHandler.cs" />

src/Orchard.Web/Core/PublishLater/Views/Parts/PublishLater.Metadata.Summary.cshtml

@@ -6,5 +6,5 @@
     DateTime? versionPublishedUtc = publishLaterPart.As<CommonPart>() == null ? null : publishLaterPart.As<CommonPart>().VersionPublishedUtc;
 }
 @if (publishLaterPart.IsPublished() && versionPublishedUtc.HasValue) {
-    @T("Published: {0}", Display.DateTimeRelative(versionPublishedUtc.Value)) @T(" | ")
+    @T("Published: {0}", Display.DateTimeRelative(dateTimeUtc: versionPublishedUtc.Value)) @T(" | ")
 }

src/Orchard.Web/Core/PublishLater/Views/Parts/PublishLater.Metadata.SummaryAdmin.cshtml

@@ -26,7 +26,7 @@
     @if ((((DateTime?)Model.ScheduledPublishUtc).HasValue && ((DateTime?)Model.ScheduledPublishUtc).Value > DateTime.UtcNow) || (publishLaterPart.IsPublished() && versionPublishedUtc.HasValue)) {
         <li>
         @if (publishLaterPart.IsPublished() && versionPublishedUtc.HasValue) {
-            @T("Published: {0}", Display.DateTimeRelative(versionPublishedUtc.Value))
+            @T("Published: {0}", Display.DateTimeRelative(dateTimeUtc: versionPublishedUtc.Value))
         }
         else {
             <img class="icon" src="@Href("~/Core/PublishLater/Content/Admin/images/scheduled.gif")" alt="@T("Scheduled")" title="@T("The page is scheduled for publishing")" /><text>  @T("Scheduled") </text>

src/Orchard.Web/Core/PublishLater/Views/Parts/PublishLater.Metadata.cshtml

@@ -6,5 +6,5 @@
     DateTime? versionPublishedUtc = publishLaterPart.As<CommonPart>() == null ? null : publishLaterPart.As<CommonPart>().VersionPublishedUtc;
 }
 @if (publishLaterPart.IsPublished() && versionPublishedUtc.HasValue) {
-    @T("Published: {0}", Display.DateTimeRelative(dateTime: versionPublishedUtc.Value))
+    @T("Published: {0}", Display.DateTimeRelative(dateTimeUtc: versionPublishedUtc.Value))
 }

src/Orchard.Web/Core/Shapes/DateTimeShapes.cs

@@ -1,15 +1,16 @@
 using System;
+using System.Web;
 using System.Web.Mvc;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
 using Orchard.Mvc.Html;
 using Orchard.Services;
 
-namespace Orchard.Mvc {
+namespace Orchard.Core.Shapes {
-    public class Shapes {
+    public class DateTimeShapes : IDependency {
         private readonly IClock _clock;
 
-        public Shapes(IClock clock) {
+        public DateTimeShapes(IClock clock) {
             _clock = clock;
             T = NullLocalizer.Instance;
         }
@@ -17,16 +18,11 @@ namespace Orchard.Mvc {
         public Localizer T { get; set; }
 
         [Shape]
-        public LocalizedString DateTimeRelative(HtmlHelper Html, DateTime? dateTime, LocalizedString defaultIfNull) {
+        public IHtmlString DateTimeRelative(HtmlHelper Html, DateTime dateTimeUtc) {
-            return dateTime.HasValue ? DateTimeRelative(Html, dateTime.Value) : defaultIfNull;
+            var time = _clock.UtcNow - dateTimeUtc;
-        }
-
-        [Shape]
-        public LocalizedString DateTimeRelative(HtmlHelper Html, DateTime dateTime) {
-            var time = _clock.UtcNow - dateTime;
 
             if (time.TotalDays > 7)
-                return Html.DateTime(dateTime, T("'on' MMM d yyyy 'at' h:mm tt"));
+                return Html.DateTime(dateTimeUtc, T("'on' MMM d yyyy 'at' h:mm tt"));
             if (time.TotalHours > 24)
                 return T.Plural("1 day ago", "{0} days ago", time.Days);
             if (time.TotalMinutes > 60)

src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml

@@ -1,6 +1,5 @@
 @model Orchard.Comments.Models.CommentsPart
 @using Orchard.Comments.Models;
-@using Orchard.Comments.Extensions;
 @using Orchard.Localization;
 
 <fieldset>

src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml

@@ -9,7 +9,7 @@
                 <h4>
                     <span class="who">@Html.LinkOrDefault(comment.Record.UserName, comment.Record.SiteName, new { rel = "nofollow" })
                     </span>
-                    <span class="when">said <time datetime="@comment.Record.CommentDateUtc.GetValueOrDefault()">@Html.Link(Display.DateTimeRelative(dateTime: comment.Record.CommentDateUtc.GetValueOrDefault()).ToString(), "#")</time>
+                    <span class="when">said <time datetime="@comment.Record.CommentDateUtc.GetValueOrDefault()">@Html.Link((string)Display.DateTimeRelative(dateTimeUtc: comment.Record.CommentDateUtc.GetValueOrDefault()).ToString(), "#")</time>
                     </span>
                 </h4>
             </header>

src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Count.SummaryAdmin.cshtml

@@ -1,5 +1,4 @@
 @using Orchard.Comments.Models;
-@using Orchard.Comments.Extensions;
 @using Orchard.Comments.ViewModels;
 @using Orchard.ContentManagement;
 <span class="commentcount">@Display.CommentSummaryLinks(item: Model.ContentPart.ContentItem, count: Model.CommentCount, pendingCount: Model.PendingCount)</span>

src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.cshtml

@@ -20,7 +20,7 @@
                 <p>@T("The search index contains the following fields: {0}.", string.Join(T(", ").Text, Model.IndexEntry.Fields))</p>
             } 
 
-            <p>@T("The search index was last updated {0}.", Display.DateTimeRelative(dateTime: Model.IndexEntry.LastUpdateUtc.Value))</p>
+            <p>@T("The search index was last updated {0}.", Display.DateTimeRelative(dateTimeUtc: Model.IndexEntry.LastUpdateUtc.Value))</p>
         } 
         <p>@T("Update the search index now: ")<button type="submit" title="@T("Update the search index.")" class="primaryAction">@T("Update")</button></p>
         @Html.AntiForgeryTokenOrchard() 

src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx

@@ -3,5 +3,5 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%
     if (Model.Creator != null) { 
-       %><%=_Encoded(" | Posted by {0} {1}", Model.Creator.UserName, Display.PublishedWhen(versionPublishedUtc: Model))%><%
+       %><%=_Encoded(" | Posted by {0} {1}", Model.Creator.UserName, Display.PublishedWhen(dateTimeUtc: Model))%><%
     } %>

src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx

@@ -7,7 +7,7 @@ foreach (var comment in Model) { %>
             <p><%: comment.Record.CommentText %></p>
         </div>
         <div class="commentauthor">
-            <span class="who"><%: Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%: Html.Link(Display.DateTimeRelative(dateTime: comment.Record.CommentDateUtc.GetValueOrDefault()).Text, "#")%></span>
+            <span class="who"><%: Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%: Html.Link(Display.DateTimeRelative(dateTimeUtc: comment.Record.CommentDateUtc.GetValueOrDefault()).Text, "#")%></span>
         </div>       
     </li><%
 } %>

src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx

@@ -2,9 +2,8 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-<%@ Import Namespace="Orchard.Core.Common.Extensions" %>
 <h3><%: Html.Link(Model.Item.Title, Url.BlogPost(Model.Item)) %></h3>
-<div class="meta"><%: Display.PublishedState(versionPublishedUtc: Model.Item)%> | <%Html.Zone("meta");%></div>
+<div class="meta"><%: Display.PublishedState(dateTimeUtc: Model.Item)%> | <%Html.Zone("meta");%></div>
 <div class="postsummary">
 <% Html.Zone("primary"); %>
 </div>

src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPart>" %>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-<%@ Import Namespace="Orchard.Core.Common.Extensions" %><%
 if (Model.Creator != null) { 
-    %><%: T("Posted by {0} {1}", Model.Creator.UserName, Display.PublishedWhen(versionPublishedUtc: Model))%><%
+    %><%: T("Posted by {0} {1}", Model.Creator.UserName, Display.PublishedWhen(dateTimeUtc: Model))%><%
 } %>

src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx

@@ -7,7 +7,7 @@ foreach (var comment in Model) { %>
             <p><%: comment.Record.CommentText %></p>
         </div>
         <div class="commentauthor">
-            <span class="who"><%: Html.LinkOrDefault(comment.Record.UserName, comment.Record.SiteName, new { rel = "nofollow" })%></span>&nbsp;<span>said <%: Html.Link(Display.DateTimeRelative(dateTime: comment.Record.CommentDateUtc.GetValueOrDefault()).Text, "#")%></span>
+            <span class="who"><%: Html.LinkOrDefault(comment.Record.UserName, comment.Record.SiteName, new { rel = "nofollow" })%></span>&nbsp;<span>said <%: Html.Link(Display.DateTimeRelative(dateTimeUtc: comment.Record.CommentDateUtc.GetValueOrDefault()).Text, "#")%></span>
         </div>       
     </li><%
 } %>

src/Orchard.Web/Themes/TheThemeMachine/Views/Items/BlogPost.Summary.cshtml

@@ -1,6 +1,5 @@
 @using Orchard.Blogs.Extensions;
 @using Orchard.Blogs.Models;
-@using Orchard.Core.Common.Extensions;
 @using Orchard.Core.Common.Models;
 @using Orchard.Core.Common.ViewModels;
 
@@ -8,7 +7,7 @@
 
 <!-- TODO: Meta should be it's own shape and not part of the blog summary view. Theme authors will need access to it. -->
 <div class="meta">
-    @Display.PublishedState(versionPublishedUtc: new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))))
+    @Display.PublishedState(dateTimeUtc: new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))))
     @Display(Model.meta)
 </div>
 

src/Orchard/Orchard.Framework.csproj

@@ -176,7 +176,6 @@
     <Compile Include="Environment\Extensions\Loaders\RawThemeExtensionLoader.cs" />
     <Compile Include="Localization\Services\DefaultLocalizedStringManager.cs" />
     <Compile Include="Localization\Services\ILocalizedStringManager.cs" />
-    <Compile Include="Mvc\Shapes.cs" />
     <Compile Include="Mvc\IOrchardViewPage.cs" />
     <Compile Include="Mvc\Spooling\HtmlStringWriter.cs" />
     <Compile Include="Scripting\IScriptingManager.cs" />