Skip to content
This repository has been archived by the owner on Mar 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Liam Grace authored Mar 16, 2017
2 parents 0bdfd68 + 48aab53 commit aae94e0
Showing 1 changed file with 34 additions and 36 deletions.
70 changes: 34 additions & 36 deletions packages/composer-playground/src/app/transaction/transaction.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,52 +16,50 @@ <h1>Submit Transaction</h1>
<div ngbDropdown class="d-inline-block">
<button type="button" class="action" id="dropdownMenu1" ngbDropdownToggle>{{selectedTransactionName}}</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenu1">
<button class="dropdown-item action " *ngFor="let transaction of transactionTypes" (click)="onTransactionSelect(transaction)">{{transaction.getName()}}</button>
<button class="dropdown-item action " *ngFor="let transaction of transactionTypes"
(click)="onTransactionSelect(transaction)">{{transaction.getName()}}
</button>
</div>
</div>
</div>
</div>
<section class="resource-container">
<section class="resource-component">
<div>
<p class="resource-preview-text">JSON Data Preview</p>
</div>
<div class="resource-bound">
<codemirror [(ngModel)]="resourceDefinition" [config]="codeConfig" (ngModelChange)="onDefinitionChanged()" width="100%" height="100%">
</codemirror>
<div class="resource-error-text" ng-if="defitionError!=null">
<p>{{defitionError}}</p>
<div>
<p class="resource-preview-text">JSON Data Preview</p>
</div>
<div class="resource-bound">
<codemirror [(ngModel)]="resourceDefinition" [config]="codeConfig" (ngModelChange)="onDefinitionChanged()"
width="100%" height="100%">
</codemirror>
<div class="resource-error-text" ng-if="defitionError!=null">
<p>{{defitionError}}</p>
</div>
</div>
</div>
</section>
</section>
</section>
<footer>
<p class="footer-text">Just need quick test data? <button type="button" class="icon" (click)="generateTransactionDeclaration()"><u>Generate Random Data</u></button></p>
<button type="button" class="secondary" (click)="activeModal.close();">
<span>Cancel</span>
</button>
<button type="button" class="primary" (click)="submitTransaction()" [disabled]="defitionError!=null || submitInProgress">
<div *ngIf="!submitInProgress">
<span>Submit</span>
</div>
<div class="transaction-footer-cta">
<button type="button" class="secondary" (click)="activeModal.dismiss();">
<span>Cancel</span>
</button>
<button type="button" class="primary" (click)="submitTransaction()" [disabled]="defitionError!=null || submitInProgress">
<div *ngIf="!submitInProgress">
<span>Submit</span>
</div>
<div *ngIf="submitInProgress" class="ibm-spinner-indeterminate small loop">
<div class="loader">
<svg class="circular" viewBox="25 25 50 50">
<circle class="circle-path" cx="50" cy="50" r="20"/>
</svg>
</div>
</div>
</button>
</div>
</div>
<p class="footer-text">Just need quick test data?
<button type="button" class="icon" (click)="generateTransactionDeclaration()"><u>Generate Random Data</u></button>
</p>
<div class="transaction-footer-cta">
<button type="button" class="secondary" (click)="activeModal.dismiss();">
<span>Cancel</span>
</button>
<button type="button" class="primary" (click)="submitTransaction()"
[disabled]="defitionError!=null || submitInProgress">
<div *ngIf="!submitInProgress">
<span>Submit</span>
</div>
<div *ngIf="submitInProgress" class="ibm-spinner-indeterminate small loop">
<div class="loader">
<svg class="circular" viewBox="25 25 50 50">
<circle class="circle-path" cx="50" cy="50" r="20"/>
</svg>
</div>
</div>
</button>
</div>
</footer>
</div>

0 comments on commit aae94e0

Please sign in to comment.