tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix(identity): change template

pull/1767/head
TheDiaval 7 years ago
parent
7c8d92ae4b
commit
3bef3650f8
4 changed files with 73 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
  2. 35
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  3. 61
      npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
  4. 9
      npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts

23
npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
View File

@ -1,16 +1,17 @@
<div id="identity-roles-wrapper" class="card"> <div class="row entry-row">
<div class="card-header"> <div class="col-auto">
<div class="row"> <h1 class="content-header-title">{{ 'AbpIdentity::Roles' | abpLocalization }}</h1>
<div class="col col-md-6"> </div>
<h5 class="card-title">{{ 'AbpIdentity::Roles' | abpLocalization }}</h5> <div class="col">
</div> <div class="text-lg-right pt-2" id="AbpContentToolbar">
<div class="text-right col col-md-6"> <button id="create-role" class="btn btn-primary" type="button" (click)="onAdd()">
<button id="create-role" class="btn btn-primary" type="button" (click)="onAdd()"> <i class="fa fa-plus mr-1"></i> <span>{{ 'AbpIdentity::NewRole' | abpLocalization }}</span>
<i class="fa fa-plus mr-1"></i> <span>{{ 'AbpIdentity::NewRole' | abpLocalization }}</span> </button>
</button>
</div>
</div> </div>
</div> </div>
</div>
<div id="identity-roles-wrapper" class="card">
<div class="card-body"> <div class="card-body">
<div id="data-tables-table-filter" class="data-tables-filter"> <div id="data-tables-table-filter" class="data-tables-filter">
<label <label

35
npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
View File

@ -1,22 +1,23 @@
<div id="identity-roles-wrapper" class="card"> <div class="row entry-row">
<div class="card-header"> <div class="col-auto">
<div class="row"> <h1 class="content-header-title">{{ 'AbpIdentity::Users' | abpLocalization }}</h1>
<div class="col col-md-6"> </div>
<h5 class="card-title">{{ 'AbpIdentity::Users' | abpLocalization }}</h5> <div class="col">
</div> <div class="text-lg-right pt-2" id="AbpContentToolbar">
<div class="text-right col col-md-6"> <button
<button [abpPermission]="'AbpIdentity.Users.Create'"
[abpPermission]="'AbpIdentity.Users.Create'" id="create-role"
id="create-role" class="btn btn-primary"
class="btn btn-primary" type="button"
type="button" (click)="onAdd()"
(click)="onAdd()" >
> <i class="fa fa-plus mr-1"></i> <span>{{ 'AbpIdentity::NewUser' | abpLocalization }}</span>
<i class="fa fa-plus mr-1"></i> <span>{{ 'AbpIdentity::NewUser' | abpLocalization }}</span> </button>
</button>
</div>
</div> </div>
</div> </div>
</div>
<div id="identity-roles-wrapper" class="card">
<div class="card-body"> <div class="card-body">
<div id="data-tables-table-filter" class="data-tables-filter"> <div id="data-tables-table-filter" class="data-tables-filter">
<label <label

61
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
View File

