X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fusers%2Fuser-list%2Fuser-list.component.html;h=e114f3425e800f724205cf38a5c245756d84984b;hb=4024c44f9027a32809931de0692d40d001df721c;hp=3090247e582345d4f6a2f53c35de820901259e6b;hpb=9a42363291c9f524d9603a940f929929599271c5;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index 3090247e5..e114f3425 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
@@ -8,12 +8,17 @@
 >
   <ng-template pTemplate="caption">
     <div class="caption">
-      <div>
+      <div class="left-buttons">
         <my-action-dropdown
           *ngIf="isInSelectionMode()" i18n-label label="Batch actions" theme="orange"
           [actions]="bulkUserActions" [entry]="selectedUsers"
         >
         </my-action-dropdown>
+
+        <a *ngIf="!isInSelectionMode()" class="add-button" routerLink="/admin/users/create">
+          <my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>
+          <ng-container i18n>Create user</ng-container>
+        </a>
       </div>
 
       <div class="ml-auto">
@@ -30,24 +35,20 @@
           </div>
           <input
             type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
-            (keyup)="onUserSearch($event)"
+            (keyup)="onSearch($event)"
           >
           <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetTableFilter()"></a>
           <span class="sr-only" i18n>Clear filters</span>
         </div>
       </div>
 
-      <a class="ml-2 add-button" routerLink="/admin/users/create">
-        <my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>
-        <ng-container i18n>Create user</ng-container>
-      </a>
     </div>
   </ng-template>
 
   <ng-template pTemplate="header">
     <tr>
       <th style="width: 40px">
-        <p-tableHeaderCheckbox></p-tableHeaderCheckbox>
+        <p-tableHeaderCheckbox ariaLabel="Select all rows" i18n-ariaLabel></p-tableHeaderCheckbox>
       </th>
       <th style="width: 40px"></th>
       <th style="width: 60px;">
@@ -57,12 +58,13 @@
           <div role="menu" class="dropdown-menu" ngbDropdownMenu>
             <div class="dropdown-header" i18n>Table parameters</div>
             <div ngbDropdownItem class="dropdown-item">
-              <p-multiSelect
-                [options]="columns" [showToggleAll]="true" [(ngModel)]="selectedColumns" optionLabel="label"
-                emptyFilterMessage="No matching column found" i18n-emptyFilterMessage [filter]="false"
-                selectedItemsLabel="{0} columns displayed" i18n-emptyFilterMessage [showHeader]="false"
-                [maxSelectedLabels]="4"
-              ></p-multiSelect>
+              <my-select-checkbox
+                name="columns"
+                [availableItems]="columns"
+                [selectableGroup]="false" [(ngModel)]="selectedColumns"
+                i18n-placeholder placeholder="Select columns"
+              >
+              </my-select-checkbox>
             </div>
             <div ngbDropdownItem class="dropdown-item">
               <my-peertube-checkbox inputName="highlightBannedUsers" [(ngModel)]="highlightBannedUsers"
@@ -71,22 +73,22 @@
           </div>
         </div>
       </th>
-      <th *ngIf="getColumn('username')" pResizableColumn i18n pSortableColumn="username">{{ getColumn('username').label }} <p-sortIcon field="username"></p-sortIcon></th>
-      <th *ngIf="getColumn('email')" i18n>{{ getColumn('email').label }}</th>
-      <th *ngIf="getColumn('quota')" style="width: 160px;" i18n pSortableColumn="videoQuotaUsed">{{ getColumn('quota').label }} <p-sortIcon field="videoQuotaUsed"></p-sortIcon></th>
-      <th *ngIf="getColumn('quotaDaily')" style="width: 160px;" i18n>{{ getColumn('quotaDaily').label }}</th>
-      <th *ngIf="getColumn('role')" style="width: 120px;" i18n pSortableColumn="role">{{ getColumn('role').label }} <p-sortIcon field="role"></p-sortIcon></th>
-      <th *ngIf="getColumn('pluginAuth')" style="width: 140px;" pResizableColumn i18n>{{ getColumn('pluginAuth').label }}</th>
-      <th *ngIf="getColumn('createdAt')" style="width: 150px;" i18n pSortableColumn="createdAt">{{ getColumn('createdAt').label }} <p-sortIcon field="createdAt"></p-sortIcon></th>
-      <th *ngIf="getColumn('lastLoginDate')" style="width: 150px;" i18n pSortableColumn="lastLoginDate">{{ getColumn('lastLoginDate').label }} <p-sortIcon field="lastLoginDate"></p-sortIcon></th>
+      <th *ngIf="isSelected('username')" pResizableColumn  pSortableColumn="username">{{ getColumn('username').label }} <p-sortIcon field="username"></p-sortIcon></th>
+      <th *ngIf="isSelected('email')">{{ getColumn('email').label }}</th>
+      <th *ngIf="isSelected('quota')" style="width: 160px;"  pSortableColumn="videoQuotaUsed">{{ getColumn('quota').label }} <p-sortIcon field="videoQuotaUsed"></p-sortIcon></th>
+      <th *ngIf="isSelected('quotaDaily')" style="width: 160px;">{{ getColumn('quotaDaily').label }}</th>
+      <th *ngIf="isSelected('role')" style="width: 120px;"  pSortableColumn="role">{{ getColumn('role').label }} <p-sortIcon field="role"></p-sortIcon></th>
+      <th *ngIf="isSelected('pluginAuth')" style="width: 140px;" pResizableColumn >{{ getColumn('pluginAuth').label }}</th>
+      <th *ngIf="isSelected('createdAt')" style="width: 150px;"  pSortableColumn="createdAt">{{ getColumn('createdAt').label }} <p-sortIcon field="createdAt"></p-sortIcon></th>
+      <th *ngIf="isSelected('lastLoginDate')" style="width: 150px;"  pSortableColumn="lastLoginDate">{{ getColumn('lastLoginDate').label }} <p-sortIcon field="lastLoginDate"></p-sortIcon></th>
     </tr>
   </ng-template>
 
   <ng-template pTemplate="body" let-expanded="expanded" let-user>
 
     <tr [pSelectableRow]="user" [ngClass]="{ banned: highlightBannedUsers && user.blocked }">
