From f0b1be7bbb6c4a3b852f6861dbb2cba2502fb7b0 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Fri, 25 Feb 2011 14:31:26 -0800
Subject: [PATCH] Splitting a few shapes

--HG--
branch : dev
---
 .../Core/Common/Views/CommonMetadataOwner.cshtml   | 14 ++++++++++++++
 .../Parts.Common.Metadata.SummaryAdmin.cshtml      |  5 +----
 src/Orchard.Web/Core/Orchard.Core.csproj           |  5 ++++-
 .../Orchard.Comments/Views/CommentAuthor.cshtml    | 13 +++++++++++++
 .../Orchard.Comments/Views/CommentMetadata.cshtml  | 12 ++++++++++++
 .../Orchard.Comments/Views/ListOfComments.cshtml   |  8 +++-----
 6 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml
 create mode 100644 src/Orchard.Web/Modules/Orchard.Comments/Views/CommentAuthor.cshtml
 create mode 100644 src/Orchard.Web/Modules/Orchard.Comments/Views/CommentMetadata.cshtml

diff --git a/src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml b/src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml
new file mode 100644
index 000000000..e40a1cf2a
--- /dev/null
+++ b/src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml
@@ -0,0 +1,14 @@
+@*
+    Model:
+      ContentPart
+*@
+
+@using Orchard.ContentManagement;
+@using Orchard.Core.Common.Models;
+@using Orchard.Security;
+@{
+    CommonPart commonPart = Model.ContentPart;
+    // owner isn't really who last modified this, is it?
+    IUser owner = commonPart.As<CommonPart>() == null ? null : commonPart.As<CommonPart>().Owner;
+}
+@T("By {0}", owner == null ? "<null>" : owner.UserName)
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.SummaryAdmin.cshtml
index 24bd964bb..cd3544eb0 100644
--- a/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.SummaryAdmin.cshtml
@@ -1,15 +1,12 @@
 @using Orchard.ContentManagement;
 @using Orchard.Core.Common.Models;
-@using Orchard.Security;
 @{
     CommonPart commonPart = Model.ContentPart;
     DateTime? modifiedUtc = commonPart.As<CommonPart>() == null ? null : commonPart.As<CommonPart>().ModifiedUtc;
-    // owner isn't really who last modified this, is it?
-    IUser owner = commonPart.As<CommonPart>() == null ? null : commonPart.As<CommonPart>().Owner;
 }
 <ul class="pageStatus">
     <li>@if (modifiedUtc.HasValue) {
         @T("Last modified: {0}", Display.DateTimeRelative(dateTimeUtc: modifiedUtc.Value))}&nbsp;&#124;&nbsp;
     </li>
-    <li>@T("By {0}", owner == null ? "<null>" : owner.UserName)</li>
+    <li>@Display.CommonMetadataOwner(ContentPart: Model.ContentPart)</li>
     </ul>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index fbb014637..ea35096fb 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -236,7 +236,7 @@
     <Content Include="Common\Views\Fields.Common.Text.cshtml" />
     <Content Include="Common\Views\Parts.Common.Body.SummaryAdmin.cshtml" />
     <Content Include="Common\Views\Parts.Common.Metadata.cshtml" />
-    <Content Include="Common\Views\Parts.Common.Metadata.SummaryAdmin.cshtml" />
+    <Content Include="Common\Views\CommonMetadataOwner.cshtml" />
     <Content Include="Containers\Module.txt" />
     <Content Include="Contents\Styles\images\menu.content.png" />
     <Content Include="Contents\Styles\menu.content.css" />
@@ -406,6 +406,9 @@
   <ItemGroup>
     <Content Include="Reports\Styles\Web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Common\Views\Parts.Common.Metadata.SummaryAdmin.cshtml" />
+  </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/Views/CommentAuthor.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/CommentAuthor.cshtml
new file mode 100644
index 000000000..f659357b5
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/CommentAuthor.cshtml
@@ -0,0 +1,13 @@
+@*
+    Model:
+      ContentPart
+*@
+
+@using Orchard.Comments.Models;
+@using Orchard.Utility.Extensions;
+
+@{
+    var comment = (Orchard.Comments.Models.CommentPart)Model.ContentPart;
+}
+
+@Html.LinkOrDefault(comment.Record.Author, comment.Record.SiteName, new { rel = "nofollow" })
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/CommentMetadata.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/CommentMetadata.cshtml
new file mode 100644
index 000000000..3fa1082f1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/CommentMetadata.cshtml
@@ -0,0 +1,12 @@
+@*
+    Model:
+      ContentPart
+*@
+
+@using Orchard.Comments.Models;
+@using Orchard.Utility.Extensions;
+@{
+    var comment = (Orchard.Comments.Models.CommentPart)Model.ContentPart;
+}
+
+said <time datetime="@comment.Record.CommentDateUtc.GetValueOrDefault()">@Html.Link((string)Display.DateTimeRelative(dateTimeUtc: comment.Record.CommentDateUtc.GetValueOrDefault()).ToString(), "#comment-" + comment.Id)</time>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
index abf748df1..c86d530c3 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
@@ -4,13 +4,11 @@
 <ul class="comments">
 @foreach (var comment in Model) {
     <li>
-        <article class="comment">
+        <article class="comment" id="comment-@comment.Id">
             <header>
                 <h4>
-                    <span class="who">@Html.LinkOrDefault(comment.Record.Author, comment.Record.SiteName, new { rel = "nofollow" })
-                    </span>
-                    <span class="when">said <time datetime="@comment.Record.CommentDateUtc.GetValueOrDefault()">@Html.Link((string)Display.DateTimeRelative(dateTimeUtc: comment.Record.CommentDateUtc.GetValueOrDefault()).ToString(), "#")</time>
-                    </span>
+                    <span class="who">@Display.CommentAuthor(ContentPart: comment)</span>
+                    <span class="when">@Display.CommentMetadata(ContentPart: comment)</span>
                 </h4>
             </header>
             <p class="text">@(new MvcHtmlString(Html.Encode(comment.Record.CommentText).ReplaceNewLinesWith("<br />$1")))</p>