Skip to content

Commit b45fc40

Browse files
HaoKHaoK
authored
Port of Bootstrap v4 SxS support to 7.0 (#38865)
1 parent 9b049bd commit b45fc40

File tree

120 files changed

+40136
-46
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+40136
-46
lines changed

‎src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
6868
<div>
6969
<p>
70-
@foreach (var provider in Model.ExternalLogins)
70+
@foreach (var provider in Model.ExternalLogins!)
7171
{
7272
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
7373
}

‎src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<header>
88
<h1>@ViewData["Title"]</h1>
99
@{
10-
if (User.Identity.IsAuthenticated)
10+
if (User.Identity!.IsAuthenticated)
1111
{
1212
<form class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Page("/", new { area = "" })" method="post">
1313
<button type="submit" class="nav-link btn btn-link text-dark">Click here to Logout</button>

‎src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@{
22
if (ViewData.TryGetValue("ParentLayout", out var parentLayout))
33
{
4-
Layout = (string)parentLayout;
4+
Layout = (string)parentLayout!;
55
}
66
else
77
{

‎src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<li class="nav-item"><a class="nav-link @ManageNavPages.IndexNavClass(ViewContext)" id="profile" asp-page="./Index" aria-current="@ManageNavPages.IndexAriaCurrent(ViewContext)">Profile</a></li>
33
<li class="nav-item"><a class="nav-link @ManageNavPages.EmailNavClass(ViewContext)" id="email" asp-page="./Email" aria-current="@ManageNavPages.EmailAriaCurrent(ViewContext)">Email</a></li>
44
<li class="nav-item"><a class="nav-link @ManageNavPages.ChangePasswordNavClass(ViewContext)" id="change-password" asp-page="./ChangePassword" aria-current="@ManageNavPages.ChangePasswordAriaCurrent(ViewContext)">Password</a></li>
5-
@if ((bool)ViewData["ManageNav.HasExternalLogins"])
5+
@if ((bool)(ViewData["ManageNav.HasExternalLogins"] ?? false))
66
{
77
<li id="external-logins" class="nav-item"><a id="external-login" class="nav-link @ManageNavPages.ExternalLoginsNavClass(ViewContext)" asp-page="./ExternalLogins" aria-current="@ManageNavPages.ExternalLoginsAriaCurrent(ViewContext)">External logins</a></li>
88
}

‎src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
5050
<div>
5151
<p>
52-
@foreach (var provider in Model.ExternalLogins)
52+
@foreach (var provider in Model.ExternalLogins!)
5353
{
5454
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
5555
}

‎src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Login.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
6868
<div>
6969
<p>
70-
@foreach (var provider in Model.ExternalLogins)
70+
@foreach (var provider in Model.ExternalLogins!)
7171
{
7272
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
7373
}

‎src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Logout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<header>
88
<h1>@ViewData["Title"]</h1>
99
@{
10-
if (User.Identity.IsAuthenticated)
10+
if (User.Identity!.IsAuthenticated)
1111
{
1212
<form class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Page("/", new { area = "" })" method="post">
1313
<button type="submit" class="nav-link btn btn-link text-dark">Click here to Logout</button>

‎src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@{
22
if (ViewData.TryGetValue("ParentLayout", out var parentLayout))
33
{
4-
Layout = (string)parentLayout;
4+
Layout = (string)parentLayout!;
55
}
66
else
77
{

‎src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/_ManageNav.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<li class="nav-item"><a class="nav-link @ManageNavPages.IndexNavClass(ViewContext)" id="profile" asp-page="./Index" aria-current="@ManageNavPages.IndexAriaCurrent(ViewContext)">Profile</a></li>
33
<li class="nav-item"><a class="nav-link @ManageNavPages.EmailNavClass(ViewContext)" id="email" asp-page="./Email" aria-current="@ManageNavPages.EmailAriaCurrent(ViewContext)">Email</a></li>
44
<li class="nav-item"><a class="nav-link @ManageNavPages.ChangePasswordNavClass(ViewContext)" id="change-password" asp-page="./ChangePassword" aria-current="@ManageNavPages.ChangePasswordAriaCurrent(ViewContext)">Password</a></li>
5-
@if ((bool)ViewData["ManageNav.HasExternalLogins"])
5+
@if ((bool)(ViewData["ManageNav.HasExternalLogins"] ?? false))
66
{
77
<li id="external-logins" class="nav-item"><a id="external-login" class="nav-link @ManageNavPages.ExternalLoginsNavClass(ViewContext)" asp-page="./ExternalLogins" aria-current="@ManageNavPages.ExternalLoginsAriaCurrent(ViewContext)">External logins</a></li>
88
}

‎src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Register.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
5050
<div>
5151
<p>
52-
@foreach (var provider in Model.ExternalLogins)
52+
@foreach (var provider in Model.ExternalLogins!)
5353
{
5454
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
5555
}

0 commit comments

Comments
 (0)