Skip to content

Commit 9dd1d0f

Browse files
VahidNVahidN
committed
Upgraded to bootstrap 4
1 parent 4c32027 commit 9dd1d0f

Some content is hidden

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

53 files changed

+597
-583
lines changed

‎src/ASPNETCoreIdentitySample.IocConfig/AddIdentityOptionsExtensions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static IServiceCollection AddIdentityOptions(
4545
setApplicationCookieOptions(provider, identityOptionsCookies, siteSettings);
4646
});
4747

48-
services.enableIimmediateLogout();
48+
services.enableImmediateLogout();
4949

5050
return services;
5151
}
@@ -63,7 +63,7 @@ private static void addConfirmEmailDataProtectorTokenOptions(this IServiceCollec
6363
});
6464
}
6565

66-
private static void enableIimmediateLogout(this IServiceCollection services)
66+
private static void enableImmediateLogout(this IServiceCollection services)
6767
{
6868
services.Configure<SecurityStampValidatorOptions>(options =>
6969
{

‎src/ASPNETCoreIdentitySample.IocConfig/IdentityServicesRegistry.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ public static class IdentityServicesRegistry
1515
public static void AddCustomIdentityServices(this IServiceCollection services)
1616
{
1717
var siteSettings = GetSiteSettings(services);
18+
services.AddIdentityOptions(siteSettings);
1819
services.AddCustomServices();
1920
services.AddCustomTicketStore(siteSettings);
2021
services.AddDynamicPermissions();
2122
services.AddCustomDataProtection(siteSettings);
22-
services.AddIdentityOptions(siteSettings);
2323
}
2424

2525
/// <summary>

‎src/ASPNETCoreIdentitySample.MsTests/ASPNETCoreIdentitySample.MsTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323
<ItemGroup>
2424
<PackageReference Include="DNTCommon.Web.Core" Version="1.3.2" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
2626
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
2727
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
2828
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />

‎src/ASPNETCoreIdentitySample.ViewModels/ASPNETCoreIdentitySample.ViewModels.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313
<ItemGroup>
1414
<PackageReference Include="DNTCommon.Web.Core" Version="1.3.2" />
15-
<PackageReference Include="cloudscribe.Web.Pagination" Version="2.1.5" />
15+
<PackageReference Include="cloudscribe.Web.Pagination" Version="2.1.6" />
1616
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.3" />
1717
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.3" />
1818
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />

‎src/ASPNETCoreIdentitySample/Areas/Identity/Views/ChangePassword/Index.cshtml

+16-17
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
ViewData["Title"] = "تغییر کلمه‌ی عبور";
44
}
55

6-
<div class="panel panel-default top30">
7-
<div class="panel-heading">
8-
<h3 class="panel-title">@ViewData["Title"]</h3>
6+
<div class="card mt-5">
7+
<div class="card-header">
8+
<h5 class="card-title">@ViewData["Title"]</h5>
99
</div>
10-
<div class="panel-body">
10+
<div class="card-body">
1111
@if (Model.LastUserPasswordChangeDate.HasValue)
1212
{
1313
<div class="alert alert-warning">
@@ -20,32 +20,31 @@
2020
}
2121
<form asp-controller="ChangePassword"
2222
asp-action="Index"
23-
method="post"
24-
class="form-horizontal">
23+
method="post">
2524
<partial name="_CustomValidationSummary" />
26-
<div class="form-group">
27-
<label asp-for="OldPassword" class="col-md-2 control-label"></label>
25+
<div class="form-group row">
26+
<label asp-for="OldPassword" class="col-md-2 col-form-label text-md-left"></label>
2827
<div class="col-md-10">
29-
<input dir="ltr" asp-for="OldPassword" class="form-control col-md-4" />
28+
<input dir="ltr" asp-for="OldPassword" class="form-control" />
3029
<span asp-validation-for="OldPassword" class="text-danger"></span>
3130
</div>
3231
</div>
33-
<div class="form-group">
34-
<label asp-for="NewPassword" class="col-md-2 control-label"></label>
32+
<div class="form-group row">
33+
<label asp-for="NewPassword" class="col-md-2 col-form-label text-md-left"></label>
3534
<div class="col-md-10">
36-
<input dir="ltr" asp-for="NewPassword" class="form-control col-md-4" />
35+
<input dir="ltr" asp-for="NewPassword" class="form-control" />
3736
<span asp-validation-for="NewPassword" class="text-danger"></span>
3837
</div>
3938
</div>
40-
<div class="form-group">
41-
<label asp-for="ConfirmPassword" class="col-md-2 control-label"></label>
39+
<div class="form-group row">
40+
<label asp-for="ConfirmPassword" class="col-md-2 col-form-label text-md-left"></label>
4241
<div class="col-md-10">
43-
<input dir="ltr" asp-for="ConfirmPassword" class="form-control col-md-4" />
42+
<input dir="ltr" asp-for="ConfirmPassword" class="form-control" />
4443
<span asp-validation-for="ConfirmPassword" class="text-danger"></span>
4544
</div>
4645
</div>
47-
<div class="form-group">
48-
<div class="col-md-offset-2 col-md-10">
46+
<div class="form-group row">
47+
<div class="offset-md-2 col-md-10">
4948
<button type="submit" class="btn btn-info col-md-2">ارسال</button>
5049
</div>
5150
</div>

‎src/ASPNETCoreIdentitySample/Areas/Identity/Views/DynamicRoleClaimsManager/Index.cshtml

+5-6
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727
<input name="RoleId" value="@Model.RoleIncludeRoleClaims.Id" type="hidden" />
2828
@foreach (var controller in Model.SecuredControllerActions.OrderBy(x => x.ControllerDisplayName))
2929
{
30-
<div class="panel panel-default top30">
31-
<div class="panel-heading">
32-
<h3 class="panel-title">
30+
<div class="card mt-5">
31+
<div class="card-header">
32+
<h5 class="card-title">
3333
@{
3434
var displayName = controller.ControllerDisplayName;
3535
if(string.IsNullOrWhiteSpace(displayName))
3636
{
3737
displayName = controller.ToString();
3838
}
3939
}
40-
@displayName</h3>
40+
@displayName</h5>
4141
</div>
42-
<ul class="list-group">
42+
<ul class="list-group list-group-flush">
4343
@foreach (var action in controller.MvcActions.OrderBy(x => x.ActionDisplayName))
4444
{
4545
var isSelected = Model.RoleIncludeRoleClaims.Claims
@@ -58,7 +58,6 @@
5858
</li>
5959
}
6060
</ul>
61-
6261
</div>
6362
}
6463

‎src/ASPNETCoreIdentitySample/Areas/Identity/Views/ForgotPassword/ForgotPasswordConfirmation.cshtml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
ViewData["Title"] = "تائید کلمه‌ی عبور فراموش شده";
33
}
44

5-
<div class="panel panel-default top30">
6-
<div class="panel-heading">
7-
<h3 class="panel-title">@ViewData["Title"]</h3>
5+
<div class="card mt-5">
6+
<div class="card-header">
7+
<h5 class="card-title">@ViewData["Title"]</h5>
88
</div>
9-
<div class="panel-body">
9+
<div class="card-body">
1010
لطفا میل‌باکس خود را جهت بازیابی کلمه‌ی عبور خود بررسی نمائید.
1111
<partial name="_PickupFolder" />
1212
</div>

‎src/ASPNETCoreIdentitySample/Areas/Identity/Views/ForgotPassword/Index.cshtml

+16-15
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,41 @@
33
ViewData["Title"] = "بازیابی کلمه‌ی عبور فراموش شده";
44
}
55

