Skip to content

Commit 7297d18

Browse files
hikalkanhikalkan
committed
Change tenants view to implement BSB admin theme.
1 parent 6c258bc commit 7297d18

File tree

4 files changed

+67
-35
lines changed

4 files changed

+67
-35
lines changed

‎angular/src/app/tenants/create-tenant-modal.component.html‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<div bsModal #createTenantModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="createUserModal" aria-hidden="true" [config]="{backdrop: 'static'}">
1+
<div bsModal #createTenantModal="bs-modal" class="modal fade" (onShown)="onShown()" tabindex="-1" role="dialog" aria-labelledby="createUserModal" aria-hidden="true" [config]="{backdrop: 'static'}">
22
<div class="modal-dialog">
33

4-
<div class="modal-content">
4+
<div #modalContent class="modal-content">
55

66
<form *ngIf="active" #createTenantForm="ngForm" novalidate (ngSubmit)="save()">
77

@@ -15,28 +15,36 @@ <h4 class="modal-title">
1515
</div>
1616

1717
<div class="modal-body">
18-
<div class="form-group">
19-
<label>{{l("TenancyName")}}</label>
20-
<input class="form-control" type="text" name="TenancyName" [(ngModel)]="tenant.tenancyName" required maxlength="64" minlength="2">
18+
<div class="form-group form-float">
19+
<div class="form-line">
20+
<input class="form-control" type="text" name="TenancyName" [(ngModel)]="tenant.tenancyName" required maxlength="64" minlength="2">
21+
<label class="form-label">{{l("TenancyName")}}</label>
22+
</div>
2123
</div>
22-
<div class="form-group">
23-
<label>{{l("Name")}}</label>
24-
<input type="text" name="Name" class="form-control" [(ngModel)]="tenant.name" required maxlength="128">
24+
<div class="form-group form-float">
25+
<div class="form-line">
26+
<input type="text" name="Name" class="form-control" [(ngModel)]="tenant.name" required maxlength="128">
27+
<label class="form-label">{{l("Name")}}</label>
28+
</div>
2529
</div>
26-
<div class="form-group">
27-
<label>{{l("DatabaseConnectionString")}} ({{l("Optional")}})</label>
28-
<input type="text" name="ConnectionString" class="form-control" [(ngModel)]="tenant.connectionString" maxlength="1024">
30+
<div class="form-group form-float">
31+
<div class="form-line">
32+
<input type="text" name="ConnectionString" class="form-control" [(ngModel)]="tenant.connectionString" maxlength="1024">
33+
<label class="form-label">{{l("DatabaseConnectionString")}} ({{l("Optional")}})</label>
34+
</div>
2935
</div>
30-
<div class="form-group">
31-
<label>{{l("AdminEmailAddress")}}</label>
32-
<input type="email" name="AdminEmailAddress" class="form-control" [(ngModel)]="tenant.adminEmailAddress" required maxlength="256" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$">
36+
<div class="form-group form-float">
37+
<div class="form-line">
38+
<input type="email" name="AdminEmailAddress" class="form-control" [(ngModel)]="tenant.adminEmailAddress" required maxlength="256" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$">
39+
<label class="form-label">{{l("AdminEmailAddress")}}</label>
40+
</div>
3341
</div>
3442
<p>{{l("DefaultPasswordIs","123qwe")}}</p>
3543
</div>
3644

3745
<div class="modal-footer">
3846
<button [disabled]="saving" type="button" class="btn btn-default" (click)="close()">{{l("Cancel")}}</button>
39-
<button type="submit" class="btn btn-primary blue" [disabled]="!createTenantForm.form.valid"><i class="fa fa-save"></i> <span>{{l("Save")}}</span></button>
47+
<button type="submit" class="btn btn-primary blue" [disabled]="!createTenantForm.form.valid">{{l("Save")}}</button>
4048
</div>
4149

4250
</form>

‎angular/src/app/tenants/create-tenant-modal.component.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import * as _ from "lodash";
1313
export class CreateTenantModalComponent extends AppComponentBase {
1414

1515
@ViewChild('createTenantModal') modal: ModalDirective;
16+
@ViewChild('modalContent') modalContent: ElementRef;
1617

1718
@Output() modalSave: EventEmitter<any> = new EventEmitter<any>();
1819

@@ -33,6 +34,10 @@ export class CreateTenantModalComponent extends AppComponentBase {
3334
this.tenant = new CreateTenantInput();
3435
}
3536

37+
onShown(): void {
38+
($ as any).AdminBSB.input.activate($(this.modalContent.nativeElement));
39+
}
40+
3641
save(): void {
3742

3843
this.saving = true;

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

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,42 @@
1-
<div [@routerTransition]>
2-
<h1>{{l("Tenants")}}</h1>
3-
<div class="row">
4-
<div class="col-md-12">
5-
<button data-toggle="modal" class="btn btn-primary pull-right" (click)="createTenant()"><i class="fa fa-plus"></i> {{l("CreateNewTenant")}}</button>
6-
<table class="table">
7-
<thead>
8-
<tr>
9-
<th>{{l("TenancyName")}}</th>
10-
<th>{{l("Name")}}</th>
11-
</tr>
12-
</thead>
13-
<tbody>
14-
<tr *ngFor="let tenant of tenants">
15-
<td>{{tenant.tenancyName}}</td>
16-
<td>{{tenant.name}}</td>
17-
</tr>
18-
</tbody>
19-
</table>
1+
<div class="row clearfix" [@routerTransition]>
2+
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
3+
<div class="card">
4+
<div class="header">
5+
<h2>
6+
{{l("Tenants")}}
7+
</h2>
8+
<ul class="header-dropdown m-r--5">
9+
<li class="dropdown">
10+
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
11+
<i class="material-icons">more_vert</i>
12+
</a>
13+
<ul class="dropdown-menu pull-right">
14+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Action</a></li>
15+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Another action</a></li>
16+
<li><a href="javascript:void(0);" class=" waves-effect waves-block">Something else here</a></li>
17+
</ul>
18+
</li>
19+
</ul>
20+
</div>
21+
<div class="body table-responsive">
22+
<table class="table">
23+
<thead>
24+
<tr>
25+
<th>{{l("TenancyName")}}</th>
26+
<th>{{l("Name")}}</th>
27+
</tr>
28+
</thead>
29+
<tbody>
30+
<tr *ngFor="let tenant of tenants">
31+
<td>{{tenant.tenancyName}}</td>
32+
<td>{{tenant.name}}</td>
33+
</tr>
34+
</tbody>
35+
</table>
36+
<button type="button" data-toggle="modal" class="btn btn-primary btn-circle waves-effect waves-circle waves-float pull-right" (click)="createTenant()">
37+
<i class="material-icons">add</i>
38+
</button>
39+
</div>
2040
</div>
2141
</div>
2242
</div>

‎angular/src/app/users/create-user-modal.component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import { ModalDirective } from 'ngx-bootstrap';
33
import { UserServiceProxy, CreateUserInput } from '@shared/service-proxies/service-proxies';
44
import { AppComponentBase } from '@shared/app-component-base';
5-
import { NgForm } from '@angular/forms';
65

76
import * as _ from "lodash";
87

0 commit comments

Comments
 (0)