-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #783 from ckm007/master
updating master with 1.1.5.2 release changes
- Loading branch information
Showing
92 changed files
with
7,908 additions
and
2,919 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
admin-ui/src/app/features/keymanager/getCertificate/view/view.component.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| /* No CSS *//*# sourceMappingURL=view.component.css.map */ | ||
| /* No CSS *//*# sourceMappingURL=view.component.css.map */ |
61 changes: 19 additions & 42 deletions
61
admin-ui/src/app/features/keymanager/getCertificate/view/view.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,30 @@ | ||
| <ng-container> | ||
| <span><h3 class="header">Get Certificate</h3></span> | ||
| <!-- <div id="flex-single-view" style="padding-top: 12px;"> | ||
| <div id="flex-single-view" style="padding-top: 12px;"> | ||
| <div id="flex-container"> | ||
| <div id="myDiv" class="flex-body"> | ||
| <mat-card> | ||
| <mat-card-content class="forms-container"> | ||
| <div class="primary-form"> | ||
| <mat-form-field> | ||
| <input | ||
| #applicationId | ||
| matInput | ||
| formControlName="applicationId" | ||
| placeholder="ApplicationId" | ||
| [value]="" | ||
| /> | ||
| </mat-form-field> | ||
| <mat-form-field> | ||
| <input | ||
| #referenceId | ||
| matInput | ||
| formControlName="referenceId" | ||
| placeholder="ReferenceId" | ||
| [value]="" | ||
| /> | ||
| </mat-form-field> | ||
| </div> | ||
| </mat-card-content> | ||
| <div class="example-container"> | ||
| <mat-form-field> | ||
| <mat-label>Application Id</mat-label> | ||
| <input matInput #input placeholder="Ex. 123" [value]="applicationId" (keyup)="captureValue($event, 'applicationId')"> | ||
| </mat-form-field> | ||
|
|
||
| <mat-form-field> | ||
| <mat-label>ReferenceId</mat-label> | ||
| <input matInput #input placeholder="Ex. 123" [value]="referenceId" (keyup)="captureValue($event, 'referenceId')"> | ||
| </mat-form-field> | ||
|
|
||
| <button id="createButton" mat-raised-button (click)="getCertificate()" (keyup)="captureValue($event, field.name)"> | ||
| Get Certificate | ||
| </button> | ||
| </div> | ||
| </mat-card> | ||
| </div> | ||
| </div> | ||
| </div> --> | ||
| <mat-card class="mat-elevation-z5"> | ||
| <app-toolbar | ||
| *ngIf=" | ||
| actionEllipsis && actionEllipsis && paginatorOptions | ||
| " | ||
| [buttonList]="actionEllipsis" | ||
| [paginationOptions]="paginatorOptions" | ||
| [filtersAppliedFlag]="filtersApplied" | ||
| (pageEvent)="pageEvent($event)" | ||
| ></app-toolbar> | ||
| <app-table | ||
| *ngIf="datas && displayedColumns && actionButtons" | ||
| [data]="datas" | ||
| [displayedColumns]="displayedColumns" | ||
| [buttonList]="actionButtons" | ||
| [sortData]="sortFilter" | ||
| [noDataFlag]="noData" | ||
| ></app-table> | ||
| </div> | ||
| <mat-card class="mat-elevation-z5" *ngIf="this.datas"> | ||
| <div>{{this.datas}}</div> | ||
| </mat-card> | ||
| </ng-container> | ||
| <!-- <ng-template #nodata><mat-spinner class="spinner-placer"></mat-spinner></ng-template> --> |
Oops, something went wrong.