Skip to content

Commit 3407114

Browse files
hikalkanhikalkan
committed
Resolved #17 and #2.
1 parent e17db64 commit 3407114

File tree

8 files changed

+73
-53
lines changed

8 files changed

+73
-53
lines changed

‎src/AbpCompanyName.AbpProjectName.Core/Localization/Source/AbpProjectName-tr.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
<text name="Cancel" value="İptal" />
4444
<text name="TenantName_Regex_Description" value="Müşteri adı en az 2 karakter olmalı, bir harfle başlamalı ve harf, rakam, tire ya da alt çizgi ile devam etmelidir." />
4545
<text name="DefaultPasswordIs" value="Varsayılan şifre {0}" />
46-
46+
<text name="CanBeEmptyToLoginAsHost" value="Host olarak giriş yapmak için boş bırakılabilir." />
47+
<text name="Register" value="Kayıt ol" />
48+
<text name="OrLoginWith" value="Ya da şununla giriş yap" />
49+
<text name="WaitingForActivationMessage" value="Hesabınız sistem yöneticisi tarafından etkinleştirilmek için bekliyor." />
50+
<text name="TenantSelection" value="Müşteri seçimi" />
51+
<text name="TenantSelection_Detail" value="Lütfen aşağıdaki müşterilerden birisini seçin." />
52+
4753
</texts>
4854
</localizationDictionary>

‎src/AbpCompanyName.AbpProjectName.Core/Localization/Source/AbpProjectName.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
<text name="Cancel" value="Cancel" />
4444
<text name="TenantName_Regex_Description" value="Tenant name must be at least 2 chars, starts with a letter and continue with letter, number, dash or underscore." />
4545
<text name="DefaultPasswordIs" value="Default password is {0}" />
46+
<text name="CanBeEmptyToLoginAsHost" value="Can be empty to login as host." />
47+
<text name="Register" value="Register" />
48+
<text name="OrLoginWith" value="Or login with" />
49+
<text name="WaitingForActivationMessage" value="Your account is waiting to be activated by system admin." />
50+
<text name="TenantSelection" value="Tenant Selection" />
51+
<text name="TenantSelection_Detail" value="Please select one of the following tenants." />
4652

4753
</texts>
4854
</localizationDictionary>

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Controllers/AccountController.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,11 @@ public virtual async Task<ActionResult> Register(RegisterViewModel model)
213213
}
214214
};
215215

216-
model.UserName = model.EmailAddress;
216+
if (model.UserName.IsNullOrEmpty())
217+
{
218+
model.UserName = model.EmailAddress;
219+
}
220+
217221
model.Password = Users.User.CreateRandomPassword();
218222

219223
if (string.Equals(externalLoginInfo.Email, model.EmailAddress, StringComparison.InvariantCultureIgnoreCase))
@@ -277,8 +281,7 @@ public virtual async Task<ActionResult> Register(RegisterViewModel model)
277281
NameAndSurname = user.Name + " " + user.Surname,
278282
UserName = user.UserName,
279283
EmailAddress = user.EmailAddress,
280-
IsActive = user.IsActive,
281-
IsEmailConfirmationRequired = false
284+
IsActive = user.IsActive
282285
});
283286
}
284287
catch (UserFriendlyException ex)

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Models/Account/RegisterResultViewModel.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,5 @@ public class RegisterResultViewModel
1111
public string NameAndSurname { get; set; }
1212

1313
public bool IsActive { get; set; }
14-
15-
public bool IsEmailConfirmationRequired { get; set; }
1614
}
1715
}

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/Login.cshtml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<div class="well bs-component">
1616
<form id="LoginForm" class="form-horizontal" action="@(Url.Action("Login", "Account"))?returnUrl=@(Model.ReturnUrl)" method="POST">
1717
<fieldset>
18-
<legend>Login</legend>
18+
<legend>@L("LogIn")</legend>
1919

2020
@if (Model.IsMultiTenancyEnabled)
2121
{
2222
<div class="form-group">
2323
<div class="col-lg-12">
2424
<input type="text" class="form-control" id="TenancyName" placeholder="Tenancy name" required maxlength="@AbpCompanyName.AbpProjectName.MultiTenancy.Tenant.MaxTenancyNameLength">
25-
<span class="text-muted">Can be empty to login as host.</span>
25+
<span class="text-muted">@L("CanBeEmptyToLoginAsHost")</span>
2626
</div>
2727
</div>
2828
}
@@ -44,16 +44,16 @@
4444
<label>
4545
<input type="checkbox" id="RememberMeInput">
4646
<span class="ripple"></span>
47-
<span class="check"></span> Remember me
47+
<span class="check"></span> @L("RememberMe")
4848
</label>
4949
</div>
5050
</div>
5151
</div>
5252

5353
<div class="form-group">
5454
<div class="col-lg-12">
55-
<button id="LoginButton" type="submit" class="btn btn-primary"><i class="fa fa-sign-in"></i> Login</button>
56-
<a class="btn btn-success" href="@Url.Action("Register")"><i class="fa fa-sign-in"></i> Register</a>
55+
<button id="LoginButton" type="submit" class="btn btn-primary"><i class="fa fa-sign-in"></i> @L("LogIn")</button>
56+
<a class="btn btn-success" href="@Url.Action("Register")"><i class="fa fa-sign-in"></i> @L("Register")</a>
5757
</div>
5858
</div>
5959
</fieldset>
@@ -65,7 +65,7 @@
6565

