Skip to content

Commit 2eee287

Browse files
personballpersonball
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3303e11 + 7fd91ac commit 2eee287

File tree

23 files changed

+236
-109
lines changed

23 files changed

+236
-109
lines changed

‎angular/src/account/login/login.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div class="card" id="LoginArea" [@routerTransition]>
22
<div #cardBody class="body">
33
<form #loginForm="ngForm" id="LoginForm" method="post" novalidate (ngSubmit)="login()">
4-
<h4 class="text-center">{{l("LogIn")}}</h4>
4+
<h4 class="text-center">{{ "LogIn" | localize }}</h4>
55

66
<div class="input-group">
77
<span class="input-group-addon">
88
<i class="material-icons">person</i>
99
</span>
1010
<div class="form-line">
11-
<input materialInput [(ngModel)]="loginService.authenticateModel.userNameOrEmailAddress" autoFocus class="form-control" type="text" autocomplete="off" placeholder="{{l('UserNameOrEmail')}}" name="userNameOrEmailAddress" required maxlength="255" />
11+
<input materialInput [(ngModel)]="loginService.authenticateModel.userNameOrEmailAddress" autoFocus class="form-control" type="text" autocomplete="off" placeholder="{{ 'UserNameOrEmail' | localize }}" name="userNameOrEmailAddress" required maxlength="255" />
1212
</div>
1313
</div>
1414

@@ -17,22 +17,22 @@ <h4 class="text-center">{{l("LogIn")}}</h4>
1717
<i class="material-icons">lock</i>
1818
</span>
1919
<div class="form-line">
20-
<input materialInput type="password" [(ngModel)]="loginService.authenticateModel.password" class="form-control" name="password" placeholder="{{l('Password')}}" required maxlength="32">
20+
<input materialInput type="password" [(ngModel)]="loginService.authenticateModel.password" class="form-control" name="password" placeholder="{{ 'Password' | localize }}" required maxlength="32">
2121
</div>
2222
</div>
2323
<div class="row">
2424
<div class="col-xs-8 p-t-5">
2525
<input type="checkbox" [(ngModel)]="loginService.rememberMe" name="rememberMe" id="rememberme" class="filled-in chk-col-pink" value="true">
26-
<label for="rememberme">{{l("RememberMe")}}</label>
26+
<label for="rememberme">{{ "RememberMe" | localize }}</label>
2727
</div>
2828
<div class="col-xs-4">
29-
<button id="LoginButton" class="btn btn-block bg-pink waves-effect" type="submit">{{l("LogIn")}}</button>
29+
<button id="LoginButton" class="btn btn-block bg-pink waves-effect" type="submit">{{ "LogIn" | localize }}</button>
3030
</div>
3131
</div>
3232

3333
<div class="row m-t-15 m-b--20" *ngIf="isSelfRegistrationAllowed">
3434
<div class="col-xs-12">
35-
<a [routerLink]="['../register']">{{l("Register")}}</a>
35+
<a [routerLink]="['../register']">{{ "Register" | localize }}</a>
3636
</div>
3737
</div>
3838
</form>

‎angular/src/account/register/register.component.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
<div class="card" [@routerTransition]>
22
<div #cardBody class="body">
33
<form #registerForm="ngForm" method="post" novalidate (ngSubmit)="save()">
4-
<h4 class="text-center">{{l("Register")}}</h4>
4+
<h4 class="text-center">{{ "Register" | localize }}</h4>
55

66
<div class="form-group form-float">
77
<div class="form-line">
88
<input materialInput class="form-control" autoFocus type="text" [(ngModel)]="model.name" name="Name" required maxlength="32" />
9-
<label class="form-label">{{l('Name')}}</label>
9+
<label class="form-label">{{ 'Name' | localize }}</label>
1010
</div>
1111
</div>
1212

1313
<div class="form-group form-float">
1414
<div class="form-line">
1515
<input materialInput class="form-control" type="text" [(ngModel)]="model.surname" name="Surname" required maxlength="32" />
16-
<label class="form-label">{{l('Surname')}}</label>
16+
<label class="form-label">{{ 'Surname' | localize }}</label>
1717
</div>
1818
</div>
1919

