Merge

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentDriver.cs

@@ -1,8 +1,9 @@
 using JetBrains.Annotations;
+using Orchard.Comments.Models;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 
-namespace Orchard.Comments.Models {
+namespace Orchard.Comments.Controllers {
     [UsedImplicitly]
     public class CommentDriver : ContentItemDriver<Comment> {
         public readonly static ContentType ContentType = new ContentType {

src/Orchard.Web/Modules/Orchard.Comments/Controllers/HasCommentsContainerDriver.cs

@@ -1,11 +1,12 @@
 using System.Linq;
 using JetBrains.Annotations;
+using Orchard.Comments.Models;
 using Orchard.Comments.ViewModels;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Records;
 
-namespace Orchard.Comments.Models {
+namespace Orchard.Comments.Controllers {
     [UsedImplicitly]
     public class HasCommentsContainerDriver : ContentPartDriver<HasCommentsContainer> {
         protected override DriverResult Display(HasCommentsContainer part, string displayType) {

src/Orchard.Web/Modules/Orchard.Comments/Controllers/HasCommentsDriver.cs

@@ -1,9 +1,10 @@
 using JetBrains.Annotations;
+using Orchard.Comments.Models;
 using Orchard.Comments.ViewModels;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 
-namespace Orchard.Comments.Models {
+namespace Orchard.Comments.Controllers {
     [UsedImplicitly]
     public class HasCommentsDriver : ContentPartDriver<HasComments> {
         protected override DriverResult Display(HasComments part, string displayType) {

src/Orchard.Web/Modules/Orchard.Comments/Models/CommentHandler.cs

@@ -1,4 +1,5 @@
 using JetBrains.Annotations;
+using Orchard.Comments.Controllers;
 using Orchard.ContentManagement.Handlers;
 using Orchard.Core.Common.Models;
 using Orchard.Data;

src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj

@@ -68,16 +68,16 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\CommentController.cs" />
+    <Compile Include="Controllers\CommentDriver.cs" />
+    <Compile Include="Controllers\HasCommentsContainerDriver.cs" />
+    <Compile Include="Controllers\HasCommentsDriver.cs" />
     <Compile Include="Extensions\HtmlHelperExtensions.cs" />
     <Compile Include="Models\ClosedCommentsRecord.cs" />
     <Compile Include="Models\Comment.cs" />
-    <Compile Include="Models\CommentDriver.cs" />
     <Compile Include="Models\CommentHandler.cs" />
     <Compile Include="Models\CommentStatus.cs" />
     <Compile Include="Models\HasCommentsContainer.cs" />
-    <Compile Include="Models\HasCommentsContainerDriver.cs" />
     <Compile Include="Models\HasCommentsContainerHandler.cs" />
-    <Compile Include="Models\HasCommentsDriver.cs" />
     <Compile Include="Feeds\CommentedOnContainerFeedQuery.cs" />
     <Compile Include="Feeds\CommentedOnFeedQuery.cs" />
     <Compile Include="Feeds\CommentFeedItemBuilder.cs" />

src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Orchard.Comments.Models;
+using Orchard.Comments.Controllers;
 using Orchard.ContentManagement.Aspects;
 using Orchard.Data;
 using Orchard.Logging;

src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.ascx

@@ -9,7 +9,7 @@
     </div>
     <div>
         <%=Html.EditorFor(m => m.ModerateComments) %>
-        <label class="forcheckbox" for="CommentSettings_ModerateComments"><%=_Encoded("Enable comment moderation")%></label>
+        <label class="forcheckbox" for="CommentSettings_ModerateComments"><%=_Encoded("Comments must be approved before they appear")%></label>
         <%=Html.ValidationMessage("ModerateComments", "*")%>
     </div>
     <div>