lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#17255: Adding a DisplayName property to fields

Browse Source 
Work Item: 17255

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-12-06 10:44:39 -08:00
parent d695e681f3
commit 8d578fb59e
18 changed files with 395 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Web/Core/Common/Views/Fields.Common.Text.cshtml
View File

@@ -1,8 +1,7 @@
@using Orchard.Utility.Extensions;
@{
string name = Model.Name;
@{
string name = Model.Field.DisplayName;
string value = Model.Value;
}
@if (HasText(name) && HasText(value)) {
<p class="text-field"><span class="name">@name.CamelFriendly():</span> <span class="value">@value</span></p>
<p class="text-field"><span class="name">@name:</span> <span class="value">@value</span></p>
}

19
src/Orchard.Web/Core/Routable/Services/RoutableService.cs
View File

@@ -1,14 +1,13 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.Core.Common.Models;
using Orchard.Core.Routable.Events;
using Orchard.Core.Routable.Models;
using Orchard.Utility.Extensions;
namespace Orchard.Core.Routable.Services {
public class RoutableService : IRoutableService {
@@ -51,20 +50,6 @@ namespace Orchard.Core.Routable.Services {
}
}
public static string RemoveDiacritics(string slug) {
string stFormD = slug.Normalize(NormalizationForm.FormD);
var sb = new StringBuilder();
foreach (char t in stFormD) {
UnicodeCategory uc = CharUnicodeInfo.GetUnicodeCategory(t);
if (uc != UnicodeCategory.NonSpacingMark) {
sb.Append(t);
}
}
return (sb.ToString().Normalize(NormalizationForm.FormC));
}
public void FillSlugFromTitle<TModel>(TModel model) where TModel : IRoutableAspect {
if ((model.Slug != null && !string.IsNullOrEmpty(model.Slug.Trim())) || string.IsNullOrEmpty(model.Title))
return;
@@ -84,7 +69,7 @@ namespace Orchard.Core.Routable.Services {
slugContext.Slug = slugContext.Slug.Substring(0, 1000);
// dots are not allowed at the begin and the end of routes
slugContext.Slug = RemoveDiacritics(slugContext.Slug.Trim('.').ToLower());
slugContext.Slug = StringExtensions.RemoveDiacritics(slugContext.Slug.Trim('.').ToLower());
}
foreach (ISlugEventHandler slugEventHandler in _slugEventHandlers) {