Skip to content

Commit 9ee5f3e

Browse files
zhyalezhyale
committed
UI improvement
1 parent 6bc50d1 commit 9ee5f3e

File tree

10 files changed

+72
-29
lines changed

10 files changed

+72
-29
lines changed

‎src/app/app.component.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ mat-icon {
1919
.mat-list-item {
2020
font-size: 12px;
2121
font-family: 'Arial Narrow', Arial, sans-serif;
22-
}
22+
padding-top: 1px;
23+
}

‎src/app/footer/footer.component.css‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
.footer {
1+
.mat-toolbar {
22
font-size: 14px;
3+
height: 36px;
34
font-family: 'Arial Narrow', Arial, sans-serif;
4-
text-align: center;
5+
text-align: center;
56
}
67

7-
.mat-toolbar-row {
8-
background-color: #D5D5D5;
9-
height: 40px;
8+
.footer {
9+
text-align: center;
10+
flex: 1 1 auto;
1011
}

‎src/app/footer/footer.component.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<mat-toolbar>
2-
<mat-toolbar-row>
32
<div class="footer">
43
All Rights Reserved by &copy;JANUSEC
5-
</div>
6-
</mat-toolbar-row>
4+
</div>
75
</mat-toolbar>

‎src/app/frontpage/frontpage.component.css‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
mat-card {
22
margin-top: 5px;
33
background-color: rgb(246, 246, 246);
4+
border-radius: 0;
5+
font-family: Helvetica, Arial, "PingFang SC", "Source Han Serif SC", "Microsoft YaHei";
46
}
57

68
.card-content {
@@ -10,4 +12,12 @@ mat-card {
1012
.card-image {
1113
width: 70%;
1214
margin-left: 15%;
15+
}
16+
17+
.mat-list-item {
18+
font-size: 14px;
19+
}
20+
21+
.mat-nav-list {
22+
display: flex;
1323
}

‎src/app/frontpage/frontpage.component.html‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,13 @@ <h2 i18n="@@product_name">Janusec Application Gateway 0.9.7</h2>
4747
</mat-card-title>
4848
</mat-card-header>
4949
<mat-card-content>
50-
<mat-list>
51-
<mat-list-item>
52-
<a href="https://www.janusec.com" alt="Janusec" target="_blank">https://www.janusec.com</a>
53-
</mat-list-item>
54-
<mat-list-item>
55-
<a href="https://janusec.github.io/documentation/user-agreement/" alt="User Protocol" target="_blank">User Agreement and Privacy Policy</a>
56-
</mat-list-item>
57-
</mat-list>
50+
<mat-nav-list>
51+
<a mat-list-item i18n="@@official_site" href="https://www.janusec.com" target="_blank">Official Site</a>
52+
<a mat-list-item href="https://janusec.github.io" target="_blank">User Guide (English)</a>
53+
<a mat-list-item href="https://janusec.github.io/cn" target="_blank">用户手册（中文）</a>
54+
<a mat-list-item i18n="@@source_code" href="https://github.com/Janusec/janusec" target="_blank">Source Code</a>
55+
<a mat-list-item i18n="@@user_agreement" href="https://janusec.github.io/documentation/user-agreement/" target="_blank">User Agreement</a>
56+
</mat-nav-list>
5857
</mat-card-content>
5958
</mat-card>
6059

‎src/app/login-form/login-form.component.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.submit {
2-
background-color: #F5F5F5;
2+
background-color: #E5E5E5;
33
}

‎src/app/navbar/navbar.component.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
.mat-toolbar {
1010
height: 40px;
1111
padding-left: 1px;
12+
padding-top: 1px;
1213
}
1314

15+
.logo-span {
16+
height: 38px;
17+
}
1418
.logo {
1519
height: 36px;
1620
}

‎src/app/navbar/navbar.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<mat-toolbar color="secondary">
2-
<span>
2+
<span class="logo-span">
33
<a routerLink="/">
44
<img [src]="logoPath" class="logo">
55
</a>

‎src/app/user-detail/user-detail.component.html‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,67 @@
22

33
<h2>
44
<mat-icon>details</mat-icon>
5-
User Details
5+
<span i18n="@@user_details">User Details</span>
66
</h2>
77
<div class="container">
88
<mat-form-field>
9-
<input matInput #username [(ngModel)]="appadmin.username" [readonly]="readOnlyValue"
9+
<input matInput i18n-placeholder="@@username"
10+
#username [(ngModel)]="appadmin.username" [readonly]="readOnlyValue"
1011
placeholder="Username" maxlength="128" required/>
1112
<mat-hint align="end">{{username.value?.length || 0}}/128</mat-hint>
1213
</mat-form-field>
1314

1415
<mat-form-field>
15-
<input matInput type="password" [(ngModel)]="plainpwd" [readonly]="readOnlyValue"
16+
<input matInput i18n-placeholder="@@password"
17+
type="password" [(ngModel)]="plainpwd" [readonly]="readOnlyValue"
1618
placeholder="Password"/>
1719
</mat-form-field>
1820

1921
<mat-form-field>
20-
<input matInput type="password" [(ngModel)]="plainpwd2" [readonly]="readOnlyValue"
22+
<input matInput i18n-placeholder="@@confirm_password"
23+
type="password" [(ngModel)]="plainpwd2" [readonly]="readOnlyValue"
2124
placeholder="Confirm Password"/>
2225
</mat-form-field>
2326

2427
<mat-form-field>
25-
<input matInput #email [(ngModel)]="appadmin.email" [readonly]="readOnlyValue"
28+
<input matInput i18n-placeholder="@@email"
29+
#email [(ngModel)]="appadmin.email" [readonly]="readOnlyValue"
2630
placeholder="Email" maxlength="128" required/>
2731
<mat-hint align="end">{{email.value?.length || 0}}/128</mat-hint>
2832
</mat-form-field>
2933

3034
<section *ngIf="applicationService.auth_user.is_cert_admin==true">
31-
<mat-checkbox [(ngModel)]="appadmin.is_super_admin" [disabled]="readOnlyValue">Authorization Administrator</mat-checkbox>
35+
<mat-checkbox i18n="@@authorization_admin"
36+
[(ngModel)]="appadmin.is_super_admin" [disabled]="readOnlyValue">
37+
Authorization Administrator
38+
</mat-checkbox>
3239
</section>
3340

3441
<section *ngIf="applicationService.auth_user.is_cert_admin==true">
35-
<mat-checkbox [(ngModel)]="appadmin.is_cert_admin" [disabled]="readOnlyValue">Certificate Administrator</mat-checkbox>
42+
<mat-checkbox i18n="@@certificate_admin"
43+
[(ngModel)]="appadmin.is_cert_admin" [disabled]="readOnlyValue">
44+
Certificate Administrator
45+
</mat-checkbox>
3646
</section>
3747

3848
<section *ngIf="applicationService.auth_user.is_cert_admin==true">
39-
<mat-checkbox [(ngModel)]="appadmin.is_app_admin" [disabled]="readOnlyValue">Application Administrator </mat-checkbox>
49+
<mat-checkbox i18n="@@application_admin"
50+
[(ngModel)]="appadmin.is_app_admin" [disabled]="readOnlyValue">
51+
Application Administrator
52+
</mat-checkbox>
4053
</section>
4154

4255
</div>
4356
<div>
44-
<button mat-raised-button [disabled]="readOnlyValue" (click)="onSave()" color="primary">Save</button>
57+
<button mat-raised-button i18n="@@save"
58+
[disabled]="readOnlyValue" (click)="onSave()" color="primary">
59+
Save
60+
</button>
4561
<button mat-raised-button (click)="changeEditable()" color="primary">{{readOnlyButtonText}}</button>
46-
<button mat-raised-button [disabled]="(appadmin.username=='admin' || appadmin.id==0)?true:readOnlyValue" (click)="onDelete()" color="primary">Delete</button>
62+
<button mat-raised-button i18n="@@delete"
63+
[disabled]="(appadmin.username=='admin' || appadmin.id==0)?true:readOnlyValue"
64+
(click)="onDelete()" color="primary">
65+
Delete
66+
</button>
4767
</div>
4868
</div>

‎src/polyfills.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ let zhTranslations = {
7777
'feature_encryped_private_key': '私钥加密',
7878
'feature_oauth': 'OAuth2（企业微信/钉钉/飞书扫码登录应用）',
7979
'support': '支持',
80+
'official_site': 'JANUSEC官方网站',
81+
'source_code': '源代码',
82+
'user_agreement': '用户协议',
8083
// login form
8184
'login_title': '管理登录',
8285
'submit': '提交',
@@ -112,6 +115,13 @@ let zhTranslations = {
112115
'node_notice': '请复制如下node_key到所有从节点config.json文件中：',
113116
// User Management
114117
'add_user': '添加用户',
118+
// User Details
119+
'user_details': '用户详情',
120+
'confirm_password': '确认口令',
121+
'email': '邮箱地址',
122+
'authorization_admin': '授权管理员（授予/撤销用户权限）',
123+
'certificate_admin': '证书管理员（可管理所有证书内容）',
124+
'application_admin': '应用管理员（可管理所有应用）',
115125
// Dash Board
116126
'application': '请选择应用',
117127
'all': '所有',

0 commit comments

Comments
 (0)