Browse Source
Merge pull request #11444 from abpframework/auto-merge/rel-5-1/840
pull/11446/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
11 additions and
11 deletions
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LanguageSwitch.razor
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/Branding.razor
-
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/Index.razor
-
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
|
|
@ -30,7 +30,7 @@ |
|
|
CultureInfo.CurrentCulture.Name, |
|
|
CultureInfo.CurrentCulture.Name, |
|
|
CultureInfo.CurrentUICulture.Name |
|
|
CultureInfo.CurrentUICulture.Name |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
if (currentLanguage == null) |
|
|
if (currentLanguage == null) |
|
|
{ |
|
|
{ |
|
|
var localizationOptions = await RequestLocalizationOptionsProvider.GetLocalizationOptionsAsync(); |
|
|
var localizationOptions = await RequestLocalizationOptionsProvider.GetLocalizationOptionsAsync(); |
|
|
@ -56,10 +56,10 @@ |
|
|
|
|
|
|
|
|
private void ChangeLanguage(LanguageInfo language) |
|
|
private void ChangeLanguage(LanguageInfo language) |
|
|
{ |
|
|
{ |
|
|
var relativeUrl = NavigationManager.Uri.RemovePreFix(NavigationManager.BaseUri).EnsureStartsWith('/'); |
|
|
var relativeUrl = NavigationManager.Uri.RemovePreFix(NavigationManager.BaseUri).EnsureStartsWith('/').EnsureStartsWith('~'); |
|
|
|
|
|
|
|
|
NavigationManager.NavigateTo( |
|
|
NavigationManager.NavigateTo( |
|
|
$"/Abp/Languages/Switch?culture={language.CultureName}&uiCulture={language.UiCultureName}&returnUrl={relativeUrl}", |
|
|
$"Abp/Languages/Switch?culture={language.CultureName}&uiCulture={language.UiCultureName}&returnUrl={relativeUrl}", |
|
|
forceLoad: true |
|
|
forceLoad: true |
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
@ -26,13 +26,13 @@ |
|
|
{ |
|
|
{ |
|
|
@foreach (var menuItem in Menu.Items) |
|
|
@foreach (var menuItem in Menu.Items) |
|
|
{ |
|
|
{ |
|
|
<a class="dropdown-item" href="@menuItem.Url?.TrimStart('~')" target="@menuItem.Target">@menuItem.DisplayName</a> |
|
|
<a class="dropdown-item" href="@menuItem.Url?.TrimStart('/', '~')" target="@menuItem.Target">@menuItem.DisplayName</a> |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
</DropdownMenu> |
|
|
</DropdownMenu> |
|
|
</Dropdown> |
|
|
</Dropdown> |
|
|
</Authorized> |
|
|
</Authorized> |
|
|
<NotAuthorized> |
|
|
<NotAuthorized> |
|
|
<a class="nav-link" href="/Account/Login">@L["Login"]</a> |
|
|
<a class="nav-link" href="Account/Login">@L["Login"]</a> |
|
|
</NotAuthorized> |
|
|
</NotAuthorized> |
|
|
</AuthorizeView> |
|
|
</AuthorizeView> |
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
<a class="navbar-brand" href=""> |
|
|
<a class="navbar-brand" href=""> |
|
|
@if (!BrandingProvider.LogoUrl.IsNullOrWhiteSpace()) |
|
|
@if (!BrandingProvider.LogoUrl.IsNullOrWhiteSpace()) |
|
|
{ |
|
|
{ |
|
|
<img src="@BrandingProvider.LogoUrl" alt="@BrandingProvider.AppName" > |
|
|
<img src="@BrandingProvider.LogoUrl.TrimStart('/', '~')" alt="@BrandingProvider.AppName"> |
|
|
} |
|
|
} |
|
|
@BrandingProvider.AppName |
|
|
@BrandingProvider.AppName |
|
|
</a> |
|
|
</a> |
|
|
|
|
|
@ -12,10 +12,10 @@ |
|
|
<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> |
|
|
|
|
|
|
|
|
@if (!CurrentUser.IsAuthenticated) |
|
|
@if (!CurrentUser.IsAuthenticated) |
|
|
{ |
|
|
{ |
|
|
<a class="btn btn-primary" href="/Account/Login" ><i class="fa fa-sign-in"></i> @L["Login"]</a> |
|
|
<a class="btn btn-primary" href="Account/Login" ><i class="fa fa-sign-in"></i> @L["Login"]</a> |
|
|
} |
|
|
} |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
@ -16,7 +16,7 @@ |
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
|
|
<title>MyCompanyName.MyProjectName.Blazor.Server</title> |
|
|
<title>MyCompanyName.MyProjectName.Blazor.Server</title> |
|
|
<base href="~/" /> |
|
|
<base href="~/" /> |
|
|
|
|
|
|
|
|
<abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" /> |
|
|
<abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" /> |
|
|
</head> |
|
|
</head> |
|
|
<body class="abp-application-layout bg-light @rtl"> |
|
|
<body class="abp-application-layout bg-light @rtl"> |
|
|
|
