Browse Source

Move use of UiMessageAlert to BasicTheme MainLayout

pull/5712/head
Mladen Macanovic 6 years ago
parent
commit
0a125d77e1
  1. 6
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
  2. 2
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
  3. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
  4. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
  5. 1
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs

6
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor

@ -11,12 +11,14 @@
</button> </button>
<div class="collapse navbar-collapse" id="main-navbar-collapse"> <div class="collapse navbar-collapse" id="main-navbar-collapse">
<ul class="navbar-nav mx-auto"> <ul class="navbar-nav mx-auto">
<NavMenu/> <NavMenu />
</ul> </ul>
<NavToolbar/> <NavToolbar />
</div> </div>
</div> </div>
</nav> </nav>
<div class="container"> <div class="container">
@Body @Body
<UiMessageAlert />
</div> </div>

2
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor

@ -8,3 +8,5 @@
@using Volo.Abp.AspNetCore.Components.WebAssembly @using Volo.Abp.AspNetCore.Components.WebAssembly
@using Blazorise @using Blazorise
@using Blazorise.DataGrid @using Blazorise.DataGrid
@using Volo.Abp.BlazoriseUI;
@using Volo.Abp.BlazoriseUI.Components;

2
framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor

@ -9,7 +9,7 @@
<ModalBody> <ModalBody>
@if ( ShowMessageIcon ) @if ( ShowMessageIcon )
{ {
<DisplayHeading Size="DisplayHeadingSize.Is2"> <DisplayHeading Size="DisplayHeadingSize.Is2" Style="text-align:center;">
<Icon Name="@MessageIcon" Style="@MessageIconStyle" /> <Icon Name="@MessageIcon" Style="@MessageIconStyle" />
</DisplayHeading> </DisplayHeading>
} }

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor

@ -3,7 +3,6 @@
@using Volo.Abp.MultiTenancy @using Volo.Abp.MultiTenancy
@using Microsoft.Extensions.Localization @using Microsoft.Extensions.Localization
@using MyCompanyName.MyProjectName.Localization @using MyCompanyName.MyProjectName.Localization
@using Volo.Abp.BlazoriseUI.Components
@inject ICurrentUser CurrentUser @inject ICurrentUser CurrentUser
@inject ICurrentTenant CurrentTenant @inject ICurrentTenant CurrentTenant
@inject AuthenticationStateProvider AuthenticationStateProvider @inject AuthenticationStateProvider AuthenticationStateProvider
@ -37,8 +36,6 @@
</CardBody> </CardBody>
</Card> </Card>
<UiMessageAlert />
<h1>Welcome to the Application</h1> <h1>Welcome to the Application</h1>
<p class="lead px-lg-5 mx-lg-5">@L["LongWelcomeMessage"]</p> <p class="lead px-lg-5 mx-lg-5">@L["LongWelcomeMessage"]</p>

1
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using Blazorise; using Blazorise;

Loading…
Cancel
Save