2020
<div class="form-group form-float">
2121
<div class="form-line">
22-
<input materialInput class="form-control" type="email" [(ngModel)]="model.emailAddress" name="EmailAddress" required maxlength="255" pattern="^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$" />
23-
<label class="form-label">{{l('EmailAddress')}}</label>
22+
<input materialInput class="form-control" type="email" [(ngModel)]="model.emailAddress" name="EmailAddress" required maxlength="255" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$" />
23+
<label class="form-label">{{ 'EmailAddress' | localize }}</label>
2424
</div>
2525
</div>
2626

2727
<div class="form-group form-float">
2828
<div class="form-line">
2929
<input materialInput class="form-control" type="text" autocomplete="off" [(ngModel)]="model.userName" name="UserName" required maxlength="32" />
30-
<label class="form-label">{{l('UserName')}}</label>
30+
<label class="form-label">{{ 'UserName' | localize }}</label>
3131
</div>
3232
</div>
3333

3434
<div class="form-group form-float">
3535
<div class="form-line">
3636
<input materialInput class="form-control" type="password" [(ngModel)]="model.password" name="Password" required maxlength="32" />
37-
<label class="form-label">{{l('Password')}}</label>
37+
<label class="form-label">{{ 'Password' | localize }}</label>
3838
</div>
3939
</div>
4040

4141
<div class="form-actions">
42-
<button [disabled]="saving" [routerLink]="['../login']" type="button" class="btn btn-default">{{l("Back")}}</button>
43-
<button type="submit" class="btn btn-success" [disabled]="!registerForm.form.valid">{{l("Submit")}}</button>
42+
<button [disabled]="saving" [routerLink]="['../login']" type="button" class="btn btn-default">{{ "Back" | localize }}</button>
43+
<button type="submit" class="btn btn-success" [disabled]="!registerForm.form.valid">{{ "Submit" | localize }}</button>
4444
</div>
4545

4646
</form>

‎angular/src/account/tenant/tenant-change-modal.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
<span aria-hidden="true">&times;</span>
1111
</button>
1212
<h4 class="modal-title">
13-
<span>{{l("ChangeTenant")}}</span>
13+
<span>{{ "ChangeTenant" | localize }}</span>
1414
</h4>
1515
</div>
1616

1717
<div class="modal-body">
1818
<div class="form-group form-float">
1919
<div class="form-line">
2020
<input #tenancyNameInput materialInput type="text" name="TenancyName" class="form-control" [ngClass]="{'edited':tenancyName}" [(ngModel)]="tenancyName" maxlength="64">
21-
<label class="form-label">{{l("TenancyName")}}</label>
21+
<label class="form-label">{{ "TenancyName" | localize }}</label>
2222
</div>
2323
</div>
24-
<span class="help-block">{{l("LeaveEmptyToSwitchToHost")}}</span>
24+
<span class="help-block">{{ "LeaveEmptyToSwitchToHost" | localize }}</span>
2525
</div>
2626

2727
<div class="modal-footer">
28-
<button [disabled]="saving" type="button" class="btn btn-default waves-effect" (click)="close()">{{l("Cancel")}}</button>
29-
<button type="submit" class="btn btn-primary waves-effect" [disabled]="!changeTenantForm.form.valid">{{l("Save")}}</button>
28+
<button [disabled]="saving" type="button" class="btn btn-default waves-effect" (click)="close()">{{ "Cancel" | localize }}</button>
29+
<button type="submit" class="btn btn-primary waves-effect" [disabled]="!changeTenantForm.form.valid">{{ "Save" | localize }}</button>
3030
</div>
3131

3232
</form>

