Commit 8395306c authored by Chris Hines's avatar Chris Hines
Browse files

Minor UI tweaks, change text, change widths

parent 3fad9c3e
Pipeline #7664 passed with stages
in 3 minutes and 1 second
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div fxLayout="column" style="width: 100%"> <div fxLayout="column" style="width: 100%">
<div style="text-align: left"> {{ jobdata.name }} </div> <div style="text-align: left"> {{ jobdata.name }} </div>
<div *ngIf="jobdata.connectionState == 0" fxLayout="row" fxLayoutAlign="space-between"> <div *ngIf="jobdata.connectionState == 0" fxLayout="row" fxLayoutAlign="space-between">
<div fxFlex="10%"> {{ jobdata.state }} </div> <div fxFlex="10%"> {{ jobdata.state }}</div>
<div fxFlex="10%"> {{ jobdata.jobid }}</div> <div fxFlex="10%"> {{ jobdata.jobid }}</div>
<div fxFlex="10%"> {{ jobdata.batch_host }}</div> <div fxFlex="10%"> {{ jobdata.batch_host }}</div>
<div fxFlex="20%" fxLayout="column"> <div fxFlex="20%" fxLayout="column">
......
<!--<div *ngIf="(identitySubject | async) === null" > <!--<div *ngIf="(identitySubject | async) === null" >
Click login and select a provider or select one you've already logged in to. Click login and select a provider or select one you've already logged in to.
</div>--> </div>-->
<div *ngIf="(identitySubject | async) !== null" > <div *ngIf="(identitySubject | async) !== null" style="width: 100%" >
<mat-list> <mat-list>
<mat-list-item> <mat-list-item>
<div fxLayout="row" fxLayoutAlign="space-between" style="width: 100%"> <div fxLayout="row" fxLayoutAlign="space-between" style="width: 100%">
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
<div fxFlex="10%"> Host </div> <div fxFlex="10%"> Host </div>
<div fxFlex="20%" fxLayout="column"> Resources </div> <div fxFlex="20%" fxLayout="column"> Resources </div>
<div fxFlex></div> <div fxFlex></div>
<div fxFlex="10%" fxLayout="row"></div> <div fxFlex="15%" fxLayout="row"></div>
</div> </div>
<mat-divider></mat-divider> <mat-divider></mat-divider>
</mat-list-item> </mat-list-item>
<div *ngFor="let job of ((identitySubject | async).joblist | async) ; let lastItem = last"> <div *ngFor="let job of ((identitySubject | async).joblist | async) ; let lastItem = last">
<div *ngIf="job.state != 'Finished'"> <div *ngIf="(appSubject | async).name == job.name && job.state != 'Finished'">
<app-job [jobdata]=job></app-job> <app-job [jobdata]=job></app-job>
<mat-divider></mat-divider> <mat-divider></mat-divider>
</div> </div>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<span class="fill-horizontal-space"></span> <span class="fill-horizontal-space"></span>
</mat-toolbar-row> </mat-toolbar-row>
</mat-toolbar> </mat-toolbar>
<mat-sidenav-container style="height: 100%; width: 100%"> <mat-sidenav-container style="height: 100%; width: 100%" autosize>
<mat-sidenav #idSideNav mode="side" opened> <mat-sidenav #idSideNav mode="side" opened>
<div fxLayout="column" style="height: 100%"> <div fxLayout="column" style="height: 100%">
<div> <div>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<button mat-menu-item routerLink="/logout"><mat-icon>logout</mat-icon>Log out of {{ az.name }}</button> <button mat-menu-item routerLink="/logout"><mat-icon>logout</mat-icon>Log out of {{ az.name }}</button>
</div> </div>
<button mat-menu-item routerLink="/settings"><mat-icon>settings</mat-icon>Settings</button> <button mat-menu-item routerLink="/settings"><mat-icon>settings</mat-icon>Settings</button>
<button *ngIf="(authService.loggedOutAuthZ | async).length > 0" mat-menu-item routerLink="/login"><mat-icon>exit_to_app</mat-icon>Login</button> <button *ngIf="(authService.loggedOutAuthZ | async).length > 0" mat-menu-item routerLink="/login"><mat-icon>exit_to_app</mat-icon>More services</button>
</mat-menu> </mat-menu>
<button mat-icon-button [matMenuTriggerFor]="actionmenu"> <button mat-icon-button [matMenuTriggerFor]="actionmenu">
<mat-icon>person</mat-icon> <mat-icon>person</mat-icon>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment