Repository: nifi-registry Updated Branches: refs/heads/master f87b927e5 -> f93859a62
NIFIREG-125 Adding bucket id and item id to droplet details in grid list Signed-off-by: Scott Aslan <[email protected]> This closed #94 Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/f93859a6 Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/f93859a6 Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/f93859a6 Branch: refs/heads/master Commit: f93859a6240c232d562cac1288e9ea3f1e027ccd Parents: f87b927 Author: Bryan Bende <[email protected]> Authored: Tue Jan 23 10:19:34 2018 -0500 Committer: Scott Aslan <[email protected]> Committed: Tue Jan 23 12:47:30 2018 -0500 ---------------------------------------------------------------------- .../registry/nf-registry-grid-list-viewer.html | 61 +++++++++++--------- .../explorer/grid-list/_structureElements.scss | 14 ++++- 2 files changed, 46 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f93859a6/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html ---------------------------------------------------------------------- diff --git a/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html b/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html index 65f90fe..d077016 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html +++ b/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html @@ -71,40 +71,45 @@ limitations under the License. </mat-menu> </div> <div fxLayout="row"> - <div fxFlex="25" class="pad-left-sm pad-top-sm"> - <span class="uppercase">Description</span> + <div fxFlex="25" class="pad-left-sm"> + <div> + <span class="uppercase">Bucket Identifier</span> + <p class="ellipsis" title="{{droplet.bucketIdentifier}}" *ngIf="droplet.bucketIdentifier">{{droplet.bucketIdentifier}}</p> + </div> + <div class="pad-top-md"> + <span class="uppercase">{{droplet.type}} Identifier</span> + <p class="ellipsis" title="{{droplet.identifier}} "*ngIf="droplet.identifier">{{droplet.identifier}}</p> + </div> + <div class="pad-top-md"> + <span class="uppercase">Description</span> + <p class="nf-registry-droplet-description" title="{{droplet.description}}" *ngIf="droplet.description">{{droplet.description}}</p> + <p *ngIf="!droplet.description">No description specified</p> + </div> </div> <div fxFlex="75"> <span class="uppercase">Change Log</span> - <button (click)="nfRegistryService.getDropletSnapshotMetadata(droplet)" matTooltip="Refresh" mat-icon-button> + <button class="nf-registry-change-log-refresh" (click)="nfRegistryService.getDropletSnapshotMetadata(droplet)" matTooltip="Refresh" mat-icon-button> <i class="fa fa-refresh info" aria-hidden="true"></i> </button> - </div> - </div> - <div fxLayout="row" class="pad-left-sm"> - <div fxFlex="25"> - <p *ngIf="droplet.description">{{droplet.description}}</p> - <p *ngIf="!droplet.description">No description specified</p> - </div> - <div id="nifi-registry-explorer-grid-list-viewer-droplet-container-details-change-log" - fxFlex="75"> - <td-steps mode="vertical"> - <td-step label="Version {{snapshotMeta.version}} - {{snapshotMeta.timestamp | amTimeAgo}}" sublabel="by {{snapshotMeta.author}}" - *ngFor="let snapshotMeta of droplet.snapshotMetadata; let i = index" - [active]="i === 0 ? true : false"> - <div fxLayout="column" fxLayoutAlign="space-between stretch"> - <div *ngIf="snapshotMeta.comments" fxLayout="row" class="md-body-2"> - {{snapshotMeta.comments}} - </div> - <div *ngIf="!snapshotMeta.comments" fxLayout="row" class="md-body-2"> - No comments specified - </div> - <div fxLayout="row" class="mat-caption"> - {{(snapshotMeta.timestamp/1000 | amFromUnix) | amDateFormat:'MMM-DD-YYYY'}} at {{(snapshotMeta.timestamp/1000 | amFromUnix) | amDateFormat:'h:mm A'}} + <div id="nifi-registry-explorer-grid-list-viewer-droplet-container-details-change-log"> + <td-steps mode="vertical"> + <td-step label="Version {{snapshotMeta.version}} - {{snapshotMeta.timestamp | amTimeAgo}}" sublabel="by {{snapshotMeta.author}}" + *ngFor="let snapshotMeta of droplet.snapshotMetadata; let i = index" + [active]="i === 0 ? true : false"> + <div fxLayout="column" fxLayoutAlign="space-between stretch"> + <div *ngIf="snapshotMeta.comments" fxLayout="row" class="md-body-2"> + {{snapshotMeta.comments}} + </div> + <div *ngIf="!snapshotMeta.comments" fxLayout="row" class="md-body-2"> + No comments specified + </div> + <div fxLayout="row" class="mat-caption"> + {{(snapshotMeta.timestamp/1000 | amFromUnix) | amDateFormat:'MMM-DD-YYYY'}} at {{(snapshotMeta.timestamp/1000 | amFromUnix) | amDateFormat:'h:mm A'}} + </div> </div> - </div> - </td-step> - </td-steps> + </td-step> + </td-steps> + </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f93859a6/nifi-registry-web-ui/src/main/webapp/theming/components/explorer/grid-list/_structureElements.scss ---------------------------------------------------------------------- diff --git a/nifi-registry-web-ui/src/main/webapp/theming/components/explorer/grid-list/_structureElements.scss b/nifi-registry-web-ui/src/main/webapp/theming/components/explorer/grid-list/_structureElements.scss index f56cd25..021fa52 100644 --- a/nifi-registry-web-ui/src/main/webapp/theming/components/explorer/grid-list/_structureElements.scss +++ b/nifi-registry-web-ui/src/main/webapp/theming/components/explorer/grid-list/_structureElements.scss @@ -38,7 +38,19 @@ #nifi-registry-explorer-grid-list-viewer-droplet-container-details-change-log { position: relative; + top: 10px; left: 0px; max-height: 500px; overflow: auto; -} \ No newline at end of file +} + +button.nf-registry-change-log-refresh.mat-icon-button { + position: absolute; + top: 36px; +} + +.nf-registry-droplet-description { + max-height: 316px; + overflow: auto; + margin-bottom: 0px; +}