‎angular/src/account/tenant/tenant-change.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div *ngIf="isMultiTenancyEnabled" class="card tenant-change-component" style="margin-bottom: 3px;">
22
<div class="body text-center">
33
<span>
4-
{{l("CurrentTenant")}}: <span *ngIf="tenancyName" title="{{name}}"><strong>{{tenancyName}}</strong></span> <span *ngIf="!tenancyName">{{l("NotSelected")}}</span> (<a href="javascript:void();" (click)="showChangeModal()">{{l("Change")}}</a>)
4+
{{ "CurrentTenant" | localize }}: <span *ngIf="tenancyName" title="{{name}}"><strong>{{tenancyName}}</strong></span> <span *ngIf="!tenancyName">{{ "NotSelected" | localize }}</span> (<a href="javascript:void();" (click)="showChangeModal()">{{ "Change" | localize }}</a>)
55
<tenantChangeModal #tenantChangeModal></tenantChangeModal>
66
</span>
77
</div>

‎angular/src/app/app.module.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { AbpModule } from '@abp/abp.module';
1414

1515
import { ServiceProxyModule } from '@shared/service-proxies/service-proxy.module';
1616
import { SharedModule } from '@shared/shared.module';
17+
import { LocalizePipe } from '@shared/pipes/localize.pipe';
1718

1819
import { HomeComponent } from '@app/home/home.component';
1920
import { AboutComponent } from '@app/about/about.component';
@@ -52,7 +53,8 @@ import { RightSideBarComponent } from '@app/layout/right-sidebar.component';
5253
SideBarUserAreaComponent,
5354
SideBarNavComponent,
5455
SideBarFooterComponent,
55-
RightSideBarComponent
56+
RightSideBarComponent,
57+
LocalizePipe
5658

