From a21e246e4d10aefb337797d5aa846b5d2d785303 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Fri, 26 Feb 2010 14:27:46 -0800 Subject: [PATCH 1/4] Some site settings cleanup - Friendly names for remaining input - Removed Theme site setting UI - Changed "Edit Settings" title to "Manage Settings" #consistency --HG-- branch : dev --- src/Orchard.Web/Core/Orchard.Core.csproj | 1 - src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx | 10 +++++----- .../Core/Themes/Models/ThemeSiteSettingsHandler.cs | 1 - .../EditorTemplates/Parts/Themes.SiteSettings.ascx | 10 ---------- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index b2975a1ad..15975cdd1 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -204,7 +204,6 @@ - diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx index ca17cb51e..92deb3ffa 100644 --- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx @@ -1,22 +1,22 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Core.Settings.ViewModels"%> -

<%=Html.TitleForPage(T("Edit Settings").ToString())%>

+

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

<%using (Html.BeginFormAntiForgeryPost()) { %> <%= Html.ValidationSummary() %>
<%=_Encoded("Global Settings")%>
- <%=Html.LabelFor(x=>x.SiteName) %> - <%=Html.EditorFor(x=>x.SiteName) %> + + <%=Html.EditorFor(m => m.SiteName) %> <%=Html.ValidationMessage("SiteName", "*") %>
- <%=Html.LabelFor(x => x.PageTitleSeparator) %> + <%=Html.EditorFor(x => x.PageTitleSeparator)%> <%=Html.ValidationMessage("PageTitleSeparator", "*")%>
- <%=Html.LabelFor(x => x.SuperUser) %> + <%=Html.EditorFor(x=>x.SuperUser) %> <%=Html.ValidationMessage("SuperUser", "*") %>
diff --git a/src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs b/src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs index 0b71ec127..eaa0d6626 100644 --- a/src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs +++ b/src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs @@ -10,7 +10,6 @@ namespace Orchard.Core.Themes.Models { _themeSiteSettingsRepository = repository; Filters.Add(new ActivatingFilter("site")); Filters.Add(StorageFilter.For(_themeSiteSettingsRepository)); - Filters.Add(new TemplateFilterForRecord("ThemeSiteSettings", "Parts/Themes.SiteSettings")); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx b/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx deleted file mode 100644 index eee660137..000000000 --- a/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Core.Themes.Records"%> -
- <%=_Encoded("Themes")%> -
- <%= Html.LabelFor(x=>x.CurrentThemeName) %> - <%= Html.EditorFor(x=>x.CurrentThemeName) %> - <%= Html.ValidationMessage("CurrentThemeName", "*")%> -
-
\ No newline at end of file From 22e5a083bfa355a03ba5095b03350b65935fcf88 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Fri, 26 Feb 2010 15:20:50 -0800 Subject: [PATCH 2/4] Adding generic ContentItem editor and display templates - ContentItem editor and display templates added that only render the "primary" zone, then remaining zones (ZonesAny) - Added a UseDefaultTemplate bool to ContentItemDriver and conditionally return the default template for Display or Edit - Updated the UserDriver to use the default templates - --HG-- branch : dev --- src/Orchard.Web/Core/Orchard.Core.csproj | 2 ++ .../Views/DisplayTemplates/Items/ContentItem.ascx | 4 ++++ .../Views/EditorTemplates/Items/ContentItem.ascx | 4 ++++ .../Modules/Orchard.Users/Controllers/UserDriver.cs | 10 ++-------- .../Modules/Orchard.Users/Orchard.Users.csproj | 1 - .../Views/EditorTemplates/Items/Users.User.ascx | 4 ---- .../ContentManagement/Drivers/ContentItemDriver.cs | 13 ++++++++++--- 7 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 src/Orchard.Web/Core/Themes/Views/DisplayTemplates/Items/ContentItem.ascx create mode 100644 src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx delete mode 100644 src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 15975cdd1..3179fa878 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -218,6 +218,8 @@ + + diff --git a/src/Orchard.Web/Core/Themes/Views/DisplayTemplates/Items/ContentItem.ascx b/src/Orchard.Web/Core/Themes/Views/DisplayTemplates/Items/ContentItem.ascx new file mode 100644 index 000000000..0189daac3 --- /dev/null +++ b/src/Orchard.Web/Core/Themes/Views/DisplayTemplates/Items/ContentItem.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<% Html.Zone("primary"); + Html.ZonesAny(); %> \ No newline at end of file diff --git a/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx b/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx new file mode 100644 index 000000000..0189daac3 --- /dev/null +++ b/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels"%> +<% Html.Zone("primary"); + Html.ZonesAny(); %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/UserDriver.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/UserDriver.cs index 454057954..d8db83aae 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/UserDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/UserDriver.cs @@ -12,6 +12,8 @@ namespace Orchard.Users.Controllers { DisplayName = "User Profile" }; + protected override bool UseDefaultTemplate { get { return true; } } + protected override ContentType GetContentType() { return ContentType; } @@ -29,13 +31,5 @@ namespace Orchard.Users.Controllers { {"Id", item.ContentItem.Id}, }; } - - protected override DriverResult Editor(User part) { - return ContentItemTemplate("Items/Users.User"); - } - - protected override DriverResult Editor(User part, IUpdateModel updater) { - return ContentItemTemplate("Items/Users.User"); - } } } diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index 5b537ab44..c3558b769 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -88,7 +88,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx deleted file mode 100644 index cd8be2988..000000000 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx +++ /dev/null @@ -1,4 +0,0 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> -<%@ Import Namespace="Orchard.Mvc.ViewModels"%> -<%@ Import Namespace="Orchard.Users.Models"%> -<% Html.ZonesAny(); %> \ No newline at end of file diff --git a/src/Orchard/ContentManagement/Drivers/ContentItemDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentItemDriver.cs index 134ec4aee..6090e01bd 100644 --- a/src/Orchard/ContentManagement/Drivers/ContentItemDriver.cs +++ b/src/Orchard/ContentManagement/Drivers/ContentItemDriver.cs @@ -16,6 +16,7 @@ namespace Orchard.ContentManagement.Drivers { public abstract class ContentItemDriver : ContentPartDriver, IContentItemDriver where TContent : class, IContent { private readonly ContentType _contentType; + protected virtual bool UseDefaultTemplate { get { return false; } } public ContentItemDriver() { } @@ -76,12 +77,18 @@ namespace Orchard.ContentManagement.Drivers { protected virtual RouteValueDictionary GetDisplayRouteValues(TContent item) { return null; } protected virtual RouteValueDictionary GetEditorRouteValues(TContent item) { return null; } - protected virtual DriverResult Display(ContentItemViewModel viewModel, string displayType) { return null; } - protected virtual DriverResult Editor(ContentItemViewModel viewModel) { return null; } - protected virtual DriverResult Editor(ContentItemViewModel viewModel, IUpdateModel updater) { return null; } + protected virtual DriverResult Display(ContentItemViewModel viewModel, string displayType) { return GetDefaultItemTemplate(); } + protected virtual DriverResult Editor(ContentItemViewModel viewModel) { return GetDefaultItemTemplate(); } + protected virtual DriverResult Editor(ContentItemViewModel viewModel, IUpdateModel updater) { return GetDefaultItemTemplate(); } public ContentItemTemplateResult ContentItemTemplate(string templateName) { return new ContentItemTemplateResult(templateName); } + + private DriverResult GetDefaultItemTemplate() { + return UseDefaultTemplate + ? ContentItemTemplate("Items/ContentItem") + : null; + } } } \ No newline at end of file From 1dfdeb8d802af10cb5ba32a0dab47c0e67c2f6a3 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Fri, 26 Feb 2010 15:57:23 -0800 Subject: [PATCH 3/4] Some comment display cleanup - only show the [comment count] Comments heading if there are comments - only show the comments are disabled message if comments are disabled *and* there *are* comments - added an Add a Comment heading above the comment form --HG-- branch : dev --- .../Parts/Comments.HasComments.ascx | 88 ++++++++----------- src/Orchard.Web/Themes/Green/Styles/site.css | 6 +- .../Parts/Comments.HasComments.ascx | 42 --------- 3 files changed, 44 insertions(+), 92 deletions(-) delete mode 100644 src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx index 99fd0f211..102e41dec 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx @@ -1,60 +1,50 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Security" %> -<%@ Import Namespace="Orchard.Comments.Models" %> -

- <%=_Encoded("{0} Comment{1}", Model.Comments.Count, Model.Comments.Count == 1 ? "" : "s")%>

-<% - if (Model.Comments.Count > 0) { Html.RenderPartial("ListOfComments", Model.Comments); } - if (Model.CommentsActive == false) { %> -

- <%=_Encoded("Comments have been disabled for this content.") %>

-<% +<%@ Import Namespace="Orchard.Comments.Models" %><% +if (Model.Comments.Count > 0) { %> +

<%=_Encoded("{0} Comment{1}", Model.Comments.Count, Model.Comments.Count == 1 ? "" : "s")%>

<% Html.RenderPartial("ListOfComments", Model.Comments); } +if (Model.CommentsActive == false) { + if (Model.Comments.Count > 0) { %> +

<%=_Encoded("Comments have been disabled for this content.") %>

<% } - else { %> +} +else { %> <% using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { %> -<%=Html.ValidationSummary() %> -<% + <%=Html.ValidationSummary() %> +

<%=_Encoded("Add a Comment") %>

<% if (!Request.IsAuthenticated) { %> -
-
- - -
-
- - -
-
- - -
-
-<% +
+
+ + +
+
+ + +
+
+ + +
+
<% } else { var currentUser = Html.Resolve().GetAuthenticatedUser(); %> - <%=Html.Hidden("Name", currentUser.UserName ?? "")%> - <%=Html.Hidden("Email", currentUser.Email ?? "")%> -<% + <%=Html.Hidden("Name", currentUser.UserName ?? "")%> + <%=Html.Hidden("Email", currentUser.Email ?? "")%><% }%> -
-
- - -
-
- " /> - <%=Html.Hidden("CommentedOn", Model.ContentItem.Id) %> - <%=Html.Hidden("ReturnUrl", Context.Request.Url) %> - <%=Html.AntiForgeryTokenOrchard() %> -
-
-<% +
+
+ + +
+
+ " /> + <%=Html.Hidden("CommentedOn", Model.ContentItem.Id) %> + <%=Html.Hidden("ReturnUrl", Context.Request.Url) %> + <%=Html.AntiForgeryTokenOrchard() %> +
+
<% } - } %> +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css index dce904dec..5055311d8 100644 --- a/src/Orchard.Web/Themes/Green/Styles/site.css +++ b/src/Orchard.Web/Themes/Green/Styles/site.css @@ -70,7 +70,11 @@ fieldset { -moz-border-radius:6px; -webkit-border-radius:6px; } - +/* todo: (heskew) tmp. leaving it up to Jon on what he wants to do with this :P */ +form.comment fieldset { + margin-bottom:0; +} + fieldset div {margin:12px 0 0 0} legend { diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx deleted file mode 100644 index 1301d25bd..000000000 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx +++ /dev/null @@ -1,42 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Comments.Models"%> -

<%=_Encoded("{0} Comment{1}", Model.Comments.Count, Model.Comments.Count == 1 ? "" : "s")%>

<% -if (Model.Comments.Count > 0) { Html.RenderPartial("ListOfComments", Model.Comments); } -if (Model.CommentsActive == false) { %> -

<%=_Encoded("Comments have been disabled for this content.") %>

<% -} else { %> - <%-- todo: (heskew) need a comment form for the authenticated user... --%> - <% using(Html.BeginForm("Create", "Admin", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { %> - <%=Html.ValidationSummary() %> -

Add a Comment

-
- - <%=Html.Hidden("CommentedOn", Model.ContentItem.Id) %> - <%=Html.Hidden("ReturnUrl", Context.Request.Url) %> -
- - -
-
- - -
-
- - -
- -
- - -
- -
- " /> - <%=Html.AntiForgeryTokenOrchard() %> -
-
<% - } -} %> - - \ No newline at end of file From 9c86a8d552ae58828ba6cc5c96ce91cbcb8488f0 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Fri, 26 Feb 2010 16:03:50 -0800 Subject: [PATCH 4/4] Adding an Information notification for pending comments --HG-- branch : dev --- .../Orchard.Comments/Controllers/CommentController.cs | 7 ++++++- src/Orchard.Web/Orchard.Web.csproj | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs index 187dd5ec9..24ca875e8 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs @@ -12,11 +12,13 @@ using Orchard.UI.Notify; namespace Orchard.Comments.Controllers { public class CommentController : Controller { + public IOrchardServices Services { get; set; } private readonly IAuthorizer _authorizer; private readonly ICommentService _commentService; private readonly INotifier _notifier; - public CommentController(ICommentService commentService, INotifier notifier, IAuthorizer authorizer) { + public CommentController(IOrchardServices services, ICommentService commentService, INotifier notifier, IAuthorizer authorizer) { + Services = services; _commentService = commentService; _notifier = notifier; _authorizer = authorizer; @@ -53,6 +55,9 @@ namespace Orchard.Comments.Controllers { Comment comment = _commentService.CreateComment(context); if (!String.IsNullOrEmpty(returnUrl)) { + if (comment.Record.Status == CommentStatus.Pending) + Services.Notifier.Information(T("Your comment will appear after the site administrator approves it.")); + return Redirect(returnUrl); } return RedirectToAction("Index"); diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 7bc98db08..2a8a0ce8b 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -196,7 +196,6 @@ -