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

Fixed issues caught when pre-compiling views. Note that I temporarily added an implicit conversion from LocalizedString to String. This may go away with Louis's pending changes.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Phil Haack
2010-06-10 01:09:13 -07:00
parent 4bd6fbb866
commit 7a53eb488e
10 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx
View File

@@ -8,7 +8,7 @@
<div class="secondary">
<% Html.Zone("secondary");%>
<fieldset>
<input class="button primaryAction" type="submit" name="submit.Save" value="<%=_Encoded("Save") %>"/>
<input class="button primaryAction" type="submit" name="submit.Save" value="<%: T("Save") %>"/>
</fieldset>
</div>
</div>

4
src/Orchard.Web/Modules/Orchard.Blogs/Views/Archives.ascx
View File

@@ -23,13 +23,13 @@
<li class="previous">
<h4><%=year %> <span>(<%=yearMonths.Sum(ym => ym.Value) %>)</span></h4><%
} %>
<%: Html.UnorderedList(yearMonths, (t, i) => Html.Link(string.Format("{0:MMMM} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth(Model.Blog.Slug, t.Key.Year, t.Key.Month)), "archiveMonthList") %>
<%: Html.UnorderedList(yearMonths, (t, i) => Html.Link(string.Format("{0:MMMM} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth(Model.Blog.Slug, t.Key.Year, t.Key.Month)).ToString(), "archiveMonthList") %>
</li><%
} %>
</ul><%
}
else { %>
<%: Html.UnorderedList(Model.Archives, (t, i) => Html.Link(string.Format("{0:MMMM yyyy} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth(Model.Blog.Slug, t.Key.Year, t.Key.Month)), "archiveMonthList") %><%
<%: Html.UnorderedList(Model.Archives, (t, i) => Html.Link(string.Format("{0:MMMM yyyy} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth(Model.Blog.Slug, t.Key.Year, t.Key.Month)).ToString(), "archiveMonthList") %><%
}
}
else { %>

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx
View File

@@ -7,7 +7,7 @@
<%@ Import Namespace="Orchard.Blogs.Models"%>
<div class="summary">
<div class="properties">
<h3><%: Html.Link(s, Url.BlogPostEdit(Model.Item))%></h3>
<h3><%: Html.Link(Model.Item.Title, Url.BlogPostEdit(Model.Item))%></h3>
<ul>
<li><%
if (Model.Item.HasPublished) { %>

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

@@ -7,7 +7,7 @@
<fieldset class="actions bulk">
<label for="publishActions"><%: T("Actions:") %></label>
<select id="publishActions" name="<%=Html.NameOf(m => m.Options.BulkAction)%>">
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, T("Choose action...")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, T("Choose action...").ToString()) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Approve, T("Approve")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Pend, T("Pend")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, T("Mark as Spam")) %>

2
src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx
View File

@@ -40,5 +40,5 @@ Exported as xml</h2>
<% using (Html.BeginFormAntiForgeryPost()) { %>
<%:Html.TextAreaFor(m=>m.ExportText, new{style="width:100%;height:640px;"}) %>
<br />
<input class="button primaryAction" type="submit" value="<%=_Encoded("Merge Changes") %>" />
<input class="button primaryAction" type="submit" value="<%: T("Merge Changes") %>" />
<%} %>

2
src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx
View File

@@ -68,7 +68,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("Save",new {id=Model.SelectedCon
</table>
<p>
<input type="submit" value="<%=_Encoded("Save") %>" />
<input type="submit" value="<%: T("Save") %>" />
</p>
<% } %>
</div>

2
src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
View File

@@ -43,7 +43,7 @@
<h4><%: T("Depends on:")%></h4>
<%: Html.UnorderedList(
feature.Descriptor.Dependencies.OrderBy(s => s),
(s, i) => Html.Link(s, string.Format("#{0}", s.AsFeatureId(n => T(n)))),
(s, i) => Html.Link(s, string.Format("#{0}", s.AsFeatureId(n => T(n)))).ToString(),
"",
"dependency",
"") %>

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

@@ -15,7 +15,7 @@
<p><%: module.Description %></p><%
} %>
<ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;">
<li><%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n))) )).OrderBy(s => s).ToArray())) %></li>
<li><%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n)))).ToString()).OrderBy(s => s).ToArray())) %></li>
<li>&nbsp;&#124;&nbsp;<%: T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? module.Author : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%>
<li>&nbsp;&#124;&nbsp;<%: T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? module.HomePage : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>").ToString())%></li>
</ul>

4
src/Orchard/Localization/LocalizedString.cs
View File

@@ -12,6 +12,10 @@ namespace Orchard.Localization {
return new LocalizedString(x);
}
public static implicit operator string(LocalizedString x) {
return x.ToString();
}
public string Text {
get { return _localized; }
}

2
src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
View File

@@ -11,7 +11,7 @@
<RootNamespace>Orchard.Web</RootNamespace>
<AssemblyName>Orchard.Web</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<MvcBuildViews>true</MvcBuildViews>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>