Repository: nifi-registry Updated Branches: refs/heads/master 7f0116293 -> d7641480b
NIFIREG-30 - Update delete icons and admin user/group row styles Signed-off-by: Bryan Bende <[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/d7641480 Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/d7641480 Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/d7641480 Branch: refs/heads/master Commit: d7641480b60ab26568868218fd777ae988476cc6 Parents: 7f01162 Author: Scott Aslan <[email protected]> Authored: Thu Dec 21 20:01:32 2017 -0500 Committer: Bryan Bende <[email protected]> Committed: Fri Dec 22 09:18:54 2017 -0500 ---------------------------------------------------------------------- .../users/nf-registry-users-administration.html | 8 ++++---- .../users/sidenav/manage-group/nf-registry-manage-group.html | 2 +- .../users/sidenav/manage-user/nf-registry-manage-user.html | 2 +- .../sidenav/manage-bucket/nf-registry-manage-bucket.html | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/d7641480/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.html ---------------------------------------------------------------------- diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.html b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.html index 1028d98..501a8a7 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.html +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.html @@ -66,10 +66,10 @@ limitations under the License. </div> </div> <div id="nifi-registry-users-administration-list-container"> - <div [ngClass]="{'nonconfigurable' : row.configurable === false, 'selected-nonconfigurable' : (row.checked === true && row.configurable === false), 'selected' : row.checked === true}" + <div *ngFor="let row of nfRegistryService.filteredUserGroups" (click)="row.checked = !row.checked;nfRegistryService.determineAllUsersAndGroupsSelectedState(row)"> - <div *ngFor="let column of nfRegistryService.userColumns" fxLayout="row" fxLayoutAlign="space-between center" class="td-data-table-row"> + <div [ngClass]="{'nonconfigurable' : row.configurable === false, 'selected-nonconfigurable' : (row.checked === true && row.configurable === false), 'selected' : row.checked === true}" *ngFor="let column of nfRegistryService.userColumns" fxLayout="row" fxLayoutAlign="space-between center" class="td-data-table-row"> <div class="td-data-table-cell" fxFlex="{{column.width}}"> <div class="ellipsis" matTooltip="{{column.format ? column.format(row[column.name]) : row[column.name]}}"> <i class="fa fa-users push-right-sm" aria-hidden="true"></i>{{column.format ? column.format(row[column.name]) : row[column.name]}} @@ -116,10 +116,10 @@ limitations under the License. </div> </div> </div> - <div [ngClass]="{'nonconfigurable' : row.configurable === false, 'selected-nonconfigurable' : (row.checked === true && row.configurable === false), 'selected' : row.checked === true}" + <div *ngFor="let row of nfRegistryService.filteredUsers" (click)="row.checked = !row.checked;nfRegistryService.determineAllUsersAndGroupsSelectedState(row)"> - <div *ngFor="let column of nfRegistryService.userColumns" fxLayout="row" fxLayoutAlign="space-between center" class="td-data-table-row"> + <div [ngClass]="{'nonconfigurable' : row.configurable === false, 'selected-nonconfigurable' : (row.checked === true && row.configurable === false), 'selected' : row.checked === true}" *ngFor="let column of nfRegistryService.userColumns" fxLayout="row" fxLayoutAlign="space-between center" class="td-data-table-row"> <div class="td-data-table-cell" fxFlex="{{column.width}}"> <div class="ellipsis" matTooltip="{{column.format ? column.format(row[column.name]) : row[column.name]}}"> {{column.format ? column.format(row[column.name]) : row[column.name]}} http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/d7641480/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.html ---------------------------------------------------------------------- diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.html b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.html index 735dd95..9003b85 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.html +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.html @@ -184,7 +184,7 @@ limitations under the License. <button (click)="removeUserFromGroup(row);row.checked = !row.checked;" [disabled]="!nfRegistryService.group.configurable" matTooltip="'Remove user from group'" mat-icon-button color="accent"> - <i class="fa fa-minus-circle" aria-hidden="true"></i> + <i class="fa fa-trash" aria-hidden="true"></i> </button> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/d7641480/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html ---------------------------------------------------------------------- diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html index ebc14b9..dcefc76 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html @@ -190,7 +190,7 @@ limitations under the License. <button (click)="removeUserFromGroup(row);row.checked = !row.checked;" [disabled]="!row.configurable" matTooltip="'Remove user from group'" mat-icon-button color="accent"> - <i class="fa fa-minus-circle" aria-hidden="true"></i> + <i class="fa fa-trash" aria-hidden="true"></i> </button> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/d7641480/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.html ---------------------------------------------------------------------- diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.html b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.html index 54f5c5c..d4da24e 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.html +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.html @@ -85,7 +85,7 @@ limitations under the License. <button (click)="removePolicyFromBucket(row);row.checked = !row.checked;" [disabled]="!nfRegistryService.currentUser.resourcePermissions.policies.canDelete" matTooltip="'Remove group policies from bucket'" mat-icon-button color="accent"> - <i class="fa fa-minus-circle" aria-hidden="true"></i> + <i class="fa fa-trash" aria-hidden="true"></i> </button> </div> </div>
