From dfa4cffe8c5425eb502b9f2b22fa29371b8c9259 Mon Sep 17 00:00:00 2001
From: GabrielMeyer <meyergabriel@live.de>
Date: Tue, 13 Aug 2019 15:35:12 +0200
Subject: [PATCH] Changes the icon of 'is gremium' and 'is active'

---
 .../components/user-detail/user-detail.component.html  |  6 ++++--
 .../components/user-list/user-list.component.html      | 10 ++++++++--
 .../components/user-list/user-list.component.scss      | 10 +++++++++-
 .../users/components/user-list/user-list.component.ts  |  2 +-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/client/src/app/site/users/components/user-detail/user-detail.component.html b/client/src/app/site/users/components/user-detail/user-detail.component.html
index 1c94f17fd..def128a6b 100644
--- a/client/src/app/site/users/components/user-detail/user-detail.component.html
+++ b/client/src/app/site/users/components/user-detail/user-detail.component.html
@@ -260,8 +260,10 @@
         <span class="state-icons">
             <span>{{ user.short_name }}</span>
             <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_active" matTooltip="{{ 'Inactive' | translate }}">block</mat-icon>
+            <mat-icon *ngIf="user.is_committee" matTooltip="{{ 'Is committee' | translate }}">account_balance</mat-icon>
+            <mat-icon *ngIf="!user.is_active && isAllowed('seeExtra')" matTooltip="{{ 'Inactive' | translate }}"
+                >block</mat-icon
+            >
         </span>
     </div>
 
diff --git a/client/src/app/site/users/components/user-list/user-list.component.html b/client/src/app/site/users/components/user-list/user-list.component.html
index d078d4ff4..ad7b6bee4 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.html
+++ b/client/src/app/site/users/components/user-list/user-list.component.html
@@ -36,8 +36,14 @@
         ></a>
         <div class="nameCell">
             <span>{{ name }}</span>
-            <mat-icon matTooltip="{{ 'Is committee' | translate }}" *ngIf="user.is_committee">stars</mat-icon>
-            <mat-icon matTooltip="{{ 'Inactive' | translate }}" *ngIf="!user.is_active">block</mat-icon>
+        </div>
+        <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>
 
diff --git a/client/src/app/site/users/components/user-list/user-list.component.scss b/client/src/app/site/users/components/user-list/user-list.component.scss
index 54249fa90..60e0ed38d 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.scss
+++ b/client/src/app/site/users/components/user-list/user-list.component.scss
@@ -14,12 +14,20 @@
     display: grid;
 }
 
+.detail-link {
+    z-index: 2;
+}
+
 .nameCell {
     position: relative;
-    z-index: 2;
+    z-index: 1;
     display: flex;
 
     span {
         margin-right: 5px;
     }
 }
+
+.icon-group {
+    z-index: 3;
+}
diff --git a/client/src/app/site/users/components/user-list/user-list.component.ts b/client/src/app/site/users/components/user-list/user-list.component.ts
index 3a761a65c..f7848db84 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.ts
+++ b/client/src/app/site/users/components/user-list/user-list.component.ts
@@ -161,7 +161,7 @@ export class UserListComponent extends BaseListViewComponent<ViewUser> implement
         private groupRepo: GroupRepositoryService,
         private choiceService: ChoiceService,
         private router: Router,
-        private operator: OperatorService,
+        public operator: OperatorService,
         protected csvExport: CsvExportService,
         private promptService: PromptService,
         public filterService: UserFilterListService,