mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Merge
--HG-- branch : dev rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Highlights.html => src/Orchard.Web/Themes/Contoso/Zones/Highlights.html
This commit is contained in:
Michael Dorian Bach
@@ -1,6 +1,6 @@
|
||||
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<TagsIndexViewModel>" %>
|
||||
<%@ Import Namespace="Orchard.Tags.ViewModels"%>
|
||||
<h1><%=Html.TitleForPage(T("Tags").ToString())%></h1>
|
||||
<h1 class="page-title"><%=Html.TitleForPage(T("Tags").ToString())%></h1>
|
||||
<%=Html.UnorderedList(
|
||||
Model.Tags,
|
||||
(t, i) => Html.ActionLink(
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<TagsSearchViewModel>" %>
|
||||
<%@ Import Namespace="Orchard.Tags.ViewModels"%>
|
||||
<% Html.AddTitleParts(T("Tags").ToString(), T("Contents tagged with {0}", Model.TagName).ToString()); %>
|
||||
<h1><%=T("Contents tagged with <span>{0}</span>", Html.Encode(Model.TagName)) %></h1>
|
||||
<%=Html.UnorderedList(Model.Items, (c, i) => Html.DisplayForItem(c).ToHtmlString(), "contentItems") %>
|
||||
<h1 class="page-title"><%=T("Contents tagged with <span>{0}</span>", Html.Encode(Model.TagName)) %></h1>
|
||||
<%=Html.UnorderedList(Model.Items, (c, i) => Html.DisplayForItem(c).ToHtmlString(), "taggedPosts contentItems") %>
|
||||
@@ -213,9 +213,10 @@
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\Items\Pages.Page.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\ListOfComments.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\Items\Blogs.BlogPost.ListByArchive.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\Parts\Comments.HasComments.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\Parts\Pages.Page.Metadata.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\DisplayTemplates\Parts\Tags.ShowTags.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\Header.ascx" />
|
||||
<Content Include="Themes\Contoso\Scripts\easySlider.js" />
|
||||
@@ -226,6 +227,7 @@
|
||||
<Content Include="Themes\Contoso\Views\Layout.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\Layout.HomePage.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\ListOfComments.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\LogOn.ascx" />
|
||||
<Content Include="Themes\Contoso\Views\User.ascx" />
|
||||
<Content Include="Themes\Green\Content\Images\bodyBackground.gif" />
|
||||
<Content Include="Themes\Green\Content\Images\bodyBackground.png" />
|
||||
|
||||
@@ -59,6 +59,9 @@ blockquote, q {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
.group {display: inline-block;} /* for IE/Mac */
|
||||
|
||||
|
||||
/*========= General Typography =========*/
|
||||
|
||||
/* Default font settings.
|
||||
@@ -96,7 +99,7 @@ p img.right { float: right; margin: 1.5em 0 1.5em 1.5em; }
|
||||
|
||||
a:focus,
|
||||
a:hover { color: #85b35c; }
|
||||
a { color: #4c5c64; text-decoration: none; }
|
||||
a { color: #5f97af; text-decoration: none; }
|
||||
|
||||
blockquote { margin: 1.5em; color: #666; font-style: italic; }
|
||||
strong { font-weight: bold; }
|
||||
@@ -249,23 +252,28 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
|
||||
|
||||
/*========= HEADER =========*/
|
||||
|
||||
/*- Page Navigation -*/
|
||||
|
||||
#nav { background: transparent url('../Content/Images/menu-left.png') no-repeat left top; margin: 20px 0px 20px 0px; }
|
||||
#nav .menu { margin: 0px; padding: 0px; height: 40px; background: transparent url('../Content/Images/menu-right.png') no-repeat right top; }
|
||||
#nav .menu li { float:left; list-style: none; background: transparent url('../Content/Images/menu-divider.png') repeat-y right top; }
|
||||
#nav .menu li a { display:block; margin: 0px 2px 1px 0px; padding: 11px 39px 0px 39px; height: 28px; color: #FFF; font-size: 1.2em; text-decoration: none; text-shadow: 0px -1px 0px #535550; }
|
||||
#nav .menu li a:hover { background: #9dc975 url('../Content/Images/menu-hover.png') repeat-x right top; }
|
||||
#nav .menu li:first-child a:hover { margin: 0px 2px 1px 0px; background: #9dc975 url('../Content/Images/menu-hover-left.png') no-repeat left top; }
|
||||
|
||||
.admin { float: right; margin: 0px; padding: 25px 0px 0px 0px; }
|
||||
.admin li { float:left; list-style: none; padding: 0px 0px 0px 20px; }
|
||||
.admin li a {}
|
||||
.header {}
|
||||
|
||||
/*- Brand -*/
|
||||
|
||||
.brand {}
|
||||
.brand .title { padding: 20px 0px 0px 0px; font-size: 1.6em; font-family: Segoe UI, Segoe, Arial, Sans-Serif; color:#4c5c64; float: left; }
|
||||
.brand { width: 962px; }
|
||||
.brand .title { padding: 20px 0px 15px 0px; font-size: 1.6em; font-family: Segoe UI, Segoe, Arial, Sans-Serif; color:#4c5c64; float: left; }
|
||||
|
||||
/*- Page Navigation -*/
|
||||
|
||||
#nav { background: transparent url('../Content/Images/menu-left.png') no-repeat left top; margin: 0px 0px 20px 0px; }
|
||||
#nav .menu { margin: 0px; padding: 0px; height: 40px; background: transparent url('../Content/Images/menu-right.png') no-repeat right top; }
|
||||
#nav .menu li { float:left; list-style: none; background: transparent url('../Content/Images/menu-divider.png') repeat-y right top; }
|
||||
#nav .menu li a { display:block; margin: 0px 2px 1px 0px; padding: 11px 39px 4px 39px; height: 24px; color: #FFF; font-size: 1.2em; text-decoration: none; text-shadow: 0px -1px 0px #535550; }
|
||||
#nav .menu li a:hover { background: #9dc975 url('../Content/Images/menu-hover.png') repeat-x right top; }
|
||||
#nav .menu li:first-child a:hover { margin: 0px 2px 1px 0px; background: #9dc975 url('../Content/Images/menu-hover-left.png') no-repeat left top; }
|
||||
|
||||
#nav .menu li.current a { background: #9dc975 url('../Content/Images/menu-hover.png') repeat-x right top; }
|
||||
#nav .menu li.current:first-child a { margin: 0px 2px 1px 0px; background: #9dc975 url('../Content/Images/menu-hover-left.png') no-repeat left top; }
|
||||
|
||||
.admin { float: right; margin: 0px; padding: 25px 0px 0px 0px; }
|
||||
.admin li { float:left; list-style: none; padding: 0px 0px 5px 20px; }
|
||||
.admin li a {}
|
||||
|
||||
|
||||
|
||||
@@ -274,7 +282,8 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
|
||||
.footer { width: 962px; border-top: solid 1px #e2e2e2; padding: 20px 0px 40px 0px; margin: 20px 0px 0px 0px; }
|
||||
.footer ul { margin: 0px; padding: 0px; float: right; }
|
||||
.footer ul li { float:left; list-style: none; color: #98bac8; padding: 0px 0px 0px 20px; }
|
||||
|
||||
.footer a { color: #4c5c64; }
|
||||
.footer a:hover { color: #85b35c; }
|
||||
|
||||
|
||||
/*========= Home =========*/
|
||||
@@ -302,10 +311,13 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
|
||||
|
||||
/*- Content Pages -*/
|
||||
.content .page-title { display: none; }
|
||||
.sub .page-title { display: block; background: transparent url('../Content/Images/sub-header.png') no-repeat left top; width: 962px; height: 46px; position: absolute; top: 1px; left: 1px; color: #ffffff; font-size: 2em; text-shadow: 0px -1px 0px #5f8b9e; padding: 15px 0px 0px 40px; }
|
||||
.sub .page-title { display: block; background: transparent url('../Content/Images/sub-header.png') no-repeat left top; width: 962px; height: 48px; position: absolute; top: 1px; left: 1px; color: #ffffff; font-size: 2em; text-shadow: 0px -1px 0px #5f8b9e; padding: 15px 0px 15px 40px; }
|
||||
.content-items .main { float: left; width: 574px; margin: 0px 60px 20px 0px; padding: 50px 0px 0px 0px; }
|
||||
.content-items .sidebar { float: left; width: 232px; padding: 45px 0px 0px 0px; }
|
||||
.content-items .side-block { float: left; width: 232px; border-bottom: solid 1px #e2e2e2; padding: 20px 0px 0px 0px; }
|
||||
.content-items .archives { float: left; width: 232px; border-bottom: solid 1px #e2e2e2; padding: 20px 0px 0px 0px; }
|
||||
.content-items .archives .archiveMonthList { padding: 20px 0px 20px 0px; list-style: none; }
|
||||
|
||||
|
||||
/*- Highlight Area -*/
|
||||
.hightlights { width: 882px; padding: 40px 40px 0px 40px; }
|
||||
@@ -316,20 +328,19 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
|
||||
.hightlights img { float: left; padding: 0px 0px 0px 0px; }
|
||||
|
||||
|
||||
|
||||
/*========= BLOGS =========*/
|
||||
|
||||
.blogPosts { margin: 0px; padding: 0px; }
|
||||
.blogPosts li { padding: 30px 0px 0px 0px; list-style: none; border-top: solid 1px #e2e2e2; }
|
||||
.blog-desc { font-size: 1.3em; line-height: 150%; color: #6da8c0; }
|
||||
.blogPosts, .taggedPosts { margin: 0px; padding: 0px; }
|
||||
.blogPosts li, .taggedPosts li { padding: 30px 0px 0px 0px; list-style: none; border-top: solid 1px #e2e2e2; }
|
||||
.blogdescription { font-size: 1.3em; line-height: 150%; color: #6da8c0; }
|
||||
|
||||
#comments { padding-top: 20px; border-top: dashed 1px #e8e8e8; padding-bottom: 10px; margin-top: 30px; }
|
||||
.comments { position: relative; padding: 0px; margin: 0px; clear: both; }
|
||||
#comments { padding-top: 20px; border-top: dashed 1px #d8d8d8; padding-bottom: 10px; margin-top: 30px; }
|
||||
.comments { position: relative; padding: 0px 0px 20px 0px; margin: 0px; clear: both; }
|
||||
.comments li { display: block; position: relative; list-style: none; background-color: #fbfff7; border: solid 1px #ebf4e3; border-bottom-color: #d5ebbd; border-right-color: #d5ebbd; padding: 20px 20px 0px 20px; margin: 0px 0px 50px 0px; }
|
||||
.comments .comment {position: absolute; bottom: -27px; left: 20px; color: #a5cc7a; background: transparent url('../Content/Images/comment-arrow.png') no-repeat 20px 0px; padding: 15px 0px 0px 0px; }
|
||||
.comments .commentauthor {position: absolute; bottom: -27px; left: 20px; color: #a5cc7a; background: transparent url('../Content/Images/comment-arrow.png') no-repeat 20px 0px; padding: 15px 0px 0px 0px; }
|
||||
|
||||
.comment-form { border: solid 1px #e8e8e8; padding: 20px; }
|
||||
.comment-form h2 { border-bottom: dashed 1px #e8e8e8; padding-bottom: 10px; }
|
||||
.comment-form { border: solid 1px #d8d8d8; padding: 20px; }
|
||||
.comment-form h2 { border-bottom: dashed 1px #d8d8d8; padding-bottom: 10px; }
|
||||
.comment-form .who {}
|
||||
.comment-form .who label { float: left; text-align: right; width: 50px; padding: 12px 10px 0px 0px; }
|
||||
.comment-form .what { padding: 10px 0px 0px 60px;}
|
||||
@@ -339,11 +350,24 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; }
|
||||
.posted { margin: 0px 0px 10px 0px; color: #999999; }
|
||||
|
||||
.tags span { display: block; float: left; padding: 3px 10px 5px 0px; }
|
||||
.tags a { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #ebebeb; color: #c8c8c8; text-shadow: 1px 1px 0px #FFF; -moz-border-radius: 5px;
|
||||
.tags a { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #d7e6ed; color: #95a5ac; text-shadow: 1px 1px 0px #FFF; -moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px; margin: 0px 10px 0px 0px; }
|
||||
.tags a:hover { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #a5cc7a; color: #668b3e; text-shadow: 1px 1px 0px #c8e6a6; -moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px; margin: 0px 10px 0px 0px; }
|
||||
|
||||
/*- Archive List -*/
|
||||
|
||||
.archive-trail { padding: 0px 0px 20px 0px; }
|
||||
|
||||
/*- Tag Cloud */
|
||||
|
||||
.tagCloud { list-style: none; margin: 20px 0px 0px 0px; }
|
||||
.tagCloud li { display: block; float: left; padding: 3px 10px 5px 0px; }
|
||||
.tagCloud a { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #d7e6ed; color: #95a5ac; text-shadow: 1px 1px 0px #FFF; -moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px; margin: 0px 10px 0px 0px; }
|
||||
.tagCloud a:hover { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #a5cc7a; color: #668b3e; text-shadow: 1px 1px 0px #c8e6a6; -moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px; margin: 0px 10px 0px 0px; }
|
||||
|
||||
/*========= PLUGINS =========*/
|
||||
|
||||
/*- Easy Slider -*/
|
||||
|
||||
@@ -6,15 +6,9 @@
|
||||
<%@ Import Namespace="Orchard.Blogs.Models"%>
|
||||
<%-- todo: (heskew) selectively display to those who have access --%>
|
||||
<h1 class="page-title"><%=Html.TitleForPage(Model.Item.Name) %></h1>
|
||||
|
||||
<% Html.RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest(Model.Item.Slug) });%>
|
||||
<% Html.RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd(Model.Item.Slug) });%>
|
||||
|
||||
<% if (Html.Resolve<IAuthenticationService>().GetAuthenticatedUser() != null){ %>
|
||||
<div class="manage"><a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit"><%=_Encoded("edit") %></a></div>
|
||||
<%} %>
|
||||
|
||||
<p class="blog-desc"><%=Html.Encode(Model.Item.Description) %></p>
|
||||
|
||||
<% Html.Zone("primary");
|
||||
<% Html.Zone("primary", ":manage :metadata");
|
||||
Html.ZonesAny(); %>
|
||||
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPostArchiveViewModel>" %>
|
||||
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
|
||||
<%@ Import Namespace="Orchard.Blogs.ViewModels"%>
|
||||
<h1 class="page-title"><%=Html.TitleForPage(T("Archives").ToString(), Model.ArchiveData.Year.ToString(), Model.ArchiveData.Month > 0 ? new DateTime(Model.ArchiveData.Year, Model.ArchiveData.Month, 1).ToString("MMMM") : null, Model.ArchiveData.Day > 0 ? Model.ArchiveData.Day.ToString() : null)%></h1>
|
||||
|
||||
<div class="archive-trail">
|
||||
<%=T("Archives").ToString()
|
||||
%> / <%=Html.Link(Model.ArchiveData.Year.ToString(), Url.BlogArchiveYear(Model.Blog.Slug, Model.ArchiveData.Year))
|
||||
%><%=Model.ArchiveData.Month > 0 ? string.Format(" / {0}", Html.Link(Model.ArchiveData.ToDateTime().ToString("MMMM"), Url.BlogArchiveMonth(Model.Blog.Slug, Model.ArchiveData.Year, Model.ArchiveData.Month))) : ""
|
||||
%><%=Model.ArchiveData.Day > 0 ? string.Format(" / {0}", Html.Link(Model.ArchiveData.Day.ToString(), Url.BlogArchiveDay(Model.Blog.Slug, Model.ArchiveData.Year, Model.ArchiveData.Month, Model.ArchiveData.Day))) : ""
|
||||
%>
|
||||
</div>
|
||||
|
||||
<%=Html.UnorderedList(Model.BlogPosts, (c, i) => Html.DisplayForItem(c).ToHtmlString(), "blogPosts contentItems")%>
|
||||
@@ -3,10 +3,5 @@
|
||||
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
|
||||
<%@ Import Namespace="Orchard.Blogs.Models"%>
|
||||
<h1 class="page-title"><%=Html.TitleForPage(Model.Item.Title)%></h1>
|
||||
<div class="metadata">
|
||||
<% if (Model.Item.Creator != null) {
|
||||
%><div class="posted"><%=_Encoded("Posted by {0} {1}", Model.Item.Creator.UserName, Html.PublishedWhen(Model.Item)) %></div><%
|
||||
} %>
|
||||
</div>
|
||||
<% Html.Zone("primary");
|
||||
Html.ZonesAny(); %>
|
||||
<% Html.Zone("primary", ":manage :metadata");
|
||||
Html.ZonesAny(); %>>
|
||||
@@ -6,7 +6,6 @@
|
||||
<div class="page-title"><%=Html.TitleForPage(Model.Item.Title)%></div>
|
||||
|
||||
<% if (Html.Resolve<IAuthenticationService>().GetAuthenticatedUser() != null){ %>
|
||||
<a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {id = Model.Item.Id, area = "Orchard.Pages"}) %>" class="ibutton edit static_text_div">
|
||||
<%} %>
|
||||
|
||||
<% Html.Zone("primary");
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Comment>>" %>
|
||||
<%@ Import Namespace="Orchard.Comments.Models"%>
|
||||
<ul class="comments"><%
|
||||
foreach (var comment in Model) { %>
|
||||
<li>
|
||||
<div class="comment">
|
||||
<span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>
|
||||
<%-- todo: (heskew) need comment permalink --%>
|
||||
<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault()), "#")%></span>
|
||||
</div>
|
||||
<div class="text">
|
||||
<%-- todo: (heskew) comment text needs processing depending on comment markup style --%>
|
||||
<p><%=Html.Encode(comment.Record.CommentText)%></p>
|
||||
</div>
|
||||
</li><%
|
||||
} %>
|
||||
</ul>
|
||||
@@ -1,43 +1,61 @@
|
||||
<%@ 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 { %>
|
||||
<% using(Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment-form" })) { %>
|
||||
<%=Html.ValidationSummary() %>
|
||||
<%
|
||||
<%@ Import Namespace="Orchard.Comments"%>
|
||||
<%@ Import Namespace="Orchard.Security" %>
|
||||
<%@ Import Namespace="Orchard.Comments.Models" %>
|
||||
<%-- todo: clean up this template - waaay too much going on in here :/ --%><%
|
||||
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 if(!Request.IsAuthenticated && !AuthorizedFor(Permissions.AddComment)) { %>
|
||||
<h2 id="addacomment"><%=_Encoded("Add a Comment") %></h2>
|
||||
<p class="info message"><%=T("You must {0} to comment.", Html.ActionLink(T("log on").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = string.Format("{0}#addacomment", Context.Request.RawUrl) }))%></p><%
|
||||
}
|
||||
else { %>
|
||||
<% using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment-form" })) { %>
|
||||
<%=Html.ValidationSummary() %>
|
||||
<h2 id="addacomment"><%=_Encoded("Add a Comment") %></h2><%
|
||||
if (!Request.IsAuthenticated) { %>
|
||||
<h2>Leave a Reply</h2>
|
||||
<fieldset class="who">
|
||||
<div class="name group">
|
||||
<label for="Name"><%=_Encoded("Name") %></label>
|
||||
<input id="Name" class="text" name="Name" type="text" />
|
||||
</div>
|
||||
<div class="email group">
|
||||
<label for="Email"><%=_Encoded("Email") %></label>
|
||||
<input id="Email" class="text" name="Email" type="text" />
|
||||
</div>
|
||||
<div class="site group">
|
||||
<label for="SiteName"><%=_Encoded("Url") %></label>
|
||||
<input id="SiteName" class="text" name="SiteName" type="text" />
|
||||
</div>
|
||||
</fieldset><%
|
||||
} %>
|
||||
<fieldset class="what">
|
||||
<div>
|
||||
<label for="CommentText"><% if (Request.IsAuthenticated) { %><%=T("Hi, {0}!", Html.Encode(Page.User.Identity.Name)) %><br /><% } %><%=_Encoded("Message") %></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="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 ?? "")%><%
|
||||
}%>
|
||||
<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><%
|
||||
}
|
||||
} %>
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %>
|
||||
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
|
||||
<%--<div class="metadata">
|
||||
<div class="posted"><%=_Encoded("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)"))%></div>
|
||||
</div>--%>
|
||||
@@ -3,13 +3,11 @@
|
||||
<%@ Import Namespace="Orchard.Mvc.Html" %>
|
||||
|
||||
<%
|
||||
Html.RegisterScript("easySlider.js");
|
||||
Html.RegisterStyle("site.css");
|
||||
|
||||
Model.Zones.AddRenderPartial("header", "Header", Model);
|
||||
Model.Zones.AddRenderPartial("menu", "Menu", Model);
|
||||
Model.Zones.AddRenderPartial("footer", "Footer", Model);
|
||||
|
||||
%>
|
||||
|
||||
<div id="container">
|
||||
@@ -31,7 +29,7 @@
|
||||
$("#slider").easySlider({
|
||||
prevText: '',
|
||||
nextText: '',
|
||||
speed: '1600',
|
||||
speed: '1600'
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -28,6 +28,11 @@
|
||||
<% Html.ZoneBody("content"); %>
|
||||
</div>
|
||||
<div class="sidebar">
|
||||
|
||||
<!-- START Blog Sidebars -->
|
||||
<%Html.Zone("sidebar");%>
|
||||
<!-- END Blog Sidebars -->
|
||||
|
||||
<div class="side-block">
|
||||
<% Html.Zone("sidebar-w1"); %>
|
||||
</div>
|
||||
|
||||
27
src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
Normal file
27
src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
Normal file
@@ -0,0 +1,27 @@
|
||||
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<LogOnViewModel>" %>
|
||||
<%@ Import Namespace="Orchard.Users.ViewModels"%>
|
||||
|
||||
<h1 class="page-title"><%=Html.TitleForPage(Model.Title)%></h1>
|
||||
<p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink("Register", "Register")%><%=_Encoded(" if you don't have an account.")%></p>
|
||||
<%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())%>
|
||||
<%
|
||||
using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Request.QueryString["ReturnUrl"]}))) { %>
|
||||
<fieldset class="login-form">
|
||||
<legend><%=_Encoded("Account Information")%></legend>
|
||||
<div class="group">
|
||||
<label for="username"><%=_Encoded("Username:")%></label>
|
||||
<%= Html.TextBox("username")%>
|
||||
<%= Html.ValidationMessage("username")%>
|
||||
</div>
|
||||
<div class="group">
|
||||
<label for="password"><%=_Encoded("Password:")%></label>
|
||||
<%= Html.Password("password")%>
|
||||
<%= Html.ValidationMessage("password")%>
|
||||
</div>
|
||||
<div class="group">
|
||||
<%= Html.CheckBox("rememberMe")%><label class="forcheckbox" for="rememberMe"><%=_Encoded("Remember me?")%></label>
|
||||
</div>
|
||||
<input type="submit" value="<%=_Encoded("Log On") %>" />
|
||||
</fieldset><%
|
||||
} %><%
|
||||
using (this.Capture("end-of-page-scripts")) { %><script type="text/javascript">$("#username").closest("form").helpfullyFocus();</script><% } %>
|
||||
@@ -21,8 +21,7 @@
|
||||
1 Microsoft Way<br />
|
||||
Redmond, WA 98444<br />
|
||||
United States<br />
|
||||
<br />
|
||||
Tel: 111-222-333-444<br />
|
||||
Fax: 555-444-333-999</p>
|
||||
Tel: 222-333-444<br />
|
||||
FAX: 222-333-444<br /> </p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user