Repository: nifi-registry Updated Branches: refs/heads/master 888e38302 -> e3e24c10b
[NIFIREG-117] update sorting function name and add ellipsis to long text in sidenav tables This closes #85. Signed-off-by: Kevin Doran <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/e3e24c10 Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/e3e24c10 Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/e3e24c10 Branch: refs/heads/master Commit: e3e24c10babe29322a3b76fafd4dd8748115a762 Parents: 888e383 Author: Scott Aslan <[email protected]> Authored: Thu Jan 11 21:32:29 2018 -0500 Committer: Kevin Doran <[email protected]> Committed: Fri Jan 19 12:15:20 2018 -0500 ---------------------------------------------------------------------- .../nf-registry-add-user-to-groups.html | 35 ++++++++++---------- .../nf-registry-add-users-to-group.html | 32 +++++++++--------- 2 files changed, 34 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/e3e24c10/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.html ---------------------------------------------------------------------- diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.html b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.html index c3103e3..829248f 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.html +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.html @@ -24,7 +24,7 @@ limitations under the License. </div> <div *ngIf="filteredUserGroups.length > 0" class="pad-bottom-md"> <div id="nifi-registry-users-administration-list-container-column-header" class="td-data-table"> - <div class="td-data-table-column" (click)="sortUsers(column)" + <div class="td-data-table-column" (click)="sortUserGroups(column)" *ngFor="let column of nfRegistryService.userGroupsColumns" fxFlex="{{column.width}}"> {{column.label}} @@ -40,24 +40,25 @@ limitations under the License. </div> </div> <div id="nifi-registry-add-selected-users-to-group-list-container"> - <div [ngClass]="{'selected' : row.checked}" *ngFor="let row of filteredUserGroups" - (click)="row.checked = !row.checked;determineAllUserGroupsSelectedState()"> - <div *ngFor="let column of nfRegistryService.userGroupsColumns" fxLayout="row" - fxLayoutAlign="space-between center" class="td-data-table-row"> - <div class="td-data-table-cell" fxFlex="{{column.width}}"> - <div> - <i class="fa fa-users push-right-sm" aria-hidden="true"></i>{{column.format ? - column.format(row[column.name]) : row[column.name]}} - </div> - </div> - <div class="td-data-table-cell"> - <mat-checkbox [(ngModel)]="row.checked" - [checked]="row.checked" - (change)="determineAllUserGroupsSelectedState()" - (click)="row.checked = !row.checked;determineAllUserGroupsSelectedState()"> - </mat-checkbox> + <div fxLayout="row" fxLayoutAlign="space-between center" + class="td-data-table-row" + [ngClass]="{'selected' : group.checked}" + *ngFor="let group of filteredUserGroups" + (click)="group.checked = !group.checked;determineAllUserGroupsSelectedState();"> + <div class="td-data-table-cell" *ngFor="let column of nfRegistryService.userGroupsColumns" + fxFlex="{{column.width}}"> + <div class="ellipsis" matTooltip="{{column.format ? column.format(group[column.name]) : group[column.name]}}"> + <i class="fa fa-users push-right-sm" aria-hidden="true"></i>{{column.format ? + column.format(group[column.name]) : group[column.name]}} </div> </div> + <div class="td-data-table-cell"> + <mat-checkbox [(ngModel)]="group.checked" + [checked]="group.checked" + (change)="determineAllUserGroupsSelectedState()" + (click)="group.checked = !group.checked;determineAllUserGroupsSelectedState()"> + </mat-checkbox> + </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/e3e24c10/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.html ---------------------------------------------------------------------- diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.html b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.html index 3bab6c4..427d370 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.html +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.html @@ -40,24 +40,24 @@ limitations under the License. </div> </div> <div id="nifi-registry-add-selected-users-to-group-list-container"> - <div [ngClass]="{'selected' : row.checked}" *ngFor="let row of filteredUsers" - (click)="row.checked = !row.checked;determineAllUsersSelectedState()"> - <div *ngFor="let column of nfRegistryService.userGroupsColumns" fxLayout="row" - fxLayoutAlign="space-between center" class="td-data-table-row"> - <div class="td-data-table-cell" fxFlex="{{column.width}}"> - <div> - {{column.format ? - column.format(row[column.name]) : row[column.name]}} - </div> - </div> - <div class="td-data-table-cell"> - <mat-checkbox [(ngModel)]="row.checked" - [checked]="row.checked" - (change)="determineAllUsersSelectedState()" - (click)="row.checked = !row.checked;determineAllUsersSelectedState()"> - </mat-checkbox> + <div fxLayout="row" fxLayoutAlign="space-between center" + class="td-data-table-row" + [ngClass]="{'selected' : user.checked}" + *ngFor="let user of filteredUsers" + (click)="user.checked = !user.checked;determineAllUsersSelectedState();"> + <div class="td-data-table-cell" *ngFor="let column of nfRegistryService.userGroupsColumns" + fxFlex="{{column.width}}"> + <div class="ellipsis" matTooltip="{{column.format ? column.format(user[column.name]) : user[column.name]}}"> + {{column.format ? column.format(user[column.name]) : user[column.name]}} </div> </div> + <div class="td-data-table-cell"> + <mat-checkbox [(ngModel)]="user.checked" + [checked]="user.checked" + (change)="determineAllUsersSelectedState()" + (click)="user.checked = !user.checked;determineAllUsersSelectedState()"> + </mat-checkbox> + </div> </div> </div> </div>
