Browse Source

bootstrap 5 version update identity package

pull/10290/head
muhammedaltug 5 years ago
parent
commit
e9101dc5d6
  1. 2
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
  2. 10
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  3. 4
      npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-props.ts

2
npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html

@ -4,7 +4,7 @@
<div class="col col-md-6"> <div class="col col-md-6">
<h5 class="card-title">{{ 'AbpIdentity::Roles' | abpLocalization }}</h5> <h5 class="card-title">{{ 'AbpIdentity::Roles' | abpLocalization }}</h5>
</div> </div>
<div class="text-right col col-md-6"> <div class="text-end col col-md-6">
<abp-page-toolbar [record]="data.items"></abp-page-toolbar> <abp-page-toolbar [record]="data.items"></abp-page-toolbar>
</div> </div>
</div> </div>

10
npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@ -4,7 +4,7 @@
<div class="col col-md-6"> <div class="col col-md-6">
<h5 class="card-title">{{ 'AbpIdentity::Users' | abpLocalization }}</h5> <h5 class="card-title">{{ 'AbpIdentity::Users' | abpLocalization }}</h5>
</div> </div>
<div class="text-right col col-md-6"> <div class="text-end col col-md-6">
<abp-page-toolbar [record]="data.items"></abp-page-toolbar> <abp-page-toolbar [record]="data.items"></abp-page-toolbar>
</div> </div>
</div> </div>
@ -53,17 +53,15 @@
<ng-template ngbNavContent> <ng-template ngbNavContent>
<div <div
*ngFor="let roleGroup of roleGroups; let i = index; trackBy: trackByFn" *ngFor="let roleGroup of roleGroups; let i = index; trackBy: trackByFn"
class="custom-checkbox custom-control mb-2" class="form-check mb-2"
> >
<input <input
type="checkbox" type="checkbox"
class="custom-control-input" class="form-check-input"
[attr.id]="'roles-' + i" [attr.id]="'roles-' + i"
[formControl]="roleGroup.controls[roles[i].name]" [formControl]="roleGroup.controls[roles[i].name]"
/> />
<label class="custom-control-label" [attr.for]="'roles-' + i">{{ <label class="form-check-label" [attr.for]="'roles-' + i">{{ roles[i].name }}</label>
roles[i].name
}}</label>
</div> </div>
</ng-template> </ng-template>
</li> </li>

4
npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-props.ts

@ -17,12 +17,12 @@ export const DEFAULT_ROLES_ENTITY_PROPS = EntityProp.createMany<IdentityRoleDto>
return of( return of(
name + name +
(isDefault (isDefault
? `<span class="badge badge-pill badge-success ml-1">${t( ? `<span class="badge rounded-pill bg-success ms-1">${t(
'AbpIdentity::DisplayName:IsDefault', 'AbpIdentity::DisplayName:IsDefault',
)}</span>` )}</span>`
: '') + : '') +
(isPublic (isPublic
? `<span class="badge badge-pill badge-info ml-1">${t( ? `<span class="badge rounded-pill bg-info ms-1">${t(
'AbpIdentity::DisplayName:IsPublic', 'AbpIdentity::DisplayName:IsPublic',
)}</span>` )}</span>`
: ''), : ''),

Loading…
Cancel
Save