-      <td>
-        <p-tableCheckbox [value]="user"></p-tableCheckbox>
+      <td class="checkbox-cell">
+        <p-tableCheckbox [value]="user" ariaLabel="Select this row" i18n-ariaLabel></p-tableCheckbox>
       </td>
 
       <td class="expand-cell">
@@ -101,16 +103,11 @@
         </my-user-moderation-dropdown>
       </td>
 
-      <td *ngIf="getColumn('username')">
+      <td *ngIf="isSelected('username')">
         <a i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer" [routerLink]="[ '/accounts/' + user.username ]">
           <div class="chip two-lines">
-            <img
-              class="avatar"
-              [src]="user?.account?.avatar?.path"
-              (error)="switchToDefaultAvatar($event)"
-              alt="Avatar"
-            >
-            <div>
+            <my-account-avatar [account]="user?.account"></my-account-avatar>
+           <div>
               <span class="user-table-primary-text">{{ user.account.displayName }}</span>
               <span class="text-muted">{{ user.username }}</span>
             </div>
@@ -118,7 +115,7 @@
         </a>
       </td>
 
-      <td *ngIf="getColumn('email')" [title]="user.email">
+      <td *ngIf="isSelected('email')" [title]="user.email">
         <ng-container *ngIf="!requiresEmailVerification || user.blocked; else emailWithVerificationStatus">
           <a class="table-email" [href]="'mailto:' + user.email">{{ user.email }}</a>
         </ng-container>
@@ -135,7 +132,7 @@
         </ng-template>
       </ng-template>
 
-      <td *ngIf="getColumn('quota')">
+      <td *ngIf="isSelected('quota')">
         <div class="progress" i18n-title title="Total video quota">
           <div class="progress-bar" role="progressbar" [style]="{ width: getUserVideoQuotaPercentage(user) + '%' }"
                [attr.aria-valuenow]="user.rawVideoQuotaUsed" aria-valuemin="0" [attr.aria-valuemax]="user.rawVideoQuota">
@@ -145,7 +142,7 @@
         </div>
       </td>
 
-      <td *ngIf="getColumn('quotaDaily')">
+      <td *ngIf="isSelected('quotaDaily')">
         <div class="progress" i18n-title title="Total daily video quota">
           <div class="progress-bar secondary" role="progressbar" [style]="{ width: getUserVideoQuotaDailyPercentage(user) + '%' }"
                [attr.aria-valuenow]="user.rawVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.rawVideoQuotaDaily">
@@ -155,18 +152,18 @@
         </div>
       </td>
 
-      <td *ngIf="getColumn('role')">
+      <td *ngIf="isSelected('role')">
         <span *ngIf="user.blocked" class="badge badge-banned" i18n-title title="The user was banned">{{ user.roleLabel }}</span>
         <span *ngIf="!user.blocked" class="badge" [ngClass]="getRoleClass(user.role)">{{ user.roleLabel }}</span>
       </td>
 
-      <td *ngIf="getColumn('pluginAuth')">
+      <td *ngIf="isSelected('pluginAuth')">
         <ng-container *ngIf="user.pluginAuth">{{ user.pluginAuth }}</ng-container>
       </td>
 
-      <td *ngIf="getColumn('createdAt')" [title]="user.createdAt">{{ user.createdAt | date: 'short' }}</td>
+      <td *ngIf="isSelected('createdAt')" [title]="user.createdAt">{{ user.createdAt | date: 'short' }}</td>
 
-      <td *ngIf="getColumn('lastLoginDate')" [title]="user.lastLoginDate">{{ user.lastLoginDate | date: 'short' }}</td>
+      <td *ngIf="isSelected('lastLoginDate')" [title]="user.lastLoginDate">{{ user.lastLoginDate | date: 'short' }}</td>
     </tr>
   </ng-template>