YARN-3845. Scheduler page does not render RGBA color combinations in IE11. (Contributed by Mohammad Shahid Khan)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/88e8cd55 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/88e8cd55 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/88e8cd55 Branch: refs/heads/YARN-2928 Commit: 88e8cd5550b366343d8683dc7f169e583299b429 Parents: 43df21a Author: Rohith Sharma K S <rohithsharm...@apache.org> Authored: Fri Jul 24 12:43:06 2015 +0530 Committer: Zhijie Shen <zjs...@apache.org> Committed: Mon Jul 27 12:57:34 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/webapp/view/TwoColumnLayout.java | 2 +- .../resourcemanager/webapp/CapacitySchedulerPage.java | 7 ++++--- .../resourcemanager/webapp/DefaultSchedulerPage.java | 4 ++-- .../server/resourcemanager/webapp/FairSchedulerPage.java | 10 ++++++---- 5 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/88e8cd55/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 71ad286..2192811 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -784,6 +784,9 @@ Release 2.8.0 - UNRELEASED YARN-3900. Protobuf layout of yarn_security_token causes errors in other protos that include it (adhoot via rkanter) + YARN-3845. Scheduler page does not render RGBA color combinations in IE11. + (Contributed by Mohammad Shahid Khan) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/88e8cd55/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java index b8f5f75..4d7752d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/TwoColumnLayout.java @@ -126,7 +126,7 @@ public class TwoColumnLayout extends HtmlPage { styles.add(join('#', tableId, "_paginate span {font-weight:normal}")); styles.add(join('#', tableId, " .progress {width:8em}")); styles.add(join('#', tableId, "_processing {top:-1.5em; font-size:1em;")); - styles.add(" color:#000; background:rgba(255, 255, 255, 0.8)}"); + styles.add(" color:#000; background:#fefefe}"); for (String style : innerStyles) { styles.add(join('#', tableId, " ", style)); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/88e8cd55/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index a784601..12a3013 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -59,9 +59,10 @@ class CapacitySchedulerPage extends RmView { static final float Q_MAX_WIDTH = 0.8f; static final float Q_STATS_POS = Q_MAX_WIDTH + 0.05f; static final String Q_END = "left:101%"; - static final String Q_GIVEN = "left:0%;background:none;border:1px dashed rgba(0,0,0,0.25)"; - static final String Q_OVER = "background:rgba(255, 140, 0, 0.8)"; - static final String Q_UNDER = "background:rgba(50, 205, 50, 0.8)"; + static final String Q_GIVEN = + "left:0%;background:none;border:1px dashed #BFBFBF"; + static final String Q_OVER = "background:#FFA333"; + static final String Q_UNDER = "background:#5BD75B"; @RequestScoped static class CSQInfo { http://git-wip-us.apache.org/repos/asf/hadoop/blob/88e8cd55/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java index 36d8309..1099baf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java @@ -38,8 +38,8 @@ class DefaultSchedulerPage extends RmView { static final String _Q = ".ui-state-default.ui-corner-all"; static final float WIDTH_F = 0.8f; static final String Q_END = "left:101%"; - static final String OVER = "font-size:1px;background:rgba(255, 140, 0, 0.8)"; - static final String UNDER = "font-size:1px;background:rgba(50, 205, 50, 0.8)"; + static final String OVER = "font-size:1px;background:#FFA333"; + static final String UNDER = "font-size:1px;background:#5BD75B"; static final float EPSILON = 1e-8f; static class QueueInfoBlock extends HtmlBlock { http://git-wip-us.apache.org/repos/asf/hadoop/blob/88e8cd55/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java index d87fb5c..5ff9422 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java @@ -46,10 +46,12 @@ public class FairSchedulerPage extends RmView { static final float Q_MAX_WIDTH = 0.8f; static final float Q_STATS_POS = Q_MAX_WIDTH + 0.05f; static final String Q_END = "left:101%"; - static final String Q_GIVEN = "left:0%;background:none;border:1px solid rgba(0,0,0,1)"; - static final String Q_INSTANTANEOUS_FS = "left:0%;background:none;border:1px dashed rgba(0,0,0,1)"; - static final String Q_OVER = "background:rgba(255, 140, 0, 0.8)"; - static final String Q_UNDER = "background:rgba(50, 205, 50, 0.8)"; + static final String Q_GIVEN = + "left:0%;background:none;border:1px solid #000000"; + static final String Q_INSTANTANEOUS_FS = + "left:0%;background:none;border:1px dashed #000000"; + static final String Q_OVER = "background:#FFA333"; + static final String Q_UNDER = "background:#5BD75B"; static final String STEADY_FAIR_SHARE = "Steady Fair Share"; static final String INSTANTANEOUS_FAIR_SHARE = "Instantaneous Fair Share"; @RequestScoped