6666
@if (loginProviders.Count > 0)
6767
{
68-
<p>Or login with:</p>
68+
<p>@L("OrLoginWith"):</p>
6969

7070
using (Html.BeginForm("ExternalLogin", "Account", method: FormMethod.Post))
7171
{

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/Register.cshtml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@using Abp.Extensions
2-
@model AbpCompanyName.AbpProjectName.WebSpaAngular.Models.Account.RegisterViewModel
1+
@model AbpCompanyName.AbpProjectName.WebSpaAngular.Models.Account.RegisterViewModel
32
@section Styles
43
{
54
<link href="~/Views/Account/Login.css" rel="stylesheet" />
@@ -10,7 +9,7 @@
109
<div class="well bs-component">
1110
<form class="form-horizontal" action="@(Url.Action("Register","Account"))" method="POST">
1211
<fieldset>
13-
<legend>Register</legend>
12+
<legend>@L("Register")</legend>
1413

1514
@if (@ViewBag.ErrorMessage != null)
1615
{
@@ -62,7 +61,7 @@
6261

6362
<div class="form-group">
6463
<div class="col-lg-12">
65-
<button type="submit" id="RegisterButton" class="btn btn-primary"><i class="fa fa-sign-in"></i> Register</button>
64+
<button type="submit" id="RegisterButton" class="btn btn-primary"><i class="fa fa-sign-in"></i> @L("Register")</button>
6665
</div>
6766
</div>
6867
</fieldset>

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/RegisterResult.cshtml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,10 @@
1010
<li><span class="text-muted">@L("EmailAddress"):</span> @Model.EmailAddress</li>
1111
</ul>
1212
<div>
13-
@if (Model.IsEmailConfirmationRequired)
14-
{
15-
<div class="alert alert-warning" role="alert">
16-
A confirmation mail sent to @Model.EmailAddress. Please click link in the email in order to confirm your mail address.
17-
</div>
18-
}
19-
2013
@if (!Model.IsActive)
2114
{
2215
<div class="alert alert-warning" role="alert">
23-
Your account is waiting to be activated by system admin.
16+
@L("WaitingForActivationMessage")
2417
</div>
2518
}
2619
</div>

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/TenantSelection.cshtml‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,52 @@
22
@{
33
ViewBag.Title = "Select Tenant";
44
}
5-
<form action="@Model.Action" method="POST">
5+
@section Styles
6+
{
7+
<link href="~/Views/Account/Login.css" rel="stylesheet" />
8+
}
9+
<div class="container">
10+
<div id="LoginArea" class="row">
11+
<div class="col-lg-12">
12+
<div class="well bs-component">
613

7-
<h3>@L("TenantSelection")</h3>
14+
<form action="@Model.Action" method="POST">
15+
<fieldset>
16+
<legend>@L("TenantSelection")</legend>
817

9-
<p>
10-
@L("TenantSelection_Detail")
11-
</p>
18+
<p>
19+
@L("TenantSelection_Detail")
20+
</p>
1221

13-
<div class="form-group form-md-radios">
14-
<div class="md-radio-list">
15-
@for (int i = 0; i < Model.Tenants.Count; i++)
16-
{
17-
var tenant = Model.Tenants[i];
18-
<div class="md-radio">
19-
@{
20-
string checkAttr = null;
21-
if (i == 0)
22-
{
23-
checkAttr = "checked=\"checked\"";
24-
}
25-
}
26-
<input type="radio" class="md-radiobtn" id="TenancyName_@(tenant.TenancyName)" name="TenancyName" value="@tenant.TenancyName" @checkAttr>
27-
<label for="TenancyName_@(tenant.TenancyName)">
28-
@tenant.Name (@tenant.TenancyName)
29-
</label>
30-
</div>
31-
}
32-
</div>
33-
</div>
22+
<div class="form-group form-md-radios">
23+
<div class="md-radio-list">
24+
@for (int i = 0; i < Model.Tenants.Count; i++)
25+
{
26+
var tenant = Model.Tenants[i];
27+
<div class="md-radio">
28+
@{
29+
string checkAttr = null;
30+
if (i == 0)
31+
{
32+
checkAttr = "checked=\"checked\"";
33+
}
34+
}
35+
<input type="radio" class="md-radiobtn" id="TenancyName_@(tenant.TenancyName)" name="TenancyName" value="@tenant.TenancyName" @checkAttr>
36+
<label for="TenancyName_@(tenant.TenancyName)">
37+
@tenant.Name (@tenant.TenancyName)
38+
</label>
39+
</div>
40+
}
41+
</div>
42+
</div>
3443

35-
<div class="form-actions">
36-
<button type="submit" class="btn btn-success uppercase pull-right">@L("Submit")</button>
44+
<div class="form-actions">
45+
<button type="submit" class="btn btn-success uppercase">@L("LogIn")</button>
46+
</div>
47+
</fieldset>
48+
</form>
49+
50+
</div>
51+
</div>
3752
</div>
38-
</form>
53+
</div>

0 commit comments

Comments
 (0)