diff --git a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx index 5e0cc4986..0e431bd8e 100644 --- a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx +++ b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx @@ -8,7 +8,7 @@
<% Html.Zone("secondary");%>
- "/> + "/>
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Archives.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Archives.ascx index fffbadd17..603ba7a01 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Archives.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Archives.ascx @@ -23,13 +23,13 @@ <% } %> <% } 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 { %> diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx index f0a059e32..cdf969acf 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx @@ -7,7 +7,7 @@ <%@ Import Namespace="Orchard.Blogs.Models"%>
-

<%: Html.Link(s, Url.BlogPostEdit(Model.Item))%>

+

<%: Html.Link(Model.Item.Title, Url.BlogPostEdit(Model.Item))%>

diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx index 42c12be5b..bf4b9d41d 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx @@ -43,7 +43,7 @@

<%: T("Depends on:")%>

<%: 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", "") %> diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx index 3ffb531c2..2c700a65a 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx @@ -15,7 +15,7 @@

<%: module.Description %>

<% } %> diff --git a/src/Orchard/Localization/LocalizedString.cs b/src/Orchard/Localization/LocalizedString.cs index 8197f4219..60e1c85dc 100644 --- a/src/Orchard/Localization/LocalizedString.cs +++ b/src/Orchard/Localization/LocalizedString.cs @@ -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; } } diff --git a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml index 025df4ecb..a1ccc32c1 100644 --- a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml +++ b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml @@ -11,7 +11,7 @@ Orchard.Web Orchard.Web v3.5 - false + true true