incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1346592 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/css/common.css hmc/html/topnav.htmli
Date Tue, 05 Jun 2012 21:11:51 GMT
Author: vikram
Date: Tue Jun  5 21:11:51 2012
New Revision: 1346592

URL: http://svn.apache.org/viewvc?rev=1346592&view=rev
Log:
AMBARI-332. Modify nav to easily switch between cluster management and monitoring (Contributed
by Yusaku)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/css/common.css
    incubator/ambari/branches/ambari-186/hmc/html/topnav.htmli

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1346592&r1=1346591&r2=1346592&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Tue Jun  5 21:11:51 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-332. Modify nav to easily switch between cluster management and monitoring. (Yusaku
via Vikram)
+
   Jitendra's commit. AMBARI-518. Junk code in manifestloader site.pp. (Jitendra via Vikram)
 
   AMBARI-331. Make txnUtils immune to backend race conditions (Varun via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/css/common.css
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/css/common.css?rev=1346592&r1=1346591&r2=1346592&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/css/common.css (original)
+++ incubator/ambari/branches/ambari-186/hmc/css/common.css Tue Jun  5 21:11:51 2012
@@ -301,22 +301,6 @@ input.unit-ms {
 	width:100px;
 }
 
-.navbar .brand {
-    color: #666666;
-    display: block;
-    float: left;
-    font-size: 16px;
-    font-weight:normal;
-    line-height: 1;
-    margin-left:0;
-    padding: 14px 10px;
-}
-
-.navbar-inner {
-	background: linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0 transparent;
-	background: -moz-linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0 transparent;
-	background: -webkit-linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0 transparent;
-}
 
 a.btn {
 	color:#333;
@@ -402,4 +386,116 @@ div.separator {
 }
 #selectServicesCoreDivId ul {
 	list-style:none outside none;
+}
+
+#masterServices {
+	margin-top:40px;
+}
+#masterServices select {
+	width:auto;
+	background-color:#fff;
+}
+#masterServices ul {
+	font-size:14px;
+	color:#65B642;
+	font-weight:bold;
+}
+/*
+#masterServices label {
+	width:240px;
+	float:left;
+	line-height: 28px;
+    margin-right: 10px;
+    text-align: right;
+}
+*/
+#masterServices .hostInfo {
+	margin-left:10px;
+	font-size:14px;
+	font-weight:normal;
+}
+#masterServices a {
+	margin-left:20px;
+}
+#masterServicesToHosts {
+	margin-left:20px;
+	width:480px;
+	float:left;
+}
+.masterServiceSelect {
+	margin-bottom:10px;	
+}
+.masterServiceSelect label {
+	font-size:14px;
+}
+#hostsToMasterServices {
+	width:440px;
+	float:left;
+}
+.hostToMasterServices {
+    background-color: #F7F7F5;
+    border: 1px solid rgba(0, 0, 0, 0.05);
+    border-radius: 4px 4px 4px 4px;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) inset;
+    margin: 0 0 20px;
+    min-height: 20px;
+    padding: 19px;
+    width:400px;
+}
+.hostToMasterServices h3 {
+	font-size:14px;
+}
+
+.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;
+}
+
+.navbar-inner {
+	background: linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0 transparent;
+	background: -moz-linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0 transparent;
+	background: -webkit-linear-gradient(#FAFAFA, #EAEAEA) repeat scroll 0 0 transparent;
+	border-radius:0;
+	border:1px solid #bbb;
+	border-width:0 0 1px 0;
+}
+
+.navbar .nav .active > a, .navbar .nav .active > a:hover {
+    background-color: #999999;
+    color: #FFFFFF;
+    text-decoration: none;
+}
+.navbar .nav > li > a {
+	border-radius:8px;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+    color: #666666;
+    float: none;
+    font-size: 13px;
+    font-weight: bold;
+    line-height: 19px;
+    margin: 6px 10px 6px 0;
+    padding: 8px 14px;
+    text-decoration: none;
+    text-shadow: none;
+}
+.navbar .nav > li > a:hover {
+  background-color: transparent;
+  color: #999999;
+  text-decoration: none;
+}
+.navbar .brand {
+	margin-right:40px;
+}
+.navbar #logo {
+	float:left;
+	padding-top:7px;
 }
\ No newline at end of file

Modified: incubator/ambari/branches/ambari-186/hmc/html/topnav.htmli
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/topnav.htmli?rev=1346592&r1=1346591&r2=1346592&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/topnav.htmli (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/topnav.htmli Tue Jun  5 21:11:51 2012
@@ -1,39 +1,36 @@
 <!-- START TOPNAV -->
     <?php 
 		if (basename($_SERVER['REQUEST_URI']) == 'initializeCluster.php') {
+			$isInitWizard = true;
 			$logoUrl = 'javascript:void 0';
         } else {
+        	$isInitWizard = false;
 			$logoUrl = '/hmc/html';
 		}
 	?>
 	<div class="navbar">
 		<div class="navbar-inner">
 			<div class="container">
-				<img style="float:left;padding-top:5px" src="../images/logo-small.gif">
+				<a href="<?php echo $logoUrl ?>"><img id="logo" src="../images/logo-small.gif"></a>
 				<a class="brand" href="<?php echo $logoUrl ?>"><?php echo $RES['app.name']
?></a>
-				<?php /*
+				<?php if (!$isInitWizard) { ?> 
 				<ul class="nav">
-					<li class="active"><a href="#">Home</a>
-					</li>
-					<li class="dropdown"><a href="#" class="dropdown-toggle"
-						data-toggle="dropdown"> Clusters <b class="caret"></b>
-					</a>
-						<ul class="dropdown-menu">
-							<li><a href="#">Cluster 1</a></li>
-							<li><a href="#">Cluster 2</a></li>
-						</ul>
+					<li class="active"><a href="/hmc/html">Cluster Management</a>
 					</li>
-					<li><a href="#">Link</a></li>
-					<li><a href="#">Link</a></li>
+					<li><a href="/hdp/dashboard/ui/home.html">Monitoring</a></li>
+				<?php } ?>
+				<?php /*
 					<li>
 						<form class="navbar-search pull-left">
 							<input style="margin-left: 20px" type="text" class="search-query"
 								placeholder="Search">
 						</form>
 					</li>
-				</ul>
 				*/ ?>
+				</ul>
 			</div>
 		</div>
 	</div>
+	
+	
 <!-- END TOPNAV -->



Mime
View raw message