You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/01/19 13:07:27 UTC
[ambari] branch trunk updated: AMBARI-22788 Unsightly artifacts
during Login. (atkach)
This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 881b464 AMBARI-22788 Unsightly artifacts during Login. (atkach)
881b464 is described below
commit 881b464983d84b795737413e137922dca6c3f06f
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Mon Jan 15 19:25:01 2018 +0200
AMBARI-22788 Unsightly artifacts during Login. (atkach)
---
ambari-admin/src/main/resources/ui/admin-web/app/index.html | 6 +++---
ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css | 9 +++++++++
ambari-admin/src/main/resources/ui/admin-web/package.json | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index a9c6984..99f1b94 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -54,15 +54,15 @@
<div class="container">
<div class="navbar-header navbar-nav">
<ol class="breadcrumb">
- <li ng-repeat="breadcrumb in breadcrumbs" ng-class="$last && 'active'">{{breadcrumb}}</li>
+ <li ng-repeat="breadcrumb in breadcrumbs" ng-class="$last && 'active'" ng-cloak>{{breadcrumb}}</li>
</ol>
</div>
<ul class="nav navbar-nav navbar-right">
<li>
- <p class="navbar-text">{{cluster.Clusters.cluster_name}}</p>
+ <p class="navbar-text" ng-cloak>{{cluster.Clusters.cluster_name}}</p>
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" ng-disabled="disabled">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" ng-disabled="disabled" ng-cloak>
<i class="fa fa-user"></i> {{currentUser}} <span class="caret"></span>
</a>
<ul class="dropdown-menu">
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
index 8f693a8..b93ea7f 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
@@ -18,6 +18,15 @@
+/**
+ * When this css rule is loaded by the browser, all html elements (including their children)
+ * that are tagged with the ngCloak directive are hidden. When AngularJS encounters this directive
+ * during the compilation of the template it deletes the ngCloak element attribute, making the compiled element visible.
+ */
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+ display: none !important;
+}
+
/*
------ START editable-list DIRECTIVE SECTION ------ -
*/
diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json
index b7c514c..b81e614 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -24,7 +24,7 @@
"karma-jasmine": "0.1.5",
"karma-ng-html2js-preprocessor": "^0.1.0",
"karma-phantomjs-launcher": "0.1",
- "phantomjs": "1.9.20",
+ "phantomjs": "^2.1.7",
"protractor": "1.0.0"
},
"scripts": {
--
To stop receiving notification emails like this one, please contact
['"commits@ambari.apache.org" <co...@ambari.apache.org>'].