Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-23 09:08:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into master-new

Browse Source
This commit is contained in:
kunw 2017-04-06 14:51:27 +08:00
commit 7510a136da
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/docker-compose.tpl
View File

@ -7,7 +7,7 @@ services:
volumes:
- /var/log/harbor/:/var/log/docker/:z
ports:
- 1514:514
- 127.0.0.1:1514:514
networks:
- harbor
registry:

2
src/ui_ng/angular-cli.json
View File

@ -28,8 +28,8 @@
"../node_modules/clarity-icons/clarity-icons.min.js",
"../node_modules/web-animations-js/web-animations.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"source": "environments/environment.ts",
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}

20
src/ui_ng/src/app/shared/gauge/gauge.component.ts
View File

@ -29,7 +29,7 @@ export class GaugeComponent implements AfterViewInit {
private _colorTwo: string;
private _size: string = "small"; //Support small, medium, large
private _title: string = "UNKNOWN"; //Lang key
private _used: number = 0;
private _free: number = 0;
private _threasHold: number = 0;
/**
@ -127,15 +127,19 @@ export class GaugeComponent implements AfterViewInit {
}
@Input()
get used(): number {
return this._used;
get free(): number {
return this._free;
}
set used(u: number) {
this._used = u;
set free(u: number) {
this._free = u;
this.determineColors();
}
get used(): number {
return this._threasHold - this._free;
}
@Input()
get threasHold(): number {
return this._threasHold;
@ -156,7 +160,11 @@ export class GaugeComponent implements AfterViewInit {
private determineColors() {
let percent: number = 0;
if (this._threasHold !== 0) {
percent = (this._used / this._threasHold) * 100;
let used: number = this._threasHold - this._free;
if (used < 0) {
used = 0;
}
percent = (used / this._threasHold) * 100;
}
while (percent > 100) {

2
src/ui_ng/src/app/shared/statictics/statistics-panel.component.html
View File

@ -37,7 +37,7 @@
</div>
<div class="statistic-item-divider" [hidden]="!isValidSession || !isValidStorage"></div>
<div class="statistic-block" [hidden]="!isValidSession || !isValidStorage">
<esxc-gauge [used]="freeStorage" [threasHold]="totalStorage" [size]="small" [title]='"STATISTICS.STORAGE"' [animate]="true">
<esxc-gauge [free]="freeStorage" [threasHold]="totalStorage" [size]="small" [title]='"STATISTICS.STORAGE"' [animate]="true">
</esxc-gauge>
</div>
</div>