Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit c447dca

Browse files
committed
Merge pull request #320 from cppwfs/SCDF-UI-319
* cppwfs-SCDF-UI-319: gh-319 Polish table formatting + Fix button alignment Resolves bugs identified in lint.
2 parents 7f93116 + 5ffc199 commit c447dca

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

ui/src/app/about/about-details.component.html

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,15 @@ <h2>Platform-specific Information of the App Deployer</h2>
141141

142142
<table class="table table-hover">
143143
<tbody>
144-
<tr *ngIf="!isEmpty(dataflowVersionInfo.runtimeEnvironment.appDeployer.platformSpecificInfo)" ng-repeat="(key, value) in dataflowVersionInfo.runtimeEnvironment.appDeployer.platformSpecificInfo">
145-
<td class="col-xs-6">{{key}}</td><td>{{value}}</td>
146-
</tr>
147-
<tr *ngIf="isEmpty(dataflowVersionInfo.runtimeEnvironment.appDeployer.platformSpecificInfo)">
148-
<td class="col-xs-12 text-center" colspan="2">No platform-specific app deployer information available.</td>
149-
</tr>
144+
<ng-template *ngIf="!isEmpty(dataflowVersionInfo.runtimeEnvironment.appDeployer.platformSpecificInfo)"
145+
ngFor let-item [ngForOf]="dataflowVersionInfo.runtimeEnvironment.appDeployer.platformSpecificInfo | keyvalues">
146+
<tr>
147+
<td class="col-xs-6">{{item.key}}</td><td>{{item.value}}</td>
148+
</tr>
149+
</ng-template>
150+
<tr *ngIf="isEmpty(dataflowVersionInfo.runtimeEnvironment.appDeployer.platformSpecificInfo)">
151+
<td class="col-xs-12 text-center" colspan="2">No platform-specific app deployer information available.</td>
152+
</tr>
150153
</tbody>
151154
</table>
152155

@@ -194,16 +197,22 @@ <h2>Platform-specific Information of the Task Launcher</h2>
194197
<!--<tr *ngIf="!isEmpty(dataflowVersionInfo.runtimeEnvironment.taskLauncher.platformSpecificInfo)" **ngFor="(key, value) in dataflowVersionInfo.runtimeEnvironment.taskLauncher.platformSpecificInfo">
195198
<td class="col-xs-6">{{key}}</td><td>{{value}}</td>
196199
</tr>-->
200+
<ng-template *ngIf="!isEmpty(dataflowVersionInfo.runtimeEnvironment.taskLauncher.platformSpecificInfo)"
201+
ngFor let-item [ngForOf]="dataflowVersionInfo.runtimeEnvironment.taskLauncher.platformSpecificInfo | keyvalues">
202+
<tr>
203+
<td class="col-xs-6">{{item.key}}</td><td>{{item.value}}</td>
204+
</tr>
205+
</ng-template>
197206
<tr *ngIf="isEmpty(dataflowVersionInfo.runtimeEnvironment.taskLauncher.platformSpecificInfo)">
198207
<td colspan="2" class="col-xs-6 text-center">No platform-specific task launcher information available.</td>
199208
</tr>
200209
</tbody>
201210
</table>
202211

203212
<div class="row">
204-
<div class="col-md-6 text-right"><button id="back-button" type="button" class="btn btn-default" (click)="goBack()"><span class="glyphicon glyphicon-arrow-left"></span> Back</button></div>
205-
<div class="col-md-6 text-left"><button id="back-button"
213+
<div class="col-md-12 text-right"><button id="back-button" type="button" class="btn btn-default" (click)="goBack()"><span class="glyphicon glyphicon-arrow-left"></span> Back</button></div>
214+
<div class="col-md-12 text-left"><button id="back-button"
206215
[ngxClipboard] [cbContent]="dataflowVersionInfo | json" (cbOnSuccess)="onCopyToClipboardSuccess($event);"
207216
type="button" class="btn btn-default"><span class="glyphicon glyphicon-copy"></span> Copy Details to Clipboard</button></div>
208217
</div>
209-
</div>
218+
</div>

ui/src/app/tasks/task-definitions/task-definitions.component.html

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@
2929
<tr>
3030
<th style="width: 70px" table-sort sort-property="['DEFINITION_NAME', 'DEFINITION']" sort-state="pageable" sort-order-change-handler="sortChanged">Name</th>
3131
<th style="width: 300px" table-sort sort-property="['DEFINITION','DEFINITION_NAME']" sort-state="pageable" sort-order-change-handler="sortChanged">Definition</th>
32-
<th style="width: 50px">Status
33-
<a #childPopover="bs-popover"
34-
[popover]="popTemplate"
35-
placement="bottom"
36-
(clickOutside)="closePopOver()"
37-
title="Available Deployment Statuses"><span class="glyphicon glyphicon-question-sign"></span></a>
38-
</th>
3932
<th style="width: 240px" colspan="1" class="text-center">Actions</th>
4033
</tr>
4134
</thead>
@@ -45,7 +38,6 @@
4538
<tr>
4639
<td>{{item.name}}</td>
4740
<td>{{item.dslText}}</td>
48-
<td>{{item.status}}</td>
4941
<td class="action-column">
5042
<button type="button" (click)="launchTask(item)"
5143
class="btn btn-default" title="Launch">
@@ -85,3 +77,4 @@ <h4 class="modal-title pull-left">Confirm Destroy Action</h4>
8577
</div>
8678
</div>
8779
</div>
80+

ui/src/app/tasks/task-details/task-details.component.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
</tr>
4242
<tr>
4343
<td>Job Execution Ids</td>
44-
<td>
45-
<span *ngFor="let jobExecutionId of taskExecution.jobExecutionIds"><button type="button" class="btn btn-default" (click)="viewJobExecutionDetails(jobExecutionId)" title="Details">{{jobExecutionId}}</button>{{$last ? '' : '&nbsp;'}}</span>
46-
</td>
44+
<td></td>
4745
</tr>
4846
<tr>
4947
<td>Start Time</td>

0 commit comments

Comments
 (0)