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 pull request #5627 from Codinlab/fixes/ContentTypeEncoding

Browse Source 
Fixes 5591 : ContentType's name encoding
This commit is contained in:
Sébastien Ros
2015-08-20 13:03:28 -07:00
parent 83a35f89cf cc70480126
commit 5b42c707b1
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml
View File

@@ -4,9 +4,8 @@
@{ @{
ContentItem contentItem = Model.ContentItem; ContentItem contentItem = Model.ContentItem;
var typeDisplayName = contentItem.TypeDefinition.DisplayName ?? contentItem.ContentType.CamelFriendly(); var typeDisplayName = contentItem.TypeDefinition.DisplayName ?? contentItem.ContentType.CamelFriendly();
var pageTitle = T("New {0}", typeDisplayName);
Layout.Title = (string)pageTitle.Text; Layout.Title = T("New {0}", Html.Raw(typeDisplayName)).Text;
} }
@using (Html.BeginFormAntiForgeryPost(Url.Action("Create", new { ReturnUrl = Request.QueryString["ReturnUrl"] }), FormMethod.Post, new { enctype = "multipart/form-data" })) { @using (Html.BeginFormAntiForgeryPost(Url.Action("Create", new { ReturnUrl = Request.QueryString["ReturnUrl"] }), FormMethod.Post, new { enctype = "multipart/form-data" })) {

6
src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml
View File

@@ -4,13 +4,13 @@
var pageTitle = T("Manage Content"); var pageTitle = T("Manage Content");
var createLinkText = T("Create New Content"); var createLinkText = T("Create New Content");
if (!string.IsNullOrWhiteSpace(typeDisplayName)) { if (!string.IsNullOrWhiteSpace(typeDisplayName)) {
pageTitle = T("Manage {0} Content", typeDisplayName); pageTitle = T("Manage {0} Content", Html.Raw(typeDisplayName));
createLinkText = T("Create New {0}", typeDisplayName); createLinkText = T("Create New {0}", Html.Raw(typeDisplayName));
} }
IEnumerable<string> cultures = Model.Options.Cultures; IEnumerable<string> cultures = Model.Options.Cultures;
Layout.Title = pageTitle; Layout.Title = pageTitle.Text;
} }
<div class="manage"> <div class="manage">

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml
View File

@@ -2,7 +2,7 @@
@{ @{
Style.Require("ContentTypesAdmin"); Style.Require("ContentTypesAdmin");
Script.Require("jQuery"); Script.Require("jQuery");
Layout.Title = T("Edit Content Type - {0}", Model.DisplayName).ToString(); Layout.Title = T("Edit Content Type - {0}", Html.Raw(Model.DisplayName)).Text;
} }
<div class="manage"> <div class="manage">

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml
View File

@@ -3,7 +3,7 @@
@{ @{
Style.Require("ContentTypesAdmin"); Style.Require("ContentTypesAdmin");
Layout.Title = T("Edit Field \"{0}\"", Model.Name).ToString(); Layout.Title = T("Edit Field \"{0}\"", Html.Raw(Model.DisplayName)).ToString();
} }
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml
View File

@@ -9,7 +9,7 @@
<div class="properties"> <div class="properties">
<h3>@Model.DisplayName</h3> @if (!string.IsNullOrWhiteSpace(stereotype)) { <text><span class="stereotype" title="Stereotype">- @stereotype</span></text>} <h3>@Model.DisplayName</h3> @if (!string.IsNullOrWhiteSpace(stereotype)) { <text><span class="stereotype" title="Stereotype">- @stereotype</span></text>}
@if (creatable) { @if (creatable) {
<p class="pageStatus">@Html.ActionLink(T("Create New {0}", Model.DisplayName).Text, "Create", new {area = "Contents", id = Model.Name})</p> <p class="pageStatus">@Html.ActionLink(T("Create New {0}", Html.Raw(Model.DisplayName)).Text, "Create", new {area = "Contents", id = Model.Name})</p>
} }
</div> </div>
<div class="related">@if (creatable) { <div class="related">@if (creatable) {