lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Erik Porter 2010-02-26 16:37:06 -08:00
commit edc09e6158
15 changed files with 77 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@ -204,7 +204,6 @@
<Content Include="Themes\Views\Admin\Install.aspx" />
<Content Include="Themes\Views\Header.ascx" />
<Content Include="Themes\Views\Document.aspx" />
<Content Include="Themes\Views\EditorTemplates\Parts\Themes.SiteSettings.ascx" />
<Content Include="Themes\Views\HeadPreload.ascx" />
<Content Include="Themes\Views\Layout.ascx" />
<Content Include="Themes\Views\Messages.ascx" />
@ -219,6 +218,8 @@
<Content Include="Navigation\Views\Web.config" />
<Content Include="Themes\Scripts\jquery-1.4.1.js" />
<Content Include="Themes\Scripts\jquery-1.4.1.min.js" />
<Content Include="Themes\Views\EditorTemplates\Items\ContentItem.ascx" />
<Content Include="Themes\Views\DisplayTemplates\Items\ContentItem.ascx" />
</ItemGroup>
<ItemGroup>
<Folder Include="Scheduling\Controllers\" />

10
src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
View File

@ -1,22 +1,22 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SettingsIndexViewModel>" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
<h1><%=Html.TitleForPage(T("Edit Settings").ToString())%></h1>
<h1><%=Html.TitleForPage(T("Manage Settings").ToString())%></h1>
<%using (Html.BeginFormAntiForgeryPost()) { %>
<%= Html.ValidationSummary() %>
<fieldset>
<legend><%=_Encoded("Global Settings")%></legend>
<div>
<%=Html.LabelFor(x=>x.SiteName) %>
<%=Html.EditorFor(x=>x.SiteName) %>
<label for="SiteName"><%=_Encoded("Site name") %></label>
<%=Html.EditorFor(m => m.SiteName) %>
<%=Html.ValidationMessage("SiteName", "*") %>
</div>
<div>
<%=Html.LabelFor(x => x.PageTitleSeparator) %>
<label for="PageTitleSeparator"><%=_Encoded("Page title separator") %></label>
<%=Html.EditorFor(x => x.PageTitleSeparator)%>
<%=Html.ValidationMessage("PageTitleSeparator", "*")%>
</div>
<div>
<%=Html.LabelFor(x => x.SuperUser) %>
<label for="SuperUser"><%=_Encoded("Super user") %></label>
<%=Html.EditorFor(x=>x.SuperUser) %>
<%=Html.ValidationMessage("SuperUser", "*") %>
</div>

1
src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs
View File

@ -10,7 +10,6 @@ namespace Orchard.Core.Themes.Models {
_themeSiteSettingsRepository = repository;
Filters.Add(new ActivatingFilter<ThemeSiteSettings>("site"));
Filters.Add(StorageFilter.For(_themeSiteSettingsRepository));
Filters.Add(new TemplateFilterForRecord<ThemeSiteSettingsRecord>("ThemeSiteSettings", "Parts/Themes.SiteSettings"));
}
}
}

4
src/Orchard.Web/Core/Themes/Views/DisplayTemplates/Items/ContentItem.ascx Normal file
View File

@ -0,0 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<% Html.Zone("primary");
Html.ZonesAny(); %>

4
src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx Normal file
View File

@ -0,0 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<% Html.Zone("primary");
Html.ZonesAny(); %>

10
src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx
View File

@ -1,10 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ThemeSiteSettingsRecord>" %>
<%@ Import Namespace="Orchard.Core.Themes.Records"%>
<fieldset>
<legend><%=_Encoded("Themes")%></legend>
<div>
<%= Html.LabelFor(x=>x.CurrentThemeName) %>
<%= Html.EditorFor(x=>x.CurrentThemeName) %>
<%= Html.ValidationMessage("CurrentThemeName", "*")%>
</div>
</fieldset>

7
src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
View File

@ -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, CurrentSite.As<CommentSettings>().Record.ModerateComments);
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");

88
src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
View File

