huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix layout and login partial issues

This commit is contained in:
Javier Calvarro Nelson 2018-08-21 16:03:38 -07:00
parent 3ed89516ba
commit 110d835434
6 changed files with 99 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
View File

@ -18,7 +18,7 @@
</head> </head>
<body> <body>
<header> <header>
<nav class="mb-3 navbar navbar-expand navbar-light flex-column flex-md-row bg-white border-bottom box-shadow"> <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container"> <div class="container">
<a class="navbar-brand" asp-area="" asp-page="/">Company.WebApplication1</a> <a class="navbar-brand" asp-area="" asp-page="/">Company.WebApplication1</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent" <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
@ -31,7 +31,7 @@
#elseif (WindowsAuth) #elseif (WindowsAuth)
<p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p> <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
#endif*@ #endif*@
<ul class="navbar-nav ml-md-auto"> <ul class="navbar-nav flex-grow-1">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
</li> </li>
@ -51,7 +51,9 @@
</div> </div>
<footer class="border-top footer pl-3 text-muted"> <footer class="border-top footer pl-3 text-muted">
&copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a> <div class="container">
&copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-page="/Privacy">Privacy</a>
</div>
</footer> </footer>
<environment include="Development"> <environment include="Development">

33
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.Identity.cshtml
View File

@ -1,25 +1,26 @@
@using Microsoft.AspNetCore.Identity @using Microsoft.AspNetCore.Identity
@inject SignInManager<IdentityUser> SignInManager @inject SignInManager<IdentityUser> SignInManager
@inject UserManager<IdentityUser> UserManager @inject UserManager<IdentityUser> UserManager
<ul class="navbar-nav">
@if (SignInManager.IsSignedIn(User)) @if (SignInManager.IsSignedIn(User))
{ {
<form asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Page("/Index", new { area = "" })" method="post" id="logoutForm" class="navbar-right"> <li class="nav-item">
<ul class="nav navbar-nav navbar-right"> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Manage/Index" title="Manage">Hello @User.Identity.Name!</a>
<li> </li>
<a asp-area="Identity" asp-page="/Account/Manage/Index" title="Manage">Hello @UserManager.GetUserName(User)!</a> <li class="nav-item">
</li> <form class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Page("/", new { area = "" })">
<li> <button type="submit" class="nav-link btn btn-link text-dark">Logout</button>
<button type="submit" class="btn btn-link navbar-btn navbar-link">Logout</button> </form>
</li> </li>
</ul>
</form>
} }
else else
{ {
<ul class="nav navbar-nav navbar-right"> <li class="nav-item">
<li><a asp-area="Identity" asp-page="/Account/Register">Register</a></li> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Register">Register</a>
<li><a asp-area="Identity" asp-page="/Account/Login">Login</a></li> </li>
</ul> <li class="nav-item">
} <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Login">Login</a>
</li>
}
</ul>

42
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_LoginPartial.OrgAuth.cshtml
View File

@ -9,39 +9,49 @@
#endif *@ #endif *@
<ul class="navbar-nav">
@*#if (IndividualB2CAuth) @*#if (IndividualB2CAuth)
@if (User.Identity.IsAuthenticated) @if (User.Identity.IsAuthenticated)
{ {
<ul class="nav navbar-nav navbar-right">
@if (!string.IsNullOrEmpty(options.EditProfilePolicyId)) @if (!string.IsNullOrEmpty(options.EditProfilePolicyId))
{ {
<li><a asp-area="AzureADB2C" asp-controller="Account" asp-action="EditProfile">Hello @User.Identity.Name!</a></li> <li class="nav-item">
<a class="nav-link text-dark" asp-area="AzureADB2C" asp-controller="Account" asp-action="EditProfile">
<span class="nav-text text-dark">Hello @User.Identity.Name!</span>
</a>
</li>
} }
else else
{ {
<li class="navbar-text">Hello @User.Identity.Name!</li> <li class="nav-item">
<span class="nav-text text-dark">Hello @User.Identity.Name!</span>
</li>
} }
<li><a asp-area="AzureADB2C" asp-controller="Account" asp-action="SignOut">Sign out</a></li> <li class="nav-item">
</ul> <a class="nav-link text-dark" asp-area="AzureADB2C" asp-controller="Account" asp-action="SignOut">Sign out</a>
</li>
} }
else else
{ {
<ul class="nav navbar-nav navbar-right"> <li class="nav-item">
<li><a asp-area="AzureADB2C" asp-controller="Account" asp-action="SignIn">Sign in</a></li> <a class="nav-link text-dark" asp-area="AzureADB2C" asp-controller="Account" asp-action="SignIn">Sign in</a>
</ul> </li>
} }
#else #else
@if (User.Identity.IsAuthenticated) @if (User.Identity.IsAuthenticated)
{ {
<ul class="nav navbar-nav navbar-right"> <li class="nav-item">
<li class="navbar-text">Hello @User.Identity.Name!</li> <span class="nav-text text-dark">Hello @User.Identity.Name!</span>
<li><a asp-area="AzureAD" asp-controller="Account" asp-action="SignOut">Sign out</a></li> </li>
</ul> <li class="nav-item">
<a class="nav-link text-dark" asp-area="AzureAD" asp-controller="Account" asp-action="SignOut">Sign out</a>
</li>
} }
else else
{ {
<ul class="nav navbar-nav navbar-right"> <li class="nav-item">
<li><a asp-area="AzureAD" asp-controller="Account" asp-action="SignIn">Sign in</a></li> <a class="nav-link text-dark" asp-area="AzureAD" asp-controller="Account" asp-action="SignIn">Sign in</a>
</ul> </li>
} }
#endif *@ #endif *@
</ul>

