lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Erik Porter
2010-03-04 13:11:07 -08:00
parent a1e25ac1d6 7217a5f6f8
commit 64aba896b1
8 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Comments/Models/CommentRecord.cs
View File

@@ -8,7 +8,7 @@ namespace Orchard.Comments.Models {
public virtual string UserName { get; set; }
public virtual string Email { get; set; }
public virtual CommentStatus Status { get; set; }
public virtual DateTime CommentDateUtc { get; set; }
public virtual DateTime? CommentDateUtc { get; set; }
public virtual string CommentText { get; set; }
public virtual int CommentedOn { get; set; }
public virtual int CommentedOnContainer { get; set; }

2
src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.aspx
View File

@@ -83,7 +83,7 @@
<%=Html.Encode(commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText) %><%=_Encoded(" ...") %>
<% } %>
</td>
<td><%=commentEntry.Comment.CommentDateUtc.ToLocalTime() %></td>
<td><%=commentEntry.Comment.CommentDateUtc.GetValueOrDefault().ToLocalTime()) %></td>
<td>
<ul class="actions">
<li class="construct">

2
src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
View File

@@ -67,7 +67,7 @@
<%=Html.Encode(commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText) %><%=_Encoded(" ...") %>
<% } %>
</td>
<td><%=commentEntry.Comment.CommentDateUtc.ToLocalTime() %></td>
<td><%=commentEntry.Comment.CommentDateUtc.GetValueOrDefault().ToLocalTime()) %></td>
<td><%=Html.ActionLink(commentEntry.CommentedOn, "Details", new { id = commentEntry.Comment.CommentedOn }) %></td>
<td>
<ul class="actions">

2
src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx
View File

@@ -6,7 +6,7 @@ foreach (var comment in Model) { %>
<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), "#")%></span>
<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 --%>

30
src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
View File

@@ -17,16 +17,32 @@
<%using (Html.BeginFormAntiForgeryPost()) { %>
<%= Html.ValidationSummary() %>
<div class="primary">
<h2><%=_Encoded("About this media")%></h2>
<fieldset>
<div>
<img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" />
</div>
<fieldset>
<%-- todo: make these real (including markup) --%>
<div>
<label><%=T("Dimensions: <span>500 x 375 pixels</span>")%></label>
<label><%=T("Size: <span>{0}</span>", Model.Size)%></label>
<label><%=T("Added on: <span>{0} by Orchard User</span>", Model.LastUpdated)%></label>
</div>
<div>
<label for="embedPath"><%=_Encoded("Embed:")%></label>
<input id="embedPath" class="textMedium" name="embedPath" type="text" readonly="readonly" value="<%=_Encoded("<img src=\"{0}\" width=\"{1}\" height=\"{2}\" alt=\"{3}\" />", ResolveUrl("~/Media/" + Model.RelativePath + "/" + Model.Name), 500, 375, Model.Caption)%>" />
<span class="hint"><%=_Encoded("Copy this html to add this image to your site.") %></span>
</div>
<div>
<label for="Name"><%=_Encoded("Name")%></label>
<input id="Name" name="Name" type="hidden" value="<%=Html.Encode(Model.Name) %>"/>
<input id="NewName" class="text" name="NewName" type="text" value="<%=Html.Encode(Model.Name) %>"/>
<input id="NewName" class="textMedium" name="NewName" type="text" value="<%=Html.Encode(Model.Name) %>"/>
</div>
<div>
<label for="Caption"><%=_Encoded("Caption")%></label>
<input id="Caption" class="text" name="Caption" type="text" value="<%= Model.Caption %>"/>
<input id="Caption" class="textMedium" name="Caption" type="text" value="<%= Model.Caption %>"/>
<span class="hint"><%=_Encoded("This will be used for the image alt tag.")%></span>
<input type="hidden" id="LastUpdated" name="LastUpdated" value="<%= Model.LastUpdated %>"/>
<input type="hidden" id="Size" name="Size" value="<%= Model.Size %>"/>
@@ -39,11 +55,11 @@
<%--<input type="submit" class="button" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
</fieldset>
</div>
<div class="secondary">
<%--<div class="secondary" style="border:1px solid #ff0000;">
<h2><%=_Encoded("Preview")%></h2>
<div><img src="<%=ResolveUrl("~/Media/" + Html.Encode(Model.RelativePath + "/" + Model.Name))%>" class="previewImage" alt="<%=Html.Encode(Model.Caption) %>" /></div>
<ul>
<%-- todo: make these real (including markup) --%>
<%-- todo: make these real (including markup)
<li><label><%=T("Dimensions: <span>500 x 375 pixels</span>")%></label></li>
<li><label><%=T("Size: <span>{0}</span>", Model.Size)%></label></li>
<li><label><%=T("Added on: <span>{0} by Orchard User</span>", Model.LastUpdated)%></label></li>
@@ -53,6 +69,6 @@
<span class="hint"><%=_Encoded("Copy this html to add this image to your site.") %></p>
</li>
</ul>
</div>
</div>--%>
<% } %>
</div>

1
src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
View File

@@ -41,6 +41,5 @@
</div>
</div>
<%-- End Content --%>
<%Html.Zone("footer");%>
<% Html.Include("Footer"); %>
</div>

2
src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx
View File

@@ -9,7 +9,7 @@ foreach (var comment in Model) { %>
</div>
<div class="commentauthor">
<span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc), "#")%></span>
<span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault()), "#")%></span>
</div>
</li><%

10
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -357,12 +357,12 @@ fieldset.bulk.actions {
}
legend {
font-size:1.6em;
font-weight:600;
font-weight:bold;
}
label {
display: block;
color:#1d1b1b;
color:#4c4c4c;
font-weight:bold;
}
label.forcheckbox {
display:inline;
@@ -425,7 +425,7 @@ fieldset {
border-bottom:1px solid #eaeaea;
padding:1em;
}
.settings fieldset div, .settings .button {
.orchard-media fieldset div, .settings fieldset div, .orchard-media .button, .settings .button {
margin:1em 0 .5em 1em;
}
.settings legend {
@@ -713,8 +713,8 @@ todo: (heskew) pull out into relevant modules where appropriate
}
.previewImage {
border:1px solid #525e50;
height:70%;
width:70%;
height:50%;
width:50%;
}
.themes #main h2 {
margin:1em 0 0 0;