diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor index 7e3004fb..650eaee6 100644 --- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor +++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Dashboard +@namespace Oqtane.Modules.Admin.Dashboard @inherits ModuleBase @inject IPageService PageService @inject IUserService UserService @@ -11,7 +11,7 @@ string url = NavigateUrl(p.Path);
-

@p.Name +

@p.Name
} diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index 72bc3c6f..2a253ed1 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -157,7 +157,7 @@ - + diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 7cd500a6..4a99881c 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -168,7 +168,7 @@ - + diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor index 73723fa5..43d6e0af 100644 --- a/Oqtane.Client/Modules/Controls/ActionDialog.razor +++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor @@ -94,7 +94,11 @@ if (!string.IsNullOrEmpty(IconName)) { - _iconSpan = $" "; + if (!IconName.Contains(" ")) + { + IconName = "oi oi-" + IconName; + } + _iconSpan = $" "; } Text = Localize(nameof(Text), Text); diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor index 1ba9ef12..cf2cd1df 100644 --- a/Oqtane.Client/Modules/Controls/ActionLink.razor +++ b/Oqtane.Client/Modules/Controls/ActionLink.razor @@ -91,7 +91,11 @@ if (!string.IsNullOrEmpty(IconName)) { - _iconSpan = $"{(IconOnly ? "" : " ")}"; + if (!IconName.Contains(" ")) + { + IconName = "oi oi-" + IconName; + } + _iconSpan = $"{(IconOnly ? "" : " ")}"; } diff --git a/Oqtane.Client/Themes/Controls/MenuHorizontal.razor b/Oqtane.Client/Themes/Controls/MenuHorizontal.razor index 4400ad71..575a513b 100644 --- a/Oqtane.Client/Themes/Controls/MenuHorizontal.razor +++ b/Oqtane.Client/Themes/Controls/MenuHorizontal.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Themes.Controls +@namespace Oqtane.Themes.Controls @inherits MenuBase @if (MenuPages.Any()) @@ -19,7 +19,7 @@ @if (p.Icon != string.Empty) { - + } @p.Name(current) @@ -31,7 +31,7 @@ @if (p.Icon != string.Empty) { - + } @p.Name diff --git a/Oqtane.Client/Themes/Controls/MenuVertical.razor b/Oqtane.Client/Themes/Controls/MenuVertical.razor index a269df15..79b20589 100644 --- a/Oqtane.Client/Themes/Controls/MenuVertical.razor +++ b/Oqtane.Client/Themes/Controls/MenuVertical.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Themes.Controls +@namespace Oqtane.Themes.Controls @inherits MenuBase @if (MenuPages.Any()) @@ -22,7 +22,7 @@ } @if (p.Icon != string.Empty) { - + } @p.Name diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor index 6373a11d..dbc8c15b 100644 --- a/Oqtane.Client/Themes/Controls/ModuleActions.razor +++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Themes.Controls +@namespace Oqtane.Themes.Controls @inherits ModuleActionsBase @attribute [OqtaneIgnore] @@ -22,7 +22,7 @@ } else { - + }   @action.Name diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs index 688a1b25..3dd8ab3f 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs @@ -39,7 +39,7 @@ namespace Oqtane.SiteTemplates Name = "Home", Parent = "", Path = "", - Icon = "home", + Icon = "oi oi-home", IsNavigation = true, IsPersonalizable = false, PagePermissions = new List { @@ -85,7 +85,7 @@ namespace Oqtane.SiteTemplates Name = "Private", Parent = "", Path = "private", - Icon = "lock-locked", + Icon = "oi oi-lock-locked", IsNavigation = true, IsPersonalizable = false, PagePermissions = new List { @@ -109,7 +109,7 @@ namespace Oqtane.SiteTemplates Name = "My Page", Parent = "", Path = "mypage", - Icon = "target", + Icon = "oi oi-target", IsNavigation = true, IsPersonalizable = true, PagePermissions = new List { diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs index 408fa3fe..e37cbbcb 100644 --- a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs +++ b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs @@ -1,4 +1,4 @@ -using Oqtane.Models; +using Oqtane.Models; using Oqtane.Infrastructure; using System.Collections.Generic; using Oqtane.Extensions; @@ -27,7 +27,7 @@ namespace Oqtane.SiteTemplates Name = "Home", Parent = "", Path = "", - Icon = "home", + Icon = "oi oi-home", IsNavigation = true, IsPersonalizable = false, PagePermissions = new List { diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 9053bea7..699eccf8 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -26,6 +26,7 @@ + @@ -60,6 +61,9 @@ + + + diff --git a/Oqtane.Server/Scripts/Tenant.02.00.01.01.sql b/Oqtane.Server/Scripts/Tenant.02.00.01.01.sql new file mode 100644 index 00000000..149728be --- /dev/null +++ b/Oqtane.Server/Scripts/Tenant.02.00.01.01.sql @@ -0,0 +1,9 @@ +/* + +Version 2.0.1 Tenant migration script + +*/ + +UPDATE [dbo].[Page] SET Icon = IIF(Icon <> '', 'oi oi-' + Icon, ''); +GO + diff --git a/Oqtane.Shared/Shared/Icons.cs b/Oqtane.Shared/Shared/Icons.cs index 586d0bae..521c3c12 100644 --- a/Oqtane.Shared/Shared/Icons.cs +++ b/Oqtane.Shared/Shared/Icons.cs @@ -1,9 +1,9 @@ -namespace Oqtane.Shared +namespace Oqtane.Shared { //Open Iconic icons set public static class Icons { - private const string Prefix = ""; //oi- + private const string Prefix = "oi oi-"; public const string AccountLogin = Prefix + "account-login"; public const string AccountLogout = Prefix + "account-logout"; public const string ActionRedo = Prefix + "action-redo";