Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
{
<div>
<p>
There are no external authentication services configured. See <a href="https://go.microsoft.com/fwlink/?LinkID=532715">this article</a>
for details on setting up this ASP.NET application to support logging in via external services.
There are no external authentication services configured. See this <a href="https://go.microsoft.com/fwlink/?LinkID=532715">article
about setting up this ASP.NET application to support logging in via external services</a>.
</p>
</div>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
{
<div>
<p>
There are no external authentication services configured. See <a href="https://go.microsoft.com/fwlink/?LinkID=532715">this article</a>
for details on setting up this ASP.NET application to support logging in via external services.
There are no external authentication services configured. See this <a href="https://go.microsoft.com/fwlink/?LinkID=532715">article
about setting up this ASP.NET application to support logging in via external services</a>.
</p>
</div>
}
Expand Down
4 changes: 4 additions & 0 deletions src/Identity/UI/src/wwwroot/V4/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ a {
border-color: #1861ac;
}

.btn-link.nav-link:focus {
outline: black auto 1px;
}

/* Sticky footer styles
-------------------------------------------------- */
html {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
text-overflow: ellipsis;
}

@media (max-width: 767.98px) {
@media (max-width: 640.98px) {
.top-row:not(.auth) {
display: none;
}
Expand All @@ -45,7 +45,7 @@
}
}

@media (min-width: 768px) {
@media (min-width: 641px) {
.page {
flex-direction: row;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
color: white;
}

@media (min-width: 768px) {
@media (min-width: 641px) {
.navbar-toggler {
display: none;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
text-overflow: ellipsis;
}

@media (max-width: 767.98px) {
@media (max-width: 640.98px) {
.top-row:not(.auth) {
display: none;
}
Expand All @@ -45,7 +45,7 @@
}
}

@media (min-width: 768px) {
@media (min-width: 641px) {
.page {
flex-direction: row;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
color: white;
}

@media (min-width: 768px) {
@media (min-width: 641px) {
.navbar-toggler {
display: none;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,7 @@
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
@*#if (IndividualAuth || OrganizationalAuth)
<partial name="_LoginPartial" />
#elseif (WindowsAuth)
<p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
#endif*@
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
<ul class="navbar-nav flex-grow-1">
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
Expand All @@ -30,6 +25,11 @@
<a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
</li>
</ul>
@*#if (IndividualAuth || OrganizationalAuth)
<partial name="_LoginPartial" />
#elseif (WindowsAuth)
<p class="nav navbar-text">Hello, @User.Identity.Name!</p>
#endif*@
</div>
</div>
</nav>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,7 @@
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
@*#if (IndividualAuth || OrganizationalAuth)
<partial name="_LoginPartial" />
#elseif (WindowsAuth)
<p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
#endif*@
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
<ul class="navbar-nav flex-grow-1">
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
Expand All @@ -30,6 +25,11 @@
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</li>
</ul>
@*#if (IndividualAuth || OrganizationalAuth)
<partial name="_LoginPartial" />
#elseif (WindowsAuth)
<p class="nav navbar-text">Hello, @User.Identity.Name!</p>
#endif*@
</div>
</div>
</nav>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@
<span class="navbar-toggler-icon"></span>
</button>
<div
class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse"
class="navbar-collapse collapse d-sm-inline-flex justify-content-end"
[ngClass]="{ show: isExpanded }"
>
<!--#if (IndividualLocalAuth) -->
<app-login-menu></app-login-menu>
<!--#endif -->
<ul class="navbar-nav flex-grow">
<li
class="nav-item"
Expand All @@ -41,6 +38,9 @@
>
</li>
</ul>
<!--#if (IndividualLocalAuth) -->
<app-login-menu></app-login-menu>
<!--#endif -->
</div>
</div>
</nav>
Expand Down
20 changes: 10 additions & 10 deletions src/ProjectTemplates/test/MvcTemplateTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
Url = PageUrls.ForgotPassword,
Links = new string [] {
PageUrls.HomeUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.HomeUrl,
PageUrls.PrivacyUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.PrivacyUrl
}
},
Expand All @@ -154,10 +154,10 @@ public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
Url = PageUrls.HomeUrl,
Links = new string[] {
PageUrls.HomeUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.HomeUrl,
PageUrls.PrivacyUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.DocsUrl,
PageUrls.PrivacyUrl
}
Expand All @@ -167,10 +167,10 @@ public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
Url = PageUrls.PrivacyFullUrl,
Links = new string[] {
PageUrls.HomeUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.HomeUrl,
PageUrls.PrivacyUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.PrivacyUrl
}
},
Expand All @@ -179,10 +179,10 @@ public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
Url = PageUrls.LoginUrl,
Links = new string[] {
PageUrls.HomeUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.HomeUrl,
PageUrls.PrivacyUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.ForgotPassword,
PageUrls.RegisterUrl,
PageUrls.ResendEmailConfirmation,
Expand All @@ -194,10 +194,10 @@ public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
Url = PageUrls.RegisterUrl,
Links = new string [] {
PageUrls.HomeUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.HomeUrl,
PageUrls.PrivacyUrl,
PageUrls.RegisterUrl,
PageUrls.LoginUrl,
PageUrls.ExternalArticle,
PageUrls.PrivacyUrl
}
Expand Down