Browse Source
Merge pull request #6030 from abpframework/dev-bar-align
Smaller fixes on top bar item alignment
pull/6035/head
Halil İbrahim Kalkan
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
20 additions and
20 deletions
-
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
-
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
-
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor
|
|
|
@ -5,17 +5,17 @@ |
|
|
|
@inject IJSRuntime JsRuntime |
|
|
|
@if (_otherLanguages != null && _otherLanguages.Any()) |
|
|
|
{ |
|
|
|
<Dropdown> |
|
|
|
<DropdownToggle Color="Color.None"> |
|
|
|
<BarDropdown> |
|
|
|
<BarDropdownToggle> |
|
|
|
@_currentLanguage.DisplayName |
|
|
|
</DropdownToggle> |
|
|
|
<DropdownMenu> |
|
|
|
</BarDropdownToggle> |
|
|
|
<BarDropdownMenu RightAligned="true"> |
|
|
|
@foreach (var language in _otherLanguages) |
|
|
|
{ |
|
|
|
<DropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</DropdownItem> |
|
|
|
<BarDropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</BarDropdownItem> |
|
|
|
} |
|
|
|
</DropdownMenu> |
|
|
|
</Dropdown> |
|
|
|
</BarDropdownMenu> |
|
|
|
</BarDropdown> |
|
|
|
} |
|
|
|
@code { |
|
|
|
private IReadOnlyList<LanguageInfo> _otherLanguages; |
|
|
|
|
|
|
|
@ -7,8 +7,8 @@ |
|
|
|
@inject SignOutSessionStateManager SignOutManager |
|
|
|
<AuthorizeView> |
|
|
|
<Authorized> |
|
|
|
<Dropdown> |
|
|
|
<DropdownToggle Color="Color.None"> |
|
|
|
<BarDropdown> |
|
|
|
<BarDropdownToggle> |
|
|
|
@if (CurrentTenant.Name != null) |
|
|
|
{ |
|
|
|
<span><i>@CurrentTenant.Name</i>\@CurrentUser.UserName</span> |
|
|
|
@ -17,25 +17,25 @@ |
|
|
|
{ |
|
|
|
<span>@CurrentUser.UserName</span> |
|
|
|
} |
|
|
|
</DropdownToggle> |
|
|
|
<DropdownMenu> |
|
|
|
</BarDropdownToggle> |
|
|
|
<BarDropdownMenu RightAligned="true"> |
|
|
|
@if (Menu != null) |
|
|
|
{ |
|
|
|
@foreach (var menuItem in Menu.Items) |
|
|
|
{ |
|
|
|
<DropdownItem Clicked="@(() => NavigateTo(menuItem.Url))">@menuItem.DisplayName</DropdownItem> |
|
|
|
<BarDropdownItem Clicked="@(() => NavigateTo(menuItem.Url))">@menuItem.DisplayName</BarDropdownItem> |
|
|
|
} |
|
|
|
} |
|
|
|
<a class="dropdown-item" href="@ServerAccountUrl"> |
|
|
|
<BarDropdownItem To="@ServerAccountUrl"> |
|
|
|
@UiLocalizer["ManageYourAccount"] |
|
|
|
</a> |
|
|
|
</BarDropdownItem> |
|
|
|
<DropdownDivider /> |
|
|
|
<DropdownItem Clicked="BeginSignOut">Logout</DropdownItem> |
|
|
|
</DropdownMenu> |
|
|
|
</Dropdown> |
|
|
|
<BarDropdownItem Clicked="BeginSignOut">Logout</BarDropdownItem> |
|
|
|
</BarDropdownMenu> |
|
|
|
</BarDropdown> |
|
|
|
</Authorized> |
|
|
|
<NotAuthorized> |
|
|
|
<a class="nav-link" href="authentication/login">Log in</a> |
|
|
|
<BarLink To="authentication/login">Log in</BarLink> |
|
|
|
</NotAuthorized> |
|
|
|
</AuthorizeView> |
|
|
|
@code{ |
|
|
|
|
|
|
|
@ -1,8 +1,8 @@ |
|
|
|
<ul class="navbar-nav"> |
|
|
|
@foreach (var render in ToolbarItemRenders) |
|
|
|
{ |
|
|
|
<li class="nav-item"> |
|
|
|
<BarItem> |
|
|
|
@render |
|
|
|
</li> |
|
|
|
</BarItem> |
|
|
|
} |
|
|
|
</ul> |
|
|
|
|
