bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +00:00
Code Issues Releases Wiki Activity

Fix member and group page container

Browse Source
This commit is contained in:
Shane Melton
2022-07-26 16:21:09 -07:00
parent 51d11d770e
commit 2407d85851
3 changed files with 361 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/web/src/app/organizations/manage/groups.component.html
View File

@@ -1,4 +1,5 @@
<div class="page-header d-flex"> <div class="container page-content">
<div class="page-header d-flex">
<h1>{{ "groups" | i18n }}</h1> <h1>{{ "groups" | i18n }}</h1>
<div class="ml-auto d-flex"> <div class="ml-auto d-flex">
<div> <div>
@@ -16,21 +17,21 @@
{{ "newGroup" | i18n }} {{ "newGroup" | i18n }}
</button> </button>
</div> </div>
</div> </div>
<ng-container *ngIf="loading"> <ng-container *ngIf="loading">
<i <i
class="bwi bwi-spinner bwi-spin text-muted" class="bwi bwi-spinner bwi-spin text-muted"
title="{{ 'loading' | i18n }}" title="{{ 'loading' | i18n }}"
aria-hidden="true" aria-hidden="true"
></i> ></i>
<span class="sr-only">{{ "loading" | i18n }}</span> <span class="sr-only">{{ "loading" | i18n }}</span>
</ng-container> </ng-container>
<ng-container <ng-container
*ngIf=" *ngIf="
!loading && !loading &&
(isPaging() ? pagedGroups : (groups | search: searchText:'name':'id')) as searchedGroups (isPaging() ? pagedGroups : (groups | search: searchText:'name':'id')) as searchedGroups
" "
> >
<p *ngIf="!searchedGroups.length">{{ "noGroupsInList" | i18n }}</p> <p *ngIf="!searchedGroups.length">{{ "noGroupsInList" | i18n }}</p>
<table <table
class="table table-hover table-list" class="table table-hover table-list"
@@ -72,6 +73,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</ng-container> </ng-container>
<ng-template #addEdit></ng-template> <ng-template #addEdit></ng-template>
<ng-template #usersTemplate></ng-template> <ng-template #usersTemplate></ng-template>
</div>

2
apps/web/src/app/organizations/manage/groups.component.ts
View File

@@ -49,7 +49,7 @@ export class GroupsComponent implements OnInit {
) {} ) {}
async ngOnInit() { async ngOnInit() {
this.route.parent.parent.params.subscribe(async (params) => { this.route.parent.params.subscribe(async (params) => {
this.organizationId = params.organizationId; this.organizationId = params.organizationId;
const organization = await this.organizationService.get(this.organizationId); const organization = await this.organizationService.get(this.organizationId);
if (organization == null || !organization.useGroups) { if (organization == null || !organization.useGroups) {

36
apps/web/src/app/organizations/manage/people.component.html
View File

@@ -1,6 +1,7 @@
<div class="page-header"> <div class="container page-content">
<h1>{{ "people" | i18n }}</h1> <div class="page-header d-flex">
<div class="mt-2 d-flex"> <h1>{{ "members" | i18n }}</h1>
<div class="ml-auto d-flex">
<div class="btn-group btn-group-sm" role="group"> <div class="btn-group btn-group-sm" role="group">
<button <button
type="button" type="button"
@@ -103,21 +104,21 @@
{{ "inviteUser" | i18n }} {{ "inviteUser" | i18n }}
</button> </button>
</div> </div>
</div> </div>
<ng-container *ngIf="loading"> <ng-container *ngIf="loading">
<i <i
class="bwi bwi-spinner bwi-spin text-muted" class="bwi bwi-spinner bwi-spin text-muted"
title="{{ 'loading' | i18n }}" title="{{ 'loading' | i18n }}"
aria-hidden="true" aria-hidden="true"
></i> ></i>
<span class="sr-only">{{ "loading" | i18n }}</span> <span class="sr-only">{{ "loading" | i18n }}</span>
</ng-container> </ng-container>
<ng-container <ng-container
*ngIf=" *ngIf="
!loading && !loading &&
(isPaging() ? pagedUsers : (users | search: searchText:'name':'email':'id')) as searchedUsers (isPaging() ? pagedUsers : (users | search: searchText:'name':'email':'id')) as searchedUsers
" "
> >
<p *ngIf="!searchedUsers.length">{{ "noUsersInList" | i18n }}</p> <p *ngIf="!searchedUsers.length">{{ "noUsersInList" | i18n }}</p>
<ng-container *ngIf="searchedUsers.length"> <ng-container *ngIf="searchedUsers.length">
<app-callout <app-callout
@@ -282,12 +283,13 @@
</tbody> </tbody>
</table> </table>
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-template #addEdit></ng-template> <ng-template #addEdit></ng-template>
<ng-template #groupsTemplate></ng-template> <ng-template #groupsTemplate></ng-template>
<ng-template #eventsTemplate></ng-template> <ng-template #eventsTemplate></ng-template>
<ng-template #confirmTemplate></ng-template> <ng-template #confirmTemplate></ng-template>
<ng-template #resetPasswordTemplate></ng-template> <ng-template #resetPasswordTemplate></ng-template>
<ng-template #bulkStatusTemplate></ng-template> <ng-template #bulkStatusTemplate></ng-template>
<ng-template #bulkConfirmTemplate></ng-template> <ng-template #bulkConfirmTemplate></ng-template>
<ng-template #bulkRemoveTemplate></ng-template> <ng-template #bulkRemoveTemplate></ng-template>
</div>