Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow to display icon for CustomSettings #13613

Merged
merged 3 commits into from
May 2, 2023
Merged

Allow to display icon for CustomSettings #13613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18d2e6f
Allow to display icon for CustomSettings
hishamco Apr 27, 2023
22d4570
Use HtmlClassify()
hishamco Apr 29, 2023
b8c0e52
Remove duplicate extension
hishamco Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.CustomSettings/AdminMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Localization;
using OrchardCore.CustomSettings.Services;
using OrchardCore.Mvc.Utilities;
using OrchardCore.Navigation;

namespace OrchardCore.CustomSettings
Expand Down Expand Up @@ -33,6 +34,8 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
.Add(S["Settings"], settings => settings
.Add(new LocalizedString(type.DisplayName, type.DisplayName), type.DisplayName.PrefixPosition(), layers => layers
.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = type.Name })
.AddClass(type.Name.HtmlClassify())
.Id(type.Name.HtmlClassify())
.Permission(Permissions.CreatePermissionForType(type))
.Resource(type.Name)
.LocalNav()
Expand Down
33 changes: 0 additions & 33 deletions src/OrchardCore/OrchardCore.ContentManagement.Abstractions/Utilities/StringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,39 +69,6 @@ public static string Ellipsize(this string text, int characterCount, string elli
return trimmed + ellipsis;
}

public static string HtmlClassify(this string text)
{
if (string.IsNullOrWhiteSpace(text))
return "";

var friendlier = text.CamelFriendly();

var result = new char[friendlier.Length];

var cursor = 0;
var previousIsNotLetter = false;
for (var i = 0; i < friendlier.Length; i++)
{
char current = friendlier[i];
if (IsLetter(current) || (char.IsDigit(current) && cursor > 0))
{
if (previousIsNotLetter && i != 0 && cursor > 0)
{
result[cursor++] = '-';
}

result[cursor++] = char.ToLowerInvariant(current);
previousIsNotLetter = false;
}
else
{
previousIsNotLetter = true;
}
}

return new string(result, 0, cursor);
}

public static LocalizedString OrDefault(this string text, LocalizedString defaultValue)
{
return string.IsNullOrEmpty(text)
Expand Down