diff options
Diffstat (limited to 'webapp/src/app/devel/build')
-rw-r--r-- | webapp/src/app/devel/build/build.component.css | 9 | ||||
-rw-r--r-- | webapp/src/app/devel/build/build.component.html | 83 | ||||
-rw-r--r-- | webapp/src/app/devel/build/build.component.ts | 13 |
3 files changed, 59 insertions, 46 deletions
diff --git a/webapp/src/app/devel/build/build.component.css b/webapp/src/app/devel/build/build.component.css index 92f953e..695a89b 100644 --- a/webapp/src/app/devel/build/build.component.css +++ b/webapp/src/app/devel/build/build.component.css @@ -33,8 +33,9 @@ width: 10em; } -.fa-size-x2 { +.fa-big { font-size: 18px; + font-weight: bold; } .textarea-scroll { @@ -46,4 +47,8 @@ h2 { font-family: sans-serif; font-variant: small-caps; font-size: x-large; -}
\ No newline at end of file +} + +.panel-heading { + background: aliceblue; +} diff --git a/webapp/src/app/devel/build/build.component.html b/webapp/src/app/devel/build/build.component.html index a66231c..2bcd2c7 100644 --- a/webapp/src/app/devel/build/build.component.html +++ b/webapp/src/app/devel/build/build.component.html @@ -1,8 +1,15 @@ <div class="panel panel-default"> <div class="panel-heading"> - <h2 class="panel-title">Build</h2> + <h2 class="panel-title" (click)="buildIsCollapsed = !buildIsCollapsed"> + Build + <div class="pull-right"> + <button class="btn btn-link" (click)="buildIsCollapsed = !buildIsCollapsed; $event.stopPropagation()"> + <span class="fa fa-big" [ngClass]="{'fa-angle-double-down': buildIsCollapsed, 'fa-angle-double-right': !buildIsCollapsed}"></span> + </button> + </div> + </h2> </div> - <div class="panel-body"> + <div class="panel-body" [collapse]="buildIsCollapsed"> <form [formGroup]="buildForm"> <div class="col-xs-12"> <table class="table table-borderless table-center"> @@ -26,43 +33,43 @@ </tr> <tr> <td colspan="2"> - <accordion> - <accordion-group #group> - <div accordion-heading> - Advanced Settings - <i class="pull-right float-xs-right fa" [ngClass]="{'fa-chevron-down': group.isOpen, 'fa-chevron-right': !group.isOpen}"></i> - </div> + <accordion> + <accordion-group #group> + <div accordion-heading> + Advanced Settings + <i class="pull-right float-xs-right fa" [ngClass]="{'fa-chevron-down': group.isOpen, 'fa-chevron-right': !group.isOpen}"></i> + </div> - <table class="table table-borderless table-in-accordion"> - <tbody> - <tr> - <th>Clean Command</th> - <td> <input type="text" style="width:99%;" formControlName="cmdClean"> </td> - </tr> - <tr> - <th>Pre-Build Command</th> - <td> <input type="text" style="width:99%;" formControlName="cmdPrebuild"> </td> - </tr> - <tr> - <th>Build Command</th> - <td> <input type="text" style="width:99%;" formControlName="cmdBuild"> </td> - </tr> - <tr> - <th>Populate Command</th> - <td> <input type="text" style="width:99%;" formControlName="cmdPopulate"> </td> - </tr> - <tr> - <th>Env variables</th> - <td> <input type="text" style="width:99%;" formControlName="envVars"> </td> - </tr> - <tr *ngIf="debugEnable"> - <th>Args variables</th> - <td> <input type="text" style="width:99%;" formControlName="cmdArgs"> </td> - </tr> - </tbody> - </table> - </accordion-group> - </accordion> + <table class="table table-borderless table-in-accordion"> + <tbody> + <tr> + <th>Clean Command</th> + <td> <input type="text" style="width:99%;" formControlName="cmdClean"> </td> + </tr> + <tr> + <th>Pre-Build Command</th> + <td> <input type="text" style="width:99%;" formControlName="cmdPrebuild"> </td> + </tr> + <tr> + <th>Build Command</th> + <td> <input type="text" style="width:99%;" formControlName="cmdBuild"> </td> + </tr> + <tr> + <th>Populate Command</th> + <td> <input type="text" style="width:99%;" formControlName="cmdPopulate"> </td> + </tr> + <tr> + <th>Env variables</th> + <td> <input type="text" style="width:99%;" formControlName="envVars"> </td> + </tr> + <tr *ngIf="debugEnable"> + <th>Args variables</th> + <td> <input type="text" style="width:99%;" formControlName="cmdArgs"> </td> + </tr> + </tbody> + </table> + </accordion-group> + </accordion> </td> </tr> </tbody> diff --git a/webapp/src/app/devel/build/build.component.ts b/webapp/src/app/devel/build/build.component.ts index 449c557..48a5824 100644 --- a/webapp/src/app/devel/build/build.component.ts +++ b/webapp/src/app/devel/build/build.component.ts @@ -23,10 +23,10 @@ export class BuildComponent implements OnInit, AfterViewChecked { @Input() curProject: IProject; - buildForm: FormGroup; - subpathCtrl = new FormControl("", Validators.required); - debugEnable: boolean = false; - + public buildForm: FormGroup; + public subpathCtrl = new FormControl("", Validators.required); + public debugEnable: boolean = false; + public buildIsCollapsed: boolean = false; public cmdOutput: string; public cmdInfo: string; @@ -67,7 +67,8 @@ export class BuildComponent implements OnInit, AfterViewChecked { // Command output data tunneling this.xdsSvr.CmdOutput$.subscribe(data => { - this.cmdOutput += data.stdout + "\n"; + this.cmdOutput += data.stdout; + this.cmdOutput += data.stderr; }); // Command exit @@ -219,4 +220,4 @@ export class BuildComponent implements OnInit, AfterViewChecked { private _outputFooter(): string { return "\n"; } -}
\ No newline at end of file +} |