@ -1,60 +1,50 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<HasComments>" %>
<%@ Import Namespace="Orchard.Security" %>
<%@ Import Namespace="Orchard.Comments.Models" %>
<h2 id="comments">
<%=_Encoded("{0} Comment{1}", Model.Comments.Count, Model.Comments.Count == 1 ? "" : "s")%></h2>
<%
if (Model.Comments.Count > 0) { Html.RenderPartial("ListOfComments", Model.Comments); }
if (Model.CommentsActive == false) { %>
<p>
<%=_Encoded("Comments have been disabled for this content.") %></p>
<%
<%@ Import Namespace="Orchard.Comments.Models" %><%
if (Model.Comments.Count > 0) { %>
<h2 id="comments"><%=_Encoded("{0} Comment{1}", Model.Comments.Count, Model.Comments.Count == 1 ? "" : "s")%></h2><% Html.RenderPartial("ListOfComments", Model.Comments); }
if (Model.CommentsActive == false) {
if (Model.Comments.Count > 0) { %>
<p><%=_Encoded("Comments have been disabled for this content.") %></p><%
}
else { %>
}
else { %>
<% using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { %>
<%=Html.ValidationSummary() %>
<%
<%=Html.ValidationSummary() %>
<h2><%=_Encoded("Add a Comment") %></h2><%
if (!Request.IsAuthenticated) { %>
<fieldset class="who">
<div>
<label for="Name">
<%=_Encoded("Name") %></label>
<input id="Name" class="text" name="Name" type="text" />
</div>
<div>
<label for="Email">
<%=_Encoded("Email") %></label>
<input id="Email" class="text" name="Email" type="text" />
</div>
<div>
<label for="SiteName">
<%=_Encoded("Url") %></label>
<input id="SiteName" class="text" name="SiteName" type="text" />
</div>
</fieldset>
<%
<fieldset class="who">
<div>
<label for="Name"><%=_Encoded("Name") %></label>
<input id="Name" class="text" name="Name" type="text" />
</div>
<div>
<label for="Email"><%=_Encoded("Email") %></label>
<input id="Email" class="text" name="Email" type="text" />
</div>
<div>
<label for="SiteName"><%=_Encoded("Url") %></label>
<input id="SiteName" class="text" name="SiteName" type="text" />
</div>
</fieldset><%
}
else {
var currentUser = Html.Resolve<IAuthenticationService>().GetAuthenticatedUser();
%>
<%=Html.Hidden("Name", currentUser.UserName ?? "")%>
<%=Html.Hidden("Email", currentUser.Email ?? "")%>
<%
<%=Html.Hidden("Name", currentUser.UserName ?? "")%>
<%=Html.Hidden("Email", currentUser.Email ?? "")%><%
}%>
<fieldset class="what">
<div>
<label for="CommentText">
<% if (Request.IsAuthenticated) { %><%=T("Hi, {0}!", Html.Encode(Page.User.Identity.Name)) %><br />
<% } %><%=_Encoded("Leave a comment") %></label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
</div>
<div>
<input type="submit" class="button" value="<%=_Encoded("Submit Comment") %>" />
<%=Html.Hidden("CommentedOn", Model.ContentItem.Id) %>
<%=Html.Hidden("ReturnUrl", Context.Request.Url) %>
<%=Html.AntiForgeryTokenOrchard() %>
</div>
</fieldset>
<%
<fieldset class="what">
<div>
<label for="CommentText"><% if (Request.IsAuthenticated) { %><%=T("Hi, {0}!", Html.Encode(Page.User.Identity.Name)) %><br /><% } %><%=_Encoded("Comment") %></label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
</div>
<div>
<input type="submit" class="button" value="<%=_Encoded("Submit Comment") %>" />
<%=Html.Hidden("CommentedOn", Model.ContentItem.Id) %>
<%=Html.Hidden("ReturnUrl", Context.Request.Url) %>
<%=Html.AntiForgeryTokenOrchard() %>
</div>
</fieldset><%
}
} %>
} %>

10
src/Orchard.Web/Modules/Orchard.Users/Controllers/UserDriver.cs
View File

@ -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");
}
}
}

1
src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
View File