6-
<div class="panel panel-default top30">
7-
<div class="panel-heading">
8-
<h3 class="panel-title">@ViewData["Title"]</h3>
6+
<div class="card mt-5">
7+
<div class="card-header">
8+
<h5 class="card-title">@ViewData["Title"]</h5>
99
</div>
10-
<div class="panel-body">
11-
<form asp-controller="ForgotPassword" asp-action="Index" method="post" class="form-horizontal">
10+
<div class="card-body">
11+
<form asp-controller="ForgotPassword" asp-action="Index" method="post">
1212
<partial name="_CustomValidationSummary" />
13-
<div class="form-group">
14-
<label asp-for="Email" class="col-md-2 control-label"></label>
13+
<div class="form-group row">
14+
<label asp-for="Email" class="col-md-2 col-form-label text-md-left"></label>
1515
<div class="col-md-10">
16-
<input dir="ltr" asp-for="Email" class="form-control col-md-4" />
16+
<input dir="ltr" asp-for="Email" class="form-control" />
1717
<span asp-validation-for="Email" class="text-danger"></span>
1818
</div>
1919
</div>
20-
<div class="form-group">
21-
<label class="col col-md-2 control-label">
20+
<div class="form-group row">
21+
<label class="col-md-2 col-form-label text-md-left">
2222
کد امنیتی
2323
</label>
24-
<div class="controls col col-md-10">
24+
<div class="col col-md-10">
2525
<dnt-captcha asp-captcha-generator-max="9000"
2626
asp-captcha-generator-min="1"
2727
asp-captcha-generator-language="Persian"
2828
asp-font-name="Tahoma"
2929
asp-font-size="20"
30+
asp-refresh-button-class="fas fa-redo btn-sm"
3031
asp-fore-color="#333333"
3132
asp-back-color="#ccc"
32-
asp-text-box-class="text-box single-line form-control col-md-4"
33-
asp-text-box-template="<div class='input-group col-md-4'><span class='input-group-addon'><span class='glyphicon glyphicon-lock'></span></span>{0}</div>"
33+
asp-text-box-class="text-box form-control"
34+
asp-text-box-template="<div class='input-group'><span class='input-group-prepend'><span class='input-group-text'><i class='fas fa-lock'></i></span></span>{0}</div>"
3435
asp-validation-message-class="text-danger"
3536
/>
3637
</div>
3738
</div>
38-
<div class="form-group">
39-
<div class="col-md-offset-2 col-md-10">
39+
<div class="form-group row">
40+
<div class="offset-md-2 col-md-10">
4041
<button type="submit" class="btn btn-info col-md-2">ارسال</button>
4142
</div>
4243
</div>

