Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hpc-team
strudelv2_spa
Commits
36ac7133
Commit
36ac7133
authored
Dec 10, 2019
by
Melvin Luong
Browse files
Updated launch-dialog and joblist formatting.
parent
fd3a2099
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/app/joblist/joblist.component.css
View file @
36ac7133
...
...
@@ -13,6 +13,7 @@ html, body {
.mat-expansion-panel
{
border-radius
:
0px
!important
;
background-color
:
#fafafa
;
}
.mat-expansion-panel
:not
([
class
*=
'mat-elevation-z'
])
{
...
...
src/app/launch-dialog/launch-dialog.component.css
View file @
36ac7133
.mat-expansion-panel
{
border-radius
:
0px
!important
;
background-color
:
#fafafa
;
}
.mat-expansion-panel
:not
([
class
*=
'mat-elevation-z'
])
{
box-shadow
:
none
;
}
.mat-expansion-panel-header
{
height
:
100%
!important
;
padding
:
10px
10px
;
border
:
1px
solid
#a2bae1
;
background-color
:
#f0f0f0
!important
;
}
.mat-expansion-panel-header.mat-expanded
:hover
{
background-color
:
#a2bae1
!important
;
}
.mat-expansion-panel-header
span
{
/* margin-left: 10px; */
color
:
#1a50a5
;
font-family
:
Raleway
;
font-size
:
22px
;
}
\ No newline at end of file
src/app/launch-dialog/launch-dialog.component.html
View file @
36ac7133
<div
fxLayout=
"column"
fxLayoutAlign=
"space-between stretch"
style=
"width: 100%"
>
<!-- <div fxFlex style="background: blue">app config</div> -->
<!--<iframe *ngIf="appconfigurl != null" fxGrow=10 fxFlex [src]="appconfigsafeurl" style="border: none"></iframe>
<iframe *ngIf="appconfigurl != null" [src]="batchcmdsafeurl" style="height: 1px; min-height: 0px; border: none" #batchbuilderiframe></iframe>-->
<mat-accordion
style=
"width: 100%"
[displayMode]=
"flat"
[togglePosition]=
"'after'"
>
<mat-expansion-panel
style=
"width: 100%"
[expanded]=
"true"
>
<mat-expansion-panel-header>
<mat-panel-title>
<span>
LAUNCH {{ getAppName() }}
</span>
</mat-panel-title>
</mat-expansion-panel-header>
<!-- <div fxFlex style="background: blue">app config</div> -->
<!--<iframe *ngIf="appconfigurl != null" fxGrow=10 fxFlex [src]="appconfigsafeurl" style="border: none"></iframe>
<iframe *ngIf="appconfigurl != null" [src]="batchcmdsafeurl" style="height: 1px; min-height: 0px; border: none" #batchbuilderiframe></iframe>-->
<div
*ngIf=
"appSubject | async as app"
style=
"width: 100%"
>
<iframe
*ngIf=
"app.startscript !== null"
[src]=
"batchcmdsafeurl"
style=
"border: none; border-style: none; border-width: 0px; width: 100%; overflow: auto"
[style.height]=
"height+'px'"
#batchbuilderiframe
></iframe>
<!--<div *ngIf="appconfigsafeurl !== null && configtoggle">
<iframe [src]="appconfigsafeurl" style="border: none; border-style: none; border-width: 0px; width: 100%" [style.height]="appconfigheight+'px'" #batchbuilderiframe></iframe>
</div>-->
<div
*ngIf=
"appSubject | async as app"
style=
"width: 100%"
>
<iframe
*ngIf=
"app.startscript !== null"
[src]=
"batchcmdsafeurl"
style=
"border: none; border-style: none; border-width: 0px; width: 100%; overflow: auto"
[style.height]=
"height+'px'"
#batchbuilderiframe
></iframe>
<!--<div *ngIf="appconfigsafeurl !== null && configtoggle">
<iframe [src]="appconfigsafeurl" style="border: none; border-style: none; border-width: 0px; width: 100%" [style.height]="appconfigheight+'px'" #batchbuilderiframe></iframe>
</div>-->
<div
*ngIf=
"appSubject | async as app"
>
<div
fxLayout=
"row"
fxLayoutAlign=
"space-around"
>
<button
*ngIf=
"appconfigsafeurl !== null"
mat-flat-button
(click)=
"configdialog()"
color=
"primary"
>
Configure
</button>
<button
*ngIf=
"app.startscript !== null"
mat-flat-button
(click)=
"launch()"
color=
"primary"
#launchbtn
[disabled]=
"!readyToLaunch"
>
Launch
</button>
<button
*ngFor=
"let action of app.appactions"
mat-flat-button
(click)=
"runaction(action)"
color=
"primary"
>
{{ action.name }}
</button>
<div
*ngIf=
"appSubject | async as app"
>
<div
fxLayout=
"row"
fxLayoutAlign=
"space-around"
>
<button
*ngIf=
"appconfigsafeurl !== null"
mat-flat-button
(click)=
"configdialog()"
color=
"primary"
>
Configure
</button>
<button
*ngIf=
"app.startscript !== null"
mat-flat-button
(click)=
"launch()"
color=
"primary"
#launchbtn
[disabled]=
"!readyToLaunch"
>
Launch
</button>
<button
*ngFor=
"let action of app.appactions"
mat-flat-button
(click)=
"runaction(action)"
color=
"primary"
>
{{ action.name }}
</button>
</div>
</div>
</div>
</
div
>
</
div
>
</
mat-expansion-panel
>
</
mat-accordion
>
</div>
<div>
<div>
src/app/launch-dialog/launch-dialog.component.ts
View file @
36ac7133
...
...
@@ -207,4 +207,14 @@ export class LaunchDialogComponent implements OnInit {
}
this
.
setReady
(
false
);
}
public
getAppName
():
string
{
// default name if this function fails to get the app name
let
appName
=
"
job
"
;
if
(
this
.
appSubject
.
value
.
name
!==
undefined
)
{
appName
=
this
.
appSubject
.
value
.
name
;
}
return
appName
.
toUpperCase
();
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment