diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss index 59f624569dd..01dc9f5b71c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss @@ -739,6 +739,14 @@ div.loggedin-user { } } +.no-border-bottom { + border-bottom: none; +} + +.margin-bottom-20 { + margin-bottom: 20px; +} + .diagnostic-info { pre { margin-bottom: 0; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss index 0bfadb06167..330106c513f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss @@ -20,9 +20,9 @@ @import 'variables.scss'; .yarn-compose-box { - position: fixed; - bottom: 0; - top: 0px; + position: absolute; + top: 50px; + bottom: 40px; right: 0px; background-color: $yarn-panel-bg; border: 1px solid $yarn-border-color; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs index 7d9aec1f0fc..94208ef7d61 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs @@ -19,23 +19,8 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}}
-
-
-
- Application Attempt -
-
- -
-
-
-
+ +
{{#if model.attempt}}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs index 5f4d29d0bd2..584d21e96ab 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs @@ -16,40 +16,36 @@ * limitations under the License. }} -
+
{{metrics-table metrics=model.metrics type="Service"}}
{{#if model.configs}} -
-
-
-
Service Configurations
-
-
- - +
+
+
Service Configurations
+
+
+
+ + + + + + + + {{#each model.configs as |config|}} - - + + - - - {{#each model.configs as |config|}} - - - - - {{/each}} - -
NameValue
NameValue{{config.name}}{{config.value}}
{{config.name}}{{config.value}}
-
+ {{/each}} + +
{{else}} -
-
-

No service configurations available!

-
+
+

No service configurations available!

{{/if}} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs index b11e125a15f..7d024c52c84 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs @@ -36,7 +36,7 @@ {{/if}} {{#if model.app.diagnostics}} -
+
{{#if model.app.isFailed}}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs index 36336ad594d..1282bcdc8bb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs @@ -18,26 +18,9 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} -
-
- -
-
-
- Component -
-
- -
-
-
- -
+
+
{{outlet}} -
+ diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs index e7ac57a7cf5..7cf4b1e6936 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs @@ -18,28 +18,21 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} -
-
- -
-
-
- Component -
-
- -
+
+
+
+
+
- -
+
{{outlet}}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs index 87b596e1a0e..5cced1c0f4c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs @@ -60,7 +60,7 @@
-
+