@ -88,7 +88,6 @@
<Content Include="Views\Admin\EditorTemplates\inputPasswordLarge.ascx" />
<Content Include="Views\Admin\EditorTemplates\inputTextLarge.ascx" />
<Content Include="Views\Admin\Index.aspx" />
<Content Include="Views\EditorTemplates\Items\Users.User.ascx" />
<Content Include="Web.config" />
<Content Include="Views\Web.config" />
</ItemGroup>

4
src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Items/Users.User.ascx
View File

@ -1,4 +0,0 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<User>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Users.Models"%>
<% Html.ZonesAny(); %>

1
src/Orchard.Web/Orchard.Web.csproj
View File

@ -196,7 +196,6 @@
<Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
<Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
<Content Include="Themes\Green\Views\DisplayTemplates\Items\Pages.Page.ascx" />
<Content Include="Themes\Green\Views\DisplayTemplates\Parts\Comments.HasComments.ascx" />
<Content Include="Themes\Green\Views\Footer.ascx" />
<Content Include="Themes\Green\Views\Layout.ascx" />
<Content Include="Themes\Green\Views\ListOfComments.ascx" />

6
src/Orchard.Web/Themes/Green/Styles/site.css
View File

@ -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 {

40
src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
View File

@ -1,40 +0,0 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<HasComments>" %>
<%@ Import Namespace="Orchard.Comments.Models"%>
<h2 id="comments"><%=_Encoded("{0} Comment{1}", Model.Comments.Count, Model.Comments.Count == 1 ? "" : "s")%></h2><%
if (Model.Comments.Count > 0) { Html.RenderPartial("ListOfComments", Model.Comments); }
if (Model.CommentsActive == false) { %>
<p><%=_Encoded("Comments have been disabled for this content.") %></p><%
} else { %>
<%-- todo: (heskew) need a comment form for the authenticated user... --%>
<% using(Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { %>
<%=Html.ValidationSummary() %>
<h2>Add a Comment</h2>
<fieldset class="who">
<%=Html.Hidden("CommentedOn", Model.ContentItem.Id) %>
<%=Html.Hidden("ReturnUrl", Context.Request.Url) %>
<div>
<label for="Name"><%=_Encoded("Name") %></label>
<input id="Name" class="text" name="Name" type="text" />
</div>
<div>
<label for="Email"><%=_Encoded("Email") %></label>
<input id="Email" class="text" name="Email" type="text" />
</div>
<div>
<label for="SiteName"><%=_Encoded("Url") %></label>
<input id="SiteName" class="text" name="SiteName" type="text" />
</div>
<div>
<label for="CommentText"><%=_Encoded("Comment") %></label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
</div>
<div>
<input type="submit" class="button" value="<%=_Encoded("Submit Comment") %>" />
<%=Html.AntiForgeryTokenOrchard() %>
</div>
</fieldset><%
}
} %>

13
src/Orchard/ContentManagement/Drivers/ContentItemDriver.cs
View File

@ -16,6 +16,7 @@ namespace Orchard.ContentManagement.Drivers {
public abstract class ContentItemDriver<TContent> : ContentPartDriver<TContent>, 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<TContent> viewModel, string displayType) { return null; }
protected virtual DriverResult Editor(ContentItemViewModel<TContent> viewModel) { return null; }
protected virtual DriverResult Editor(ContentItemViewModel<TContent> viewModel, IUpdateModel updater) { return null; }
protected virtual DriverResult Display(ContentItemViewModel<TContent> viewModel, string displayType) { return GetDefaultItemTemplate(); }
protected virtual DriverResult Editor(ContentItemViewModel<TContent> viewModel) { return GetDefaultItemTemplate(); }
protected virtual DriverResult Editor(ContentItemViewModel<TContent> viewModel, IUpdateModel updater) { return GetDefaultItemTemplate(); }
public ContentItemTemplateResult<TContent> ContentItemTemplate(string templateName) {
return new ContentItemTemplateResult<TContent>(templateName);
}
private DriverResult GetDefaultItemTemplate() {
return UseDefaultTemplate
? ContentItemTemplate("Items/ContentItem")
: null;
}
}
}