incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1362335 - in /incubator/ambari/trunk: ./ mon_dashboard/src/ui/ mon_dashboard/src/ui/js/ mon_dashboard/src/ui/styles/
Date Tue, 17 Jul 2012 03:04:57 GMT
Author: yusaku
Date: Tue Jul 17 03:04:56 2012
New Revision: 1362335

URL: http://svn.apache.org/viewvc?rev=1362335&view=rev
Log:
AMBARI-639. Monitoring Dashboard does not show the Help Link in the top nav and a link to
Apache 2.0 license and NOTICE file in the footer (Contributed by yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/mon_dashboard/src/ui/hbase.html
    incubator/ambari/trunk/mon_dashboard/src/ui/hdfs.html
    incubator/ambari/trunk/mon_dashboard/src/ui/home.html
    incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js
    incubator/ambari/trunk/mon_dashboard/src/ui/mapreduce.html
    incubator/ambari/trunk/mon_dashboard/src/ui/styles/common.css

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1362335&r1=1362334&r2=1362335&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jul 17 03:04:56 2012
@@ -69,6 +69,9 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    AMBARI-639. Monitoring Dashboard does not show the Help Link in the top nav
+    and a link to Apache 2.0 license and NOTICE file in the footer (yusaku) 
+
     AMBARI-638. Weirdness with Custom Config page when the user goes back to 
     previous stages (yusaku)
 

Modified: incubator/ambari/trunk/mon_dashboard/src/ui/hbase.html
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/mon_dashboard/src/ui/hbase.html?rev=1362335&r1=1362334&r2=1362335&view=diff
==============================================================================
--- incubator/ambari/trunk/mon_dashboard/src/ui/hbase.html (original)
+++ incubator/ambari/trunk/mon_dashboard/src/ui/hbase.html Tue Jul 17 03:04:56 2012
@@ -36,6 +36,7 @@
         <ul class="nav">
           <li><a href="/hmc/html">Cluster Management</a></li>
           <li class="active"><a href="/hdp/dashboard/ui/home.html">Monitoring</a></li>
+          <li class="right"><a class="help" href="javascript:void(0)" target="_blank">Help</a></li>
         </ul>
       </div>
     </div>

Modified: incubator/ambari/trunk/mon_dashboard/src/ui/hdfs.html
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/mon_dashboard/src/ui/hdfs.html?rev=1362335&r1=1362334&r2=1362335&view=diff
==============================================================================
--- incubator/ambari/trunk/mon_dashboard/src/ui/hdfs.html (original)
+++ incubator/ambari/trunk/mon_dashboard/src/ui/hdfs.html Tue Jul 17 03:04:56 2012
@@ -36,6 +36,7 @@
         <ul class="nav">
           <li><a href="/hmc/html">Cluster Management</a></li>
           <li class="active"><a href="/hdp/dashboard/ui/home.html">Monitoring</a></li>
+          <li class="right"><a class="help" href="javascript:void(0)" target="_blank">Help</a></li>
         </ul>
       </div>
     </div>

Modified: incubator/ambari/trunk/mon_dashboard/src/ui/home.html
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/mon_dashboard/src/ui/home.html?rev=1362335&r1=1362334&r2=1362335&view=diff
==============================================================================
--- incubator/ambari/trunk/mon_dashboard/src/ui/home.html (original)
+++ incubator/ambari/trunk/mon_dashboard/src/ui/home.html Tue Jul 17 03:04:56 2012
@@ -36,6 +36,7 @@
         <ul class="nav">
           <li><a href="/hmc/html">Cluster Management</a></li>
           <li class="active"><a href="/hdp/dashboard/ui/home.html">Monitoring</a></li>
+          <li class="right"><a class="help" href="javascript:void(0)" target="_blank">Help</a></li>
         </ul>
       </div>
     </div>

Modified: incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js?rev=1362335&r1=1362334&r2=1362335&view=diff
==============================================================================
--- incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js (original)
+++ incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js Tue Jul 17 03:04:56 2012
@@ -34,7 +34,8 @@
   $(document).ready(function(){
     document.title = 'Ambari';
     $('#brand').html('Ambari');
-    $('#footer').html('');
+    $('#footer').html('<a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Licensed
under the Apache License, Version 2.0</a>.<br><a href="/hmc/licenses/NOTICE.txt"
target="_blank">See third-party tools/resources that Ambari uses and their respective authors</a>');
+    $('.navbar a.help').attr('href', 'http://incubator.apache.org/ambari/install.html');
     self.clearTimeout(to);
     a.refreshPage();
     a.setEventDelegation();

Modified: incubator/ambari/trunk/mon_dashboard/src/ui/mapreduce.html
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/mon_dashboard/src/ui/mapreduce.html?rev=1362335&r1=1362334&r2=1362335&view=diff
==============================================================================
--- incubator/ambari/trunk/mon_dashboard/src/ui/mapreduce.html (original)
+++ incubator/ambari/trunk/mon_dashboard/src/ui/mapreduce.html Tue Jul 17 03:04:56 2012
@@ -36,6 +36,7 @@
         <ul class="nav">
           <li><a href="/hmc/html">Cluster Management</a></li>
           <li class="active"><a href="/hdp/dashboard/ui/home.html">Monitoring</a></li>
+          <li class="right"><a class="help" href="javascript:void(0)" target="_blank">Help</a></li>
         </ul>
       </div>
     </div>

Modified: incubator/ambari/trunk/mon_dashboard/src/ui/styles/common.css
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/mon_dashboard/src/ui/styles/common.css?rev=1362335&r1=1362334&r2=1362335&view=diff
==============================================================================
--- incubator/ambari/trunk/mon_dashboard/src/ui/styles/common.css (original)
+++ incubator/ambari/trunk/mon_dashboard/src/ui/styles/common.css Tue Jul 17 03:04:56 2012
@@ -48,6 +48,10 @@ footer {
 	padding:40px 10px;
 	color:#454545;
 }
+footer a:link, footer a:visited {
+  color:#666666;
+  text-decoration:underline;
+}
 header {
 	width:1045px;
 	margin:20px 10px;
@@ -431,18 +435,17 @@ section.row > section {
 	margin-bottom:30px
 }
 .navbar .brand {
-    color: #666666;
-    display: block;
-    float: left;
-    font-size: 16px;
-    font-weight: normal;
-    line-height: 1;
-    margin-left: 0;
-    margin-right: 40px;
-    margin-top: 3px;
-    padding: 14px 10px;
-    text-decoration: none;
-    width:280px;
+  color: #666666;
+  display: block;
+  float: left;
+  font-size: 16px;
+  font-weight: normal;
+  line-height: 1;
+  margin-left: 0;
+  margin-right: 40px;
+  margin-top: 3px;
+  padding: 14px 10px;
+  text-decoration: none;
 }
 
 .navbar-inner {
@@ -457,7 +460,8 @@ section.row > section {
 }
 .navbar .nav {
 	display:block;
-	float:left;
+	float:none;
+  overflow:hidden;
 	left:0;
 	margin:0 10px 0 0;
 	position:relative;
@@ -496,6 +500,9 @@ section.row > section {
 	color: #999999;
 	text-decoration: none;
 }
+.navbar .nav > li.right {
+  float: right;
+}
 .navbar .brand {
 	margin-right:40px;
 }



Mime
View raw message