Browse Source

Fix setting management dependency problem and top menu items.

pull/8074/head
Halil İbrahim Kalkan 6 years ago
parent
commit
c06e4edb22
  1. 18
      framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
  2. 3
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs
  3. 3
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj

18
framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor

@ -12,12 +12,11 @@
<a class="dropdown-item @cssClass @disabled" href="@url" target="@MenuItem.Target" id="@elementId"> <a class="dropdown-item @cssClass @disabled" href="@url" target="@MenuItem.Target" id="@elementId">
@if (MenuItem.Icon != null) @if (MenuItem.Icon != null)
{ {
if (MenuItem.Icon.StartsWith("fa")) <i class="@MenuItem.Icon mr-1"></i>
{
<i class="@MenuItem.Icon"></i>
}
} }
@MenuItem.DisplayName <span>
@MenuItem.DisplayName
</span>
</a> </a>
} }
} }
@ -26,10 +25,11 @@ else
<div class="dropdown-submenu"> <div class="dropdown-submenu">
<a role="button" @onclick="ToggleSubMenu" class="btn dropdown-toggle" data-toggle="dropdown" <a role="button" @onclick="ToggleSubMenu" class="btn dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
<span class="lp-icon"> @if (MenuItem.Icon != null)
<i class="@(MenuItem.Icon ?? "")"></i> {
</span> <i class="@MenuItem.Icon mr-1"></i>
<span class="lp-text"> }
<span>
@MenuItem.DisplayName @MenuItem.DisplayName
</span> </span>
</a> </a>

3
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs

@ -12,8 +12,7 @@ namespace Volo.Abp.SettingManagement.Blazor
[DependsOn( [DependsOn(
typeof(AbpAutoMapperModule), typeof(AbpAutoMapperModule),
typeof(AbpAspNetCoreComponentsWebThemingModule), typeof(AbpAspNetCoreComponentsWebThemingModule),
typeof(AbpSettingManagementDomainSharedModule), typeof(AbpSettingManagementApplicationContractsModule)
typeof(AbpSettingManagementHttpApiClientModule)
)] )]
public class AbpSettingManagementBlazorModule : AbpModule public class AbpSettingManagementBlazorModule : AbpModule
{ {

3
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Volo.Abp.SettingManagement.Blazor.csproj

@ -14,7 +14,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Volo.Abp.SettingManagement.HttpApi.Client\Volo.Abp.SettingManagement.HttpApi.Client.csproj" /> <ProjectReference Include="..\Volo.Abp.SettingManagement.Application.Contracts\Volo.Abp.SettingManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\Volo.Abp.SettingManagement.Domain.Shared\Volo.Abp.SettingManagement.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

Loading…
Cancel
Save