Skip to content

Menu action icons #12418

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

Merged
nathanwoulfe merged 3 commits into from
May 17, 2022
Merged

Menu action icons #12418

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
7778dcf
Fix icon for export member
bjarnef May 17, 2022
cd1d21d
Add missing start summary tag
bjarnef May 17, 2022
fac01ab
Formatting
bjarnef May 17, 2022
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
12 changes: 7 additions & 5 deletions src/Umbraco.Core/Models/Trees/ActionMenuItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Services;
using Umbraco.Extensions;

namespace Umbraco.Cms.Core.Models.Trees
Expand Down Expand Up @@ -27,22 +27,24 @@ public abstract class ActionMenuItem : MenuItem
/// </summary>
public virtual string? AngularServiceMethodName { get; } = null;

protected ActionMenuItem(string alias, string name) : base(alias, name)
protected ActionMenuItem(string alias, string name)
: base(alias, name)
{
Initialize();
}

protected ActionMenuItem(string alias, ILocalizedTextService textService) : base(alias, textService)
protected ActionMenuItem(string alias, ILocalizedTextService textService)
: base(alias, textService)
{
Initialize();
}

private void Initialize()
{
//add the current type to the metadata
// add the current type to the metadata
if (AngularServiceMethodName.IsNullOrWhiteSpace())
{
//if no method name is supplied we will assume that the menu action is the type name of the current menu class
// if no method name is supplied we will assume that the menu action is the type name of the current menu class
ExecuteJsMethod($"{AngularServiceName}.{this.GetType().Name}");
}
else
Expand Down
5 changes: 3 additions & 2 deletions src/Umbraco.Core/Models/Trees/ExportMember.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ public sealed class ExportMember : ActionMenuItem
{
public override string AngularServiceName => "umbracoMenuActions";

public ExportMember(ILocalizedTextService textService) : base("export", textService)
public ExportMember(ILocalizedTextService textService)
: base("export", textService)
{
Icon = "download-alt";
Icon = "icon-download-alt";
UseLegacyIcon = false;
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/Umbraco.Core/Models/Trees/MenuItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public MenuItem(string alias, ILocalizedTextService textService)
{
Alias = alias;
Name = textService.Localize("actions", Alias);
TextDescription = textService.Localize("visuallyHiddenTexts", alias + "_description", Thread.CurrentThread.CurrentUICulture);
TextDescription = textService.Localize("visuallyHiddenTexts", alias + "_description", Thread.CurrentThread.CurrentUICulture);
}

/// <summary>
Expand Down Expand Up @@ -91,6 +91,7 @@ public MenuItem(IAction action, string name = "")
[DataMember(Name = "icon")]
public string Icon { get; set; }

/// <summary>
/// Used in the UI to indicate whether icons should be prefixed with "icon-".
/// If not legacy icon full icon name should be specified.
/// </summary>
Expand Down