@ -1,25 +1,24 @@
<div id="wrapper" class="card"> <div class="row entry-row">
<div class="card-header"> <div class="col-auto">
<div class="row"> <h1 class="content-header-title">{{ 'AbpTenantManagement::Tenants' | abpLocalization }}</h1>
<div class="col col-md-6"> </div>
<h5 class="card-title"> <div class="col">
{{ 'AbpTenantManagement::Tenants' | abpLocalization }} <div class="text-lg-right pt-2" id="AbpContentToolbar">
</h5> <button
</div> [abpPermission]="'AbpTenantManagement.Tenants.Create'"
<div class="text-right col col-md-6"> id="create-tenants"
<button class="btn btn-primary"
[abpPermission]="'AbpTenantManagement.Tenants.Create'" type="button"
id="create-tenants" (click)="onAddTenant()"
class="btn btn-primary" >
type="button" <i class="fa fa-plus mr-1"></i>
(click)="onAddTenant()" <span>{{ 'AbpTenantManagement::NewTenant' | abpLocalization }}</span>
> </button>
<i class="fa fa-plus mr-1"></i>
<span>{{ 'AbpTenantManagement::NewTenant' | abpLocalization }}</span>
</button>
</div>
</div> </div>
</div> </div>
</div>
<div id="wrapper" class="card">
<div class="card-body"> <div class="card-body">
<div id="data-tables-table-filter" class="data-tables-filter"> <div id="data-tables-table-filter" class="data-tables-filter">
<label <label
@ -31,25 +30,37 @@
/></label> /></label>
</div> </div>
<p-table <p-table
[value]="data$ | async" [value]="data$ | async | abpSort: sortOrder"
[lazy]="true" [lazy]="true"
[lazyLoadOnInit]="false" [lazyLoadOnInit]="false"
[paginator]="true" [paginator]="true"
[rows]="10" [rows]="10"
[totalRecords]="totalCount$ | async" [totalRecords]="totalCount$ | async"
[loading]="loading" [loading]="loading"
[resizableColumns]="true"
[scrollable]="true"
(onLazyLoad)="onPageChange($event)" (onLazyLoad)="onPageChange($event)"
> >
<ng-template pTemplate="header"> <ng-template pTemplate="colgroup">
<colgroup>
<col *ngFor="let width of [65, 200]" [ngStyle]="{ 'width.px': width }" />
</colgroup>
</ng-template>
<ng-template pTemplate="header" let-columns>
<tr> <tr>
<th>{{ 'AbpTenantManagement::Actions' | abpLocalization }}</th> <th>{{ 'AbpTenantManagement::Actions' | abpLocalization }}</th>
<th>{{ 'AbpTenantManagement::TenantName' | abpLocalization }}</th> <th pResizableColumn (click)="changeSortOrder()">
{{ 'AbpTenantManagement::TenantName' | abpLocalization }}
<span class="float-right"
><i [ngClass]="['fa', sortOrder === 'desc' ? 'fa-sort-desc' : 'fa-sort-asc']"></i
></span>
</th>
</tr> </tr>
</ng-template> </ng-template>
<ng-template pTemplate="body" let-data> <ng-template pTemplate="body" let-data>
<tr> <tr>
<td> <td>
<div ngbDropdown class="d-inline-block"> <div ngbDropdown container="body" class="d-inline-block">
<button <button
class="btn btn-primary btn-sm dropdown-toggle" class="btn btn-primary btn-sm dropdown-toggle"
data-toggle="dropdown" data-toggle="dropdown"
@ -97,7 +108,7 @@
</div> </div>
</div> </div>
<abp-modal [(visible)]="isModalVisible" [busy]="modalBusy"> <abp-modal size="md" [(visible)]="isModalVisible" [busy]="modalBusy">
<ng-template #abpHeader> <ng-template #abpHeader>
<h3>{{ selectedModalContent.title | abpLocalization }}</h3> <h3>{{ selectedModalContent.title | abpLocalization }}</h3>
</ng-template> </ng-template>

9
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
View File

@ -58,6 +58,8 @@ export class TenantsComponent {
modalBusy: boolean = false; modalBusy: boolean = false;
sortOrder: string = 'asc';
get useSharedDatabase(): boolean { get useSharedDatabase(): boolean {
return this.defaultConnectionStringForm.get('useSharedDatabase').value; return this.defaultConnectionStringForm.get('useSharedDatabase').value;
} }
@ -184,8 +186,8 @@ export class TenantsComponent {
? new UpdateTenant({ ...this.tenantForm.value, id: this.selected.id }) ? new UpdateTenant({ ...this.tenantForm.value, id: this.selected.id })
: new CreateTenant(this.tenantForm.value), : new CreateTenant(this.tenantForm.value),
) )
.pipe(finalize(()=> (this.modalBusy = false)))
.subscribe(() => { .subscribe(() => {
this.modalBusy = false;
this.isModalVisible = false; this.isModalVisible = false;
}); });
} }
@ -198,7 +200,6 @@ export class TenantsComponent {
.subscribe((status: Toaster.Status) => { .subscribe((status: Toaster.Status) => {
if (status === Toaster.Status.confirm) { if (status === Toaster.Status.confirm) {
this.store.dispatch(new DeleteTenant(id)); this.store.dispatch(new DeleteTenant(id));
this.modalBusy = false;
} }
}); });
} }
@ -217,4 +218,8 @@ export class TenantsComponent {
.pipe(finalize(() => (this.loading = false))) .pipe(finalize(() => (this.loading = false)))
.subscribe(); .subscribe();
} }
changeSortOrder() {
this.sortOrder = this.sortOrder.toLowerCase() === "asc" ? "desc" : "asc";
}
} }

Write Preview
Loading…
Cancel
Save