5759
],
5860
imports: [

‎angular/src/app/layout/sidebar-user-area.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="btn-group user-helper-dropdown">
99
<i class="material-icons" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">keyboard_arrow_down</i>
1010
<ul class="dropdown-menu pull-right">
11-
<li><a (click)="logout()"><i class="material-icons">input</i>{{l('Logout')}}</a></li>
11+
<li><a (click)="logout()"><i class="material-icons">input</i>{{ 'Logout' | localize }}</a></li>
1212
</ul>
1313
</div>
1414
</div>

‎angular/src/app/roles/create-role/create-role.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span aria-hidden="true">&times;</span>
1111
</button>
1212
<h4 class="modal-title">
13-
<span>{{l("CreateNewRole")}}</span>
13+
<span>{{ "CreateNewRole" | localize }}</span>
1414
</h4>
1515
</div>
1616
<div class="modal-body">
@@ -19,7 +19,7 @@ <h4 class="modal-title">
1919
<div class="form-group form-float">
2020
<div class="form-line">
2121
<input id="rolename" type="text" name="RoleName" [(ngModel)]="role.name" required maxlength="32" minlength="2" class="validate form-control">
22-
<label for="rolename" class="form-label">{{l("RoleName")}}</label>
22+
<label for="rolename" class="form-label">{{ "RoleName" | localize }}</label>
2323
</div>
2424
</div>
2525
</div>
@@ -30,7 +30,7 @@ <h4 class="modal-title">
3030
<div class="form-group form-float">
3131
<div class="form-line">
3232
<input id="displayname" type="text" name="DisplayName" [(ngModel)]="role.displayName" required maxlength="32" minlength="2" class="validate form-control">
33-
<label for="displayname" class="form-label">{{l("DisplayName")}}</label>
33+
<label for="displayname" class="form-label">{{ "DisplayName" | localize }}</label>
3434
</div>
3535
</div>
3636
</div>
@@ -62,10 +62,10 @@ <h4>Permissions</h4>
6262

6363
<div class="modal-footer">
6464
<button [disabled]="saving" type="button" class="btn btn-default waves-effect" (click)="close()">
65-
{{l("Cancel")}}
65+
{{ "Cancel" | localize }}
6666
</button>
6767
<button [disabled]="!createRoleForm.form.valid || saving" type="submit" class="btn btn-primary waves-effect">
68-
{{l("Save")}}
68+
{{ "Save" | localize }}
6969
</button>
7070
</div>
7171

‎angular/src/app/roles/edit-role/edit-role.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span aria-hidden="true">&times;</span>
1111
</button>
1212
<h4 class="modal-title">
13-
<span>{{l("EditRole")}} <span *ngIf="model.role.isStatic"> (<span style="color:red">static</span>)</span></span>
13+
<span>{{ "EditRole" | localize }} <span *ngIf="model.role.isStatic"> (<span style="color:red">static</span>)</span></span>
1414
</h4>
1515
</div>
1616
<div class="modal-body">
@@ -20,7 +20,7 @@ <h4 class="modal-title">
2020
<div class="form-group form-float">
2121
<div class="form-line">
2222
<input id="rolename" [disabled]="model.role.isStatic" type="text" name="RoleName" [(ngModel)]="model.role.name" required maxlength="32" minlength="2" class="validate form-control">
23-
<label for="rolename" class="form-label">{{l("RoleName")}}</label>
23+
<label for="rolename" class="form-label">{{ "RoleName" | localize }}</label>
2424
</div>
2525
</div>
2626
</div>
@@ -31,7 +31,7 @@ <h4 class="modal-title">
3131
<div class="form-group form-float">
3232
<div class="form-line">
3333
<input id="displayname" type="text" name="DisplayName" [(ngModel)]="model.role.displayName" required maxlength="32" minlength="2" class="validate form-control">
34-
<label for="displayname" class="form-label">{{l("DisplayName")}}</label>
34+
<label for="displayname" class="form-label">{{ "DisplayName" | localize }}</label>
3535
</div>
3636
</div>
3737
</div>
@@ -64,10 +64,10 @@ <h4>Permissions</h4>
6464
</div>
6565
<div class="modal-footer">
6666
<button [disabled]="saving" type="button" class="btn btn-default waves-effect" (click)="close()">
67-
{{l("Cancel")}}
67+
{{ "Cancel" | localize }}
6868
</button>
6969
<button [disabled]="!editRoleForm.form.valid || saving" type="submit" class="btn btn-primary waves-effect">
70-
{{l("Save")}}
70+
{{ "Save" | localize }}
7171
</button>
7272
</div>
7373

‎angular/src/app/roles/roles.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="card main-content">
44
<div class="header">
55
<h2>
6-
{{l('Roles')}}
6+
{{ 'Roles' | localize }}
77
</h2>
88
<ul class="header-dropdown m-r--5">
99
<i class="fa fa-spin fa-spinner" *ngIf="isTableLoading"></i>
@@ -22,9 +22,9 @@ <h2>
2222
<table class="table table-hover table-striped">
2323
<thead>
2424
<tr>
25-
<th>{{l('RoleName')}}</th>
26-
<th>{{l('DisplayName')}}</th>
27-
<th>{{l('Actions')}}</th>
25+
<th>{{ 'RoleName' | localize }}</th>
26+
<th>{{ 'DisplayName' | localize }}</th>
27+
<th>{{ 'Actions' | localize }}</th>
2828
</tr>
2929
</thead>
3030
<tbody>
@@ -45,7 +45,7 @@ <h2>
4545
</table>
4646

4747
<div class="text-align: center;" *ngIf="totalItems > pageSize">
48-
<pagination-controls (pageChange)="getDataPage($event)" id="server"></pagination-controls>
48+
<abp-pagination-controls (pageChange)="getDataPage($event)" id="server"></abp-pagination-controls>
4949
</div>
5050
<button type="button" data-toggle="modal" class="btn btn-primary btn-circle waves-effect waves-circle waves-float pull-right" (click)="createRole()">
5151
<i class="material-icons">add</i>
@@ -56,4 +56,4 @@ <h2>
5656
</div>
5757

5858
<create-role-modal #createRoleModal (modalSave)="refresh()"></create-role-modal>
59-
<edit-role-modal #editRoleModal (modalSave)="refresh()"></edit-role-modal>
59+
<edit-role-modal #editRoleModal (modalSave)="refresh()"></edit-role-modal>

0 commit comments

Comments
 (0)