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 #5498 from yw80/1.9.x

Browse Source 
Delete the CamelFriendly function call to DisplayName.
This commit is contained in:
Nicholas Mayne
2015-07-16 15:23:00 +01:00
parent 99e05c8a09 938fd5b827
commit 6bc98bede6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
View File

@@ -59,7 +59,7 @@
<ul class="menu-items-zone">
@foreach (var descriptor in Model.MenuItemDescriptors.OrderBy(x => x.DisplayName)) {
<li>
<div class="menu-item-description"><h2>@T(descriptor.DisplayName.CamelFriendly())</h2>
<div class="menu-item-description"><h2>@T(descriptor.DisplayName)</h2>
@if (!string.IsNullOrWhiteSpace(descriptor.Description)) {
<span class="hint">@T(descriptor.Description)</span>
}

4
src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.Autocomplete.cshtml
View File

@@ -30,7 +30,7 @@
var selectedTerms = Newtonsoft.Json.JsonConvert.SerializeObject(Model.Terms.Where(x => x.IsChecked).Select(x => new { label = x.Name, value = x.Id, levels = 0, disabled = true }));
}
<fieldset class="taxonomy-wrapper" data-name-prefix="@Html.FieldNameFor(m => m)" data-id-prefix="@Html.FieldIdFor(m => m)">
<legend @if(Model.Settings.Required) { <text>class="required"</text> }>@Model.DisplayName.CamelFriendly()</legend>
<legend @if(Model.Settings.Required) { <text>class="required"</text> }>@Model.DisplayName</legend>
@if (Model.Settings.Autocomplete) {
<div class="terms-editor" data-all-terms="@allTerms" data-selected-terms="@selectedTerms" data-allow-new-terms="@Model.Settings.AllowCustomTerms.ToString().ToLower()" data-singlechoice="@Model.Settings.SingleChoice.ToString().ToLower()">
<ul></ul>
@@ -69,7 +69,7 @@
@if (!Model.Terms.Any()) {
<div class="no-terms">
@T("There are no terms defined for {0} yet.", Model.DisplayName.CamelFriendly())
@T("There are no terms defined for {0} yet.", Model.DisplayName)
<a href="@Url.Action("Index", "TermAdmin", new { taxonomyId = Model.TaxonomyId, area = "Orchard.Taxonomies" })">@T("Create some terms")</a>
</div>
}

4
src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml
View File

@@ -14,7 +14,7 @@
}
<fieldset class="taxonomy-wrapper" data-name-prefix="@Html.FieldNameFor(m => m)" data-id-prefix="@Html.FieldIdFor(m => m)">
<legend @if(settings.Required) { <text>class="required"</text> }>@Model.DisplayName.CamelFriendly()</legend>
<legend @if(settings.Required) { <text>class="required"</text> }>@Model.DisplayName</legend>
<div class="expando">
@if (!String.IsNullOrWhiteSpace(Model.Settings.Hint))
@@ -45,7 +45,7 @@
@if (!Model.Terms.Any()) {
<div class="no-terms">
@T("There are no terms defined for {0} yet.", Model.DisplayName.CamelFriendly())
@T("There are no terms defined for {0} yet.", Model.DisplayName)
<a href="@Url.Action("Index", "TermAdmin", new { taxonomyId = Model.TaxonomyId, area = "Orchard.Taxonomies" })">@T("Create some terms")</a>
</div>
}