+
+ + + + + + + + + +
+
- -
- -
-
- {{decorator.id}} - {{decorator.state}} -
-
-
- Pool: {{job.poolId}} - -
+ {{decorator.id}} + {{decorator.state}} + Pool: {{job.poolId}} +
- - -
- - - - - - - - +
+ +
diff --git a/app/components/job/home/job-home.html b/app/components/job/home/job-home.html index 57b6aeaef3..13dda39be1 100644 --- a/app/components/job/home/job-home.html +++ b/app/components/job/home/job-home.html @@ -1,8 +1,7 @@
- + +
diff --git a/app/components/pool/details/pool-details.html b/app/components/pool/details/pool-details.html index da507a095c..4ae8e67a41 100644 --- a/app/components/pool/details/pool-details.html +++ b/app/components/pool/details/pool-details.html @@ -4,27 +4,21 @@
- - - - + + + +
- -
- {{pool.id}} - {{pool.vmSize}}, {{pool.allocationState}} -
-
- -
-
- -

Last resized {{poolDecorator.lastResized}}

-

{{poolDecorator.poolOs}}

- -
+ {{pool.id}} + {{pool.vmSize}}, {{pool.allocationState}} +

Last resized {{poolDecorator.lastResized}}

+

{{poolDecorator.poolOs}}

+ +
+
+
diff --git a/app/components/pool/home/pool-home.html b/app/components/pool/home/pool-home.html index 9b1f4265ff..bd0fea300c 100644 --- a/app/components/pool/home/pool-home.html +++ b/app/components/pool/home/pool-home.html @@ -1,6 +1,6 @@
- +
diff --git a/app/components/task/home/task-home.html b/app/components/task/home/task-home.html index 1cea5f363c..d1ef08bc89 100644 --- a/app/components/task/home/task-home.html +++ b/app/components/task/home/task-home.html @@ -1,8 +1,7 @@
- + +
diff --git a/app/styles/job/details.scss b/app/styles/job/details.scss index f63be8c20c..913e51f8b2 100644 --- a/app/styles/job/details.scss +++ b/app/styles/job/details.scss @@ -8,6 +8,11 @@ md-card.overview { > .content { padding: 18px; + flex: 1; + } + + > .tile { + border-left: 1px solid #d5d5d5; } } From 68a983f2b8292952be8fe9d2b062f59805108c3b Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Mon, 29 May 2017 13:03:08 -0700 Subject: [PATCH 4/9] Update node and task details --- .../base/buttons/action-buttons.component.ts | 9 ++++- .../base/buttons/action-buttons.scss | 11 ++++++ app/components/node/details/node-details.html | 24 +++++-------- app/components/task/details/task-details.html | 36 ++++++++----------- 4 files changed, 43 insertions(+), 37 deletions(-) diff --git a/app/components/base/buttons/action-buttons.component.ts b/app/components/base/buttons/action-buttons.component.ts index fbcbf121df..14a6534969 100644 --- a/app/components/base/buttons/action-buttons.component.ts +++ b/app/components/base/buttons/action-buttons.component.ts @@ -28,11 +28,12 @@ export class ActionButtonComponent { public title: string; @Input() + @HostBinding("class.disabled") public disabled = false; @Input() @HostBinding("attr.type") - public type: ButtonType; + public type: ButtonType = "normal"; @Input() @HostBinding("attr.color") @@ -57,6 +58,12 @@ export class ActionButtonComponent { event.preventDefault(); } } + + public ngOnChanges(changes) { + if ("disabled" in changes) { + this.tabindex = this.disabled ? "-1" : "0"; + } + } } @Component({ diff --git a/app/components/base/buttons/action-buttons.scss b/app/components/base/buttons/action-buttons.scss index 9843859358..87bfba5a5c 100644 --- a/app/components/base/buttons/action-buttons.scss +++ b/app/components/base/buttons/action-buttons.scss @@ -21,6 +21,17 @@ bl-action-btn { vertical-align: middle; line-height: $action-btn-size; + &.disabled[color] { + cursor: not-allowed; + color: #d5d5d5; + background: #f5f5f5; + + &:hover { + color: #d5d5d5; + background: #f5f5f5; + } + } + &[type="normal"] { // Nothing } diff --git a/app/components/node/details/node-details.html b/app/components/node/details/node-details.html index db3add65d4..44dc876c77 100644 --- a/app/components/node/details/node-details.html +++ b/app/components/node/details/node-details.html @@ -1,23 +1,17 @@
- -
+
+ -
-
- {{node.id}} - {{node.state}} -
- - + + +
+
+ {{node.id}} + {{node.state}}

Pool: {{poolId}}

- - - - +
diff --git a/app/components/task/details/task-details.html b/app/components/task/details/task-details.html index bdb2a971f1..21e8f45c62 100644 --- a/app/components/task/details/task-details.html +++ b/app/components/task/details/task-details.html @@ -4,29 +4,23 @@
-
-
- -
- -
-
- {{task.id}} - {{task.displayName}} - {{task.state}} -
-
- -

Job: {{jobId}}

-
-
+
+ + + + + + + +
+
+ {{task.id}} - {{task.displayName}} + {{task.state}} +

Job: {{jobId}}

+
+
- - - - - - From 7e1d159891218b30e58968b04a16fa2c3350fc86 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Mon, 29 May 2017 15:39:59 -0700 Subject: [PATCH 5/9] update for account --- .../account/details/account-details.html | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/components/account/details/account-details.html b/app/components/account/details/account-details.html index 922c2fb640..d096d018be 100644 --- a/app/components/account/details/account-details.html +++ b/app/components/account/details/account-details.html @@ -1,16 +1,14 @@
-
- -
- -
-
- {{account.name}} - {{account.properties.accountEndpoint}} -
-
+
+ + + +
+
+ {{account.name}} + {{account.properties.accountEndpoint}}