2
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
View File

@ -20,7 +20,7 @@
<header> <header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"> <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container"> <div class="container">
<a class="navbar-brand" href="~/">Company.WebApplication1</a> <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Company.WebApplication1</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent" <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation"> aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>

44
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.Identity.cshtml
View File

@ -1,22 +1,26 @@
@using Microsoft.AspNetCore.Identity
@inject SignInManager<IdentityUser> SignInManager
@inject UserManager<IdentityUser> UserManager
<ul class="navbar-nav"> <ul class="navbar-nav">
@if (User.Identity.IsAuthenticated) @if (SignInManager.IsSignedIn(User))
{ {
<li class="nav-item"> <li class="nav-item">
<a id="manage" class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Manage/Index" title="Manage">Hello @User.Identity.Name!</a> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Manage/Index" title="Manage">Hello @User.Identity.Name!</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<form id="logoutForm" class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Page("/Index", new { area = "" })"> <form class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Action("Index", "Home", new { area = "" })">
<button id="logout" type="submit" class="nav-link btn btn-link text-dark">Logout</button> <button type="submit" class="nav-link btn btn-link text-dark">Logout</button>
</form> </form>
</li> </li>
} }
else else
{ {
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" id="register" asp-area="Identity" asp-page="/Account/Register">Register</a> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Register">Register</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" id="login" asp-area="Identity" asp-page="/Account/Login">Login</a> <a class="nav-link text-dark" asp-area="Identity" asp-page="/Account/Login">Login</a>
</li> </li>
} }
</ul> </ul>

42
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.OrgAuth.cshtml
View File

@ -10,39 +10,49 @@
#endif *@ #endif *@
<ul class="navbar-nav">
@*#if (IndividualB2CAuth) @*#if (IndividualB2CAuth)
@if (User.Identity.IsAuthenticated) @if (User.Identity.IsAuthenticated)
{ {
<ul class="nav navbar-nav navbar-right">
@if (!string.IsNullOrEmpty(options.EditProfilePolicyId)) @if (!string.IsNullOrEmpty(options.EditProfilePolicyId))
{ {
<li><a asp-area="AzureADB2C" asp-controller="Account" asp-action="EditProfile">Hello @User.Identity.Name!</a></li> <li class="nav-item">
<a class="nav-link text-dark" asp-area="AzureADB2C" asp-controller="Account" asp-action="EditProfile">
<span class="nav-text text-dark">Hello @User.Identity.Name!</span>
</a>
</li>
} }
else else
{ {
<li class="navbar-text">Hello @User.Identity.Name!</li> <li class="nav-item">
<span class="nav-text text-dark">Hello @User.Identity.Name!</span>
</li>
} }
<li><a asp-area="AzureADB2C" asp-controller="Account" asp-action="SignOut">Sign out</a></li> <li class="nav-item">
</ul> <a class="nav-link text-dark" asp-area="AzureADB2C" asp-controller="Account" asp-action="SignOut">Sign out</a>
</li>
} }
else else
{ {
<ul class="nav navbar-nav navbar-right"> <li class="nav-item">
<li><a asp-area="AzureADB2C" asp-controller="Account" asp-action="SignIn">Sign in</a></li> <a class="nav-link text-dark" asp-area="AzureADB2C" asp-controller="Account" asp-action="SignIn">Sign in</a>
</ul> </li>
} }
#else #else
@if (User.Identity.IsAuthenticated) @if (User.Identity.IsAuthenticated)
{ {
<ul class="nav navbar-nav navbar-right"> <li class="nav-item">
<li class="navbar-text">Hello @User.Identity.Name!</li> <span class="nav-text text-dark">Hello @User.Identity.Name!</span>
<li><a asp-area="AzureAD" asp-controller="Account" asp-action="SignOut">Sign out</a></li> </li>
</ul> <li class="nav-item">
<a class="nav-link text-dark" asp-area="AzureAD" asp-controller="Account" asp-action="SignOut">Sign out</a>
</li>
} }
else else
{ {
<ul class="nav navbar-nav navbar-right"> <li class="nav-item">
<li><a asp-area="AzureAD" asp-controller="Account" asp-action="SignIn">Sign in</a></li> <a class="nav-link text-dark" asp-area="AzureAD" asp-controller="Account" asp-action="SignIn">Sign in</a>
</ul> </li>
} }
#endif *@ #endif *@
</ul>