Skip to content

Commit 2f8cb55

Browse files
HaoKHaoK
committed
Fix some differences in samples/tets
1 parent d4e8cdd commit 2f8cb55

File tree

4 files changed

+58
-34
lines changed

4 files changed

+58
-34
lines changed

‎src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
ViewData["Title"] = "Profile";
55
}
66

7-
<h4>@ViewData["Title"]</h4>
7+
<h3>@ViewData["Title"]</h3>
88
<partial name="_StatusMessage" for="StatusMessage" />
99
<div class="row">
1010
<div class="col-md-6">
11-
<form method="post">
11+
<form id="profile-form" method="post">
1212
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
1313
<div class="form-group">
1414
<label asp-for="Username"></label>
@@ -27,7 +27,7 @@
2727
<input asp-for="Input.PhoneNumber" class="form-control" />
2828
<span asp-validation-for="Input.PhoneNumber" class="text-danger"></span>
2929
</div>
30-
<button type="submit" class="btn btn-default">Save</button>
30+
<button type="submit" class="btn btn-primary">Save</button>
3131
</form>
3232
</div>
3333
</div>

‎src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<input asp-for="Input.Age" class="form-control" />
3838
<span asp-validation-for="Input.Age" class="text-danger"></span>
3939
</div>
40-
<button type="submit" class="btn btn-default">Register</button>
40+
<button type="submit" class="btn btn-primary">Register</button>
4141
</form>
4242
</div>
4343
</div>

‎src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml‎

Lines changed: 50 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,64 @@
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<title>@ViewData["Title"] - Identity Sample</title>
7-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous" />
8-
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
7+
<environment include="Development">
8+
<link rel="stylesheet" href="~/Identity/lib/bootstrap/dist/css/bootstrap.css" />
9+
<link rel="stylesheet" href="~/Identity/css/site.css" />
10+
</environment>
11+
<environment exclude="Development">
12+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
13+
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"
14+
asp-fallback-href="~/Identity/lib/bootstrap/dist/css/bootstrap.min.css"
15+
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
16+
<link rel="stylesheet" href="~/Identity/css/site.css" asp-append-version="true" />
17+
</environment>
918
</head>
1019
<body>
11-
<div class="navbar navbar-inverse navbar-fixed-top">
12-
<div class="container">
13-
<div class="navbar-header">
14-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
15-
<span class="sr-only">Toggle navigation</span>
16-
<span class="icon-bar"></span>
17-
<span class="icon-bar"></span>
18-
<span class="icon-bar"></span>
19-
</button>
20-
<a asp-controller="Home" asp-action="Index" class="navbar-brand">Identity Sample</a>
21-
</div>
22-
<div class="navbar-collapse collapse">
20+
<header>
21+
<nav class="navbar navbar-expand-sm navbar-light navbar-toggleable-sm bg-white border-bottom box-shadow mb-3">
22+
<div class="container-fluid">
23+
<a class="navbar-brand" href="~/">Identity Sample</a>
24+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
25+
aria-expanded="false" aria-label="Toggle navigation">
26+
<span class="navbar-toggler-icon"></span>
27+
</button>
28+
<div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
2329
<ul class="nav navbar-nav">
24-
<li><a asp-controller="Home" asp-action="Index">Home</a></li>
30+
<li><a asp-controller="Home" asp-action="Index">Identity Sample</a></li>
2531
</ul>
2632
@await Html.PartialAsync("_LoginPartial")
2733
</div>
2834
</div>
29-
</div>
30-
<div class="container body-content">
31-
@RenderBody()
32-
<hr />
33-
<footer>
34-
<p>&copy; 2018 - IdentitySample.DefaultUI</p>
35-
</footer>
36-
</div>
35+
</nav>
36+
</header>
3737

38-
<script src="//ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.4.min.js"></script>
39-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
40-
<script src="~/js/site.js" asp-append-version="true"></script>
38+
<div class="container">
39+
<partial name="_CookieConsentPartial" optional />
40+
<main role="main" class="pb-1">
41+
@RenderBody()
42+
</main>
43+
</div>
44+
<environment include="Development">
45+
<script src="~/Identity/lib/jquery/dist/jquery.js"></script>
46+
<script src="~/Identity/lib/bootstrap/dist/js/bootstrap.bundle.js"></script>
47+
<script src="~/Identity/js/site.js" asp-append-version="true"></script>
48+
</environment>
49+
<environment exclude="Development">
50+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"
51+
asp-fallback-src="~/Identity/lib/jquery/dist/jquery.min.js"
52+
asp-fallback-test="window.jQuery"
53+
crossorigin="anonymous"
54+
integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=">
55+
</script>
56+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
57+
asp-fallback-src="~/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js"
58+
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
59+
crossorigin="anonymous"
60+
integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF">
61+
</script>
62+
<script src="~/Identity/js/site.js" asp-append-version="true"></script>
63+
</environment>
4164

42-
@RenderSection("scripts", required: false)
65+
@await RenderSectionAsync("Scripts", required: false)
4366
</body>
4467
</html>

‎src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
1010
</environment>
1111
<environment exclude="Development">
12-
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
12+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
13+
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"
1314
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
1415
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
1516
</environment>
1617
<link rel="stylesheet" href="~/css/site.css" />
1718
</head>
1819
<body>
1920
<header>
20-
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
21-
<div class="container">
21+
<nav class="navbar navbar-expand-sm navbar-light navbar-toggleable-sm bg-white border-bottom box-shadow mb-3">
22+
<div class="container-fluid">
2223
<a class="navbar-brand" href="~/">Identity.DefaultUI.WebSite</a>
2324
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
2425
aria-expanded="false" aria-label="Toggle navigation">

0 commit comments

Comments
 (0)