ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [35/45] ambari git commit: AMBARI-20678. Complete node name is not shown when node name is larger than 17 characters (pallavkul)
Date Mon, 24 Apr 2017 02:21:17 GMT
AMBARI-20678. Complete node name is not shown when node name is larger than 17 characters (pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84a8b762
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84a8b762
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84a8b762

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 84a8b76282fd1791b6ca70da6425a4bf8e2d8a12
Parents: 8d3cc47
Author: pallavkul <pallav.kul@gmail.com>
Authored: Fri Apr 21 21:17:37 2017 +0530
Committer: pallavkul <pallav.kul@gmail.com>
Committed: Fri Apr 21 21:17:37 2017 +0530

----------------------------------------------------------------------
 .../hive20/src/main/resources/ui/app/adapters/application.js  | 2 +-
 .../views/hive20/src/main/resources/ui/app/styles/app.scss    | 7 +++++++
 .../main/resources/ui/app/utils/hive-explainer/renderer.js    | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/84a8b762/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js b/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js
index 42935fc..696f861 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/adapters/application.js
@@ -57,7 +57,7 @@ export default DS.RESTAdapter.extend({
       // In development mode when the UI is served using ember serve the xhr requests are
proxied to ambari server
       // by setting the proxyurl parameter in ember serve and for ambari to authenticate
the requests, it needs this
       // basic authorization. This is for default admin/admin username/password combination.
-      //headers['Authorization'] = 'Basic YWRtaW46YWRtaW4=';
+      headers['Authorization'] = 'Basic YWRtaW46YWRtaW4=';
       //headers['Authorization'] = 'Basic aGl2ZTpoaXZl';
       //headers['Authorization'] = 'Basic ZGlwYXlhbjpkaXBheWFu';
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/84a8b762/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index f4b63c5..ca3bc98 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -977,3 +977,10 @@ rect.operator__box {
 .CodeMirror-scroll {
   padding-bottom: 20px;
 }
+
+.ellipsis-node {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100px;
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/84a8b762/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js
b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js
index 78aa39d..987cda9 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js
@@ -159,7 +159,7 @@ function getRenderer(type, isSingleReducer) {
             <i class='fa ${getOperatorIcon(d._operator)}' aria-hidden='true'></i>
           </div>
           <div class='operator-body' style='margin-left: 10px;'>
-            <div>${getOperatorLabel(d, isSingleReducer)}</div>
+            <div class="ellipsis-node" title=${getOperatorLabel(d, isSingleReducer)}>${getOperatorLabel(d,
isSingleReducer)}</div>
             ${(d['limit:'] && d['limit:'] > -1) ? '<div><span style="font-weight:
lighter;">Limit:</span> ' + d['limit:'] + ' </div>' : ''}
           </div>
         </div>
@@ -175,7 +175,7 @@ function getRenderer(type, isSingleReducer) {
           <i class='fa ${getOperatorIcon(d._operator)}' aria-hidden='true'></i>
         </div>
         <div class='operator-body' style='margin-left: 10px;'>
-          <div>${getOperatorLabel(d, isSingleReducer)}</div>
+          <div class="ellipsis-node" title=${getOperatorLabel(d, isSingleReducer)}>${getOperatorLabel(d,
isSingleReducer)}</div>
           ${stats}
         </div>
       </div>


Mime
View raw message