You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ra...@apache.org on 2012/05/17 20:05:38 UTC
svn commit: r1339756 - in /incubator/ambari/branches/ambari-186: ./
hmc/puppet/modules/hdp-dashboard/templates/ mon_dashboard/src/ui/
mon_dashboard/src/ui/js/
Author: ramya
Date: Thu May 17 18:05:37 2012
New Revision: 1339756
URL: http://svn.apache.org/viewvc?rev=1339756&view=rev
Log:
AMBARI-251. Oozie link is not displayed even when Oozie is installed
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb
incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html
incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html
incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html
incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js
incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1339756&r1=1339755&r2=1339756&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu May 17 18:05:37 2012
@@ -2,6 +2,9 @@ Ambari Change log
Release 0.x.x - unreleased
+ AMBARI-251. Oozie link is not displayed even when Oozie is installed
+ (vgogate via ramya)
+
AMBARI-298. The current stage and the next stage are shown at the same time
during state transition (Yusaku Sako via ramya)
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb?rev=1339756&r1=1339755&r2=1339756&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/templates/cluster_configuration.json.erb Thu May 17 18:05:37 2012
@@ -80,15 +80,15 @@
],
"TEMPLETON" : [
{
- "installed": <%=not scope.function_hdp_no_hosts("public_templeton_host")%>,
+ "installed": <%=not scope.function_hdp_no_hosts("public_templeton_server_host")%>,
"name": "TEMPLETON"
}
],
"OOZIE" : [
{
- "installed": <%=not scope.function_hdp_no_hosts("public_oozie_host")%>,
+ "installed": <%=not scope.function_hdp_no_hosts("public_oozie_server")%>,
"name": "OOZIE",
- "oozie_host": "<%=scope.function_hdp_host("public_oozie_host")%>",
+ "oozie_host": "<%=scope.function_hdp_host("public_oozie_server")%>",
"oozie_port": 11000
}
]
Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html?rev=1339756&r1=1339755&r2=1339756&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html Thu May 17 18:05:37 2012
@@ -43,11 +43,10 @@
</nav>
<section id="links">
- <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Post Feedback</a>
- <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Documentation</a>
+ <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+ <a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
- <a id="oozie" class="roundedBox" href="" target="_blank">Oozie</a>
</section>
<section class="clear"></section>
</section>
@@ -128,7 +127,7 @@
<a id="graphForwardLink" href=""></a>
</section>
- <footer></footer>
+ <footer>Hortonworks © 2012</footer>
<script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
<script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
<script type="text/javascript" src="./libs/jquery.multiselect.js"></script>
Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html?rev=1339756&r1=1339755&r2=1339756&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html Thu May 17 18:05:37 2012
@@ -43,11 +43,10 @@
</nav>
<section id="links">
- <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Post Feedback</a>
- <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Documentation</a>
+ <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+ <a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
- <a id="oozie" class="roundedBox" href="" target="_blank">Oozie</a>
</section>
<section class="clear"></section>
</section>
@@ -129,7 +128,7 @@
<a id="graphForwardLink" href=""></a>
</section>
- <footer></footer>
+ <footer>Hortonworks © 2012</footer>
<script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
<script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
<script type="text/javascript" src="./libs/jquery.multiselect.js"></script>
Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html?rev=1339756&r1=1339755&r2=1339756&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html Thu May 17 18:05:37 2012
@@ -43,11 +43,10 @@
</nav>
<section id="links">
- <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Post Feedback</a>
- <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Documentation</a>
+ <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+ <a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
- <a id="oozie" class="roundedBox" href="" target="_blank">Oozie</a>
</section>
<section class="clear"></section>
</section>
@@ -147,7 +146,7 @@
<a id="graphForwardLink" href=""></a>
</section>
- <footer></footer>
+ <footer>Hortonworks © 2012</footer>
<script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
<script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
<script type="text/javascript" src="./libs/jquery.multiselect.js"></script>
Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js?rev=1339756&r1=1339755&r2=1339756&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js Thu May 17 18:05:37 2012
@@ -589,12 +589,16 @@
nagios.setAttribute("href", data.nagios_url);
var ganglia = document.getElementById("ganglia");
ganglia.setAttribute("href", data.ganglia_url);
- var oozie = document.getElementById("oozie");
if (data.oozie_url != "") {
- oozie.setAttribute("href", data.oozie_url);
- } else {
- oozie.style.display = 'none';
- }
+ var oozie_button = document.createElement("a");
+ oozie_button.setAttribute("id", "oozie");
+ oozie_button.setAttribute("class", "roundedBox");
+ oozie_button.setAttribute("target", "_blank");
+ oozie_button.setAttribute("href", data.oozie_url);
+ oozie_button.innerHTML = "Oozie";
+ var links = document.getElementById("links");
+ links.appendChild(oozie_button);
+ }
};
// Get Graphs for Dashboard page
Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html?rev=1339756&r1=1339755&r2=1339756&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html Thu May 17 18:05:37 2012
@@ -43,11 +43,10 @@
</nav>
<section id="links">
- <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Post Feedback</a>
- <a class="roundedBox" href="http://www.hortonworks.com" target="_blank">Documentation</a>
+ <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
+ <a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
- <a id="oozie" class="roundedBox" href="" target="_blank">Oozie</a>
</section>
<section class="clear"></section>
</section>
@@ -134,7 +133,7 @@
<a id="graphForwardLink" href=""></a>
</section>
- <footer></footer>
+ <footer>Hortonworks © 2012</footer>
<script type="text/javascript" src="./libs/jquery-1.7.1.js"></script>
<script type="text/javascript" src="./libs/jqueryui/js/jquery-ui-1.7.3.custom.min.js"></script>
<script type="text/javascript" src="./libs/jquery.multiselect.js"></script>