hadoop git commit: YARN-7825. [UI2] Maintain constant horizontal application info bar for Application Attempt page. Contributed by Akhil PB.
Repository: hadoop Updated Branches: refs/heads/branch-3.2 52f9759bf -> 50acba2e3 YARN-7825. [UI2] Maintain constant horizontal application info bar for Application Attempt page. Contributed by Akhil PB. (cherry picked from commit 228dc192f1108438e2a221ec2ed7b6fd44080295) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/50acba2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/50acba2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/50acba2e Branch: refs/heads/branch-3.2 Commit: 50acba2e394db5978f95ebee913fbfdf6edfb891 Parents: 52f9759 Author: Sunil G Authored: Mon Oct 8 11:54:56 2018 +0530 Committer: Sunil G Committed: Mon Oct 8 11:55:50 2018 +0530 -- .../src/main/webapp/app/styles/app.scss | 8 ++ .../src/main/webapp/app/styles/compose-box.scss | 6 +- .../src/main/webapp/app/styles/layout.scss | 8 ++ .../webapp/app/templates/yarn-app-attempt.hbs | 80 - .../webapp/app/templates/yarn-app/configs.hbs | 93 +--- .../main/webapp/app/templates/yarn-app/info.hbs | 2 +- .../app/templates/yarn-component-instance.hbs | 22 + .../app/templates/yarn-component-instances.hbs | 33 +++ .../main/webapp/app/templates/yarn-queue.hbs| 2 +- .../webapp/app/templates/yarn-queue/apps.hbs| 5 +- 10 files changed, 144 insertions(+), 115 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/50acba2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss -- 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 59f6245..01dc9f5 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; http://git-wip-us.apache.org/repos/asf/hadoop/blob/50acba2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss -- 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 0bfadb0..330106c 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; http://git-wip-us.apache.org/repos/asf/hadoop/blob/50acba2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss index 587df66..10607af 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss @@ -44,3 +44,11 @@ .top-1 { margin-top: 5px; } + +.top-2 { + margin-top: 10px; +} + +.top-3 { + margin-top: 20px; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/50acba2e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs -- 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 7d9aec1..044b9b1 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,30 +19,70 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} - - - -Application Attempt - - - - -{{#link-to 'yarn-app-attempt' tagName="li"}} - {{#link-to
hadoop git commit: YARN-7825. [UI2] Maintain constant horizontal application info bar for Application Attempt page. Contributed by Akhil PB.
Repository: hadoop Updated Branches: refs/heads/branch-3.1 9bbf494c7 -> dd445e036 YARN-7825. [UI2] Maintain constant horizontal application info bar for Application Attempt page. Contributed by Akhil PB. (cherry picked from commit 228dc192f1108438e2a221ec2ed7b6fd44080295) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd445e03 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd445e03 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd445e03 Branch: refs/heads/branch-3.1 Commit: dd445e03681099b97a7a9b6b65bd22cd932af861 Parents: 9bbf494 Author: Sunil G Authored: Mon Oct 8 11:54:56 2018 +0530 Committer: Sunil G Committed: Mon Oct 8 11:56:28 2018 +0530 -- .../src/main/webapp/app/styles/app.scss | 8 ++ .../src/main/webapp/app/styles/compose-box.scss | 6 +- .../src/main/webapp/app/styles/layout.scss | 8 ++ .../webapp/app/templates/yarn-app-attempt.hbs | 80 - .../webapp/app/templates/yarn-app/configs.hbs | 93 +--- .../main/webapp/app/templates/yarn-app/info.hbs | 2 +- .../app/templates/yarn-component-instance.hbs | 22 + .../app/templates/yarn-component-instances.hbs | 33 +++ .../main/webapp/app/templates/yarn-queue.hbs| 2 +- .../webapp/app/templates/yarn-queue/apps.hbs| 5 +- 10 files changed, 144 insertions(+), 115 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd445e03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss -- 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 59f6245..01dc9f5 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; http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd445e03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss -- 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 0bfadb0..330106c 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; http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd445e03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss index 587df66..10607af 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss @@ -44,3 +44,11 @@ .top-1 { margin-top: 5px; } + +.top-2 { + margin-top: 10px; +} + +.top-3 { + margin-top: 20px; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd445e03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs -- 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 7d9aec1..044b9b1 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,30 +19,70 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} - - - -Application Attempt - - - - -{{#link-to 'yarn-app-attempt' tagName="li"}} - {{#link-to
hadoop git commit: YARN-7825. [UI2] Maintain constant horizontal application info bar for Application Attempt page. Contributed by Akhil PB.
Repository: hadoop Updated Branches: refs/heads/trunk 907ef6c28 -> 228dc192f YARN-7825. [UI2] Maintain constant horizontal application info bar for Application Attempt page. Contributed by Akhil PB. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/228dc192 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/228dc192 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/228dc192 Branch: refs/heads/trunk Commit: 228dc192f1108438e2a221ec2ed7b6fd44080295 Parents: 907ef6c Author: Sunil G Authored: Mon Oct 8 11:54:56 2018 +0530 Committer: Sunil G Committed: Mon Oct 8 11:54:56 2018 +0530 -- .../src/main/webapp/app/styles/app.scss | 8 ++ .../src/main/webapp/app/styles/compose-box.scss | 6 +- .../src/main/webapp/app/styles/layout.scss | 8 ++ .../webapp/app/templates/yarn-app-attempt.hbs | 80 - .../webapp/app/templates/yarn-app/configs.hbs | 93 +--- .../main/webapp/app/templates/yarn-app/info.hbs | 2 +- .../app/templates/yarn-component-instance.hbs | 22 + .../app/templates/yarn-component-instances.hbs | 33 +++ .../main/webapp/app/templates/yarn-queue.hbs| 2 +- .../webapp/app/templates/yarn-queue/apps.hbs| 5 +- 10 files changed, 144 insertions(+), 115 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/228dc192/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss -- 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 59f6245..01dc9f5 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; http://git-wip-us.apache.org/repos/asf/hadoop/blob/228dc192/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss -- 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 0bfadb0..330106c 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; http://git-wip-us.apache.org/repos/asf/hadoop/blob/228dc192/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss index 587df66..10607af 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss @@ -44,3 +44,11 @@ .top-1 { margin-top: 5px; } + +.top-2 { + margin-top: 10px; +} + +.top-3 { + margin-top: 20px; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/228dc192/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs -- 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 7d9aec1..044b9b1 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,30 +19,70 @@ {{breadcrumb-bar breadcrumbs=breadcrumbs}} - - - -Application Attempt - - - - -{{#link-to 'yarn-app-attempt' tagName="li"}} - {{#link-to 'yarn-app-attempt' model.attempt.id}}Attempt Info{{/link-to}} -{{/link-to}} -