‎src/ASPNETCoreIdentitySample/Areas/Identity/Views/ForgotPassword/ResetPassword.cshtml

+16-16
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
ViewData["Title"] = "تنظیم مجدد کلمه‌ی عبور";
44
}
55

6-
<div class="panel panel-default top30">
7-
<div class="panel-heading">
8-
<h3 class="panel-title">@ViewData["Title"]</h3>
6+
<div class="card mt-5">
7+
<div class="card-header">
8+
<h5 class="card-title">@ViewData["Title"]</h5>
99
</div>
10-
<div class="panel-body">
11-
<form asp-controller="ForgotPassword" asp-action="ResetPassword" method="post" class="form-horizontal">
10+
<div class="card-body">
11+
<form asp-controller="ForgotPassword" asp-action="ResetPassword" method="post">
1212
<partial name="_CustomValidationSummary" />
1313
<input asp-for="Code" type="hidden" />
14-
<div class="form-group">
15-
<label asp-for="Email" class="col-md-2 control-label"></label>
14+
<div class="form-group row">
15+
<label asp-for="Email" class="col-md-2 col-form-label text-md-left"></label>
1616
<div class="col-md-10">
17-
<input dir="ltr" asp-for="Email" class="form-control col-md-4" />
17+
<input dir="ltr" asp-for="Email" class="form-control" />
1818
<span asp-validation-for="Email" class="text-danger"></span>
1919
</div>
2020
</div>
21-
<div class="form-group">
22-
<label asp-for="Password" class="col-md-2 control-label"></label>
21+
<div class="form-group row">
22+
<label asp-for="Password" class="col-md-2 col-form-label text-md-left"></label>
2323
<div class="col-md-10">
24-
<input dir="ltr" asp-for="Password" class="form-control col-md-4" />
24+
<input dir="ltr" asp-for="Password" class="form-control" />
2525
<span asp-validation-for="Password" class="text-danger"></span>
2626
</div>
2727
</div>
28-
<div class="form-group">
29-
<label asp-for="ConfirmPassword" class="col-md-2 control-label"></label>
28+
<div class="form-group row">
29+
<label asp-for="ConfirmPassword" class="col-md-2 col-form-label text-md-left"></label>
3030
<div class="col-md-10">
31-
<input dir="ltr" asp-for="ConfirmPassword" class="form-control col-md-4" />
31+
<input dir="ltr" asp-for="ConfirmPassword" class="form-control" />
3232
<span asp-validation-for="ConfirmPassword" class="text-danger"></span>
3333
</div>
3434
</div>
35-
<div class="form-group">
36-
<div class="col-md-offset-2 col-md-10">
35+
<div class="form-group row">
36+
<div class="offset-md-2 col-md-10">
3737
<button type="submit" class="btn btn-info col-md-2">ارسال</button>
3838
</div>
3939
</div>

‎src/ASPNETCoreIdentitySample/Areas/Identity/Views/ForgotPassword/ResetPasswordConfirmation.cshtml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
ViewData["Title"] = "تائید تغییر کلمه‌ی عبور";
33
}
44

5-
<div class="panel panel-default top30">
6-
<div class="panel-heading">
7-
<h3 class="panel-title">@ViewData["Title"]</h3>
5+
<div class="card mt-5">
6+
<div class="card-header">
7+
<h5 class="card-title">@ViewData["Title"]</h5>
88
</div>
9-
<div class="panel-body">
9+
<div class="card-body">
1010
کلمه‌ی عبور شما تغییر یافت. لطفا جهت ورود به سیستم <a asp-controller="Login" asp-action="Index">اینجا</a> کلیک کنید.
1111
</div>
1212
</div>

‎src/ASPNETCoreIdentitySample/Areas/Identity/Views/Home/Index.cshtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="panel panel-info">
2-
<div class="panel-heading">
1+
<div class="card card-info">
2+
<div class="card-header">
33
<h4>خوش آمدید!</h4>
44
</div>
55
</div>

0 commit comments

Comments
 (0)