You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2017/10/14 22:37:06 UTC
hadoop git commit: HDFS-12661. Ozone: Support optional documentation
link in KSM/SCM webui. Contributed by Elek, Marton.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 9ba335733 -> 252cf8bbb
HDFS-12661. Ozone: Support optional documentation link in KSM/SCM webui. Contributed by Elek, Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/252cf8bb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/252cf8bb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/252cf8bb
Branch: refs/heads/HDFS-7240
Commit: 252cf8bbbc459ad63ddde45213eb1de2b5ccbe57
Parents: 9ba3357
Author: Anu Engineer <ae...@apache.org>
Authored: Sat Oct 14 15:31:26 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Sat Oct 14 15:31:26 2017 -0700
----------------------------------------------------------------------
.../hadoop-hdfs/src/main/webapps/static/ozone.js | 12 +++++++++++-
.../src/main/webapps/static/templates/tools.html | 1 +
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/252cf8bb/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
index f0d4011..0d7a286 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
@@ -230,6 +230,16 @@
});
angular.module('ozone').component('commonTools', {
- templateUrl: '/static/templates/tools.html'
+ templateUrl: '/static/templates/tools.html',
+ controller: function ($http) {
+ var ctrl = this;
+ ctrl.docs = false;
+ $http.head("/docs/index.html")
+ .then(function (result) {
+ ctrl.docs = true;
+ },function(){
+ ctrl.docs = false;
+ });
+ }
});
})();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/252cf8bb/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html
index cd11021..4ff92e3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html
@@ -34,5 +34,6 @@
aria-hidden="true"></a></li>
</ul>
</li>
+ <li ng-show="$ctrl.docs"><a href="/docs">Documentation</a></li>
</ul>
</div><!--/.nav-collapse -->
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org