ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4916 from GabrielInTheWorld/fixUserIcons

Browse Source 
Changes the icon of 'is gremium' and 'is active'
This commit is contained in:
Emanuel Schütze 2019-08-13 16:32:22 +02:00 committed by GitHub
commit 4988b758ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/site/users/components/user-detail/user-detail.component.html
View File

@ -260,8 +260,10 @@
<span class="state-icons"> <span class="state-icons">
<span>{{ user.short_name }}</span> <span>{{ user.short_name }}</span>
<mat-icon *ngIf="user.is_present" matTooltip="{{ 'Is present' | translate }}">check_box</mat-icon> <mat-icon *ngIf="user.is_present" matTooltip="{{ 'Is present' | translate }}">check_box</mat-icon>
<mat-icon *ngIf="user.is_committee" matTooltip="{{ 'Is committee' | translate }}">stars</mat-icon> <mat-icon *ngIf="user.is_committee" matTooltip="{{ 'Is committee' | translate }}">account_balance</mat-icon>
<mat-icon *ngIf="!user.is_active" matTooltip="{{ 'Inactive' | translate }}">block</mat-icon> <mat-icon *ngIf="!user.is_active && isAllowed('seeExtra')" matTooltip="{{ 'Inactive' | translate }}"
>block</mat-icon
>
</span> </span>
</div> </div>

10
client/src/app/site/users/components/user-list/user-list.component.html
View File

@ -36,8 +36,14 @@
></a> ></a>
<div class="nameCell"> <div class="nameCell">
<span>{{ name }}</span> <span>{{ name }}</span>
<mat-icon matTooltip="{{ 'Is committee' | translate }}" *ngIf="user.is_committee">stars</mat-icon> </div>
<mat-icon matTooltip="{{ 'Inactive' | translate }}" *ngIf="!user.is_active">block</mat-icon> <div class="icon-group">
<mat-icon matTooltip="{{ 'Is committee' | translate }}" *ngIf="user.is_committee">account_balance</mat-icon>
<mat-icon
matTooltip="{{ 'Inactive' | translate }}"
*ngIf="!user.is_active && this.operator.hasPerms('users.see_extra')"
>block</mat-icon
>
</div> </div>
</div> </div>

10
client/src/app/site/users/components/user-list/user-list.component.scss
View File

@ -14,12 +14,20 @@
display: grid; display: grid;
} }
.detail-link {
z-index: 2;
}
.nameCell { .nameCell {
position: relative; position: relative;
z-index: 2; z-index: 1;
display: flex; display: flex;
span { span {
margin-right: 5px; margin-right: 5px;
} }
} }
.icon-group {
z-index: 3;
}

2
client/src/app/site/users/components/user-list/user-list.component.ts
View File

@ -161,7 +161,7 @@ export class UserListComponent extends BaseListViewComponent<ViewUser> implement
private groupRepo: GroupRepositoryService, private groupRepo: GroupRepositoryService,
private choiceService: ChoiceService, private choiceService: ChoiceService,
private router: Router, private router: Router,
private operator: OperatorService, public operator: OperatorService,
protected csvExport: CsvExportService, protected csvExport: CsvExportService,
private promptService: PromptService, private promptService: PromptService,
public filterService: UserFilterListService, public filterService: UserFilterListService,