diff options
Diffstat (limited to 'client/src/app/+admin')
4 files changed, 30 insertions, 44 deletions
diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.html b/client/src/app/+admin/friends/friend-list/friend-list.component.html index 254d0c65e..e15ecde14 100644 --- a/client/src/app/+admin/friends/friend-list/friend-list.component.html +++ b/client/src/app/+admin/friends/friend-list/friend-list.component.html | |||
@@ -2,10 +2,10 @@ | |||
2 | 2 | ||
3 | <ng2-smart-table [settings]="tableSettings" [source]="friendsSource"></ng2-smart-table> | 3 | <ng2-smart-table [settings]="tableSettings" [source]="friendsSource"></ng2-smart-table> |
4 | 4 | ||
5 | <a *ngIf="hasFriends()" class="add-user btn btn-danger pull-left" (click)="quitFriends()"> | 5 | <a *ngIf="hasFriends()" class="btn btn-danger pull-left" (click)="quitFriends()"> |
6 | Quit friends | 6 | Quit friends |
7 | </a> | 7 | </a> |
8 | 8 | ||
9 | <a *ngIf="!hasFriends()" class="add-user btn btn-success pull-right" [routerLink]="['/admin/friends/add']"> | 9 | <a *ngIf="!hasFriends()" class="btn btn-success pull-right" [routerLink]="['/admin/friends/add']"> |
10 | Make friends | 10 | Make friends |
11 | </a> | 11 | </a> |
diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.scss b/client/src/app/+admin/friends/friend-list/friend-list.component.scss index cb597e12b..0a0f621c6 100644 --- a/client/src/app/+admin/friends/friend-list/friend-list.component.scss +++ b/client/src/app/+admin/friends/friend-list/friend-list.component.scss | |||
@@ -1,3 +1,3 @@ | |||
1 | table { | 1 | .btn { |
2 | margin-bottom: 40px; | 2 | margin-top: 10px; |
3 | } | 3 | } |
diff --git a/client/src/app/+admin/requests/request-stats/request-stats.component.html b/client/src/app/+admin/requests/request-stats/request-stats.component.html index ca531258c..f35da6535 100644 --- a/client/src/app/+admin/requests/request-stats/request-stats.component.html +++ b/client/src/app/+admin/requests/request-stats/request-stats.component.html | |||
@@ -1,37 +1,38 @@ | |||
1 | <h3>Requests stats</h3> | 1 | <h3>Requests stats</h3> |
2 | 2 | ||
3 | <div *ngFor="let requestSchedulerName of statsTitles | keys"> | 3 | <div *ngFor="let requestSchedulerName of statsTitles | keys" class="col-lg-4 col-md-12"> |
4 | <div class="block" *ngIf="stats[requestSchedulerName] !== null"> | 4 | <div class="panel panel-default" *ngIf="stats[requestSchedulerName] !== null"> |
5 | <h4>{{ statsTitles[requestSchedulerName] }}</h4> | 5 | <div class="panel-heading">{{ statsTitles[requestSchedulerName] }}</div> |
6 | 6 | ||
7 | <div class="requests-general"> | 7 | <div class="panel-body"> |
8 | <div> | 8 | <div class="requests-general"> |
9 | <span class="label-description">Remaining requests:</span> | 9 | <div> |
10 | {{ stats[requestSchedulerName].totalRequests }} | 10 | <span class="label-description">Remaining requests:</span> |
11 | </div> | 11 | {{ stats[requestSchedulerName].totalRequests }} |
12 | </div> | ||
12 | 13 | ||
13 | <div> | 14 | <div> |
14 | <span class="label-description">Interval seconds between requests:</span> | 15 | <span class="label-description">Interval seconds between requests:</span> |
15 | {{ stats[requestSchedulerName].secondsInterval }} | 16 | {{ stats[requestSchedulerName].secondsInterval }} |
16 | </div> | 17 | </div> |
17 | 18 | ||
18 | <div> | 19 | <div> |
19 | <span class="label-description">Remaining time before the scheduled request:</span> | 20 | <span class="label-description">Remaining time before the scheduled request:</span> |
20 | {{ stats[requestSchedulerName].remainingSeconds }} | 21 | {{ stats[requestSchedulerName].remainingSeconds }} |
22 | </div> | ||
21 | </div> | 23 | </div> |
22 | </div> | ||
23 | 24 | ||
24 | <div class="requests-limit"> | 25 | <div class="requests-limit"> |
25 | <div> | 26 | <div> |
26 | <span class="label-description">Maximum number of different pods for a scheduled request:</span> | 27 | <span class="label-description">Maximum number of different pods for a scheduled request:</span> |
27 | {{ stats[requestSchedulerName].requestsLimitPods }} | 28 | {{ stats[requestSchedulerName].requestsLimitPods }} |
28 | </div> | 29 | </div> |
29 | 30 | ||
30 | <div> | 31 | <div> |
31 | <span class="label-description">Maximum number of requests per pod for a scheduled request:</span> | 32 | <span class="label-description">Maximum number of requests per pod for a scheduled request:</span> |
32 | {{ stats[requestSchedulerName].requestsLimitPerPod }} | 33 | {{ stats[requestSchedulerName].requestsLimitPerPod }} |
34 | </div> | ||
33 | </div> | 35 | </div> |
34 | </div> | 36 | </div> |
35 | |||
36 | </div> | 37 | </div> |
37 | </div> | 38 | </div> |
diff --git a/client/src/app/+admin/requests/request-stats/request-stats.component.scss b/client/src/app/+admin/requests/request-stats/request-stats.component.scss index c9f724604..b2c413259 100644 --- a/client/src/app/+admin/requests/request-stats/request-stats.component.scss +++ b/client/src/app/+admin/requests/request-stats/request-stats.component.scss | |||
@@ -1,23 +1,8 @@ | |||
1 | .block { | ||
2 | margin-bottom: 40px; | ||
3 | } | ||
4 | |||
5 | .label-description { | 1 | .label-description { |
6 | display: inline-block; | ||
7 | font-weight: bold; | 2 | font-weight: bold; |
8 | color: black; | 3 | color: black; |
9 | } | 4 | } |
10 | 5 | ||
11 | .requests-general { | ||
12 | .label-description { | ||
13 | width: 320px; | ||
14 | } | ||
15 | } | ||
16 | |||
17 | .requests-limit { | 6 | .requests-limit { |
18 | margin-top: 20px; | 7 | margin-top: 20px; |
19 | |||
20 | .label-description { | ||
21 | width: 430px; | ||
22 | } | ||
23 | } | 8 | } |